Merge remote-tracking branch 'origin/main' into remote-admin

# Conflicts:
#	contact/ui/contact_ui.py
#	contact/ui/control_ui.py

contact/message_handlers/rx_handler.py

@@ -74,16 +74,26 @@ def play_sound():
             logging.warning("Configured notification sound is unavailable: %s", sound_path)
             return
 
-        executable = "afplay" if platform.system() == "Darwin" else shutil.which("ffplay") or shutil.which("mpg123")
+        executable = "afplay" if platform.system() == "Darwin" else next(
+            (shutil.which(player) for player in ("ffplay", "mpg123", "mpv", "cvlc", "paplay") if shutil.which(player)),
+            None,
+        )
 
         if executable and sound_path:
+            player = os.path.basename(executable)
             cmd = [executable, sound_path]
-            if executable == "ffplay":
+            if player == "ffplay":
                 cmd = [executable, "-nodisp", "-autoexit", sound_path]
+            elif player == "mpv":
+                cmd = [executable, "--no-video", sound_path]
+            elif player == "cvlc":
+                cmd = [executable, "--play-and-exit", sound_path]
 
             subprocess.run(cmd, check=True, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
             return
-        logging.warning("No suitable sound player found for notification sound")
+        logging.warning(
+            "No suitable sound player found for notification sound; install ffmpeg (ffplay), mpg123, mpv, or VLC."
+        )
 
     except subprocess.CalledProcessError as e:
         logging.error(f"Sound playback failed: {e}")

contact/ui/contact_ui.py

@@ -1,5 +1,6 @@
 import curses
 import logging
+from typing import Optional
 import time
 import traceback
 from numbers import Real
@@ -383,6 +384,41 @@ def main_ui(stdscr: curses.window) -> None:
     handle_resize(stdscr, True)
 
     while True:
+        interface = interface_state.interface
+        if (
+            hasattr(interface, "stream")
+            and interface.stream is None
+            and not ui_state.reconnect_attempted
+        ):
+            ui_state.reconnect_attempted = True
+            status_win = show_connection_status(stdscr, "Disconnected", "Trying to reconnect…")
+            try:
+                from contact.ui.control_ui import reconnect_interface_with_splash
+
+                reconnect_interface_with_splash(stdscr, interface)
+                if status_win is not None:
+                    status_win.erase()
+                    status_win.refresh()
+                ui_state.reconnect_attempted = False
+                handle_resize(stdscr, False)
+            except Exception:
+                if status_win is not None:
+                    status_win.erase()
+                    status_win.refresh()
+                handle_resize(stdscr, False)
+                logging.exception("Automatic reconnect after transport disconnect failed")
+                retry = get_list_input(
+                    "Contact could not reconnect after 20 seconds.",
+                    "Retry",
+                    ["Retry", "Cancel"],
+                    mandatory=True,
+                )
+                if retry == "Retry":
+                    ui_state.reconnect_attempted = False
+                    handle_resize(stdscr, False)
+                    continue
+                handle_resize(stdscr, False)
+
         with app_state.lock:
             process_pending_ui_updates(stdscr)
         entry_display = f"{ui_state.reply_context}{input_text or ''}"
@@ -652,12 +688,27 @@ def handle_enter(input_text: str) -> str:
             )
             return input_text
         # Enter key pressed, send user input as message
-        send_message(
-            input_text,
-            channel=ui_state.selected_channel,
-            reply_id=ui_state.reply_id,
-            reply_context=ui_state.reply_context,
-        )
+        try:
+            send_message(
+                input_text,
+                channel=ui_state.selected_channel,
+                reply_id=ui_state.reply_id,
+                reply_context=ui_state.reply_context,
+            )
+        except Exception as exc:
+            logging.warning("Message send failed; reconnecting interface: %s", exc)
+            try:
+                from contact.ui.control_ui import reconnect_interface_with_splash
+
+                reconnect_interface_with_splash(root_win, interface_state.interface)
+                contact.ui.dialog.dialog("Reconnected", "Connection restored. Your message was not sent; press Enter to retry.")
+            except Exception as reconnect_exc:
+                logging.exception("Automatic reconnect failed")
+                contact.ui.dialog.dialog(
+                    "Reconnect failed",
+                    "Contact could not reconnect after 20 seconds. Check the radio connection and retry your message.",
+                )
+            return input_text
         ui_state.reply_id = None
         ui_state.reply_context = ""
         ui_state.reply_id_unavailable = False
@@ -959,14 +1010,28 @@ def handle_backtick(stdscr: curses.window) -> None:
         settings_menu(stdscr, interface)
     elif remote_node_num is not None:
         wait_win = None
+
+        def remote_status(message: Optional[str]) -> None:
+            nonlocal wait_win
+            if message is None:
+                if wait_win is not None:
+                    wait_win.erase()
+                    wait_win.refresh()
+                    wait_win = None
+                return
+            if wait_win is None:
+                wait_win = show_remote_admin_wait(stdscr, get_name_from_database(remote_node_num))
+            update_remote_admin_wait(wait_win, message)
+
         try:
-            wait_win = show_remote_admin_wait(stdscr, get_name_from_database(remote_node_num))
             settings_menu(
                 stdscr,
                 interface,
-                node=interface.getNode(remote_node_num),
+                # Settings requests configs explicitly; avoid getNode's
+                # implicit channel request racing that setup.
+                node=interface.getNode(remote_node_num, False),
                 remote=True,
-                status_callback=lambda message: update_remote_admin_wait(wait_win, message),
+                status_callback=remote_status,
             )
         except SystemExit as exc:
             logging.warning("Remote admin was rejected for %s: %s", remote_node_num, exc)
@@ -1010,6 +1075,23 @@ def show_remote_admin_wait(stdscr: curses.window, node_name: str) -> curses.wind
         return None
 
 
+def show_connection_status(stdscr: curses.window, title: str, message: str) -> curses.window | None:
+    """Display a non-blocking connection-status dialog over the current UI."""
+    try:
+        height, width = stdscr.getmaxyx()
+        box_width = min(width - 4, max(len(message) + 4, len(title) + 6, 32))
+        win = curses.newwin(5, box_width, max(0, (height - 5) // 2), max(0, (width - box_width) // 2))
+        win.bkgd(get_color("background"))
+        win.attrset(get_color("window_frame"))
+        win.border()
+        win.addstr(0, 2, f" {title} ", get_color("settings_default"))
+        win.addstr(2, 2, message[: box_width - 4], get_color("settings_default"))
+        win.refresh()
+        return win
+    except curses.error:
+        return None
+
+
 def update_remote_admin_wait(wait_win: curses.window | None, message: str) -> None:
     """Append the current remote-admin request to the waiting overlay."""
     if wait_win is None:

contact/ui/control_ui.py

@@ -5,6 +5,7 @@ import logging
 import os
 import sys
 import threading
+import time
 from typing import List
 from meshtastic.protobuf import admin_pb2
 
@@ -26,7 +27,6 @@ from contact.ui.colors import get_color
 from contact.ui.dialog import dialog
 from contact.ui.menus import generate_menu_from_protobuf
 from contact.ui.nav_utils import move_highlight, draw_arrows, update_help_window
-from contact.ui.splash import draw_splash
 from contact.ui.user_config import json_editor
 from contact.utilities.arg_parser import setup_parser
 from contact.utilities.singleton import interface_state, menu_state
@@ -236,9 +236,6 @@ def reconnect_interface_with_splash(stdscr: object, interface: object) -> object
     except Exception:
         pass
 
-    stdscr.clear()
-    stdscr.refresh()
-    draw_splash(stdscr)
     new_interface = reconnect_interface(setup_parser().parse_args())
     interface_state.interface = new_interface
     redraw_main_ui_after_reconnect(stdscr)
@@ -302,6 +299,49 @@ def _request_remote_with_timeout(request, *args) -> None:
         raise failure[0]
 
 
+def _request_remote_channels_with_timeout(node: object) -> None:
+    """Retrieve a remote node's channel list without leaving the UI waiting forever."""
+    node.requestChannels()
+    deadline = time.monotonic() + REMOTE_ADMIN_REQUEST_TIMEOUT_SECONDS
+    while getattr(node, "channels", None) is None:
+        if time.monotonic() >= deadline:
+            raise TimeoutError("Timed out waiting for the remote node's channel list.")
+        time.sleep(0.1)
+
+
+def _request_remote_section(node: object, menu_path: List[str], selected_option: str, status_callback=None) -> bool:
+    """Fetch exactly the remote-admin section the user is opening.
+
+    Meshtastic returns radio and module settings one protobuf section at a
+    time.  Asking for all of them on menu entry is both slow and unreliable on
+    long paths, so leave the top-level menu immediately available.
+    """
+    if menu_path == ["Main Menu"] and selected_option == "Channels":
+        if status_callback:
+            status_callback("Requesting channel list…")
+        _request_remote_channels_with_timeout(node)
+        return True
+
+    if len(menu_path) != 2:
+        return False
+
+    category = menu_path[-1]
+    if category == "Radio Settings":
+        config = node.localConfig
+    elif category == "Module Settings":
+        config = node.moduleConfig
+    else:
+        return False
+
+    field = config.DESCRIPTOR.fields_by_name.get(selected_option)
+    if field is None or field.name in {"version", "sessionkey"}:
+        return False
+    if status_callback:
+        status_callback(f"Requesting {selected_option} config…")
+    _request_remote_with_timeout(node.requestConfig, field)
+    return True
+
+
 def settings_menu(
     stdscr: object, interface: object, node: object = None, remote: bool = False, status_callback=None
 ) -> None:
@@ -313,21 +353,6 @@ def settings_menu(
     node_name = node_info.get("user", {}).get("longName") if isinstance(node_info, dict) else None
     admin_target_label = node_name or f"!{node_num:08x}"
 
-    if remote:
-        # Remote nodes do not populate radio config automatically. Request
-        # the standard sections before building the menu. Module requests are
-        # intentionally deferred: firmware may omit modules and never answer
-        # those requests, which would otherwise block the entire UI.
-        for config_type in list(node.localConfig.DESCRIPTOR.fields):
-            if config_type.name in {"version", "sessionkey"}:
-                continue
-            if status_callback:
-                status_callback(f"Requesting {config_type.name} config…")
-            _request_remote_with_timeout(node.requestConfig, config_type)
-        if status_callback:
-            status_callback("Requesting channels…")
-        _request_remote_with_timeout(node.requestChannels)
-
     menu = generate_menu_from_protobuf(interface, node=node, include_app_settings=not remote)
     menu_state.current_menu = menu["Main Menu"]
     menu_state.menu_path = ["Main Menu"]
@@ -783,7 +808,28 @@ def settings_menu(
 
                 menu_state.current_menu[selected_option] = (field, new_value)
             else:
-                menu_state.current_menu = menu_state.current_menu[selected_option]
+                requested_remote_section = False
+                if remote:
+                    try:
+                        requested_remote_section = _request_remote_section(
+                            node, menu_state.menu_path, selected_option, status_callback
+                        )
+                    finally:
+                        if status_callback:
+                            status_callback(None)
+                    if requested_remote_section:
+                        # The response updates the node's protobufs. Rebuild
+                        # the menu before entering the requested section so
+                        # the newly received values are what the user sees.
+                        menu = generate_menu_from_protobuf(interface, node=node, include_app_settings=False)
+                        refreshed_menu = menu["Main Menu"]
+                        for path_step in menu_state.menu_path[1:]:
+                            refreshed_menu = refreshed_menu[path_step]
+                        menu_state.current_menu = refreshed_menu[selected_option]
+                    else:
+                        menu_state.current_menu = menu_state.current_menu[selected_option]
+                else:
+                    menu_state.current_menu = menu_state.current_menu[selected_option]
                 menu_state.menu_path.append(selected_option)
                 menu_state.menu_index.append(menu_state.selected_index)
                 menu_state.selected_index = 0

contact/ui/ui_state.py

@@ -39,6 +39,7 @@ class ChatUIState:
     redraw_full_ui: bool = False
     scroll_messages_to_bottom: bool = False
     preserve_message_selection: bool = False
+    reconnect_attempted: bool = False
     oldest_message_rowid: Dict[Union[str, int], int] = field(default_factory=dict)
     has_older_messages: Dict[Union[str, int], bool] = field(default_factory=dict)
     message_line_ranges: Dict[Union[str, int], List[tuple]] = field(default_factory=dict)

contact/utilities/interfaces.py

@@ -44,15 +44,21 @@ def initialize_interface(args):
         logging.critical(f"Fatal error initializing interface: {ex}")
 
 
-def reconnect_interface(args, attempts: int = 15, delay_seconds: float = 1.0):
+def reconnect_interface(args, attempts: int = 20, delay_seconds: float = 1.0):
     last_error = None
 
     for attempt in range(attempts):
         try:
             interface = initialize_interface(args)
-            if interface is not None:
+            if interface is not None and getattr(interface, "localNode", None) is not None and getattr(
+                interface.localNode, "localConfig", None
+            ) is not None and (not hasattr(interface, "stream") or interface.stream is not None):
                 return interface
-            last_error = RuntimeError("initialize_interface returned None")
+            last_error = RuntimeError("interface did not complete connection setup")
+            try:
+                interface.close()
+            except Exception:
+                pass
         except Exception as ex:
             last_error = ex
 

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "contact"
-version = "1.6.0"
+version = "1.6.2"
 description = "This Python curses client for Meshtastic is a terminal-based client designed to manage device settings, enable mesh chat communication, and handle configuration backups and restores."
 authors = [
     {name = "Ben Lipsey",email = "ben@pdxlocations.com"}