From 8ffb50e60edb4bc1dc2a9cb0a8dc775713cdf37a Mon Sep 17 00:00:00 2001 From: acidvegas Date: Mon, 2 Dec 2024 22:50:05 -0500 Subject: [PATCH] Fixed error when parsing NaN (converting to None) --- src/meshtastic_mqtt_json/client.py | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/src/meshtastic_mqtt_json/client.py b/src/meshtastic_mqtt_json/client.py index 260e0fd..7e07e24 100644 --- a/src/meshtastic_mqtt_json/client.py +++ b/src/meshtastic_mqtt_json/client.py @@ -167,7 +167,22 @@ class MeshtasticMQTT(object): if self.filters and portnum_name not in self.filters: return - json_packet = json.loads(MessageToJson(mp)) + # Convert to JSON with parsing options to handle NaN + json_packet = json.loads(MessageToJson(mp, including_default_value_fields=True, + preserving_proto_field_name=True, + float_precision=10)) + + # Replace NaN values with null in the JSON structure + def replace_nan(obj): + if isinstance(obj, dict): + return {k: replace_nan(v) for k, v in obj.items()} + elif isinstance(obj, list): + return [replace_nan(x) for x in obj] + elif isinstance(obj, str) and obj == 'NaN': + return None + return obj + + json_packet = replace_nan(json_packet) # Process the message based on its type if mp.decoded.portnum == portnums_pb2.ADMIN_APP: