node-red-contrib-3dm-space 1.0.5 → 1.1.0

package/3dm-cloud-out.js

@@ -56,7 +56,7 @@ module.exports = function (RED) {
      * 60000 = 1 update per minute.
      * This only applies to live online data when the queue is empty.
      */
-    var LIVE_PUBLISH_INTERVAL_MS = 60000;
+    var LIVE_PUBLISH_INTERVAL_MS = 45000;
 
     var RATE_LIMIT_TEXT = "rate limited: slow your payloads down!";
     var QUEUE_FULL_TEXT = "queue full: message rejected";

package/3dm-config-store.js

@@ -140,6 +140,34 @@ module.exports = function (RED) {
         return text === "scheduler" || text === "schedule" || text === "consched" || text === "control-schedule";
     }
 
+    function stableStringify(value) {
+        if (value === null || typeof value !== "object") {
+            return JSON.stringify(value);
+        }
+
+        if (Array.isArray(value)) {
+            return "[" + value.map(stableStringify).join(",") + "]";
+        }
+
+        return "{" + Object.keys(value).sort().map(function (key) {
+            return JSON.stringify(key) + ":" + stableStringify(value[key]);
+        }).join(",") + "}";
+    }
+
+    function configBlockChanged(oldBlock, newBlock) {
+        if (!oldBlock) {
+            return true;
+        }
+
+        return stableStringify({
+            type: oldBlock.type,
+            data: oldBlock.data
+        }) !== stableStringify({
+            type: newBlock.type,
+            data: newBlock.data
+        });
+    }
+
     function ThreeDMConfigStoreNode(config) {
         RED.nodes.createNode(this, config);
 
@@ -239,7 +267,23 @@ module.exports = function (RED) {
                 return true;
             }
 
-            return String(configName) === node.configName;
+            return String(configName).trim() === node.configName;
+        }
+
+        function getAcceptedConfigNames(configStore) {
+            var names = [];
+
+            if (!configStore || typeof configStore !== "object" || Array.isArray(configStore)) {
+                return names;
+            }
+
+            Object.keys(configStore).forEach(function (configName) {
+                if (shouldAcceptConfigName(configName)) {
+                    names.push(String(configName).trim());
+                }
+            });
+
+            return names;
         }
 
         function inferBlockType(configName, block) {
@@ -309,12 +353,19 @@ module.exports = function (RED) {
                 return savedNames;
             }
 
-            Object.keys(configStore).forEach(function (configName) {
-                if (!shouldAcceptConfigName(configName)) {
+            Object.keys(configStore).forEach(function (rawConfigName) {
+                if (!shouldAcceptConfigName(rawConfigName)) {
+                    return;
+                }
+
+                var configName = String(rawConfigName).trim();
+                var normalisedBlock = normaliseConfigBlock(configName, configStore[rawConfigName]);
+
+                if (!configBlockChanged(latestStore[configName], normalisedBlock)) {
                     return;
                 }
 
-                latestStore[configName] = normaliseConfigBlock(configName, configStore[configName]);
+                latestStore[configName] = normalisedBlock;
                 savedNames.push(configName);
             });
 
@@ -846,6 +897,7 @@ module.exports = function (RED) {
                 var configStore = extractConfigStore(msg);
 
                 if (configStore) {
+                    var matchedNames = getAcceptedConfigNames(configStore);
                     var savedNames = storeConfig(configStore);
 
                     if (savedNames.length > 0) {
@@ -856,8 +908,17 @@ module.exports = function (RED) {
                         }
 
                         runConfigStore(false, true);
+                    } else if (matchedNames.length > 0) {
+                        setStatus("blue", "ring", "config unchanged: " + matchedNames.join(", "));
                     } else {
-                        setStatus("yellow", "ring", "configStore ignored");
+                        setStatus(
+                            "yellow",
+                            "ring",
+                            "configStore ignored - looking for " +
+                                (node.configName || "all") +
+                                ", received " +
+                                Object.keys(configStore).join(", ")
+                        );
                     }
 
                     if (done) {