v2.1.19

update testing as well

Author: migillett

meshtastic_listener/__main__.py

@@ -143,14 +143,12 @@ def __print_packet_received__(self, logger: Callable, message: dict) -> None:
 
         channel = message.get('channel', 0)
         packet = message.get('decoded', {})
-        snr = message.get('rxSnr', "N/A")
-        rx_rssi = message.get('rxRssi', "N/A")
         msg_type = packet.get('portnum', 'UNKNOWN')
 
         shortname = self.db.get_shortname(node_num)
         log_insert = self.__sanitize_string__(f"node {node_num}" if str(shortname) == str(node_num) else f"{node_num} ({shortname})")
 
-        logger(f"Received {msg_type} payload from {log_insert} on channel {channel} ({rx_rssi} dB rxRssi, {snr} rxSNR): {json.dumps(packet)}")
+        logger(f"Received {msg_type} payload from {log_insert} on channel {channel}: {json.dumps(packet)}")
 
     def __human_readable_ts__(self, rxTime: int | None = None) -> str:
         if rxTime is None:

meshtastic_listener/commands/cmd_handler.py

@@ -1,8 +1,9 @@
 import logging
 import inspect
+from time import time
+from datetime import timedelta
 
 from meshtastic_listener.data_structures import MessageReceived, NodeHealthCheck
-from meshtastic_listener.commands.subscriptions import handle_subscription_command
 from meshtastic_listener.listener_db.listener_db import ListenerDb, Waypoints
 
 logger = logging.getLogger(__name__)
@@ -70,7 +71,9 @@ def cmd_traceroute_health(self) -> str:
         '''
         5: !t - Get traceroute health summary
         '''
-        response = ''
+        lookback_ts = int(time()) - timedelta(days=1).total_seconds()
+        
+        response = 'Traceroute Summary:\n'
         nodes = self.db.get_favorite_nodes()
         if len(nodes) == 0:
             return 'No favorite nodes found'
@@ -80,13 +83,15 @@ def cmd_traceroute_health(self) -> str:
                 continue
             results = self.db.get_traceroute_results_by_node(
                 source_id=self.server_node_id,
-                target_id=node.nodeNum
+                target_id=node.nodeNum,
+                lookback_ts=lookback_ts
             )
             if len(results) == 0:
                 response += f'{node.shortName}: No traces\n'
             else:
                 successes = sum(1 for r in results if r.rxTime is not None)
-                response += f'{node.shortName}: {successes}/{len(results)}\n'
+                percentage = int((successes / len(results)) * 100)
+                response += f'{node.shortName}: {successes}/{len(results)} {percentage}%\n'
         return response.strip()
 
     # def cmd_subscriptions(self, context: MessageReceived) -> str:

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "meshtatic_listener"
-version = "2.1.18"
+version = "2.1.19"
 description = "A server for connecting to a Meshtastic device and responding to commands."
 authors = [{ name = "Michael Gillett", email = "51103663+migillett@users.noreply.github.com" }]
 requires-python = ">=3.10,<3.14"

tests/test_listener.py

@@ -87,16 +87,38 @@ def test_listener():
                 message_received = json.load(json_file)
                 listener.__on_receive__(packet=message_received)
 
+    message_received = {
+        "from": 1111111111,
+        "to": 1234567890,
+        "decoded": {
+            "portnum": "TEXT_MESSAGE_APP",
+            "bitfield": 0,
+            "text": ""
+        },
+        "id": 222222222,
+        "rxTime": 0,
+        "rxSnr": 6.75,
+        "hopLimit": 7,
+        "wantAck": True,
+        "rxRssi": -35,
+        "hopStart": 7,
+        "publicKey": "asdfasdfasdfasdfasdfasdfasdf=",
+        "pkiEncrypted": True,
+        "fromId": "!12345678",
+        "toId": "!12345678"
+    }
+
     # a list of commands and the expected response from the BBS
     # we'll do a check of response.startswith(expected_response) for each command
     test_commands = [
         (None, ''),
-        ('!h', ''), # this message will be long, so just check for a basic response
-        ('!r', 'RX HOPS:'),
+        ('!r', 'RX HOPS: 7 / 7\nRX SNR: 6.75\nRX RSSI: -35'),
         ('!w', 'Sent 1 waypoint to your map'), # we created 1 waypoint using the JSON test above
-        ('!i', 'Meshtastic Listener testing'),
-        ('!l', '1234567890 (TEST): testing'),
         ('!c', 'No health check data available.'),  # no health check data in the test messages
+        ('!l', '1234567890 (TEST): testing'),
+        ('!t', 'Traceroute Summary:'),
+        ('!i', 'Meshtastic Listener testing'),
+        ('!h', ''), # this message will be long, so just check for a basic response
 
         # SUBSCRIPTIONS
         # ('!s', 'Subscription Commands:'),
@@ -113,27 +135,6 @@ def test_listener():
         # ('!s add *', 'Successfully subscribed to all topics'),
     ]
 
-    message_received = {
-        "from": 1234567890,
-        "to": 1234567890,
-        "decoded": {
-            "portnum": "TEXT_MESSAGE_APP",
-            "bitfield": 0,
-            "text": ""
-        },
-        "id": 1234567890,
-        "rxTime": 0,
-        "rxSnr": 6.75,
-        "hopLimit": 7,
-        "wantAck": True,
-        "rxRssi": -35,
-        "hopStart": 7,
-        "publicKey": "asdfasdfasdfasdfasdfasdfasdf=",
-        "pkiEncrypted": True,
-        "fromId": "!12345678",
-        "toId": "!12345678"
-    }
-
     for message in test_commands:
         print(f'Sending message: {message[0]}')
         message_received['rxTime'] = int(time())