From d50c8ae815221a6fb56eecfb731b38a25b5f7178 Mon Sep 17 00:00:00 2001
From: brad28b <70585927+brad28b@users.noreply.github.com>
Date: Thu, 16 May 2024 10:32:42 +1000
Subject: [PATCH] Update monitor_mesh.py

---
 monitor_mesh.py | 44 +++++++++++++++++++++++++++-----------------
 1 file changed, 27 insertions(+), 17 deletions(-)

diff --git a/monitor_mesh.py b/monitor_mesh.py
index 3caf4bb..32be09d 100644
--- a/monitor_mesh.py
+++ b/monitor_mesh.py
@@ -7,13 +7,16 @@ import json
 # MySQL database configuration
 servername = "localhost"
 username = "meshtastic"
-password = "YOUR_PASSWORD_HERE"
+password = "YOUR_PASSWORD"
 dbname = "meshtastic"
 
 # MQTT broker configuration
-broker_address = "192.168.X.X"
+broker_address = "192.168.x.x"
 broker_port = 1883
 client_id = "mesh-monitor-py"
+topic = "Meshtastic/2/json/LongFast/!da5ed0a0" # replace !da5ed0a0 with your own Node ID
+
+# You should not need to modify anything beyong here
 
 # Connect to MySQL database
 conn = pymysql.connect(host=servername, user=username, password=password, database=dbname)
@@ -32,16 +35,27 @@ def process_JSON(data, type):
             sql_values += "%s,"
             params.append(value)
 
-    for field, value in data['payload'].items():
-        if isinstance(value, list):
-            field_str = '|'.join([f"node_id:{item['node_id']}:snr:{item['snr']}" for item in value])
-            sql_columns += f"`payload_{field}`,"
-            sql_values += "%s,"
-            params.append(field_str)
-        else:
-            sql_columns += f"`payload_{field}`,"
-            sql_values += "%s,"
-            params.append(value)
+    payload_value = data.get('payload')
+    if isinstance(payload_value, dict):
+        for field, value in payload_value.items():
+            if isinstance(value, list):
+                if field == 'neighbors':
+                    # Extract neighbor information and join into a single string
+                    field_str = '|'.join([f"node_id:{item['node_id']}:snr:{item['snr']}" for item in value])
+                else:
+                    field_str = '|'.join(value)  # Concatenate array elements into a string
+                sql_columns += f"`payload_{field}`,"
+                sql_values += "%s,"
+                params.append(field_str)
+            else:
+                sql_columns += f"`payload_{field}`,"
+                sql_values += "%s,"
+                params.append(value)
+    else:
+        # Handle the case where payload is not a dictionary with iterable values
+        sql_columns += "`payload_route`,"
+        sql_values += "%s,"
+        params.append(payload_value)
 
     # Remove trailing commas
     sql_columns = sql_columns.rstrip(",")
@@ -59,8 +73,7 @@ def process_JSON(data, type):
     cursor.close()
 
 def on_connect(client, userdata, flags, rc):
-#    print("Connected to MQTT broker with result code "+str(rc))
-    client.subscribe("Meshtastic/2/json/LongFast/!da5ed0a0")
+    client.subscribe(topic)
 
 def on_message(client, userdata, msg):
     print(msg.payload.decode())
@@ -70,13 +83,10 @@ def on_message(client, userdata, msg):
     if data['type'] in known_types:
         process_JSON(data, data['type'])
 
-
 mqtt_client = mqtt.Client(client_id=client_id)
 mqtt_client.on_connect = on_connect
 mqtt_client.on_message = on_message
 
-# print("MySQL connection successful")
-
 try:
     mqtt_client.connect(broker_address, broker_port, 60)
     mqtt_client.loop_forever()