show connection errors in console

maybe fix aplay

contact/__main__.py

@@ -53,22 +53,21 @@ logging.basicConfig(
 
 app_state.lock = threading.Lock()
 
+
 # ------------------------------------------------------------------------------
 # Main Program Logic
 # ------------------------------------------------------------------------------
+def prompt_region_if_unset(args: object) -> None:
+    """Prompt user to set region if it is unset."""
+    confirmation = get_list_input("Your region is UNSET. Set it now?", "Yes", ["Yes", "No"])
+    if confirmation == "Yes":
+        set_region(interface_state.interface)
+        interface_state.interface.close()
+        interface_state.interface = initialize_interface(args)
 
 
-def initialize_globals(args) -> None:
+def initialize_globals(args: object) -> None:
     """Initializes interface and shared globals."""
-    interface_state.interface = initialize_interface(args)
-
-    # Prompt for region if unset
-    if interface_state.interface.localNode.localConfig.lora.region == 0:
-        confirmation = get_list_input("Your region is UNSET. Set it now?", "Yes", ["Yes", "No"])
-        if confirmation == "Yes":
-            set_region(interface_state.interface)
-            interface_state.interface.close()
-            interface_state.interface = initialize_interface(args)
 
     interface_state.myNodeNum = get_nodeNum()
     ui_state.channel_list = get_channels()
@@ -81,55 +80,63 @@ def initialize_globals(args) -> None:
 
 def main(stdscr: curses.window) -> None:
     """Main entry point for the curses UI."""
+
     output_capture = io.StringIO()
-
     try:
-        with contextlib.redirect_stdout(output_capture), contextlib.redirect_stderr(output_capture):
-            setup_colors()
-            draw_splash(stdscr)
+        setup_colors()
+        draw_splash(stdscr)
 
-            args = setup_parser().parse_args()
+        args = setup_parser().parse_args()
 
-            if getattr(args, "settings", False):
-                subprocess.run([sys.executable, "-m", "contact.settings"], check=True)
-                return
+        if getattr(args, "settings", False):
+            subprocess.run([sys.executable, "-m", "contact.settings"], check=True)
+            return
 
-            logging.info("Initializing interface...")
-            with app_state.lock:
-                initialize_globals(args)
-                logging.info("Starting main UI")
+        logging.info("Initializing interface...")
+        with app_state.lock:
+            interface_state.interface = initialize_interface(args)
 
-            main_ui(stdscr)
+            if interface_state.interface.localNode.localConfig.lora.region == 0:
+                prompt_region_if_unset(args)
 
-    except Exception as e:
-        console_output = output_capture.getvalue()
-        logging.error("Uncaught exception: %s", e)
-        logging.error("Traceback: %s", traceback.format_exc())
-        logging.error("Console output:\n%s", console_output)
+            initialize_globals(args)
+            logging.info("Starting main UI")
+
+        try:
+            with contextlib.redirect_stdout(output_capture), contextlib.redirect_stderr(output_capture):
+                main_ui(stdscr)
+        except Exception:
+            console_output = output_capture.getvalue()
+            logging.error("Uncaught exception inside main_ui")
+            logging.error("Traceback:\n%s", traceback.format_exc())
+            logging.error("Console output:\n%s", console_output)
+            return
+
+    except Exception:
         raise
 
 
 def start() -> None:
-    """Launch curses wrapper and redirect logs to file."""
+    """Entry point for the application."""
 
     if "--help" in sys.argv or "-h" in sys.argv:
         setup_parser().print_help()
         sys.exit(0)
 
-    with open(config.log_file_path, "a", buffering=1) as log_f:
-        sys.stdout = log_f
-        sys.stderr = log_f
-
-        with contextlib.redirect_stdout(log_f), contextlib.redirect_stderr(log_f):
-            try:
-                curses.wrapper(main)
-            except KeyboardInterrupt:
-                logging.info("User exited with Ctrl+C")
-                sys.exit(0)
-            except Exception as e:
-                logging.error("Fatal error: %s", e)
-                logging.error("Traceback: %s", traceback.format_exc())
-                sys.exit(1)
+    try:
+        curses.wrapper(main)
+    except KeyboardInterrupt:
+        logging.info("User exited with Ctrl+C")
+        sys.exit(0)
+    except Exception as e:
+        logging.critical("Fatal error", exc_info=True)
+        try:
+            curses.endwin()
+        except Exception:
+            pass
+        print("Fatal error:", e)
+        traceback.print_exc()
+        sys.exit(1)
 
 
 if __name__ == "__main__":

contact/message_handlers/rx_handler.py

@@ -3,11 +3,12 @@ import os
 import platform
 import shutil
 import subprocess
-import time
-from datetime import datetime
 from typing import Any, Dict
 
-from contact.utilities.utils import refresh_node_list
+from contact.utilities.utils import (
+    refresh_node_list,
+    add_new_message,
+)
 from contact.ui.contact_ui import (
     draw_packetlog_win,
     draw_node_list,
@@ -29,37 +30,42 @@ from contact.utilities.singleton import ui_state, interface_state, app_state
 def play_sound():
     try:
         system = platform.system()
+        sound_path = None
+        executable = None
 
         if system == "Darwin":  # macOS
             sound_path = "/System/Library/Sounds/Ping.aiff"
-            if os.path.exists(sound_path):
-                subprocess.run(["afplay", sound_path], check=True)
-                return
-            else:
-                logging.warning(f"macOS sound file not found: {sound_path}")
+            executable = "afplay"
 
         elif system == "Linux":
-            sound_path = "/usr/share/sounds/freedesktop/stereo/complete.oga"
-            if os.path.exists(sound_path):
-                if shutil.which("paplay"):
-                    subprocess.run(["paplay", sound_path], check=True)
-                    return
-                elif shutil.which("aplay"):
-                    subprocess.run(["aplay", sound_path], check=True)
-                    return
-                else:
-                    logging.warning("No sound player found (paplay/aplay)")
+            ogg_path = "/usr/share/sounds/freedesktop/stereo/complete.oga"
+            wav_path = "/usr/share/sounds/alsa/Front_Center.wav"  # common fallback
+
+            if shutil.which("paplay") and os.path.exists(ogg_path):
+                executable = "paplay"
+                sound_path = ogg_path
+            elif shutil.which("ffplay") and os.path.exists(ogg_path):
+                executable = "ffplay"
+                sound_path = ogg_path
+            elif shutil.which("aplay") and os.path.exists(wav_path):
+                executable = "aplay"
+                sound_path = wav_path
             else:
-                logging.warning(f"Linux sound file not found: {sound_path}")
+                logging.warning("No suitable sound player or sound file found on Linux")
+
+        if executable and sound_path:
+            cmd = [executable, sound_path]
+            if executable == "ffplay":
+                cmd = [executable, "-nodisp", "-autoexit", sound_path]
+
+            subprocess.run(cmd, check=True, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
+            return
 
     except subprocess.CalledProcessError as e:
         logging.error(f"Sound playback failed: {e}")
     except Exception as e:
         logging.error(f"Unexpected error: {e}")
 
-    # Final fallback: terminal beep
-    print("\a")
-
 
 def on_receive(packet: Dict[str, Any], interface: Any) -> None:
     """
@@ -119,7 +125,9 @@ def on_receive(packet: Dict[str, Any], interface: Any) -> None:
 
                     channel_number = ui_state.channel_list.index(packet["from"])
 
-                if ui_state.channel_list[channel_number] != ui_state.channel_list[ui_state.selected_channel]:
+                channel_id = ui_state.channel_list[channel_number]
+
+                if channel_id != ui_state.channel_list[ui_state.selected_channel]:
                     add_notification(channel_number)
                     refresh_channels = True
                 else:
@@ -129,40 +137,14 @@ def on_receive(packet: Dict[str, Any], interface: Any) -> None:
                 message_from_id = packet["from"]
                 message_from_string = get_name_from_database(message_from_id, type="short") + ":"
 
-                if ui_state.channel_list[channel_number] not in ui_state.all_messages:
-                    ui_state.all_messages[ui_state.channel_list[channel_number]] = []
-
-                # Timestamp handling
-                current_timestamp = time.time()
-                current_hour = datetime.fromtimestamp(current_timestamp).strftime("%Y-%m-%d %H:00")
-
-                # Retrieve the last timestamp if available
-                channel_messages = ui_state.all_messages[ui_state.channel_list[channel_number]]
-                if channel_messages:
-                    # Check the last entry for a timestamp
-                    for entry in reversed(channel_messages):
-                        if entry[0].startswith("--"):
-                            last_hour = entry[0].strip("- ").strip()
-                            break
-                    else:
-                        last_hour = None
-                else:
-                    last_hour = None
-
-                # Add a new timestamp if it's a new hour
-                if last_hour != current_hour:
-                    ui_state.all_messages[ui_state.channel_list[channel_number]].append((f"-- {current_hour} --", ""))
-
-                ui_state.all_messages[ui_state.channel_list[channel_number]].append(
-                    (f"{config.message_prefix} {message_from_string} ", message_string)
-                )
+                add_new_message(channel_id, f"{config.message_prefix} {message_from_string} ", message_string)
 
                 if refresh_channels:
                     draw_channel_list()
                 if refresh_messages:
                     draw_messages_window(True)
 
-                save_message_to_db(ui_state.channel_list[channel_number], message_from_id, message_string)
+                save_message_to_db(channel_id, message_from_id, message_string)
 
         except KeyError as e:
             logging.error(f"Error processing packet: {e}")

contact/message_handlers/tx_handler.py

@@ -1,4 +1,3 @@
-from datetime import datetime
 from typing import Any, Dict
 
 import google.protobuf.json_format
@@ -16,6 +15,8 @@ import contact.ui.default_config as config
 
 from contact.utilities.singleton import ui_state, interface_state
 
+from contact.utilities.utils import add_new_message
+
 ack_naks: Dict[str, Dict[str, Any]] = {}  # requestId -> {channel, messageIndex, timestamp}
 
 
@@ -146,8 +147,9 @@ def on_response_traceroute(packet: Dict[str, Any]) -> None:
         update_node_info_in_db(packet["from"], chat_archived=False)
 
     channel_number = ui_state.channel_list.index(packet["from"])
+    channel_id = ui_state.channel_list[channel_number]
 
-    if ui_state.channel_list[channel_number] == ui_state.channel_list[ui_state.selected_channel]:
+    if channel_id == ui_state.channel_list[ui_state.selected_channel]:
         refresh_messages = True
     else:
         add_notification(channel_number)
@@ -155,18 +157,14 @@ def on_response_traceroute(packet: Dict[str, Any]) -> None:
 
     message_from_string = get_name_from_database(packet["from"], type="short") + ":\n"
 
-    if ui_state.channel_list[channel_number] not in ui_state.all_messages:
-        ui_state.all_messages[ui_state.channel_list[channel_number]] = []
-    ui_state.all_messages[ui_state.channel_list[channel_number]].append(
-        (f"{config.message_prefix} {message_from_string}", msg_str)
-    )
+    add_new_message(channel_id, f"{config.message_prefix} {message_from_string}", msg_str)
 
     if refresh_channels:
         draw_channel_list()
     if refresh_messages:
         draw_messages_window(True)
-    save_message_to_db(ui_state.channel_list[channel_number], packet["from"], msg_str)
 
+    save_message_to_db(channel_id, packet["from"], msg_str)
 
 def send_message(message: str, destination: int = BROADCAST_NUM, channel: int = 0) -> None:
     """
@@ -190,32 +188,7 @@ def send_message(message: str, destination: int = BROADCAST_NUM, channel: int =
         channelIndex=send_on_channel,
     )
 
-    # Add sent message to the messages dictionary
-    if channel_id not in ui_state.all_messages:
-        ui_state.all_messages[channel_id] = []
-
-    # Handle timestamp logic
-    current_timestamp = int(datetime.now().timestamp())  # Get current timestamp
-    current_hour = datetime.fromtimestamp(current_timestamp).strftime("%Y-%m-%d %H:00")
-
-    # Retrieve the last timestamp if available
-    channel_messages = ui_state.all_messages[channel_id]
-    if channel_messages:
-        # Check the last entry for a timestamp
-        for entry in reversed(channel_messages):
-            if entry[0].startswith("--"):
-                last_hour = entry[0].strip("- ").strip()
-                break
-        else:
-            last_hour = None
-    else:
-        last_hour = None
-
-    # Add a new timestamp if it's a new hour
-    if last_hour != current_hour:
-        ui_state.all_messages[channel_id].append((f"-- {current_hour} --", ""))
-
-    ui_state.all_messages[channel_id].append((config.sent_message_prefix + config.ack_unknown_str + ": ", message))
+    add_new_message(channel_id, config.sent_message_prefix + config.ack_unknown_str + ": ", message)
 
     timestamp = save_message_to_db(channel_id, myid, message)
 
@@ -230,10 +203,14 @@ def send_traceroute() -> None:
     """
     Sends a RouteDiscovery protobuf to the selected node.
     """
+
+    channel_id = ui_state.node_list[ui_state.selected_node]
+    add_new_message(channel_id, f"{config.message_prefix} Sent Traceroute", "")
+
     r = mesh_pb2.RouteDiscovery()
     interface_state.interface.sendData(
         r,
-        destinationId=ui_state.node_list[ui_state.selected_node],
+        destinationId=channel_id,
         portNum=portnums_pb2.PortNum.TRACEROUTE_APP,
         wantResponse=True,
         onResponse=on_response_traceroute,

contact/ui/contact_ui.py

@@ -108,7 +108,7 @@ def main_ui(stdscr: curses.window) -> None:
     handle_resize(stdscr, True)
 
     while True:
-        draw_text_field(entry_win, f"Input: {input_text[-(stdscr.getmaxyx()[1] - 10):]}", get_color("input"))
+        draw_text_field(entry_win, f"Input: {(input_text or '')[-(stdscr.getmaxyx()[1] - 10):]}", get_color("input"))
 
         # Get user input from entry window
         char = entry_win.get_wch()
@@ -137,8 +137,7 @@ def main_ui(stdscr: curses.window) -> None:
             handle_leftright(char)
 
         elif char in (chr(curses.KEY_ENTER), chr(10), chr(13)):
-            handle_enter(input_text)
-            input_text = ""
+            input_text = handle_enter(input_text)
 
         elif char == chr(20):  # Ctrl + t for Traceroute
             handle_ctrl_t(stdscr)
@@ -298,7 +297,7 @@ def handle_leftright(char: int) -> None:
         refresh_pad(2)
 
 
-def handle_enter(input_text: str) -> None:
+def handle_enter(input_text: str) -> str:
     """Handle Enter key events to send messages or select channels."""
     if ui_state.current_window == 2:
         node_list = ui_state.node_list
@@ -318,6 +317,7 @@ def handle_enter(input_text: str) -> None:
         draw_node_list()
         draw_channel_list()
         draw_messages_window(True)
+        return input_text
 
     elif len(input_text) > 0:
         # Enter key pressed, send user input as message
@@ -325,8 +325,9 @@ def handle_enter(input_text: str) -> None:
         draw_messages_window(True)
 
         # Clear entry window and reset input text
-        input_text = ""
         entry_win.erase()
+        return ""
+    return input_text
 
 
 def handle_ctrl_t(stdscr: curses.window) -> None:
@@ -335,14 +336,14 @@ def handle_ctrl_t(stdscr: curses.window) -> None:
     curses.curs_set(0)  # Hide cursor
     contact.ui.dialog.dialog(
         stdscr,
-        "Traceroute Sent",
+        f"Traceroute Sent To: {get_name_from_database(ui_state.node_list[ui_state.selected_node])}",
         "Results will appear in messages window.\nNote: Traceroute is limited to once every 30 seconds.",
     )
     curses.curs_set(1)  # Show cursor again
     handle_resize(stdscr, False)
 
 
-def handle_backspace(entry_win: curses.window, input_text: str) -> None:
+def handle_backspace(entry_win: curses.window, input_text: str) -> str:
     """Handle backspace key events to remove the last character from input text."""
     if input_text:
         input_text = input_text[:-1]

contact/utilities/utils.py

@@ -1,4 +1,5 @@
 import datetime
+import time
 from meshtastic.protobuf import config_pb2
 import contact.ui.default_config as config
 
@@ -134,3 +135,31 @@ def get_time_ago(timestamp):
     if unit != "s":
         return f"{value} {unit} ago"
     return "now"
+
+def add_new_message(channel_id, prefix, message):
+    if channel_id not in ui_state.all_messages:
+        ui_state.all_messages[channel_id] = []
+
+    # Timestamp handling
+    current_timestamp = time.time()
+    current_hour = datetime.datetime.fromtimestamp(current_timestamp).strftime("%Y-%m-%d %H:00")
+
+    # Retrieve the last timestamp if available
+    channel_messages = ui_state.all_messages[channel_id]
+    if channel_messages:
+        # Check the last entry for a timestamp
+        for entry in reversed(channel_messages):
+            if entry[0].startswith("--"):
+                last_hour = entry[0].strip("- ").strip()
+                break
+        else:
+            last_hour = None
+    else:
+        last_hour = None
+
+    # Add a new timestamp if it's a new hour
+    if last_hour != current_hour:
+        ui_state.all_messages[channel_id].append((f"-- {current_hour} --", ""))
+
+    # Add the message
+    ui_state.all_messages[channel_id].append((prefix,message))

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "contact"
-version = "1.3.13"
+version = "1.3.15"
 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"}