bump version

README.md

@@ -9,7 +9,7 @@ This Python curses client for Meshtastic is a terminal-based client designed to
 <img width="846" alt="Contact - Main UI Screenshot" src="https://github.com/user-attachments/assets/d2996bfb-2c6d-46a8-b820-92a9143375f4">
 
 <br><br>
-The settings dialogue can be accessed within the client or may be run standalone to configure your node by launching `settings.py`
+The settings dialogue can be accessed within the client or may be run standalone to configure your node by launching `contact --settings` or 'contact -c`
 
 <img width="441" alt="Contact - Settings Dialogue" src="https://github.com/user-attachments/assets/dd47f52a-d4d8-4e40-8001-9ea53d87f816" />
 

contact/__main__.py

@@ -29,11 +29,7 @@ from contact.utilities.arg_parser import setup_parser
 from contact.utilities.interfaces import initialize_interface
 from contact.utilities.input_handlers import get_list_input
 from contact.utilities.utils import get_channels, get_node_list, get_nodeNum
-
 import contact.globals as globals
-from contact.ui.ui_state import NodeState
-
-node_state = NodeState()
 
 # Set ncurses compatibility settings
 os.environ["NCURSES_NO_UTF8_ACS"] = "1"
@@ -69,25 +65,25 @@ def main(stdscr):
 
             logging.info("Initializing interface %s", args)
             with globals.lock:
-                node_state.interface = initialize_interface(args)
+                globals.interface = initialize_interface(args)
 
-                if node_state.interface.localNode.localConfig.lora.region == 0:
+                if globals.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(node_state)
-                        node_state.interface.close()
-                        node_state.interface = initialize_interface(args)
+                        set_region(globals.interface)
+                        globals.interface.close()
+                        globals.interface = initialize_interface(args)
 
                 logging.info("Interface initialized")
-                get_nodeNum(node_state)
+                globals.myNodeNum = get_nodeNum()
                 globals.channel_list = get_channels()
                 globals.node_list = get_node_list()
                 pub.subscribe(on_receive, 'meshtastic.receive')
-                init_nodedb(node_state)
-                load_messages_from_db(node_state)
+                init_nodedb()
+                load_messages_from_db()
                 logging.info("Starting main UI")
 
-            main_ui(stdscr, node_state)
+            main_ui(stdscr)
 
     except Exception as e:
         console_output = output_capture.getvalue()

contact/globals.py

@@ -1,4 +1,4 @@
-# interface = None
+interface = None
 lock = None
 display_log = False
 all_messages = {}
@@ -6,7 +6,7 @@ channel_list = []
 notifications = []
 packet_buffer = []
 node_list = []
-# myNodeNum = 0
+myNodeNum = 0
 selected_channel = 0
 selected_message = 0
 selected_node = 0

contact/localisations/en.ini

@@ -78,6 +78,13 @@ dns, "IPv4 DNS server", ""
 rsyslog_server, "RSyslog server", ""
 enabled_protocols, "Enabled protocols", ""
 
+[config.network.ipv4_config]
+title, "IPv4 Config", ""
+ip, "IP", ""
+gateway, "Gateway", ""
+subnet, "Subnet", ""
+dns, "DNS", ""
+
 [config.display]
 title, "Display"
 screen_on_secs, "Screen on duration", "How long the screen remains on in seconds after the user button is pressed or messages are received."
@@ -105,6 +112,35 @@ theme, "Theme", ""
 alert_enabled, "Alert enabled", ""
 banner_enabled, "Banner enabled", ""
 ring_tone_id, "Ring tone ID", ""
+language, "Language", ""
+node_filter, "Node Filter", ""
+node_highlight, "Node Highlight", ""
+calibration_data, "Calibration Data", ""
+map_data, "Map Data", ""
+
+[config.device_ui.node_filter]
+title, "Node Filter"
+unknown_switch, "Unknown Switch", ""
+offline_switch, "Offline Switch", ""
+public_key_switch, "Public Key Switch", ""
+hops_away, "Hops Away", ""
+position_switch, "Position Switch", ""
+node_name, "Node Name", ""
+channel, "Channel", ""
+
+[config.device_ui.node_highlight]
+title, "Node Highlight"
+chat_switch, "Chat Switch", ""
+position_switch, "Position Switch", ""
+telemetry_switch, "Telemetry Switch", ""
+iaq_switch, "IAQ Switch", ""
+node_name, "Node Name", ""
+
+[config.device_ui.map_data]
+title, "Map Data"
+home, "Home", ""
+style, "Style", ""
+follow_gps, "Follow GPS", ""
 
 [config.lora]
 title, "LoRa"

contact/message_handlers/rx_handler.py

@@ -10,7 +10,7 @@ import contact.globals as globals
 
 from datetime import datetime
 
-def on_receive(packet, node_state):
+def on_receive(packet, interface):
 
     with globals.lock:
         # Update packet log
@@ -20,7 +20,7 @@ def on_receive(packet, node_state):
             globals.packet_buffer = globals.packet_buffer[-20:]
             
         if globals.display_log:
-            draw_packetlog_win(node_state)
+            draw_packetlog_win()
         try:
             if 'decoded' not in packet:
                 return
@@ -32,7 +32,7 @@ def on_receive(packet, node_state):
 
             if packet['decoded']['portnum'] == 'NODEINFO_APP':
                 if "user" in packet['decoded'] and "longName" in packet['decoded']["user"]: 
-                    maybe_store_nodeinfo_in_db(packet, node_state)
+                    maybe_store_nodeinfo_in_db(packet)
 
             elif packet['decoded']['portnum'] == 'TEXT_MESSAGE_APP':
                 message_bytes = packet['decoded']['payload']
@@ -66,7 +66,7 @@ def on_receive(packet, node_state):
 
                 # Add received message to the messages list
                 message_from_id = packet['from']
-                message_from_string = get_name_from_database(message_from_id, node_state, type='short') + ":"
+                message_from_string = get_name_from_database(message_from_id, type='short') + ":"
 
                 if globals.channel_list[channel_number] not in globals.all_messages:
                     globals.all_messages[globals.channel_list[channel_number]] = []
@@ -95,9 +95,9 @@ def on_receive(packet, node_state):
                 globals.all_messages[globals.channel_list[channel_number]].append((f"{config.message_prefix} {message_from_string} ", message_string))
 
                 if refresh_channels:
-                    draw_channel_list(node_state)
+                    draw_channel_list()
                 if refresh_messages:
-                    draw_messages_window(node_state, True)
+                    draw_messages_window(True)
 
                 save_message_to_db(globals.channel_list[channel_number], message_from_id, message_string)
 

contact/message_handlers/tx_handler.py

@@ -11,7 +11,7 @@ ack_naks = {}
 
 # Note "onAckNak" has special meaning to the API, thus the nonstandard naming convention
 # See https://github.com/meshtastic/python/blob/master/meshtastic/mesh_interface.py#L462
-def onAckNak(packet, node_state):
+def onAckNak(packet):
     from contact.ui.contact_ui import draw_messages_window
     request = packet['decoded']['requestId']
     if(request not in ack_naks):
@@ -35,13 +35,13 @@ def onAckNak(packet, node_state):
 
     globals.all_messages[acknak['channel']][acknak['messageIndex']] = (config.sent_message_prefix + confirm_string + ": ", message)
 
-    update_ack_nak(acknak['channel'], acknak['timestamp'], message, ack_type, node_state)
+    update_ack_nak(acknak['channel'], acknak['timestamp'], message, ack_type)
 
     channel_number = globals.channel_list.index(acknak['channel'])
     if globals.channel_list[channel_number] == globals.channel_list[globals.selected_channel]:
-        draw_messages_window(node_state)
+        draw_messages_window()
 
-def on_response_traceroute(packet, node_state):
+def on_response_traceroute(packet):
     """on response for trace route"""
     from contact.ui.contact_ui import draw_channel_list, draw_messages_window, add_notification
 
@@ -56,18 +56,18 @@ def on_response_traceroute(packet, node_state):
 
     msg_str = "Traceroute to:\n"
 
-    route_str = get_name_from_database(packet["to"], node_state, 'short') or f"{packet['to']:08x}" # Start with destination of response
+    route_str = get_name_from_database(packet["to"], 'short') or f"{packet['to']:08x}" # Start with destination of response
 
     # SNR list should have one more entry than the route, as the final destination adds its SNR also
     lenTowards = 0 if "route" not in msg_dict else len(msg_dict["route"])
     snrTowardsValid = "snrTowards" in msg_dict and len(msg_dict["snrTowards"]) == lenTowards + 1
     if lenTowards > 0: # Loop through hops in route and add SNR if available
         for idx, node_num in enumerate(msg_dict["route"]):
-            route_str += " --> " + (get_name_from_database(node_num, node_state, 'short') or f"{node_num:08x}") \
+            route_str += " --> " + (get_name_from_database(node_num, 'short') or f"{node_num:08x}") \
                      + " (" + (str(msg_dict["snrTowards"][idx] / 4) if snrTowardsValid and msg_dict["snrTowards"][idx] != UNK_SNR else "?") + "dB)"
 
     # End with origin of response
-    route_str += " --> " + (get_name_from_database(packet["from"], node_state, 'short') or f"{packet['from']:08x}") \
+    route_str += " --> " + (get_name_from_database(packet["from"], 'short') or f"{packet['from']:08x}") \
              + " (" + (str(msg_dict["snrTowards"][-1] / 4) if snrTowardsValid and msg_dict["snrTowards"][-1] != UNK_SNR else "?") + "dB)"
 
     msg_str += route_str + "\n" # Print the route towards destination
@@ -77,15 +77,15 @@ def on_response_traceroute(packet, node_state):
     backValid = "hopStart" in packet and "snrBack" in msg_dict and len(msg_dict["snrBack"]) == lenBack + 1
     if backValid:
         msg_str += "Back:\n"
-        route_str = get_name_from_database(packet["from"], node_state, 'short') or f"{packet['from']:08x}" # Start with origin of response
+        route_str = get_name_from_database(packet["from"], 'short') or f"{packet['from']:08x}" # Start with origin of response
 
         if lenBack > 0: # Loop through hops in routeBack and add SNR if available
             for idx, node_num in enumerate(msg_dict["routeBack"]):
-                route_str += " --> " + (get_name_from_database(node_num, node_state, 'short') or f"{node_num:08x}") \
+                route_str += " --> " + (get_name_from_database(node_num, 'short') or f"{node_num:08x}") \
                          + " (" + (str(msg_dict["snrBack"][idx] / 4) if msg_dict["snrBack"][idx] != UNK_SNR else "?") + "dB)"
 
         # End with destination of response (us)
-        route_str += " --> " + (get_name_from_database(packet["to"], node_state, 'short') or f"{packet['to']:08x}") \
+        route_str += " --> " + (get_name_from_database(packet["to"], 'short') or f"{packet['to']:08x}") \
                  + " (" + (str(msg_dict["snrBack"][-1] / 4) if msg_dict["snrBack"][-1] != UNK_SNR else "?") + "dB)"
 
         msg_str += route_str + "\n" # Print the route back to us
@@ -94,7 +94,7 @@ def on_response_traceroute(packet, node_state):
         globals.channel_list.append(packet['from'])
         refresh_channels = True
 
-    if(is_chat_archived(packet['from']), node_state):
+    if(is_chat_archived(packet['from'])):
         update_node_info_in_db(packet['from'], chat_archived=False)
 
     channel_number = globals.channel_list.index(packet['from'])
@@ -105,21 +105,21 @@ def on_response_traceroute(packet, node_state):
         add_notification(channel_number)
         refresh_channels = True
 
-    message_from_string = get_name_from_database(packet['from'], node_state, type='short') + ":\n"
+    message_from_string = get_name_from_database(packet['from'], type='short') + ":\n"
 
     if globals.channel_list[channel_number] not in globals.all_messages:
         globals.all_messages[globals.channel_list[channel_number]] = []
     globals.all_messages[globals.channel_list[channel_number]].append((f"{config.message_prefix} {message_from_string}", msg_str))
 
     if refresh_channels:
-        draw_channel_list(node_state)
+        draw_channel_list()
     if refresh_messages:
-        draw_messages_window(node_state, True)
+        draw_messages_window(True)
     save_message_to_db(globals.channel_list[channel_number], packet['from'], msg_str)
 
 
-def send_message(message, node_state, destination=BROADCAST_NUM, channel=0):
-    myid = node_state.myNodeNum
+def send_message(message, destination=BROADCAST_NUM, channel=0):
+    myid = globals.myNodeNum
     send_on_channel = 0
     channel_id = globals.channel_list[channel]
     if isinstance(channel_id, int):
@@ -128,7 +128,7 @@ def send_message(message, node_state, destination=BROADCAST_NUM, channel=0):
     elif isinstance(channel_id, str):
         send_on_channel = channel
 
-    sent_message_data = node_state.interface.sendText(
+    sent_message_data = globals.interface.sendText(
         text=message,
         destinationId=destination,
         wantAck=True,
@@ -168,9 +168,9 @@ def send_message(message, node_state, destination=BROADCAST_NUM, channel=0):
 
     ack_naks[sent_message_data.id] = {'channel': channel_id, 'messageIndex': len(globals.all_messages[channel_id]) - 1, 'timestamp': timestamp}
 
-def send_traceroute(node_state):
+def send_traceroute():
     r = mesh_pb2.RouteDiscovery()
-    node_state.interface.sendData(
+    globals.interface.sendData(
         r,
         destinationId=globals.node_list[globals.selected_node],
         portNum=portnums_pb2.PortNum.TRACEROUTE_APP,

contact/settings.py

@@ -25,17 +25,17 @@ def main(stdscr):
 
             parser = setup_parser()
             args = parser.parse_args()
-            node_state.interface = initialize_interface(args)
+            interface = initialize_interface(args)
 
-            if node_state.interface.localNode.localConfig.lora.region == 0:
+            if 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(node_state.interface)
-                    node_state.interface.close()
-                    node_state.interface = initialize_interface(args)
+                    set_region(interface)
+                    interface.close()
+                    interface = initialize_interface(args)
             stdscr.clear()
             stdscr.refresh()
-            settings_menu(stdscr, node_state)
+            settings_menu(stdscr, interface)
 
     except Exception as e:
         console_output = output_capture.getvalue()
@@ -52,9 +52,6 @@ logging.basicConfig( # Run `tail -f client.log` in another terminal to view live
 )
 
 if __name__ == "__main__":
-    from contact.ui.ui_state import NodeState
-    node_state = NodeState()
-
     log_file = config.log_file_path
     log_f = open(log_file, "a", buffering=1)  # Enable line-buffering for immediate log writes
 

contact/ui/contact_ui.py

@@ -13,7 +13,7 @@ import contact.ui.default_config as config
 import contact.ui.dialog
 import contact.globals as globals
 
-def handle_resize(stdscr, firstrun, node_state):
+def handle_resize(stdscr, firstrun):
     global messages_pad, messages_win, nodes_pad, nodes_win, channel_pad, channel_win, function_win, packetlog_win, entry_win
 
     # Calculate window max dimensions
@@ -80,17 +80,17 @@ def handle_resize(stdscr, firstrun, node_state):
     curses.curs_set(1)
 
     try:
-        draw_function_win(node_state)
-        draw_channel_list(node_state)
-        draw_messages_window(node_state, True)
-        draw_node_list(node_state)
+        draw_function_win()
+        draw_channel_list()
+        draw_messages_window(True)
+        draw_node_list()
     except:
         # Resize events can come faster than we can re-draw, which can cause a curses error.
         # In this case we'll see another curses.KEY_RESIZE in our key handler and draw again later.
         pass
 
 
-def main_ui(stdscr, node_state):
+def main_ui(stdscr):
     global input_text
     input_text = ""
     stdscr.keypad(True)
@@ -111,7 +111,7 @@ def main_ui(stdscr, node_state):
             elif globals.current_window == 1:
                 scroll_messages(-1)
             elif globals.current_window == 2:
-                scroll_nodes(-1, node_state)
+                scroll_nodes(-1)
 
         elif char == curses.KEY_DOWN:
             if globals.current_window == 0:
@@ -119,11 +119,11 @@ def main_ui(stdscr, node_state):
             elif globals.current_window == 1:
                 scroll_messages(1)
             elif globals.current_window == 2:
-                scroll_nodes(1, node_state)
+                scroll_nodes(1)
 
         elif char == curses.KEY_HOME:
             if globals.current_window == 0:
-                select_channel(0, node_state)
+                select_channel(0)
             elif globals.current_window == 1:
                 globals.selected_message = 0
                 refresh_pad(1)
@@ -132,7 +132,7 @@ def main_ui(stdscr, node_state):
 
         elif char == curses.KEY_END:
             if globals.current_window == 0:
-                select_channel(len(globals.channel_list) - 1, node_state)
+                select_channel(len(globals.channel_list) - 1)
             elif globals.current_window == 1:
                 msg_line_count = messages_pad.getmaxyx()[0]
                 globals.selected_message = max(msg_line_count - get_msg_window_lines(), 0)
@@ -142,7 +142,7 @@ def main_ui(stdscr, node_state):
 
         elif char == curses.KEY_PPAGE:
             if globals.current_window == 0:
-                select_channel(globals.selected_channel - (channel_win.getmaxyx()[0] - 2), node_state) # select_channel will bounds check for us
+                select_channel(globals.selected_channel - (channel_win.getmaxyx()[0] - 2)) # select_channel will bounds check for us
             elif globals.current_window == 1:
                 globals.selected_message = max(globals.selected_message - get_msg_window_lines(), 0)
                 refresh_pad(1)
@@ -151,7 +151,7 @@ def main_ui(stdscr, node_state):
 
         elif char == curses.KEY_NPAGE:
             if globals.current_window == 0:
-                select_channel(globals.selected_channel + (channel_win.getmaxyx()[0] - 2), node_state) # select_channel will bounds check for us
+                select_channel(globals.selected_channel + (channel_win.getmaxyx()[0] - 2)) # select_channel will bounds check for us
             elif globals.current_window == 1:
                 msg_line_count = messages_pad.getmaxyx()[0]
                 globals.selected_message = min(globals.selected_message + get_msg_window_lines(), msg_line_count - get_msg_window_lines())
@@ -169,7 +169,7 @@ def main_ui(stdscr, node_state):
                 channel_win.attrset(get_color("window_frame"))
                 channel_win.box()
                 channel_win.refresh()
-                highlight_line(False, 0, globals.selected_channel, node_state)
+                highlight_line(False, 0, globals.selected_channel)
                 refresh_pad(0)
             if old_window == 1:
                 messages_win.attrset(get_color("window_frame"))
@@ -177,11 +177,11 @@ def main_ui(stdscr, node_state):
                 messages_win.refresh()
                 refresh_pad(1)
             elif old_window == 2:
-                draw_function_win(node_state)
+                draw_function_win()
                 nodes_win.attrset(get_color("window_frame"))
                 nodes_win.box()
                 nodes_win.refresh()
-                highlight_line(False, 2, globals.selected_node, node_state)
+                highlight_line(False, 2, globals.selected_node)
                 refresh_pad(2)
 
             if globals.current_window == 0:
@@ -189,7 +189,7 @@ def main_ui(stdscr, node_state):
                 channel_win.box()
                 channel_win.attrset(get_color("window_frame"))
                 channel_win.refresh()
-                highlight_line(True, 0, globals.selected_channel, node_state)
+                highlight_line(True, 0, globals.selected_channel)
                 refresh_pad(0)
             elif globals.current_window == 1:
                 messages_win.attrset(get_color("window_frame_selected"))
@@ -198,12 +198,12 @@ def main_ui(stdscr, node_state):
                 messages_win.refresh()
                 refresh_pad(1)
             elif globals.current_window == 2:
-                draw_function_win(node_state)
+                draw_function_win()
                 nodes_win.attrset(get_color("window_frame_selected"))
                 nodes_win.box()
                 nodes_win.attrset(get_color("window_frame"))
                 nodes_win.refresh()
-                highlight_line(True, 2, globals.selected_node, node_state)
+                highlight_line(True, 2, globals.selected_node)
                 refresh_pad(2)
 
         # Check for Esc
@@ -212,7 +212,7 @@ def main_ui(stdscr, node_state):
 
         # Check for Ctrl + t
         elif char == chr(20):
-            send_traceroute(node_state)
+            send_traceroute()
             curses.curs_set(0)  # Hide cursor
             contact.ui.dialog.dialog(stdscr, "Traceroute Sent", "Results will appear in messages window.\nNote: Traceroute is limited to once every 30 seconds.")
             curses.curs_set(1)  # Show cursor again
@@ -229,20 +229,20 @@ def main_ui(stdscr, node_state):
 
                 globals.selected_channel = globals.channel_list.index(node_list[globals.selected_node])
 
-                if(is_chat_archived(globals.channel_list[globals.selected_channel], node_state)):
+                if(is_chat_archived(globals.channel_list[globals.selected_channel])):
                     update_node_info_in_db(globals.channel_list[globals.selected_channel], chat_archived=False)
 
                 globals.selected_node = 0
                 globals.current_window = 0
 
-                draw_node_list(node_state)
-                draw_channel_list(node_state)
-                draw_messages_window(node_state, True)
+                draw_node_list()
+                draw_channel_list()
+                draw_messages_window(True)
 
             elif len(input_text) > 0:
                 # Enter key pressed, send user input as message
-                send_message(input_text, node_state, channel=globals.selected_channel)
-                draw_messages_window(node_state, True)
+                send_message(input_text, channel=globals.selected_channel)
+                draw_messages_window(True)
 
                 # Clear entry window and reset input text
                 input_text = ""
@@ -259,7 +259,7 @@ def main_ui(stdscr, node_state):
             
         elif char == "`": # ` Launch the settings interface
             curses.curs_set(0)
-            settings_menu(stdscr, node_state.interface)
+            settings_menu(stdscr, globals.interface)
             curses.curs_set(1)
             refresh_node_list()
             handle_resize(stdscr, False)
@@ -268,11 +268,11 @@ def main_ui(stdscr, node_state):
             # Display packet log
             if globals.display_log is False:
                 globals.display_log = True
-                draw_messages_window(node_state, True)
+                draw_messages_window(True)
             else:
                 globals.display_log = False
                 packetlog_win.erase()
-                draw_messages_window(node_state, True)
+                draw_messages_window(True)
 
         elif char == curses.KEY_RESIZE:
             input_text = ""
@@ -291,29 +291,29 @@ def main_ui(stdscr, node_state):
 
                     del globals.channel_list[globals.selected_channel]
                     globals.selected_channel = min(globals.selected_channel, len(globals.channel_list) - 1)
-                    select_channel(globals.selected_channel, node_state)
-                    draw_channel_list(node_state)
-                    draw_messages_window(node_state)
+                    select_channel(globals.selected_channel)
+                    draw_channel_list()
+                    draw_messages_window()
 
             if(globals.current_window == 2):
                 curses.curs_set(0)
-                confirmation = get_list_input(f"Remove {get_name_from_database(globals.node_list[globals.selected_node], node_state)} from nodedb?", "No", ["Yes", "No"])
+                confirmation = get_list_input(f"Remove {get_name_from_database(globals.node_list[globals.selected_node])} from nodedb?", "No", ["Yes", "No"])
                 if confirmation == "Yes":
-                    node_state.interface.localNode.removeNode(globals.node_list[globals.selected_node])
+                    globals.interface.localNode.removeNode(globals.node_list[globals.selected_node])
 
                     # Directly modifying the interface from client code - good? Bad? If it's stupid but it works, it's not supid?
-                    del(node_state.interface.nodesByNum[globals.node_list[globals.selected_node]])
+                    del(globals.interface.nodesByNum[globals.node_list[globals.selected_node]])
 
                     # Convert to "!hex" representation that interface.nodes uses
                     hexid = f"!{hex(globals.node_list[globals.selected_node])[2:]}"
-                    del(node_state.interface.nodes[hexid])
+                    del(globals.interface.nodes[hexid])
 
                     globals.node_list.pop(globals.selected_node)
 
-                    draw_messages_window(node_state)
-                    draw_node_list(node_state)
+                    draw_messages_window()
+                    draw_node_list()
                 else:
-                    draw_messages_window(node_state)
+                    draw_messages_window()
                 curses.curs_set(1)
                 continue
 
@@ -325,25 +325,25 @@ def main_ui(stdscr, node_state):
         # ^F
         elif char == chr(6):
             if globals.current_window == 2:
-                selectedNode = node_state.interface.nodesByNum[globals.node_list[globals.selected_node]]
+                selectedNode = globals.interface.nodesByNum[globals.node_list[globals.selected_node]]
 
                 curses.curs_set(0)
 
                 if 'isFavorite' not in selectedNode or selectedNode['isFavorite'] == False:
-                    confirmation = get_list_input(f"Set {get_name_from_database(globals.node_list[globals.selected_node])} as Favorite?", node_state, None, ["Yes", "No"])
+                    confirmation = get_list_input(f"Set {get_name_from_database(globals.node_list[globals.selected_node])} as Favorite?", None, ["Yes", "No"])
                     if confirmation == "Yes":
-                        node_state.interface.localNode.setFavorite(globals.node_list[globals.selected_node])
+                        globals.interface.localNode.setFavorite(globals.node_list[globals.selected_node])
                         # Maybe we shouldn't be modifying the nodedb, but maybe it should update itself
-                        node_state.interface.nodesByNum[globals.node_list[globals.selected_node]]['isFavorite'] = True
+                        globals.interface.nodesByNum[globals.node_list[globals.selected_node]]['isFavorite'] = True
 
                         refresh_node_list()
 
                 else:
-                    confirmation = get_list_input(f"Remove {get_name_from_database(globals.node_list[globals.selected_node])} from Favorites?", node_state, None, ["Yes", "No"])
+                    confirmation = get_list_input(f"Remove {get_name_from_database(globals.node_list[globals.selected_node])} from Favorites?", None, ["Yes", "No"])
                     if confirmation == "Yes":
-                        node_state.interface.localNode.removeFavorite(globals.node_list[globals.selected_node])
+                        globals.interface.localNode.removeFavorite(globals.node_list[globals.selected_node])
                         # Maybe we shouldn't be modifying the nodedb, but maybe it should update itself
-                        node_state.interface.nodesByNum[globals.node_list[globals.selected_node]]['isFavorite'] = False
+                        globals.interface.nodesByNum[globals.node_list[globals.selected_node]]['isFavorite'] = False
 
                         refresh_node_list()
 
@@ -351,20 +351,20 @@ def main_ui(stdscr, node_state):
 
         elif char == chr(7):
             if globals.current_window == 2:
-                selectedNode = node_state.interface.nodesByNum[globals.node_list[globals.selected_node]]
+                selectedNode = globals.interface.nodesByNum[globals.node_list[globals.selected_node]]
 
                 curses.curs_set(0)
 
                 if 'isIgnored' not in selectedNode or selectedNode['isIgnored'] == False:
-                    confirmation = get_list_input(f"Set {get_name_from_database(globals.node_list[globals.selected_node])} as Ignored?", node_state, "No", ["Yes", "No"])
+                    confirmation = get_list_input(f"Set {get_name_from_database(globals.node_list[globals.selected_node])} as Ignored?", "No", ["Yes", "No"])
                     if confirmation == "Yes":
-                        node_state.interface.localNode.setIgnored(globals.node_list[globals.selected_node])
-                        node_state.interface.nodesByNum[globals.node_list[globals.selected_node]]['isIgnored'] = True
+                        globals.interface.localNode.setIgnored(globals.node_list[globals.selected_node])
+                        globals.interface.nodesByNum[globals.node_list[globals.selected_node]]['isIgnored'] = True
                 else:
-                    confirmation = get_list_input(f"Remove {get_name_from_database(globals.node_list[globals.selected_node])} from Ignored?", node_state, "No", ["Yes", "No"])
+                    confirmation = get_list_input(f"Remove {get_name_from_database(globals.node_list[globals.selected_node])} from Ignored?", "No", ["Yes", "No"])
                     if confirmation == "Yes":
-                        node_state.interface.localNode.removeIgnored(globals.node_list[globals.selected_node])
-                        node_state.interface.nodesByNum[globals.node_list[globals.selected_node]]['isIgnored'] = False
+                        globals.interface.localNode.removeIgnored(globals.node_list[globals.selected_node])
+                        globals.interface.nodesByNum[globals.node_list[globals.selected_node]]['isIgnored'] = False
 
                 handle_resize(stdscr, False)
 
@@ -377,7 +377,7 @@ def main_ui(stdscr, node_state):
 
 
 
-def draw_channel_list(node_state):
+def draw_channel_list():
     channel_pad.erase()
     win_height, win_width = channel_win.getmaxyx()
     start_index = max(0, globals.selected_channel - (win_height - 3))  # Leave room for borders
@@ -388,9 +388,9 @@ def draw_channel_list(node_state):
     for channel in globals.channel_list:
         # Convert node number to long name if it's an integer
         if isinstance(channel, int):
-            if is_chat_archived(channel, node_state):
+            if is_chat_archived(channel):
                 continue
-            channel_name = get_name_from_database(channel, node_state, type='long')
+            channel_name = get_name_from_database(channel, type='long')
             if channel_name is None:
                 continue
             channel = channel_name
@@ -418,7 +418,7 @@ def draw_channel_list(node_state):
 
     refresh_pad(0)
 
-def draw_messages_window(node_state, scroll_to_bottom = False):
+def draw_messages_window(scroll_to_bottom = False):
     """Update the messages window based on the selected channel and scroll position."""
     messages_pad.erase()
 
@@ -459,9 +459,9 @@ def draw_messages_window(node_state, scroll_to_bottom = False):
 
     refresh_pad(1)
 
-    draw_packetlog_win(node_state)
+    draw_packetlog_win()
 
-def draw_node_list(node_state):
+def draw_node_list():
     global nodes_pad
 
     # This didn't work, for some reason an error is thown on startup, so we just create the pad every time
@@ -479,9 +479,9 @@ def draw_node_list(node_state):
         logging.error("Traceback: %s", traceback.format_exc())
 
     for i, node_num in enumerate(globals.node_list):
-        node = node_state.interface.nodesByNum[node_num]
+        node = globals.interface.nodesByNum[node_num]
         secure = 'user' in node and 'publicKey' in node['user'] and node['user']['publicKey']
-        node_str = f"{'🔐' if secure else '🔓'} {get_name_from_database(node_num, node_state, 'long')}".ljust(box_width - 2)[:box_width - 2]
+        node_str = f"{'🔐' if secure else '🔓'} {get_name_from_database(node_num, 'long')}".ljust(box_width - 2)[:box_width - 2]
         color = "node_list"
         if 'isFavorite' in node and node['isFavorite']:
             color = "node_favorite"
@@ -501,21 +501,21 @@ def draw_node_list(node_state):
     curses.curs_set(1)
     entry_win.refresh()
 
-def select_channel(idx, node_state):
+def select_channel(idx):
     old_selected_channel = globals.selected_channel
     globals.selected_channel = max(0, min(idx, len(globals.channel_list) - 1))
-    draw_messages_window(node_state, True)
+    draw_messages_window(True)
 
     # For now just re-draw channel list when clearing notifications, we can probably make this more efficient
     if globals.selected_channel in globals.notifications:
         remove_notification(globals.selected_channel)
-        draw_channel_list(node_state)
+        draw_channel_list()
         return
-    highlight_line(False, 0, old_selected_channel, node_state)
-    highlight_line(True, 0, globals.selected_channel, node_state)
+    highlight_line(False, 0, old_selected_channel)
+    highlight_line(True, 0, globals.selected_channel)
     refresh_pad(0)
 
-def scroll_channels(direction, node_state):
+def scroll_channels(direction):
     new_selected_channel = globals.selected_channel + direction
 
     if new_selected_channel < 0:
@@ -523,7 +523,7 @@ def scroll_channels(direction, node_state):
     elif new_selected_channel >= len(globals.channel_list):
         new_selected_channel = 0
 
-    select_channel(new_selected_channel, node_state)
+    select_channel(new_selected_channel)
 
 def scroll_messages(direction):
     globals.selected_message += direction
@@ -533,17 +533,17 @@ def scroll_messages(direction):
 
     refresh_pad(1)
 
-def select_node(idx, node_state):
+def select_node(idx):
     old_selected_node = globals.selected_node
     globals.selected_node = max(0, min(idx, len(globals.node_list) - 1))
 
-    highlight_line(False, 2, old_selected_node, node_state)
-    highlight_line(True, 2, globals.selected_node, node_state)
+    highlight_line(False, 2, old_selected_node)
+    highlight_line(True, 2, globals.selected_node)
     refresh_pad(2)
 
-    draw_function_win(node_state)
+    draw_function_win()
 
-def scroll_nodes(direction, node_state):
+def scroll_nodes(direction):
     new_selected_node = globals.selected_node + direction
 
     if new_selected_node < 0:
@@ -551,9 +551,9 @@ def scroll_nodes(direction, node_state):
     elif new_selected_node >= len(globals.node_list):
         new_selected_node = 0
 
-    select_node(new_selected_node, node_state)
+    select_node(new_selected_node)
 
-def draw_packetlog_win(node_state):
+def draw_packetlog_win():
 
     columns = [10,10,15,30]
     span = 0
@@ -574,10 +574,10 @@ def draw_packetlog_win(node_state):
                 break
             
             # Format each field
-            from_id = get_name_from_database(packet['from'], node_state, 'short').ljust(columns[0])
+            from_id = get_name_from_database(packet['from'], 'short').ljust(columns[0])
             to_id = (
                 "BROADCAST".ljust(columns[1]) if str(packet['to']) == "4294967295"
-                else get_name_from_database(packet['to'], node_state, 'short').ljust(columns[1])
+                else get_name_from_database(packet['to'], 'short').ljust(columns[1])
             )
             if 'decoded' in packet:
                 port = packet['decoded']['portnum'].ljust(columns[2])
@@ -645,10 +645,10 @@ def search(win):
 
     entry_win.erase()
 
-def draw_node_details(node_state):
+def draw_node_details():
     node = None
     try:
-        node = node_state.interface.nodesByNum[globals.node_list[globals.selected_node]]
+        node = globals.interface.nodesByNum[globals.node_list[globals.selected_node]]
     except KeyError:
         return
 
@@ -702,9 +702,9 @@ def draw_help():
 
     draw_centered_text_field(function_win, function_str, 0, get_color("commands"))
 
-def draw_function_win(node_state):
+def draw_function_win():
     if(globals.current_window == 2):
-        draw_node_details(node_state)
+        draw_node_details()
     else:
         draw_help()
 
@@ -746,7 +746,7 @@ def refresh_pad(window):
                         box.getbegyx()[0] + 1, box.getbegyx()[1] + 1,
                         box.getbegyx()[0] + lines, box.getbegyx()[1] + box.getmaxyx()[1] - 2)
 
-def highlight_line(highlight, window, line, node_state):
+def highlight_line(highlight, window, line):
     pad = nodes_pad
 
     color = get_color("node_list")
@@ -754,7 +754,7 @@ def highlight_line(highlight, window, line, node_state):
 
     if window == 2:
         node_num = globals.node_list[line]
-        node = node_state.interface.nodesByNum[node_num]
+        node = globals.interface.nodesByNum[node_num]
         if 'isFavorite' in node and node['isFavorite']:
             color = get_color("node_favorite")
         if 'isIgnored' in node and node['isIgnored']:

contact/ui/control_ui.py

@@ -15,7 +15,7 @@ from contact.utilities.control_utils import parse_ini_file, transform_menu_path
 from contact.ui.user_config import json_editor
 from contact.ui.ui_state import MenuState
 
-menu_state = MenuState()
+state = MenuState()
 
 
 # Constants
@@ -39,10 +39,10 @@ config_folder = os.path.join(locals_dir, "node-configs")
 field_mapping, help_text = parse_ini_file(translation_file)
 
 
-def display_menu(menu_state):
+def display_menu(state):
 
     min_help_window_height = 6
-    num_items = len(menu_state.current_menu) + (1 if menu_state.show_save_option else 0)
+    num_items = len(state.current_menu) + (1 if state.show_save_option else 0)
 
     # Determine the available height for the menu
     max_menu_height = curses.LINES 
@@ -62,18 +62,18 @@ def display_menu(menu_state):
     menu_win.border()
     menu_win.keypad(True)
 
-    menu_pad = curses.newpad(len(menu_state.current_menu) + 1, width - 8)
+    menu_pad = curses.newpad(len(state.current_menu) + 1, width - 8)
     menu_pad.bkgd(get_color("background"))
 
-    header = " > ".join(word.title() for word in menu_state.menu_path)
+    header = " > ".join(word.title() for word in state.menu_path)
     if len(header) > width - 4:
         header = header[:width - 7] + "..."
     menu_win.addstr(1, 2, header, get_color("settings_breadcrumbs", bold=True))
 
-    transformed_path = transform_menu_path(menu_state.menu_path)
+    transformed_path = transform_menu_path(state.menu_path)
 
-    for idx, option in enumerate(menu_state.current_menu):
-        field_info = menu_state.current_menu[option]
+    for idx, option in enumerate(state.current_menu):
+        field_info = state.current_menu[option]
         current_value = field_info[1] if isinstance(field_info, tuple) else ""
         full_key = '.'.join(transformed_path + [option])
         display_name = field_mapping.get(full_key, option)
@@ -82,41 +82,41 @@ def display_menu(menu_state):
         display_value = f"{current_value}"[:width // 2 - 4]
 
         try:
-            color = get_color("settings_sensitive" if option in sensitive_settings else "settings_default", reverse=(idx == menu_state.selected_index))
+            color = get_color("settings_sensitive" if option in sensitive_settings else "settings_default", reverse=(idx == state.selected_index))
             menu_pad.addstr(idx, 0, f"{display_option:<{width // 2 - 2}} {display_value}".ljust(width - 8), color)
         except curses.error:
             pass
 
-    if menu_state.show_save_option:
+    if state.show_save_option:
         save_position = menu_height - 2
-        menu_win.addstr(save_position, (width - len(save_option)) // 2, save_option, get_color("settings_save", reverse=(menu_state.selected_index == len(menu_state.current_menu))))
+        menu_win.addstr(save_position, (width - len(save_option)) // 2, save_option, get_color("settings_save", reverse=(state.selected_index == len(state.current_menu))))
 
     # Draw help window with dynamically updated max_help_lines
-    draw_help_window(start_y, start_x, menu_height, max_help_lines, transformed_path, menu_state)
+    draw_help_window(start_y, start_x, menu_height, max_help_lines, transformed_path, state)
 
     menu_win.refresh()
     menu_pad.refresh(
-        menu_state.start_index[-1], 0,
+        state.start_index[-1], 0,
         menu_win.getbegyx()[0] + 3, menu_win.getbegyx()[1] + 4,
-        menu_win.getbegyx()[0] + 3 + menu_win.getmaxyx()[0] - 5 - (2 if menu_state.show_save_option else 0),
+        menu_win.getbegyx()[0] + 3 + menu_win.getmaxyx()[0] - 5 - (2 if state.show_save_option else 0),
         menu_win.getbegyx()[1] + menu_win.getmaxyx()[1] - 4
     )
 
-    max_index = num_items + (1 if menu_state.show_save_option else 0) - 1
-    visible_height = menu_win.getmaxyx()[0] - 5 - (2 if menu_state.show_save_option else 0)
+    max_index = num_items + (1 if state.show_save_option else 0) - 1
+    visible_height = menu_win.getmaxyx()[0] - 5 - (2 if state.show_save_option else 0)
 
-    draw_arrows(menu_win, visible_height, max_index, menu_state)
+    draw_arrows(menu_win, visible_height, max_index, state)
 
     return menu_win, menu_pad
 
 
-def draw_help_window(menu_start_y, menu_start_x, menu_height, max_help_lines, transformed_path, menu_state):
+def draw_help_window(menu_start_y, menu_start_x, menu_height, max_help_lines, transformed_path, state):
     global help_win
 
     if 'help_win' not in globals():
         help_win = None  # Initialize if it does not exist
 
-    selected_option = list(menu_state.current_menu.keys())[menu_state.selected_index] if menu_state.current_menu else None
+    selected_option = list(state.current_menu.keys())[state.selected_index] if state.current_menu else None
     help_y = menu_start_y + menu_height
 
     help_win = update_help_window(help_win, help_text, transformed_path, selected_option, max_help_lines, width, help_y, menu_start_x)
@@ -251,116 +251,116 @@ def get_wrapped_help_text(help_text, transformed_path, selected_option, width, m
     return wrapped_help
 
 
-def move_highlight(old_idx, options, menu_win, menu_pad, help_win, help_text, max_help_lines, menu_state):
-    if old_idx == menu_state.selected_index:  # No-op
+def move_highlight(old_idx, options, menu_win, menu_pad, help_win, help_text, max_help_lines, state):
+    if old_idx == state.selected_index:  # No-op
         return
 
-    max_index = len(options) + (1 if menu_state.show_save_option else 0) - 1
-    visible_height = menu_win.getmaxyx()[0] - 5 - (2 if menu_state.show_save_option else 0)
+    max_index = len(options) + (1 if state.show_save_option else 0) - 1
+    visible_height = menu_win.getmaxyx()[0] - 5 - (2 if state.show_save_option else 0)
 
-    # Adjust menu_state.start_index only when moving out of visible range
-    if menu_state.selected_index == max_index and menu_state.show_save_option:
+    # Adjust state.start_index only when moving out of visible range
+    if state.selected_index == max_index and state.show_save_option:
         pass
-    elif menu_state.selected_index < menu_state.start_index[-1]:  # Moving above the visible area
-        menu_state.start_index[-1] = menu_state.selected_index
-    elif menu_state.selected_index >= menu_state.start_index[-1] + visible_height:  # Moving below the visible area
-        menu_state.start_index[-1] = menu_state.selected_index - visible_height
+    elif state.selected_index < state.start_index[-1]:  # Moving above the visible area
+        state.start_index[-1] = state.selected_index
+    elif state.selected_index >= state.start_index[-1] + visible_height:  # Moving below the visible area
+        state.start_index[-1] = state.selected_index - visible_height
     pass
 
-    # Ensure menu_state.start_index is within bounds
-    menu_state.start_index[-1] = max(0, min(menu_state.start_index[-1], max_index - visible_height + 1))
+    # Ensure state.start_index is within bounds
+    state.start_index[-1] = max(0, min(state.start_index[-1], max_index - visible_height + 1))
 
     # Clear old selection
-    if menu_state.show_save_option and old_idx == max_index:
+    if state.show_save_option and old_idx == max_index:
         menu_win.chgat(menu_win.getmaxyx()[0] - 2, (width - len(save_option)) // 2, len(save_option), get_color("settings_save"))
     else:
         menu_pad.chgat(old_idx, 0, menu_pad.getmaxyx()[1], get_color("settings_sensitive") if options[old_idx] in sensitive_settings else get_color("settings_default"))
 
     # Highlight new selection
-    if menu_state.show_save_option and menu_state.selected_index == max_index:
+    if state.show_save_option and state.selected_index == max_index:
         menu_win.chgat(menu_win.getmaxyx()[0] - 2, (width - len(save_option)) // 2, len(save_option), get_color("settings_save", reverse=True))
     else:
-        menu_pad.chgat(menu_state.selected_index, 0, menu_pad.getmaxyx()[1], get_color("settings_sensitive", reverse=True) if options[menu_state.selected_index] in sensitive_settings else get_color("settings_default", reverse=True))
+        menu_pad.chgat(state.selected_index, 0, menu_pad.getmaxyx()[1], get_color("settings_sensitive", reverse=True) if options[state.selected_index] in sensitive_settings else get_color("settings_default", reverse=True))
 
     menu_win.refresh()
     
     # Refresh pad only if scrolling is needed
-    menu_pad.refresh(menu_state.start_index[-1], 0,
+    menu_pad.refresh(state.start_index[-1], 0,
                      menu_win.getbegyx()[0] + 3, menu_win.getbegyx()[1] + 4,
                      menu_win.getbegyx()[0] + 3 + visible_height, 
                      menu_win.getbegyx()[1] + menu_win.getmaxyx()[1] - 4)
 
     # Update help window
-    transformed_path = transform_menu_path(menu_state.menu_path)
-    selected_option = options[menu_state.selected_index] if menu_state.selected_index < len(options) else None
+    transformed_path = transform_menu_path(state.menu_path)
+    selected_option = options[state.selected_index] if state.selected_index < len(options) else None
     help_y = menu_win.getbegyx()[0] + menu_win.getmaxyx()[0]
     help_win = update_help_window(help_win, help_text, transformed_path, selected_option, max_help_lines, width, help_y, menu_win.getbegyx()[1])
 
-    draw_arrows(menu_win, visible_height, max_index, menu_state)
+    draw_arrows(menu_win, visible_height, max_index, state)
 
 
-def draw_arrows(win, visible_height, max_index, menu_state):
+def draw_arrows(win, visible_height, max_index, state):
 
     # vh = visible_height + (1 if show_save_option else 0)
-    mi = max_index - (2 if menu_state.show_save_option else 0) 
+    mi = max_index - (2 if state.show_save_option else 0) 
 
     if visible_height < mi:
-        if menu_state.start_index[-1] > 0:
+        if state.start_index[-1] > 0:
             win.addstr(3, 2, "▲", get_color("settings_default"))
         else:
             win.addstr(3, 2, " ", get_color("settings_default"))
 
-        if mi - menu_state.start_index[-1] >= visible_height + (0 if menu_state.show_save_option else 1) :
+        if mi - state.start_index[-1] >= visible_height + (0 if state.show_save_option else 1) :
             win.addstr(visible_height + 3, 2, "▼", get_color("settings_default"))
         else:
             win.addstr(visible_height + 3, 2, " ", get_color("settings_default"))
         
 
-def settings_menu(stdscr, node_state):
+def settings_menu(stdscr, interface):
     curses.update_lines_cols()
 
-    menu = generate_menu_from_protobuf(node_state)
-    menu_state.current_menu = menu["Main Menu"]
-    menu_state.menu_path = ["Main Menu"]
+    menu = generate_menu_from_protobuf(interface)
+    state.current_menu = menu["Main Menu"]
+    state.menu_path = ["Main Menu"]
 
 
     modified_settings = {}
     
     need_redraw = True
-    menu_state.show_save_option = False
+    state.show_save_option = False
 
     while True:
         if(need_redraw):
-            options = list(menu_state.current_menu.keys())
+            options = list(state.current_menu.keys())
 
-            menu_state.show_save_option = (
-                len(menu_state.menu_path) > 2 and ("Radio Settings" in menu_state.menu_path or "Module Settings" in menu_state.menu_path)
+            state.show_save_option = (
+                len(state.menu_path) > 2 and ("Radio Settings" in state.menu_path or "Module Settings" in state.menu_path)
             ) or (
-                len(menu_state.menu_path) == 2 and "User Settings" in menu_state.menu_path 
+                len(state.menu_path) == 2 and "User Settings" in state.menu_path 
             ) or (
-                len(menu_state.menu_path) == 3 and "Channels" in menu_state.menu_path
+                len(state.menu_path) == 3 and "Channels" in state.menu_path
             )
 
             # Display the menu
-            menu_win, menu_pad = display_menu(menu_state)
+            menu_win, menu_pad = display_menu(state)
 
             need_redraw = False
 
         # Capture user input
         key = menu_win.getch()
 
-        max_index = len(options) + (1 if menu_state.show_save_option else 0) - 1
+        max_index = len(options) + (1 if state.show_save_option else 0) - 1
         # max_help_lines = 4
 
         if key == curses.KEY_UP:
-            old_selected_index = menu_state.selected_index
-            menu_state.selected_index = max_index if menu_state.selected_index == 0 else menu_state.selected_index - 1
-            move_highlight(old_selected_index, options, menu_win, menu_pad, help_win, help_text, max_help_lines, menu_state)
+            old_selected_index = state.selected_index
+            state.selected_index = max_index if state.selected_index == 0 else state.selected_index - 1
+            move_highlight(old_selected_index, options, menu_win, menu_pad, help_win, help_text, max_help_lines, state)
             
         elif key == curses.KEY_DOWN:
-            old_selected_index = menu_state.selected_index
-            menu_state.selected_index = 0 if menu_state.selected_index == max_index else menu_state.selected_index + 1
-            move_highlight(old_selected_index, options, menu_win, menu_pad, help_win, help_text, max_help_lines, menu_state)
+            old_selected_index = state.selected_index
+            state.selected_index = 0 if state.selected_index == max_index else state.selected_index + 1
+            move_highlight(old_selected_index, options, menu_win, menu_pad, help_win, help_text, max_help_lines, state)
 
         elif key == curses.KEY_RESIZE:
             need_redraw = True
@@ -372,36 +372,36 @@ def settings_menu(stdscr, node_state):
             menu_win.refresh()
             help_win.refresh()
 
-        elif key == ord("\t") and menu_state.show_save_option:
-            old_selected_index = menu_state.selected_index
-            menu_state.selected_index = max_index
-            move_highlight(old_selected_index, options, menu_win, menu_pad, help_win, help_text, max_help_lines, menu_state)
+        elif key == ord("\t") and state.show_save_option:
+            old_selected_index = state.selected_index
+            state.selected_index = max_index
+            move_highlight(old_selected_index, options, menu_win, menu_pad, help_win, help_text, max_help_lines, state)
 
         elif key == curses.KEY_RIGHT or key == ord('\n'):
             need_redraw = True
-            menu_state.start_index.append(0)
+            state.start_index.append(0)
             menu_win.erase()
             help_win.erase()
 
-            # draw_help_window(menu_win.getbegyx()[0], menu_win.getbegyx()[1], menu_win.getmaxyx()[0], max_help_lines, menu_state.current_menu, selected_index, transform_menu_path(menu_state.menu_path))
+            # draw_help_window(menu_win.getbegyx()[0], menu_win.getbegyx()[1], menu_win.getmaxyx()[0], max_help_lines, state.current_menu, selected_index, transform_menu_path(state.menu_path))
 
             menu_win.refresh()
             help_win.refresh()
 
-            if menu_state.show_save_option and menu_state.selected_index == len(options):
-                save_changes(node_state, modified_settings, menu_state)
+            if state.show_save_option and state.selected_index == len(options):
+                save_changes(interface, modified_settings, state)
                 modified_settings.clear()
                 logging.info("Changes Saved")
 
-                if len(menu_state.menu_path) > 1:
-                    menu_state.menu_path.pop()
-                    menu_state.current_menu = menu["Main Menu"]
-                    for step in menu_state.menu_path[1:]:
-                        menu_state.current_menu = menu_state.current_menu.get(step, {})
-                    menu_state.selected_index = 0
+                if len(state.menu_path) > 1:
+                    state.menu_path.pop()
+                    state.current_menu = menu["Main Menu"]
+                    for step in state.menu_path[1:]:
+                        state.current_menu = state.current_menu.get(step, {})
+                    state.selected_index = 0
                 continue
 
-            selected_option = options[menu_state.selected_index]
+            selected_option = options[state.selected_index]
 
             if selected_option == "Exit":
                 break
@@ -410,27 +410,27 @@ def settings_menu(stdscr, node_state):
                 filename = get_text_input("Enter a filename for the config file")
                 if not filename:
                     logging.info("Export aborted: No filename provided.")
-                    menu_state.start_index.pop()
+                    state.start_index.pop()
                     continue  # Go back to the menu
                 if not filename.lower().endswith(".yaml"):
                     filename += ".yaml"
 
                 try:
-                    config_text = config_export(node_state)
+                    config_text = config_export(interface)
                     yaml_file_path = os.path.join(config_folder, filename)
 
                     if os.path.exists(yaml_file_path):
                         overwrite = get_list_input(f"{filename} already exists. Overwrite?", None, ["Yes", "No"])
                         if overwrite == "No":
                             logging.info("Export cancelled: User chose not to overwrite.")
-                            menu_state.start_index.pop()
+                            state.start_index.pop()
                             continue  # Return to menu
                     os.makedirs(os.path.dirname(yaml_file_path), exist_ok=True)
                     with open(yaml_file_path, "w", encoding="utf-8") as file:
                         file.write(config_text)
                     logging.info(f"Config file saved to {yaml_file_path}")
                     dialog(stdscr, "Config File Saved:", yaml_file_path)
-                    menu_state.start_index.pop()
+                    state.start_index.pop()
                     continue
                 except PermissionError:
                     logging.error(f"Permission denied: Unable to write to {yaml_file_path}")
@@ -438,7 +438,7 @@ def settings_menu(stdscr, node_state):
                     logging.error(f"OS error while saving config: {e}")
                 except Exception as e:
                     logging.error(f"Unexpected error: {e}")
-                menu_state.start_index.pop()
+                state.start_index.pop()
                 continue
                 
             elif selected_option == "Load Config File":
@@ -460,73 +460,73 @@ def settings_menu(stdscr, node_state):
                     file_path = os.path.join(config_folder, filename)
                     overwrite = get_list_input(f"Are you sure you want to load {filename}?", None, ["Yes", "No"])
                     if overwrite == "Yes":
-                        config_import(node_state, file_path)
-                menu_state.start_index.pop()
+                        config_import(interface, file_path)
+                state.start_index.pop()
                 continue
 
             elif selected_option == "Config URL":
-                current_value = node_state.interface.localNode.getURL()
+                current_value = interface.localNode.getURL()
                 new_value = get_text_input(f"Config URL is currently: {current_value}")
                 if new_value is not None:
                     current_value = new_value
                     overwrite = get_list_input(f"Are you sure you want to load this config?", None, ["Yes", "No"])
                     if overwrite == "Yes":
-                        node_state.interface.localNode.setURL(new_value)
+                        interface.localNode.setURL(new_value)
                         logging.info(f"New Config URL sent to node")
-                menu_state.start_index.pop()
+                state.start_index.pop()
                 continue
 
             elif selected_option == "Reboot":
                 confirmation = get_list_input("Are you sure you want to Reboot?", None,  ["Yes", "No"])
                 if confirmation == "Yes":
-                    node_state.interface.localNode.reboot()
+                    interface.localNode.reboot()
                     logging.info(f"Node Reboot Requested by menu")
-                menu_state.start_index.pop()
+                state.start_index.pop()
                 continue
 
             elif selected_option == "Reset Node DB":
                 confirmation = get_list_input("Are you sure you want to Reset Node DB?", None,  ["Yes", "No"])
                 if confirmation == "Yes":
-                    node_state.interface.localNode.resetNodeDb()
+                    interface.localNode.resetNodeDb()
                     logging.info(f"Node DB Reset Requested by menu")
-                menu_state.start_index.pop()
+                state.start_index.pop()
                 continue
 
             elif selected_option == "Shutdown":
                 confirmation = get_list_input("Are you sure you want to Shutdown?", None, ["Yes", "No"])
                 if confirmation == "Yes":
-                    node_state.interface.localNode.shutdown()
+                    interface.localNode.shutdown()
                     logging.info(f"Node Shutdown Requested by menu")
-                menu_state.start_index.pop()
+                state.start_index.pop()
                 continue
 
             elif selected_option == "Factory Reset":
                 confirmation = get_list_input("Are you sure you want to Factory Reset?", None,  ["Yes", "No"])
                 if confirmation == "Yes":
-                    node_state.interface.localNode.factoryReset()
+                    interface.localNode.factoryReset()
                     logging.info(f"Factory Reset Requested by menu")
-                menu_state.start_index.pop()
+                state.start_index.pop()
                 continue
 
             elif selected_option == "App Settings":
                 menu_win.clear()
                 menu_win.refresh()
-                menu_state.menu_path.append("App Settings")
-                menu_state.menu_index.append(menu_state.selected_index)
-                json_editor(stdscr, menu_state)  # Open the App Settings menu
-                menu_state.current_menu = menu["Main Menu"]
-                menu_state.menu_path = ["Main Menu"]
-                menu_state.start_index.pop()
-                menu_state.selected_index = 4
+                state.menu_path.append("App Settings")
+                state.menu_index.append(state.selected_index)
+                json_editor(stdscr, state)  # Open the App Settings menu
+                state.current_menu = menu["Main Menu"]
+                state.menu_path = ["Main Menu"]
+                state.start_index.pop()
+                state.selected_index = 4
                 continue
                 # need_redraw = True
                 
-            field_info = menu_state.current_menu.get(selected_option)
+            field_info = state.current_menu.get(selected_option)
             if isinstance(field_info, tuple):
                 field, current_value = field_info
 
                 # Transform the menu path to get the full key
-                transformed_path = transform_menu_path(menu_state.menu_path)
+                transformed_path = transform_menu_path(state.menu_path)
                 full_key = '.'.join(transformed_path + [selected_option])
 
                 # Fetch human-readable name from field_mapping
@@ -536,70 +536,73 @@ def settings_menu(stdscr, node_state):
                     if selected_option in ['longName', 'shortName']:
                         new_value = get_text_input(f"{human_readable_name} is currently: {current_value}")
                         new_value = current_value if new_value is None else new_value
-                        menu_state.current_menu[selected_option] = (field, new_value)
+                        state.current_menu[selected_option] = (field, new_value)
 
                     elif selected_option == 'isLicensed':
                         new_value = get_list_input(f"{human_readable_name} is currently: {current_value}", str(current_value),  ["True", "False"])
                         new_value = new_value == "True"
-                        menu_state.current_menu[selected_option] = (field, new_value)
+                        state.current_menu[selected_option] = (field, new_value)
 
-                    for option, (field, value) in menu_state.current_menu.items():
+                    for option, (field, value) in state.current_menu.items():
                         modified_settings[option] = value
 
-                    menu_state.start_index.pop()
+                    state.start_index.pop()
 
                 elif selected_option in ['latitude', 'longitude', 'altitude']:
                     new_value = get_text_input(f"{human_readable_name} is currently: {current_value}")
                     new_value = current_value if new_value is None else new_value
-                    menu_state.current_menu[selected_option] = (field, new_value)
+                    state.current_menu[selected_option] = (field, new_value)
 
                     for option in ['latitude', 'longitude', 'altitude']:
-                        if option in menu_state.current_menu:
-                            modified_settings[option] = menu_state.current_menu[option][1]
+                        if option in state.current_menu:
+                            modified_settings[option] = state.current_menu[option][1]
 
-                    menu_state.start_index.pop()
+                    state.start_index.pop()
 
                 elif selected_option == "admin_key":
                     new_values = get_admin_key_input(current_value)
                     new_value = current_value if new_values is None else [base64.b64decode(key) for key in new_values]
-                    menu_state.start_index.pop()
+                    state.start_index.pop()
 
                 elif field.type == 8:  # Handle boolean type
-                    new_value = get_list_input(human_readable_name, str(current_value),  ["True", "False"])
-                    new_value = new_value == "True" or new_value is True
-                    menu_state.start_index.pop()
+                    new_value = get_list_input(human_readable_name, str(current_value), ["True", "False"])
+                    if new_value == "Not Set":
+                        pass  # Leave it as-is
+                    else:
+                        new_value = new_value == "True" or new_value is True
+                    state.start_index.pop()
 
                 elif field.label == field.LABEL_REPEATED:  # Handle repeated field - Not currently used
                     new_value = get_repeated_input(current_value)
                     new_value = current_value if new_value is None else new_value.split(", ")
-                    menu_state.start_index.pop()
+                    state.start_index.pop()
 
                 elif field.enum_type:  # Enum field
                     enum_options = {v.name: v.number for v in field.enum_type.values}
                     new_value_name = get_list_input(human_readable_name, current_value, list(enum_options.keys()))
                     new_value = enum_options.get(new_value_name, current_value)
-                    menu_state.start_index.pop()
+                    state.start_index.pop()
 
                 elif field.type == 7: # Field type 7 corresponds to FIXED32
                     new_value = get_fixed32_input(current_value)
-                    menu_state.start_index.pop()
+                    state.start_index.pop()
 
                 elif field.type == 13: # Field type 13 corresponds to UINT32
                     new_value = get_text_input(f"{human_readable_name} is currently: {current_value}")
                     new_value = current_value if new_value is None else int(new_value)
-                    menu_state.start_index.pop()
+                    state.start_index.pop()
 
                 elif field.type == 2: # Field type 13 corresponds to INT64
                     new_value = get_text_input(f"{human_readable_name} is currently: {current_value}")
                     new_value = current_value if new_value is None else float(new_value)
-                    menu_state.start_index.pop()
+                    state.start_index.pop()
 
                 else:  # Handle other field types
                     new_value = get_text_input(f"{human_readable_name} is currently: {current_value}")
                     new_value = current_value if new_value is None else new_value
-                    menu_state.start_index.pop()
+                    state.start_index.pop()
                 
-                for key in menu_state.menu_path[3:]:  # Skip "Main Menu"
+                for key in state.menu_path[3:]:  # Skip "Main Menu"
                     modified_settings = modified_settings.setdefault(key, {})
 
                 # Add the new value to the appropriate level
@@ -610,12 +613,12 @@ def settings_menu(stdscr, node_state):
                     enum_value_descriptor = field.enum_type.values_by_number.get(new_value)
                     new_value = enum_value_descriptor.name if enum_value_descriptor else new_value
 
-                menu_state.current_menu[selected_option] = (field, new_value)
+                state.current_menu[selected_option] = (field, new_value)
             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
+                state.current_menu = state.current_menu[selected_option]
+                state.menu_path.append(selected_option)
+                state.menu_index.append(state.selected_index)
+                state.selected_index = 0
 
 
         elif key == curses.KEY_LEFT:
@@ -625,30 +628,30 @@ def settings_menu(stdscr, node_state):
             help_win.erase()
 
             # max_help_lines = 4
-            # draw_help_window(menu_win.getbegyx()[0], menu_win.getbegyx()[1], menu_win.getmaxyx()[0], max_help_lines, menu_state.current_menu, selected_index, transform_menu_path(menu_state.menu_path))
+            # draw_help_window(menu_win.getbegyx()[0], menu_win.getbegyx()[1], menu_win.getmaxyx()[0], max_help_lines, state.current_menu, selected_index, transform_menu_path(state.menu_path))
 
             menu_win.refresh()
             help_win.refresh()
 
-            if len(menu_state.menu_path) < 2:
+            if len(state.menu_path) < 2:
                 modified_settings.clear()
 
             # Navigate back to the previous menu
-            if len(menu_state.menu_path) > 1:
-                menu_state.menu_path.pop()
-                menu_state.current_menu = menu["Main Menu"]
-                for step in menu_state.menu_path[1:]:
-                    menu_state.current_menu = menu_state.current_menu.get(step, {})
-                menu_state.selected_index = menu_state.menu_index.pop()
-                menu_state.start_index.pop()
+            if len(state.menu_path) > 1:
+                state.menu_path.pop()
+                state.current_menu = menu["Main Menu"]
+                for step in state.menu_path[1:]:
+                    state.current_menu = state.current_menu.get(step, {})
+                state.selected_index = state.menu_index.pop()
+                state.start_index.pop()
                 
         elif key == 27:  # Escape key
             menu_win.erase()
             menu_win.refresh()
             break
 
-def set_region(node_state):
-    node = node_state.interface.getNode('^local')
+def set_region(interface):
+    node = interface.getNode('^local')
     device_config = node.localConfig
     lora_descriptor = device_config.lora.DESCRIPTOR
 

contact/ui/ui_state.py

@@ -5,23 +5,4 @@ class MenuState:
         self.selected_index = 0     # Selected Row
         self.current_menu = {}      # Contents of the current menu
         self.menu_path = []         # Menu Path
-        self.show_save_option = False
-
-class NodeState:
-    def __init__(self):
-        self.interface = None
-        self.myNodeNum = 0
-
-
-
-        # self.lock = None
-        # self.display_log = False
-        # self.all_messages = {}
-        # self.channel_list = []
-        # self.notifications = []
-        # self.packet_buffer = []
-        # self.node_list = []
-        # self.selected_channel = 0
-        # self.selected_message = 0
-        # self.selected_node = 0
-        # self.current_window = 0
+        self.show_save_option = False

contact/ui/user_config.py

@@ -20,7 +20,7 @@ def edit_color_pair(key, current_value):
 
     return [fg_color, bg_color]
 
-def edit_value(key, current_value, menu_state):
+def edit_value(key, current_value, state):
 
     height = 10
     input_width = width - 16  # Allow space for "New Value: "
@@ -96,17 +96,17 @@ def edit_value(key, current_value, menu_state):
     return user_input if user_input else current_value
 
 
-def display_menu(menu_state):
+def display_menu(state):
     """
     Render the configuration menu with a Save button directly added to the window.
     """
-    num_items = len(menu_state.current_menu) + (1 if menu_state.show_save_option else 0)
+    num_items = len(state.current_menu) + (1 if state.show_save_option else 0)
 
     # Determine menu items based on the type of current_menu
-    if isinstance(menu_state.current_menu, dict):
-        options = list(menu_state.current_menu.keys())
-    elif isinstance(menu_state.current_menu, list):
-        options = [f"[{i}]" for i in range(len(menu_state.current_menu))]
+    if isinstance(state.current_menu, dict):
+        options = list(state.current_menu.keys())
+    elif isinstance(state.current_menu, list):
+        options = [f"[{i}]" for i in range(len(state.current_menu))]
     else:
         options = []  # Fallback in case of unexpected data types
 
@@ -130,110 +130,110 @@ def display_menu(menu_state):
     menu_pad.bkgd(get_color("background"))
 
     # Display the menu path
-    header = " > ".join(menu_state.menu_path)
+    header = " > ".join(state.menu_path)
     if len(header) > width - 4:
         header = header[:width - 7] + "..."
     menu_win.addstr(1, 2, header, get_color("settings_breadcrumbs", bold=True))
 
     # Populate the pad with menu options
     for idx, key in enumerate(options):
-        value = menu_state.current_menu[key] if isinstance(menu_state.current_menu, dict) else menu_state.current_menu[int(key.strip("[]"))]
+        value = state.current_menu[key] if isinstance(state.current_menu, dict) else state.current_menu[int(key.strip("[]"))]
         display_key = f"{key}"[:width // 2 - 2]
         display_value = (
             f"{value}"[:width // 2 - 8]
         )
 
-        color = get_color("settings_default", reverse=(idx == menu_state.selected_index))
+        color = get_color("settings_default", reverse=(idx == state.selected_index))
         menu_pad.addstr(idx, 0, f"{display_key:<{width // 2 - 2}} {display_value}".ljust(width - 8), color)
 
     # Add Save button to the main window
-    if menu_state.show_save_option:
+    if state.show_save_option:
         save_position = menu_height - 2
-        menu_win.addstr(save_position, (width - len(save_option)) // 2, save_option, get_color("settings_save", reverse=(menu_state.selected_index == len(menu_state.current_menu))))
+        menu_win.addstr(save_position, (width - len(save_option)) // 2, save_option, get_color("settings_save", reverse=(state.selected_index == len(state.current_menu))))
 
     menu_win.refresh()
     menu_pad.refresh(
-        menu_state.start_index[-1], 0,
+        state.start_index[-1], 0,
         menu_win.getbegyx()[0] + 3, menu_win.getbegyx()[1] + 4,
-        menu_win.getbegyx()[0] + 3 + menu_win.getmaxyx()[0] - 5 - (2 if menu_state.show_save_option else 0),
+        menu_win.getbegyx()[0] + 3 + menu_win.getmaxyx()[0] - 5 - (2 if state.show_save_option else 0),
         menu_win.getbegyx()[1] + menu_win.getmaxyx()[1] - 4
     )
 
-    max_index = num_items + (1 if menu_state.show_save_option else 0) - 1
-    visible_height = menu_win.getmaxyx()[0] - 5 - (2 if menu_state.show_save_option else 0)
+    max_index = num_items + (1 if state.show_save_option else 0) - 1
+    visible_height = menu_win.getmaxyx()[0] - 5 - (2 if state.show_save_option else 0)
 
-    draw_arrows(menu_win, visible_height, max_index, menu_state)
+    draw_arrows(menu_win, visible_height, max_index, state)
 
     return menu_win, menu_pad, options
 
 
-def move_highlight(old_idx, new_idx, options, menu_win, menu_pad, menu_state):
-    if old_idx == new_idx:  # No-op
+def move_highlight(old_idx, options, menu_win, menu_pad, state):
+    if old_idx == state.selected_index:  # No-op
         return
 
-    max_index = len(options) + (1 if menu_state.show_save_option else 0) - 1
-    visible_height = menu_win.getmaxyx()[0] - 5 - (2 if menu_state.show_save_option else 0)
+    max_index = len(options) + (1 if state.show_save_option else 0) - 1
+    visible_height = menu_win.getmaxyx()[0] - 5 - (2 if state.show_save_option else 0)
 
-    # Adjust menu_state.start_index only when moving out of visible range
-    if new_idx == max_index and menu_state.show_save_option:
+    # Adjust state.start_index only when moving out of visible range
+    if state.selected_index == max_index and state.show_save_option:
         pass
-    elif new_idx < menu_state.start_index[-1]:  # Moving above the visible area
-        menu_state.start_index[-1] = new_idx
-    elif new_idx >= menu_state.start_index[-1] + visible_height:  # Moving below the visible area
-        menu_state.start_index[-1] = new_idx - visible_height
+    elif state.selected_index < state.start_index[-1]:  # Moving above the visible area
+        state.start_index[-1] = state.selected_index
+    elif state.selected_index >= state.start_index[-1] + visible_height:  # Moving below the visible area
+        state.start_index[-1] = state.selected_index - visible_height
     pass
 
-    # Ensure menu_state.start_index is within bounds
-    menu_state.start_index[-1] = max(0, min(menu_state.start_index[-1], max_index - visible_height + 1))
+    # Ensure state.start_index is within bounds
+    state.start_index[-1] = max(0, min(state.start_index[-1], max_index - visible_height + 1))
 
     # Clear old selection
-    if menu_state.show_save_option and old_idx == max_index:
+    if state.show_save_option and old_idx == max_index:
         menu_win.chgat(menu_win.getmaxyx()[0] - 2, (width - len(save_option)) // 2, len(save_option), get_color("settings_save"))
     else:
         menu_pad.chgat(old_idx, 0, menu_pad.getmaxyx()[1], get_color("settings_sensitive") if options[old_idx] in sensitive_settings else get_color("settings_default"))
 
     # Highlight new selection
-    if menu_state.show_save_option and new_idx == max_index:
+    if state.show_save_option and state.selected_index == max_index:
         menu_win.chgat(menu_win.getmaxyx()[0] - 2, (width - len(save_option)) // 2, len(save_option), get_color("settings_save", reverse=True))
     else:
-        menu_pad.chgat(new_idx, 0, menu_pad.getmaxyx()[1], get_color("settings_sensitive", reverse=True) if options[new_idx] in sensitive_settings else get_color("settings_default", reverse=True))
+        menu_pad.chgat(state.selected_index, 0, menu_pad.getmaxyx()[1], get_color("settings_sensitive", reverse=True) if options[state.selected_index] in sensitive_settings else get_color("settings_default", reverse=True))
 
     menu_win.refresh()
     
     # Refresh pad only if scrolling is needed
-    menu_pad.refresh(menu_state.start_index[-1], 0,
+    menu_pad.refresh(state.start_index[-1], 0,
                      menu_win.getbegyx()[0] + 3, menu_win.getbegyx()[1] + 4,
                      menu_win.getbegyx()[0] + 3 + visible_height, 
                      menu_win.getbegyx()[1] + menu_win.getmaxyx()[1] - 4)
 
-    draw_arrows(menu_win, visible_height, max_index, menu_state)
+    draw_arrows(menu_win, visible_height, max_index, state)
 
 
-def draw_arrows(win, visible_height, max_index, menu_state):
+def draw_arrows(win, visible_height, max_index, state):
 
-    mi = max_index - (2 if menu_state.show_save_option else 0) 
+    mi = max_index - (2 if state.show_save_option else 0) 
 
     if visible_height < mi:
-        if menu_state.start_index[-1] > 0:
+        if state.start_index[-1] > 0:
             win.addstr(3, 2, "▲", get_color("settings_default"))
         else:
             win.addstr(3, 2, " ", get_color("settings_default"))
 
-        if mi - menu_state.start_index[-1] >= visible_height + (0 if menu_state.show_save_option else 1) :
+        if mi - state.start_index[-1] >= visible_height + (0 if state.show_save_option else 1) :
             win.addstr(visible_height + 3, 2, "▼", get_color("settings_default"))
         else:
             win.addstr(visible_height + 3, 2, " ", get_color("settings_default"))
 
 
-def json_editor(stdscr, menu_state):
+def json_editor(stdscr, state):
 
-    menu_state.selected_index = 0  # Track the selected option
+    state.selected_index = 0  # Track the selected option
 
     script_dir = os.path.dirname(os.path.abspath(__file__))
     parent_dir = os.path.abspath(os.path.join(script_dir, os.pardir))
     file_path = os.path.join(parent_dir, "config.json")
 
-    menu_state.show_save_option = True  # Always show the Save button
+    state.show_save_option = True  # Always show the Save button
 
     # Ensure the file exists
     if not os.path.exists(file_path):
@@ -245,37 +245,37 @@ def json_editor(stdscr, menu_state):
         original_data = json.load(f)
 
     data = original_data  # Reference to the original data
-    menu_state.current_menu = data  # Track the current level of the menu
+    state.current_menu = data  # Track the current level of the menu
 
     # Render the menu
-    menu_win, menu_pad, options = display_menu(menu_state)
+    menu_win, menu_pad, options = display_menu(state)
     need_redraw = True
 
     while True:
         if(need_redraw):
-            menu_win, menu_pad, options = display_menu(menu_state)
+            menu_win, menu_pad, options = display_menu(state)
             menu_win.refresh()
             need_redraw = False
             
-        max_index = len(options) + (1 if menu_state.show_save_option else 0) - 1
+        max_index = len(options) + (1 if state.show_save_option else 0) - 1
         key = menu_win.getch()
 
         if key == curses.KEY_UP:
 
-            old_selected_index = menu_state.selected_index
-            menu_state.selected_index = max_index if menu_state.selected_index == 0 else menu_state.selected_index - 1
-            move_highlight(old_selected_index, menu_state.selected_index, options, menu_win, menu_pad, menu_state)
+            old_selected_index = state.selected_index
+            state.selected_index = max_index if state.selected_index == 0 else state.selected_index - 1
+            move_highlight(old_selected_index, options, menu_win, menu_pad, state)
 
         elif key == curses.KEY_DOWN:
 
-            old_selected_index = menu_state.selected_index
-            menu_state.selected_index = 0 if menu_state.selected_index == max_index else menu_state.selected_index + 1
-            move_highlight(old_selected_index, menu_state.selected_index, options, menu_win, menu_pad, menu_state)
+            old_selected_index = state.selected_index
+            state.selected_index = 0 if state.selected_index == max_index else state.selected_index + 1
+            move_highlight(old_selected_index, options, menu_win, menu_pad, state)
 
-        elif key == ord("\t") and menu_state.show_save_option:
-            old_selected_index = menu_state.selected_index
-            menu_state.selected_index = max_index
-            move_highlight(old_selected_index, menu_state.selected_index, options, menu_win, menu_pad, menu_state)
+        elif key == ord("\t") and state.show_save_option:
+            old_selected_index = state.selected_index
+            state.selected_index = max_index
+            move_highlight(old_selected_index, options, menu_win, menu_pad, state)
 
         elif key in (curses.KEY_RIGHT, 10, 13):  # 10 = \n, 13 = carriage return
 
@@ -283,41 +283,41 @@ def json_editor(stdscr, menu_state):
             menu_win.erase()
             menu_win.refresh()
 
-            if menu_state.selected_index < len(options):  # Handle selection of a menu item
-                selected_key = options[menu_state.selected_index]
-                menu_state.menu_path.append(str(selected_key))
-                menu_state.start_index.append(0)
-                menu_state.menu_index.append(menu_state.selected_index)
+            if state.selected_index < len(options):  # Handle selection of a menu item
+                selected_key = options[state.selected_index]
+                state.menu_path.append(str(selected_key))
+                state.start_index.append(0)
+                state.menu_index.append(state.selected_index)
                 
                 # Handle nested data
-                if isinstance(menu_state.current_menu, dict):
-                    if selected_key in menu_state.current_menu:
-                        selected_data = menu_state.current_menu[selected_key]
+                if isinstance(state.current_menu, dict):
+                    if selected_key in state.current_menu:
+                        selected_data = state.current_menu[selected_key]
                     else:
                         continue  # Skip invalid key
-                elif isinstance(menu_state.current_menu, list):
-                    selected_data = menu_state.current_menu[int(selected_key.strip("[]"))]
+                elif isinstance(state.current_menu, list):
+                    selected_data = state.current_menu[int(selected_key.strip("[]"))]
 
                 if isinstance(selected_data, list) and len(selected_data) == 2:
                     # Edit color pair
                     new_value = edit_color_pair(selected_key, selected_data)
-                    menu_state.menu_path.pop()
-                    menu_state.start_index.pop()
-                    menu_state.menu_index.pop()
-                    menu_state.current_menu[selected_key] = new_value
+                    state.menu_path.pop()
+                    state.start_index.pop()
+                    state.menu_index.pop()
+                    state.current_menu[selected_key] = new_value
 
                 elif isinstance(selected_data, (dict, list)):
                     # Navigate into nested data
-                    menu_state.current_menu = selected_data
-                    menu_state.selected_index = 0  # Reset the selected index
+                    state.current_menu = selected_data
+                    state.selected_index = 0  # Reset the selected index
 
                 else:
                     # General value editing
-                    new_value = edit_value(selected_key, selected_data, menu_state)
-                    menu_state.menu_path.pop()
-                    menu_state.menu_index.pop()
-                    menu_state.start_index.pop()
-                    menu_state.current_menu[selected_key] = new_value
+                    new_value = edit_value(selected_key, selected_data, state)
+                    state.menu_path.pop()
+                    state.menu_index.pop()
+                    state.start_index.pop()
+                    state.current_menu[selected_key] = new_value
                     need_redraw = True
                 
             else:
@@ -332,16 +332,16 @@ def json_editor(stdscr, menu_state):
             menu_win.erase()
             menu_win.refresh()
 
-            # menu_state.selected_index = menu_state.menu_index[-1]
+            # state.selected_index = state.menu_index[-1]
 
             # Navigate back in the menu
-            if len(menu_state.menu_path) > 2:
-                menu_state.menu_path.pop()
-                menu_state.start_index.pop()
-                menu_state.current_menu = data
+            if len(state.menu_path) > 2:
+                state.menu_path.pop()
+                state.start_index.pop()
+                state.current_menu = data
 
-                for path in menu_state.menu_path[2:]:
-                    menu_state.current_menu = menu_state.current_menu[path] if isinstance(menu_state.current_menu, dict) else menu_state.current_menu[int(path.strip("[]"))]
+                for path in state.menu_path[2:]:
+                    state.current_menu = state.current_menu[path] if isinstance(state.current_menu, dict) else state.current_menu[int(path.strip("[]"))]
 
             else:
                 # Exit the editor
@@ -360,14 +360,14 @@ def save_json(file_path, data):
 def main(stdscr):
     from contact.ui.ui_state import MenuState
 
-    menu_state = MenuState()
-    if len(menu_state.menu_path) == 0:
-        menu_state.menu_path = ["App Settings"]  # Initialize if not set
+    state = MenuState()
+    if len(state.menu_path) == 0:
+        state.menu_path = ["App Settings"]  # Initialize if not set
 
     curses.curs_set(0)
     stdscr.keypad(True)
     setup_colors()
-    json_editor(stdscr, menu_state)
+    json_editor(stdscr, state)
 
 if __name__ == "__main__":
     curses.wrapper(main)

contact/utilities/config_io.py

@@ -123,24 +123,24 @@ def setPref(config, comp_name, raw_val) -> bool:
 
 
 
-def config_import(node_state, filename):
+def config_import(interface, filename):
     with open(filename, encoding="utf8") as file:
         configuration = yaml.safe_load(file)
         closeNow = True
 
-        node_state.interface.getNode('^local', False).beginSettingsTransaction()
+        interface.getNode('^local', False).beginSettingsTransaction()
 
         if "owner" in configuration:
             logging.info(f"Setting device owner to {configuration['owner']}")
             waitForAckNak = True
-            node_state.interface.getNode('^local', False).setOwner(configuration["owner"])
+            interface.getNode('^local', False).setOwner(configuration["owner"])
 
         if "owner_short" in configuration:
             logging.info(
                 f"Setting device owner short to {configuration['owner_short']}"
             )
             waitForAckNak = True
-            node_state.interface.getNode('^local', False).setOwner(
+            interface.getNode('^local', False).setOwner(
                 long_name=None, short_name=configuration["owner_short"]
             )
 
@@ -149,23 +149,23 @@ def config_import(node_state, filename):
                 f"Setting device owner short to {configuration['ownerShort']}"
             )
             waitForAckNak = True
-            node_state.interface.getNode('^local', False).setOwner(
+            interface.getNode('^local', False).setOwner(
                 long_name=None, short_name=configuration["ownerShort"]
             )
 
         if "channel_url" in configuration:
             logging.info(f"Setting channel url to {configuration['channel_url']}")
-            node_state.interface.getNode('^local').setURL(configuration["channel_url"])
+            interface.getNode('^local').setURL(configuration["channel_url"])
 
         if "channelUrl" in configuration:
             logging.info(f"Setting channel url to {configuration['channelUrl']}")
-            node_state.interface.getNode('^local').setURL(configuration["channelUrl"])
+            interface.getNode('^local').setURL(configuration["channelUrl"])
 
         if "location" in configuration:
             alt = 0
             lat = 0.0
             lon = 0.0
-            localConfig = node_state.interface.localNode.localConfig
+            localConfig = interface.localNode.localConfig
 
             if "alt" in configuration["location"]:
                 alt = int(configuration["location"]["alt"] or 0)
@@ -177,43 +177,43 @@ def config_import(node_state, filename):
                 lon = float(configuration["location"]["lon"] or 0)
                 logging.info(f"Fixing longitude at {lon} degrees")
             logging.info("Setting device position")
-            node_state.interface.localNode.setFixedPosition(lat, lon, alt)
+            interface.localNode.setFixedPosition(lat, lon, alt)
 
         if "config" in configuration:
-            localConfig = node_state.interface.getNode('^local').localConfig
+            localConfig = interface.getNode('^local').localConfig
             for section in configuration["config"]:
                 traverseConfig(
                     section, configuration["config"][section], localConfig
                 )
-                node_state.interface.getNode('^local').writeConfig(
+                interface.getNode('^local').writeConfig(
                     camel_to_snake(section)
                 )
 
         if "module_config" in configuration:
-            moduleConfig = node_state.interface.getNode('^local').moduleConfig
+            moduleConfig = interface.getNode('^local').moduleConfig
             for section in configuration["module_config"]:
                 traverseConfig(
                     section,
                     configuration["module_config"][section],
                     moduleConfig,
                 )
-                node_state.interface.getNode('^local').writeConfig(
+                interface.getNode('^local').writeConfig(
                     camel_to_snake(section)
                 )
 
-        node_state.interface.getNode('^local', False).commitSettingsTransaction()
+        interface.getNode('^local', False).commitSettingsTransaction()
         logging.info("Writing modified configuration to device")
 
 
 
-def config_export(node_state) -> str:
+def config_export(interface) -> str:
     """used in --export-config"""
     configObj = {}
 
-    owner = node_state.interface.getLongName()
-    owner_short = node_state.interface.getShortName()
-    channel_url = node_state.interface.localNode.getURL()
-    myinfo = node_state.interface.getMyNodeInfo()
+    owner = interface.getLongName()
+    owner_short = interface.getShortName()
+    channel_url = interface.localNode.getURL()
+    myinfo = interface.getMyNodeInfo()
     pos = myinfo.get("position")
     lat = None
     lon = None
@@ -238,7 +238,7 @@ def config_export(node_state) -> str:
         if alt:
             configObj["location"]["alt"] = alt
 
-    config = MessageToDict(node_state.interface.localNode.localConfig)	#checkme - Used as a dictionary here and a string below
+    config = MessageToDict(interface.localNode.localConfig)	#checkme - Used as a dictionary here and a string below
     if config:
         # Convert inner keys to correct snake/camelCase
         prefs = {}
@@ -261,7 +261,7 @@ def config_export(node_state) -> str:
         else:
             configObj["config"] = config
 
-    module_config = MessageToDict(node_state.interface.localNode.moduleConfig)
+    module_config = MessageToDict(interface.localNode.moduleConfig)
     if module_config:
         # Convert inner keys to correct snake/camelCase
         prefs = {}

contact/utilities/db_handler.py

@@ -7,9 +7,9 @@ from contact.utilities.utils import decimal_to_hex
 import contact.ui.default_config as config
 import contact.globals as globals
 
-def get_table_name(channel, node_state):
+def get_table_name(channel):
     # Construct the table name
-    table_name = f"{str(node_state.myNodeNum)}_{channel}_messages"
+    table_name = f"{str(globals.myNodeNum)}_{channel}_messages"
     quoted_table_name = f'"{table_name}"'  # Quote the table name becuase we begin with numerics and contain spaces
     return quoted_table_name
 
@@ -47,7 +47,7 @@ def save_message_to_db(channel, user_id, message_text):
         logging.error(f"Unexpected error in save_message_to_db: {e}")
 
 
-def update_ack_nak(channel, timestamp, message, ack, node_state):
+def update_ack_nak(channel, timestamp, message, ack):
     try:
         with sqlite3.connect(config.db_file_path) as db_connection:
             db_cursor = db_connection.cursor()
@@ -59,7 +59,7 @@ def update_ack_nak(channel, timestamp, message, ack, node_state):
                       message_text = ?
             """
 
-            db_cursor.execute(update_query, (ack, str(node_state.myNodeNum), timestamp, message))
+            db_cursor.execute(update_query, (ack, str(globals.myNodeNum), timestamp, message))
             db_connection.commit()
 
     except sqlite3.Error as e:
@@ -69,14 +69,14 @@ def update_ack_nak(channel, timestamp, message, ack, node_state):
         logging.error(f"Unexpected error in update_ack_nak: {e}")
 
 
-def load_messages_from_db(node_state):
+def load_messages_from_db():
     """Load messages from the database for all channels and update globals.all_messages and globals.channel_list."""
     try:
         with sqlite3.connect(config.db_file_path) as db_connection:
             db_cursor = db_connection.cursor()
 
             query = "SELECT name FROM sqlite_master WHERE type='table' AND name LIKE ?"
-            db_cursor.execute(query, (f"{str(node_state.myNodeNum)}_%_messages",))
+            db_cursor.execute(query, (f"{str(globals.myNodeNum)}_%_messages",))
             tables = [row[0] for row in db_cursor.fetchall()]
 
             # Iterate through each table and fetch its messages
@@ -123,10 +123,10 @@ def load_messages_from_db(node_state):
                         elif ack_type == "Nak":
                             ack_str = config.nak_str
 
-                        if user_id == str(node_state.myNodeNum):
+                        if user_id == str(globals.myNodeNum):
                             formatted_message = (f"{config.sent_message_prefix}{ack_str}: ", message)
                         else:
-                            formatted_message = (f"{config.message_prefix} {get_name_from_database(int(user_id), node_state,'short')}: ", message)
+                            formatted_message = (f"{config.message_prefix} {get_name_from_database(int(user_id), 'short')}: ", message)
                         
                         hourly_messages[hour].append(formatted_message)
 
@@ -142,14 +142,14 @@ def load_messages_from_db(node_state):
         logging.error(f"SQLite error in load_messages_from_db: {e}")
 
 
-def init_nodedb(node_state):
+def init_nodedb():
     """Initialize the node database and update it with nodes from the interface."""
     
     try:
         if not globals.interface.nodes:
             return  # No nodes to initialize
 
-        ensure_node_table_exists(node_state)  # Ensure the table exists before insertion
+        ensure_node_table_exists()  # Ensure the table exists before insertion
         nodes_snapshot = list(globals.interface.nodes.values())
 
         # Insert or update all nodes
@@ -172,7 +172,7 @@ def init_nodedb(node_state):
         logging.error(f"Unexpected error in init_nodedb: {e}")
 
 
-def maybe_store_nodeinfo_in_db(packet, node_state):
+def maybe_store_nodeinfo_in_db(packet):
     """Save nodeinfo unless that record is already there, updating if necessary."""
     try:
         user_id = packet['from']
@@ -183,21 +183,21 @@ def maybe_store_nodeinfo_in_db(packet, node_state):
         role = packet['decoded']['user'].get('role', 'CLIENT')
         public_key = packet['decoded']['user'].get('publicKey', '')
 
-        update_node_info_in_db(node_state, user_id, long_name, short_name, hw_model, is_licensed, role, public_key)
+        update_node_info_in_db(user_id, long_name, short_name, hw_model, is_licensed, role, public_key)
 
     except sqlite3.Error as e:
         logging.error(f"SQLite error in maybe_store_nodeinfo_in_db: {e}")
     except Exception as e:
         logging.error(f"Unexpected error in maybe_store_nodeinfo_in_db: {e}")
 
-def update_node_info_in_db(node_state, user_id, long_name=None, short_name=None, hw_model=None, is_licensed=None, role=None, public_key=None, chat_archived=None):
+def update_node_info_in_db(user_id, long_name=None, short_name=None, hw_model=None, is_licensed=None, role=None, public_key=None, chat_archived=None):
     """Update or insert node information into the database, preserving unchanged fields."""
     try:
-        ensure_node_table_exists(node_state)  # Ensure the table exists before any operation
+        ensure_node_table_exists()  # Ensure the table exists before any operation
 
         with sqlite3.connect(config.db_file_path) as db_connection:
             db_cursor = db_connection.cursor()
-            table_name = f'"{node_state.myNodeNum}_nodedb"'  # Quote in case of numeric names
+            table_name = f'"{globals.myNodeNum}_nodedb"'  # Quote in case of numeric names
 
             table_columns = [i[1] for i in db_cursor.execute(f'PRAGMA table_info({table_name})')]
             if "chat_archived" not in table_columns:
@@ -249,9 +249,9 @@ def update_node_info_in_db(node_state, user_id, long_name=None, short_name=None,
         logging.error(f"Unexpected error in update_node_info_in_db: {e}")
 
 
-def ensure_node_table_exists(node_state):
+def ensure_node_table_exists():
     """Ensure the node database table exists."""
-    table_name = f'"{node_state.myNodeNum}_nodedb"'  # Quote for safety
+    table_name = f'"{globals.myNodeNum}_nodedb"'  # Quote for safety
     schema = '''
         user_id TEXT PRIMARY KEY,
         long_name TEXT,
@@ -279,7 +279,7 @@ def ensure_table_exists(table_name, schema):
         logging.error(f"Unexpected error in ensure_table_exists({table_name}): {e}")
 
 
-def get_name_from_database(user_id,  node_state, type="long"):
+def get_name_from_database(user_id, type="long"):
     """
     Retrieve a user's name (long or short) from the node database.
     
@@ -292,7 +292,7 @@ def get_name_from_database(user_id,  node_state, type="long"):
             db_cursor = db_connection.cursor()
 
             # Construct table name
-            table_name = f"{str(node_state.myNodeNum)}_nodedb"
+            table_name = f"{str(globals.myNodeNum)}_nodedb"
             nodeinfo_table = f'"{table_name}"'  # Quote table name for safety
             
             # Determine the correct column to fetch
@@ -313,11 +313,11 @@ def get_name_from_database(user_id,  node_state, type="long"):
         logging.error(f"Unexpected error in get_name_from_database: {e}")
         return "Unknown"
 
-def is_chat_archived(user_id, node_state):
+def is_chat_archived(user_id):
     try:
         with sqlite3.connect(config.db_file_path) as db_connection:
             db_cursor = db_connection.cursor()
-            table_name = f"{str(node_state.myNodeNum)}_nodedb"
+            table_name = f"{str(globals.myNodeNum)}_nodedb"
             nodeinfo_table = f'"{table_name}"'
             query = f"SELECT chat_archived FROM {nodeinfo_table} WHERE user_id = ?"
             db_cursor.execute(query, (user_id,))

contact/utilities/save_to_radio.py

@@ -4,7 +4,7 @@ import logging
 import base64
 import time
 
-def save_changes(node_state, modified_settings, menu_state):
+def save_changes(interface, modified_settings, state):
     """
     Save changes to the device based on modified settings.
     :param interface: Meshtastic interface instance
@@ -16,7 +16,7 @@ def save_changes(node_state, modified_settings, menu_state):
             logging.info("No changes to save. modified_settings is empty.")
             return
         
-        node = node_state.interface.getNode('^local')
+        node = interface.getNode('^local')
         admin_key_backup = None
         if 'admin_key' in modified_settings:
             # Get reference to security config
@@ -52,19 +52,19 @@ def save_changes(node_state, modified_settings, menu_state):
             if not modified_settings:
                 return
 
-        if menu_state.menu_path[1] ==  "Radio Settings" or menu_state.menu_path[1] == "Module Settings":
-            config_category = menu_state.menu_path[2].lower() # for radio and module configs
+        if state.menu_path[1] ==  "Radio Settings" or state.menu_path[1] == "Module Settings":
+            config_category = state.menu_path[2].lower() # for radio and module configs
 
             if {'latitude', 'longitude', 'altitude'} & modified_settings.keys():
                 lat = float(modified_settings.get('latitude', 0.0))
                 lon = float(modified_settings.get('longitude', 0.0))
                 alt = int(modified_settings.get('altitude', 0))
 
-                node_state.interface.localNode.setFixedPosition(lat, lon, alt)
+                interface.localNode.setFixedPosition(lat, lon, alt)
                 logging.info(f"Updated {config_category} with Latitude: {lat} and Longitude {lon} and Altitude {alt}")
                 return
 
-        elif menu_state.menu_path[1] == "User Settings":  # for user configs
+        elif state.menu_path[1] == "User Settings":  # for user configs
             config_category = "User Settings"
             long_name = modified_settings.get("longName")
             short_name = modified_settings.get("shortName")
@@ -77,11 +77,11 @@ def save_changes(node_state, modified_settings, menu_state):
 
             return
         
-        elif menu_state.menu_path[1] == "Channels":    # for channel configs
+        elif state.menu_path[1] == "Channels":    # for channel configs
             config_category = "Channels"
 
             try:
-                channel = menu_state.menu_path[-1]
+                channel = state.menu_path[-1]
                 channel_num = int(channel.split()[-1]) - 1
             except (IndexError, ValueError) as e:
                 channel_num = None

contact/utilities/utils.py

@@ -67,9 +67,10 @@ def refresh_node_list():
         return True
     return False
 
-def get_nodeNum(node_state):
-    myinfo = node_state.interface.getMyNodeInfo()
-    node_state.myNodeNum = myinfo['num']
+def get_nodeNum():
+    myinfo = globals.interface.getMyNodeInfo()
+    myNodeNum = myinfo['num']
+    return myNodeNum
 
 def decimal_to_hex(decimal_number):
     return f"!{decimal_number:08x}"

pyproject.toml

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