always store data as serialized json

Author: miraculixx

configurable_http_proxy/dbstore.py

@@ -1,3 +1,4 @@
+import json
 import logging
 import os
 from datetime import datetime
@@ -92,10 +93,13 @@ def get(self, path, trie=False):
         # -- if trie is True, will return the data and the matching prefix
         try_routes = self._split_routes(path) if trie else [path]
         for path in try_routes:
-            doc = self.table.find_one(path=path)
+            doc = self.table.find_one(path=path, order_by="id")
             if doc:
-                data = self._from_json(doc["data"] if not trie else doc)
-                if trie:
+                if not trie:
+                    data = self._from_json(doc["data"])
+                else:
+                    data = doc
+                    data["data"] = self._from_json(doc["data"])
                     data["prefix"] = path
                 break
         else:
@@ -104,13 +108,15 @@ def get(self, path, trie=False):
 
     def add(self, path, data):
         # add the data for the given exact path
-        self.table.insert(self._clean_json({"path": path, "data": data}))
+        self.table.insert({"path": path, "data": self._to_json(data)})
 
     def update(self, path, data):
         # update the data for the given exact path
-        doc = self.table.find_one(path=path)
+        doc = self.table.find_one(path=path, order_by="id")
+        doc["data"] = self._from_json(doc["data"])
         doc["data"].update(data)
-        self.table.update(self._clean_json(doc), "id")
+        doc["data"] = self._to_json(doc["data"])
+        self.table.update(doc, "id")
 
     def remove(self, path):
         # remove all matching routes for the given path
@@ -119,23 +125,24 @@ def remove(self, path):
 
     def all(self):
         # return all data for all paths
-        return self._from_json({item["path"]: item["data"] for item in self.table.find()})
+        return {item["path"]: self._from_json(item["data"]) for item in self.table.find(order_by="id")}
 
-    def _clean_json(self, data):
+    def _to_json(self, data):
         # simple converter for serializable data
         for k, v in dict(data).items():
             if isinstance(v, datetime):
                 data[k] = f"_dt_:{v.isoformat()}"
-            if isinstance(v, dict):
-                data[k] = self._clean_json(v)
-        return data
+            elif isinstance(v, dict):
+                data[k] = self._to_json(v)
+        return json.dumps(data)
 
     def _from_json(self, data):
         # simple converter from serialized data
+        data = json.loads(data) if isinstance(data, (str, bytes)) else data
         for k, v in dict(data).items():
             if isinstance(v, str) and v.startswith("_dt_:"):
                 data[k] = datetime.fromisoformat(v.split(":", 1)[-1])
-            if isinstance(v, dict):
+            elif isinstance(v, dict):
                 data[k] = self._from_json(v)
         return data