Bump version to 1.5.6 in pyproject.toml

refactor exit

contact/__main__.py

@@ -57,6 +57,8 @@ logging.basicConfig(
 
 app_state.lock = threading.Lock()
 
+DEFAULT_CLOSE_TIMEOUT_SECONDS = 5.0
+
 
 # ------------------------------------------------------------------------------
 # Main Program Logic
@@ -72,11 +74,36 @@ def prompt_region_if_unset(args: object, stdscr: Optional[curses.window] = None)
         interface_state.interface = reconnect_interface(args)
 
 
-def close_interface(interface: object) -> None:
+def close_interface(interface: object, timeout_seconds: float = DEFAULT_CLOSE_TIMEOUT_SECONDS) -> bool:
     if interface is None:
-        return
-    with contextlib.suppress(Exception):
-        interface.close()
+        return True
+
+    close_errors = []
+
+    def _close_target() -> None:
+        try:
+            interface.close()
+        except BaseException as error:  # Keep shutdown resilient even for KeyboardInterrupt/SystemExit from libraries.
+            close_errors.append(error)
+
+    close_thread = threading.Thread(target=_close_target, name="meshtastic-interface-close", daemon=True)
+    close_thread.start()
+    close_thread.join(timeout_seconds)
+
+    if close_thread.is_alive():
+        logging.warning("Timed out closing interface after %.1fs; continuing shutdown", timeout_seconds)
+        return False
+
+    if not close_errors:
+        return True
+
+    error = close_errors[0]
+    if isinstance(error, KeyboardInterrupt):
+        logging.info("Interrupted while closing interface; continuing shutdown")
+        return True
+
+    logging.warning("Ignoring error while closing interface: %r", error)
+    return True
 
 
 def interface_is_ready(interface: object) -> bool:
@@ -205,23 +232,32 @@ def start() -> None:
         setup_parser().print_help()
         sys.exit(0)
 
+    interrupted = False
+    fatal_error = None
+
     try:
         curses.wrapper(main)
-        close_interface(interface_state.interface)
     except KeyboardInterrupt:
+        interrupted = True
         logging.info("User exited with Ctrl+C")
-        close_interface(interface_state.interface)
-        sys.exit(0)
     except Exception as e:
+        fatal_error = e
         logging.critical("Fatal error", exc_info=True)
         try:
             curses.endwin()
         except Exception:
             pass
-        print("Fatal error:", e)
+    finally:
+        close_interface(interface_state.interface)
+
+    if fatal_error is not None:
+        print("Fatal error:", fatal_error)
         traceback.print_exc()
         sys.exit(1)
 
+    if interrupted:
+        sys.exit(0)
+
 
 if __name__ == "__main__":
     start()

contact/localisations/en.ini

@@ -12,6 +12,7 @@ Reboot, "Reboot", ""
 Reset Node DB, "Reset Node DB", ""
 Shutdown, "Shutdown", ""
 Factory Reset, "Factory Reset", ""
+factory_reset_config, "Factory Reset Config", ""
 Exit, "Exit", ""
 Yes, "Yes", ""
 No, "No", ""
@@ -55,6 +56,7 @@ confirm.reboot, "Are you sure you want to Reboot?", ""
 confirm.reset_node_db, "Are you sure you want to Reset Node DB?", ""
 confirm.shutdown, "Are you sure you want to Shutdown?", ""
 confirm.factory_reset, "Are you sure you want to Factory Reset?", ""
+confirm.factory_reset_config, "Are you sure you want to Factory Reset Config?", ""
 confirm.save_before_exit_section, "You have unsaved changes in {section}. Save before exiting?", ""
 prompt.select_region, "Select your region:", ""
 dialog.slow_down_title, "Slow down", ""

contact/localisations/fr.ini

@@ -0,0 +1,197 @@
+##field_name, "Nom du champ lisible avec première lettre en majuscule", "Texte d'aide avec [warning]avertissements[/warning], [note]notes[/note], [underline]soulignements[/underline], \033[31mcodes couleur ANSI\033[0m et \nsauts de ligne."
+Main Menu, "Menu principal", ""
+User Settings, "Paramètres utilisateur", ""
+Channels, "Canaux", ""
+Radio Settings, "Paramètres radio", ""
+Module Settings, "Paramètres des modules", ""
+App Settings, "Paramètres de l'application", ""
+Export Config File, "Exporter le fichier de configuration", ""
+Load Config File, "Charger le fichier de configuration", ""
+Config URL, "URL de configuration", ""
+Reboot, "Redémarrer", ""
+Reset Node DB, "Réinitialiser la base de données des nœuds", ""
+Shutdown, "Éteindre", ""
+Factory Reset, "Réinitialisation d'usine", ""
+factory_reset_config, "Réinitialiser la configuration d'usine", ""
+Exit, "Quitter", ""
+Yes, "Oui", ""
+No, "Non", ""
+Cancel, "Annuler", ""
+
+[ui]
+save_changes, "Enregistrer les modifications", ""
+dialog.invalid_input, "Entrée invalide", ""
+prompt.enter_new_value, "Entrer une nouvelle valeur : ", ""
+error.value_empty, "La valeur ne peut pas être vide.", ""
+error.value_exact_length, "La valeur doit comporter exactement {length} caractères.", ""
+error.value_min_length, "La valeur doit comporter au moins {length} caractères.", ""
+error.value_max_length, "La valeur ne doit pas dépasser {length} caractères.", ""
+error.digits_only, "Seuls les chiffres (0-9) sont autorisés.", ""
+error.number_range, "Entrez un nombre entre {min_value} et {max_value}.", ""
+error.float_invalid, "Doit être un nombre à virgule flottante valide.", ""
+prompt.edit_admin_keys, "Modifier jusqu'à 3 clés administrateur :", ""
+label.admin_key, "Clé administrateur", ""
+error.admin_key_invalid, "Erreur : chaque clé doit être en Base64 valide et faire 32 octets !", ""
+prompt.edit_values, "Modifier jusqu'à 3 valeurs :", ""
+label.value, "Valeur", ""
+prompt.enter_ip, "Entrez une adresse IP (xxx.xxx.xxx.xxx) :", ""
+label.current, "Actuel", ""
+label.new_value, "Nouvelle valeur", ""
+label.editing, "Modification de {label}", ""
+label.current_value, "Valeur actuelle :", ""
+error.ip_invalid, "Adresse IP invalide. Réessayez.", ""
+prompt.select_foreground_color, "Sélectionner la couleur de premier plan pour {label}", ""
+prompt.select_background_color, "Sélectionner la couleur d'arrière-plan pour {label}", ""
+prompt.select_value, "Sélectionner {label}", ""
+confirm.save_before_exit, "Vous avez des modifications non enregistrées. Enregistrer avant de quitter ?", ""
+prompt.config_filename, "Entrez un nom de fichier pour le fichier de configuration", ""
+confirm.overwrite_file, "{filename} existe déjà. Écraser ?", ""
+dialog.config_saved_title, "Fichier de configuration enregistré :", ""
+dialog.no_config_files, " Aucun fichier de configuration trouvé. Exportez-en un d'abord.", ""
+prompt.choose_config_file, "Choisissez un fichier de configuration", ""
+confirm.load_config_file, "Êtes-vous sûr de vouloir charger {filename} ?", ""
+prompt.config_url_current, "L'URL de configuration est actuellement : {value}", ""
+confirm.load_config_url, "Êtes-vous sûr de vouloir charger cette configuration ?", ""
+confirm.reboot, "Êtes-vous sûr de vouloir redémarrer ?", ""
+confirm.reset_node_db, "Êtes-vous sûr de vouloir réinitialiser la base de données des nœuds ?", ""
+confirm.shutdown, "Êtes-vous sûr de vouloir éteindre ?", ""
+confirm.factory_reset, "Êtes-vous sûr de vouloir effectuer une réinitialisation d'usine ?", ""
+confirm.factory_reset_config, "Êtes-vous sûr de vouloir réinitialiser la configuration d'usine ?", ""
+confirm.save_before_exit_section, "Vous avez des modifications non enregistrées dans {section}. Enregistrer avant de quitter ?", ""
+prompt.select_region, "Sélectionnez votre région :", ""
+dialog.slow_down_title, "Ralentissez", ""
+dialog.slow_down_body, "Veuillez attendre 2 secondes entre les messages.", ""
+dialog.node_details_title, "📡 Détails du nœud : {name}", ""
+dialog.traceroute_not_sent_title, "Traceroute non envoyé", ""
+dialog.traceroute_not_sent_body, "Veuillez attendre {seconds} secondes avant d'envoyer un autre traceroute.", ""
+dialog.traceroute_sent_title, "Traceroute envoyé à : {name}", ""
+dialog.traceroute_sent_body, "Les résultats apparaîtront dans la fenêtre des messages.", ""
+dialog.help_title, "Aide - Raccourcis clavier", ""
+help.scroll, "Haut/Bas = Défilement", ""
+help.switch_window, "Gauche/Droite = Changer de fenêtre", ""
+help.jump_windows, "F1/F2/F3 = Aller à Canal/Messages/Nœuds", ""
+help.enter, "ENTRÉE = Envoyer / Sélectionner", ""
+help.settings, "` ou F12 = Paramètres", ""
+help.quit, "ESC = Quitter", ""
+help.packet_log, "Ctrl+P = Activer/désactiver le journal des paquets", ""
+help.traceroute, "Ctrl+T ou F4 = Traceroute", ""
+help.node_info, "F5 = Informations complètes du nœud", ""
+help.archive_chat, "Ctrl+D = Archiver la discussion / supprimer le nœud", ""
+help.favorite, "Ctrl+F = Favori", ""
+help.ignore, "Ctrl+G = Ignorer", ""
+help.search, "Ctrl+/ ou / = Rechercher", ""
+help.help, "Ctrl+K = Aide", ""
+help.no_help, "Aucune aide disponible.", ""
+
+[User Settings]
+user, "Utilisateur", ""
+longName, "Nom long du nœud", "Si vous êtes un opérateur radioamateur agréé et avez activé le mode HAM, cela doit être votre indicatif."
+shortName, "Nom court du nœud", "Doit contenir jusqu'à 4 octets."
+isLicensed, "Activer le mode radioamateur (HAM)", "IMPORTANT : lire la documentation Meshtastic avant d'activer."
+
+[app_settings]
+title, "Paramètres de l'application", ""
+channel_list_16ths, "Largeur de la liste des canaux", ""
+node_list_16ths, "Largeur de la liste des nœuds", ""
+single_pane_mode, "Mode panneau unique", ""
+db_file_path, "Chemin du fichier de base de données", ""
+log_file_path, "Chemin du fichier journal", ""
+node_configs_file_path, "Chemin des configurations des nœuds", ""
+language, "Langue", ""
+message_prefix, "Préfixe des messages", ""
+sent_message_prefix, "Préfixe des messages envoyés", ""
+notification_symbol, "Symbole de notification", ""
+notification_sound, "Son de notification", ""
+ack_implicit_str, "ACK (implicite)", ""
+ack_str, "ACK", ""
+nak_str, "NAK", ""
+ack_unknown_str, "ACK (inconnu)", ""
+node_sort, "Tri des nœuds", ""
+theme, "Thème", ""
+
+[config.device]
+title, "Appareil", ""
+role, "Rôle", ""
+serial_enabled, "Activer la console série", ""
+button_gpio, "GPIO bouton", ""
+buzzer_gpio, "GPIO buzzer", ""
+rebroadcast_mode, "Mode de rediffusion", ""
+node_info_broadcast_secs, "Intervalle diffusion infos nœud", ""
+double_tap_as_button_press, "Double tap = bouton", ""
+is_managed, "Activer mode géré", ""
+disable_triple_click, "Désactiver triple clic", ""
+tzdef, "Fuseau horaire", ""
+led_heartbeat_disabled, "Désactiver LED heartbeat", ""
+buzzer_mode, "Mode buzzer", ""
+
+[config.network]
+title, "Réseau", ""
+wifi_enabled, "Wi-Fi activé", ""
+wifi_ssid, "SSID Wi-Fi", ""
+wifi_psk, "Mot de passe Wi-Fi", ""
+ntp_server, "Serveur NTP", ""
+eth_enabled, "Ethernet activé", ""
+address_mode, "Mode IPv4", ""
+ip, "Adresse IP", ""
+gateway, "Passerelle", ""
+subnet, "Sous-réseau", ""
+dns, "DNS", ""
+
+[config.display]
+title, "Affichage", ""
+screen_on_secs, "Durée écran actif", ""
+gps_format, "Format GPS", ""
+auto_screen_carousel_secs, "Intervalle carrousel", ""
+compass_north_top, "Toujours nord en haut", ""
+flip_screen, "Retourner écran", ""
+units, "Unités préférées", ""
+
+[config.bluetooth]
+title, "Bluetooth", ""
+enabled, "Activé", ""
+mode, "Mode d'appairage", ""
+fixed_pin, "Code PIN fixe", ""
+
+[module.mqtt]
+title, "MQTT", ""
+enabled, "Activé", ""
+address, "Adresse serveur", ""
+username, "Nom d'utilisateur", ""
+password, "Mot de passe", ""
+encryption_enabled, "Chiffrement activé", ""
+json_enabled, "JSON activé", ""
+tls_enabled, "TLS activé", ""
+
+[module.serial]
+title, "Série", ""
+enabled, "Activé", ""
+echo, "Écho", ""
+rxd, "GPIO réception", ""
+txd, "GPIO transmission", ""
+baud, "Débit en bauds", ""
+timeout, "Délai", ""
+
+[module.telemetry]
+title, "Télémétrie", ""
+device_update_interval, "Intervalle métriques appareil", ""
+environment_update_interval, "Intervalle métriques environnement", ""
+environment_measurement_enabled, "Télémétrie environnement activée", ""
+
+[module.audio]
+title, "Audio", ""
+codec2_enabled, "Activé", ""
+ptt_pin, "GPIO PTT", ""
+bitrate, "Débit audio", ""
+
+[module.remote_hardware]
+title, "Matériel distant", ""
+enabled, "Activé", ""
+available_pins, "Broches disponibles", ""
+
+[module.ambient_lighting]
+title, "Éclairage ambiant", ""
+led_state, "État LED", ""
+current, "Courant", ""
+red, "Rouge", ""
+green, "Vert", ""
+blue, "Bleu", ""

contact/localisations/ru.ini

@@ -12,6 +12,7 @@ Reboot, "Перезагрузить", ""
 Reset Node DB, "Сбросить БД узлов", ""
 Shutdown, "Выключить", ""
 Factory Reset, "Сброс до заводских", ""
+factory_reset_config, "Сбросить только конфигурацию", ""
 Exit, "Выход", ""
 Yes, "Да", ""
 No, "Нет", ""
@@ -55,6 +56,7 @@ confirm.reboot, "Перезагрузить устройство?", ""
 confirm.reset_node_db, "Сбросить БД узлов?", ""
 confirm.shutdown, "Выключить устройство?", ""
 confirm.factory_reset, "Сбросить до заводских настроек?", ""
+confirm.factory_reset_config, "Сбросить только конфигурацию?", ""
 confirm.save_before_exit_section, "Есть несохраненные изменения в {section}. Сохранить перед выходом?", ""
 prompt.select_region, "Выберите ваш регион:", ""
 dialog.slow_down_title, "Подождите", ""

contact/ui/control_ui.py

@@ -5,6 +5,7 @@ import logging
 import os
 import sys
 from typing import List
+from meshtastic.protobuf import admin_pb2
 
 from contact.utilities.save_to_radio import save_changes
 import contact.ui.default_config as config
@@ -34,7 +35,7 @@ MAX_MENU_WIDTH = 80  # desired max; will shrink on small terminals
 save_option = "Save Changes"
 max_help_lines = 0
 help_win = None
-sensitive_settings = ["Reboot", "Reset Node DB", "Shutdown", "Factory Reset"]
+sensitive_settings = ["Reboot", "Reset Node DB", "Shutdown", "Factory Reset", "factory_reset_config"]
 
 
 # Compute the effective menu width for the current terminal
@@ -43,7 +44,7 @@ def get_menu_width() -> int:
     return max(20, min(MAX_MENU_WIDTH, curses.COLS - 2))
 
 
-sensitive_settings = ["Reboot", "Reset Node DB", "Shutdown", "Factory Reset"]
+sensitive_settings = ["Reboot", "Reset Node DB", "Shutdown", "Factory Reset", "factory_reset_config"]
 
 # Get the parent directory of the script
 script_dir = os.path.dirname(os.path.abspath(__file__))
@@ -246,6 +247,26 @@ def reconnect_after_admin_action(stdscr: object, interface: object, action, log_
     return reconnect_interface_with_splash(stdscr, interface)
 
 
+def request_factory_reset(node: object, full: bool = False):
+    try:
+        return node.factoryReset(full=full)
+    except TypeError as ex:
+        field_name = "factory_reset_device" if full else "factory_reset_config"
+        field = admin_pb2.AdminMessage.DESCRIPTOR.fields_by_name[field_name]
+        if field.cpp_type != field.CPPTYPE_INT32:
+            raise
+
+        node.ensureSessionKey()
+        message = admin_pb2.AdminMessage()
+        setattr(message, field_name, 1)
+
+        if node == node.iface.localNode:
+            on_response = None
+        else:
+            on_response = node.onAckNak
+        return node._sendAdmin(message, onResponse=on_response)
+
+
 def redraw_main_ui_after_reconnect(stdscr: object) -> None:
     try:
         from contact.ui import contact_ui
@@ -538,7 +559,27 @@ def settings_menu(stdscr: object, interface: object) -> None:
                 )
                 if confirmation == "Yes":
                     interface = reconnect_after_admin_action(
-                        stdscr, interface, interface.localNode.factoryReset, "Factory Reset Requested by menu"
+                        stdscr,
+                        interface,
+                        lambda: request_factory_reset(interface.localNode, full=True),
+                        "Factory Reset Requested by menu",
+                    )
+                    menu = rebuild_menu_at_current_path(interface, menu_state)
+                menu_state.start_index.pop()
+                continue
+
+            elif selected_option == "factory_reset_config":
+                confirmation = get_list_input(
+                    t("ui.confirm.factory_reset_config", default="Are you sure you want to Factory Reset Config?"),
+                    None,
+                    ["Yes", "No"],
+                )
+                if confirmation == "Yes":
+                    interface = reconnect_after_admin_action(
+                        stdscr,
+                        interface,
+                        lambda: request_factory_reset(interface.localNode, full=False),
+                        "Factory Reset Config Requested by menu",
                     )
                     menu = rebuild_menu_at_current_path(interface, menu_state)
                 menu_state.start_index.pop()

contact/ui/menus.py

@@ -133,6 +133,7 @@ def generate_menu_from_protobuf(interface: object) -> Dict[str, Any]:
             "Reset Node DB": None,
             "Shutdown": None,
             "Factory Reset": None,
+            "factory_reset_config": None,
             "Exit": None,
         }
     )

pyproject.toml

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

tests/test_control_ui.py

@@ -1,4 +1,5 @@
 from argparse import Namespace
+from types import SimpleNamespace
 import unittest
 from unittest import mock
 
@@ -63,3 +64,49 @@ class ControlUiTests(unittest.TestCase):
         get_channels.assert_called_once_with()
         refresh_node_list.assert_called_once_with()
         handle_resize.assert_called_once_with(stdscr, False)
+
+    def test_request_factory_reset_uses_library_helper_when_supported(self) -> None:
+        node = mock.Mock()
+
+        control_ui.request_factory_reset(node)
+
+        node.factoryReset.assert_called_once_with(full=False)
+        node.ensureSessionKey.assert_not_called()
+        node._sendAdmin.assert_not_called()
+
+    def test_request_factory_reset_uses_library_helper_for_full_reset_when_supported(self) -> None:
+        node = mock.Mock()
+
+        control_ui.request_factory_reset(node, full=True)
+
+        node.factoryReset.assert_called_once_with(full=True)
+        node.ensureSessionKey.assert_not_called()
+        node._sendAdmin.assert_not_called()
+
+    def test_request_factory_reset_falls_back_to_int_valued_admin_message(self) -> None:
+        node = mock.Mock()
+        node.factoryReset.side_effect = TypeError(
+            "Field meshtastic.protobuf.AdminMessage.factory_reset_config: Expected an int, got a boolean."
+        )
+        node.iface = SimpleNamespace(localNode=node)
+
+        control_ui.request_factory_reset(node)
+
+        node.ensureSessionKey.assert_called_once_with()
+        sent_message = node._sendAdmin.call_args.args[0]
+        self.assertEqual(sent_message.factory_reset_config, 1)
+        self.assertIsNone(node._sendAdmin.call_args.kwargs["onResponse"])
+
+    def test_request_factory_reset_full_falls_back_to_int_valued_admin_message(self) -> None:
+        node = mock.Mock()
+        node.factoryReset.side_effect = TypeError(
+            "Field meshtastic.protobuf.AdminMessage.factory_reset_device: Expected an int, got a boolean."
+        )
+        node.iface = SimpleNamespace(localNode=node)
+
+        control_ui.request_factory_reset(node, full=True)
+
+        node.ensureSessionKey.assert_called_once_with()
+        sent_message = node._sendAdmin.call_args.args[0]
+        self.assertEqual(sent_message.factory_reset_device, 1)
+        self.assertIsNone(node._sendAdmin.call_args.kwargs["onResponse"])

tests/test_main.py

@@ -186,6 +186,15 @@ class MainRuntimeTests(unittest.TestCase):
         wrapper.assert_called_once_with(entrypoint.main)
         interface.close.assert_called_once_with()
 
+    def test_start_does_not_crash_when_wrapper_returns_without_interface(self) -> None:
+        interface_state.interface = None
+
+        with mock.patch.object(entrypoint.sys, "argv", ["contact"]):
+            with mock.patch.object(entrypoint.curses, "wrapper") as wrapper:
+                entrypoint.start()
+
+        wrapper.assert_called_once_with(entrypoint.main)
+
     def test_main_returns_cleanly_when_user_closes_missing_node_dialog(self) -> None:
         stdscr = mock.Mock()
         args = Namespace(settings=False, demo_screenshot=False)
@@ -215,6 +224,18 @@ class MainRuntimeTests(unittest.TestCase):
         interface.close.assert_called_once_with()
         exit_mock.assert_called_once_with(0)
 
+    def test_start_handles_keyboard_interrupt_with_no_interface(self) -> None:
+        interface_state.interface = None
+
+        with mock.patch.object(entrypoint.sys, "argv", ["contact"]):
+            with mock.patch.object(entrypoint.curses, "wrapper", side_effect=KeyboardInterrupt):
+                with mock.patch.object(entrypoint.sys, "exit", side_effect=SystemExit(0)) as exit_mock:
+                    with self.assertRaises(SystemExit) as raised:
+                        entrypoint.start()
+
+        self.assertEqual(raised.exception.code, 0)
+        exit_mock.assert_called_once_with(0)
+
     def test_start_handles_fatal_exception_and_exits_one(self) -> None:
         with mock.patch.object(entrypoint.sys, "argv", ["contact"]):
             with mock.patch.object(entrypoint.curses, "wrapper", side_effect=RuntimeError("boom")):

tests/test_menus.py

@@ -0,0 +1,28 @@
+from types import SimpleNamespace
+import unittest
+
+from meshtastic.protobuf import config_pb2, module_config_pb2
+
+from contact.ui.menus import generate_menu_from_protobuf
+
+
+class MenusTests(unittest.TestCase):
+    def test_main_menu_includes_factory_reset_config_after_factory_reset(self) -> None:
+        local_node = SimpleNamespace(
+            localConfig=config_pb2.Config(),
+            moduleConfig=module_config_pb2.ModuleConfig(),
+            getChannelByChannelIndex=lambda _: None,
+        )
+        interface = SimpleNamespace(
+            localNode=local_node,
+            getMyNodeInfo=lambda: {
+                "user": {"longName": "Test User", "shortName": "TU", "isLicensed": False},
+                "position": {"latitude": 0.0, "longitude": 0.0, "altitude": 0},
+            },
+        )
+
+        menu = generate_menu_from_protobuf(interface)
+        keys = list(menu["Main Menu"].keys())
+
+        self.assertLess(keys.index("Factory Reset"), keys.index("factory_reset_config"))
+        self.assertEqual(keys[keys.index("Factory Reset") + 1], "factory_reset_config")