From c14fe630447878e5f6c90c179eb6cb6ea94e27eb Mon Sep 17 00:00:00 2001 From: prokrypt Date: Sat, 15 Mar 2025 15:29:37 -0700 Subject: [PATCH 1/5] fix error when viewing packetlist for node with no nodeinfo --- meshview/web.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meshview/web.py b/meshview/web.py index c4cfb13..4af2ecf 100644 --- a/meshview/web.py +++ b/meshview/web.py @@ -13,7 +13,7 @@ import seaborn as sns import matplotlib.pyplot as plt from aiohttp import web from markupsafe import Markup -from jinja2 import Environment, PackageLoader, select_autoescape +from jinja2 import Environment, PackageLoader, select_autoescape, Undefined from google.protobuf import text_format from google.protobuf.message import Message from meshtastic.protobuf.portnums_pb2 import PortNum @@ -165,6 +165,8 @@ async def build_neighbors(node_id): def node_id_to_hex(node_id): + if node_id is None or isinstance(node_id, Undefined): + return "Invalid node_id" # i... have no clue if node_id == 4294967295: return "^all" else: From 196ca07dacedcdde770c32d9c921b5585a33e9bc Mon Sep 17 00:00:00 2001 From: prokrypt Date: Sun, 16 Mar 2025 13:20:33 -0700 Subject: [PATCH 2/5] mqtt_store.py: update channel on seen nodeinfo --- meshview/mqtt_store.py | 1 + 1 file changed, 1 insertion(+) diff --git a/meshview/mqtt_store.py b/meshview/mqtt_store.py index 292d996..809879b 100644 --- a/meshview/mqtt_store.py +++ b/meshview/mqtt_store.py @@ -115,6 +115,7 @@ async def process_envelope(topic, env): node.short_name = user.short_name node.hw_model = hw_model node.role = role + node.channel = env.channel_id node.last_update =datetime.datetime.now() else: From 0b8597c704fb50fd1bc093be5a0d4a3327ab044d Mon Sep 17 00:00:00 2001 From: Pablo Revilla Date: Mon, 17 Mar 2025 13:25:36 -0700 Subject: [PATCH 3/5] Fixed Date format to mm/dd/YYYY. Added /api that dumps a json with all the nodes. --- meshview/templates/base.html | 2 +- meshview/templates/packet_details.html | 29 ++++++++++++++++++++------ 2 files changed, 24 insertions(+), 7 deletions(-) diff --git a/meshview/templates/base.html b/meshview/templates/base.html index 27e8b8a..b6d438b 100644 --- a/meshview/templates/base.html +++ b/meshview/templates/base.html @@ -35,7 +35,7 @@ -
{{ site_config["site"]["title"] }} - {{ site_config["site"]["domain"] }}
+
{{ site_config["site"]["title"] }} {{ site_config["site"]["domain"] }}
{{ site_config["site"]["message"] }}
Quick Links:  Nodes - Conversations - See everything  - Mesh Graph LF - MS  - Stats diff --git a/meshview/templates/packet_details.html b/meshview/templates/packet_details.html index 4b402c9..47e4c98 100644 --- a/meshview/templates/packet_details.html +++ b/meshview/templates/packet_details.html @@ -13,7 +13,7 @@
Import Time
-
{{seen.import_time.strftime('%-I:%M:%S %p - %m-%d-%Y')}}
+
{{seen.import_time.strftime('%-I:%M:%S %p - %d-%m-%Y')}}
rx_time
{{seen.rx_time|format_timestamp}}
hop_limit
@@ -36,7 +36,7 @@ {% if map_center %}