optimized settings transmission (lowered the length of transmitted data)

insighio · Oct 9, 2023 · 69be20b · 69be20b
1 parent 97b058c
commit 69be20b
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 10 deletions.
diff --git a/insighioNode/web_server.py b/insighioNode/web_server.py
@@ -113,12 +113,26 @@ def get(self, data):
         return {"raw": raw_val}, 200
 
 class Config:
+    def convert_params_to_string(self, data):
+        queryString = ""
+        try:
+            for key in data["queryParams"].keys():
+                if key in data["encodedParams"]:
+                    queryString += "{}={}&".format(key, data["encodedParams"][key])
+                else:
+                    queryString += "{}={}&".format(key, data["queryParams"][key])
+            if queryString != "":
+                queryString = queryString[0: -1]
+        except Exception as e:
+            logging.exception(e, "convert_params_to_string")
+        return queryString
+
     def post(self, data):
         print("received config data: {}".format(data))
-        logging.debug("about to save queryString: " + data["queryString"])
 
         import utils
-        utils.writeToFile("/configLog", data["queryString"])
+        logging.debug("about to save queryParams: {}".format(data["queryParams"]))
+        utils.writeToFile("/configLog", self.convert_params_to_string(data))
 
         try:
             from utils import configuration_handler

diff --git a/insighioNode/www/step-5-4-measurement-naming.html b/insighioNode/www/step-5-4-measurement-naming.html
@@ -104,6 +104,7 @@
       }
       catch (e) {
         console.log("failed parsing: ", storedMapping)
+        storedMapping =  {}
       }
 
       if (storedMapping) {

diff --git a/insighioNode/www/step-8-apply.html b/insighioNode/www/step-8-apply.html
@@ -58,24 +58,23 @@
 
       function apply() {
         var config = Cookies.get()
-        var configString = ""
+        var encodedParams = {}
+        var isConfigValid = false
 
         for (let key in config) {
           if (config.hasOwnProperty(key)) {
-            configString += (key + "=" + config[key] + "&")
+            isConfigValid = true
             if(key === 'wifi-ssid' || key === 'wifi-pass' || key === 'meas-name-mapping' || key === 'meas-keyvalue') {
+              encodedParams[key] = config[key]
               config[key] = decodeURIComponent(config[key]).replaceAll("\\", "\\\\").replaceAll("'", "\\'")
             }
           }
         }
 
-        if (configString !== "")
-          configString = configString.slice(0, -1)
+        console.log("queryParams: ", config)
+        const objToSend = { queryParams: config, encodedParams }
 
-        console.log("configString: ", configString)
-        const objToSend = { queryParams: config, queryString: configString }
-
-        if (configString == "") {
+        if (!isConfigValid) {
           startOver()
           return
         }