modified node parsing to accept ony number of nested strings

2b4ab2b122

CHANGELOG.rst

@@ -2,6 +2,17 @@
 Changelog
 =========
 
+version 1.2.0
+=============
+
+Bugs:
+	* Fixed agent sometimes being None causing an oxception
+	* Fixed bad code in device_open_url
+
+Features:
+	* Changed websockets version to 15. This now uses the proxy implemention from that library, instead of the previous hack.
+	* Added lastaddr and lastconnect to list_devices API
+
 version 1.1.2
 =============
 Bugs:

src/meshctrl/session.py

@@ -478,7 +478,18 @@ class Session(object):
         if "result" in res0:
             raise exceptions.ServerError(res0["result"])
         if details:
-            nodes = json.loads(res0["data"])
+            try:
+                nodes = res0["data"]
+                # Accept any number of nested strings, meshcentral is odd
+                while True:
+                    try:
+                        nodes = json.loads(nodes)
+                    except TypeError:
+                        break
+            except Exception as e:
+                print(f"Failed to parse device data: {e}")
+                return
+
             for node in nodes:
                 if node["node"].get("meshid", None):
                     node["node"]["mesh"] = mesh.Mesh(node["node"].get("meshid"), self)
@@ -1969,4 +1980,4 @@ class _FileExplorerWrapper:
         return await self._files.__aenter__()
 
     async def __aexit__(self, exc_t, exc_v, exc_tb):
-        return await self._files.__aexit__(exc_t, exc_v, exc_tb)
+        return await self._files.__aexit__(exc_t, exc_v, exc_tb)