From bc5a5951d451c04f94c2dce50f02ac9c15ad2cb0 Mon Sep 17 00:00:00 2001
From: Ben Lipsey <benlipsey@gmail.com>
Date: Sun, 13 Apr 2025 14:18:52 -0700
Subject: [PATCH] current state

---
 contact/message_handlers/rx_handler.py | 29 +++++++++++++++++-----
 contact/message_handlers/tx_handler.py | 34 ++++++++++++++++++++------
 2 files changed, 50 insertions(+), 13 deletions(-)

diff --git a/contact/message_handlers/rx_handler.py b/contact/message_handlers/rx_handler.py
index dd8c746..32e4fde 100644
--- a/contact/message_handlers/rx_handler.py
+++ b/contact/message_handlers/rx_handler.py
@@ -1,17 +1,34 @@
 import logging
 import time
-from contact.utilities.utils import refresh_node_list
 from datetime import datetime
-from contact.ui.contact_ui import draw_packetlog_win, draw_node_list, draw_messages_window, draw_channel_list, add_notification
-from contact.utilities.db_handler import save_message_to_db, maybe_store_nodeinfo_in_db, get_name_from_database, update_node_info_in_db
+from typing import Any
+
+from contact.utilities.utils import refresh_node_list
+from contact.ui.contact_ui import (
+    draw_packetlog_win,
+    draw_node_list,
+    draw_messages_window,
+    draw_channel_list,
+    add_notification,
+)
+from contact.utilities.db_handler import (
+    save_message_to_db,
+    maybe_store_nodeinfo_in_db,
+    get_name_from_database,
+    update_node_info_in_db,
+)
 import contact.ui.default_config as config
 import contact.globals as globals
 
 
-from datetime import datetime
-
-def on_receive(packet, interface):
+def on_receive(packet: dict[str, Any], interface: Any) -> None:
+    """
+    Handles an incoming packet from a Meshtastic interface.
 
+    Args:
+        packet: The received Meshtastic packet as a dictionary.
+        interface: The Meshtastic interface instance that received the packet.
+    """
     with globals.lock:
         # Update packet log
         globals.packet_buffer.append(packet)
diff --git a/contact/message_handlers/tx_handler.py b/contact/message_handlers/tx_handler.py
index 50b83f1..6834be0 100644
--- a/contact/message_handlers/tx_handler.py
+++ b/contact/message_handlers/tx_handler.py
@@ -1,17 +1,29 @@
 from datetime import datetime
+from typing import Any
+
 import google.protobuf.json_format
 from meshtastic import BROADCAST_NUM
 from meshtastic.protobuf import mesh_pb2, portnums_pb2
 
-from contact.utilities.db_handler import save_message_to_db, update_ack_nak, get_name_from_database, is_chat_archived, update_node_info_in_db
+from contact.utilities.db_handler import (
+    save_message_to_db,
+    update_ack_nak,
+    get_name_from_database,
+    is_chat_archived,
+    update_node_info_in_db,
+)
 import contact.ui.default_config as config
 import contact.globals as globals
 
-ack_naks = {}
+ack_naks: dict[str, dict[str, Any]] = {}  # requestId -> {channel, messageIndex, timestamp}
+
 
 # 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):
+def onAckNak(packet: dict[str, Any]) -> None:
+    """
+    Handles incoming ACK/NAK response packets.
+    """
     from contact.ui.contact_ui import draw_messages_window
     request = packet['decoded']['requestId']
     if(request not in ack_naks):
@@ -41,8 +53,10 @@ def onAckNak(packet):
     if globals.channel_list[channel_number] == globals.channel_list[globals.selected_channel]:
         draw_messages_window()
 
-def on_response_traceroute(packet):
-    """on response for trace route"""
+def on_response_traceroute(packet: dict[str, Any]) -> None:
+    """
+    Handle traceroute response packets and render the route visually in the UI.
+    """
     from contact.ui.contact_ui import draw_channel_list, draw_messages_window, add_notification
 
     refresh_channels = False
@@ -118,7 +132,10 @@ def on_response_traceroute(packet):
     save_message_to_db(globals.channel_list[channel_number], packet['from'], msg_str)
 
 
-def send_message(message, destination=BROADCAST_NUM, channel=0):
+def send_message(message: str, destination: int = BROADCAST_NUM, channel: int = 0) -> None:
+    """
+    Sends a chat message using the selected channel.
+    """
     myid = globals.myNodeNum
     send_on_channel = 0
     channel_id = globals.channel_list[channel]
@@ -168,7 +185,10 @@ def send_message(message, 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():
+def send_traceroute() -> None:
+    """
+    Sends a RouteDiscovery protobuf to the selected node.
+    """
     r = mesh_pb2.RouteDiscovery()
     globals.interface.sendData(
         r,