@bldgblocks/node-red-contrib-control 0.1.32 → 0.1.34

package/nodes/accumulate-block.html

@@ -15,7 +15,7 @@
 
 <script type="text/javascript">
     RED.nodes.registerType("accumulate-block", {
-        category: "control",
+        category: "bldgblocks control",
         color: "#301934",
         defaults: {
             name: { value: "" },

package/nodes/add-block.html

@@ -11,7 +11,7 @@
 
 <script type="text/javascript">
     RED.nodes.registerType("add-block", {
-        category: "control",
+        category: "bldgblocks control",
         color: "#301934",
         defaults: {
             name: { value: "" },

package/nodes/analog-switch-block.html

@@ -13,7 +13,7 @@
 <!-- JavaScript Section: Registers the node and handles editor logic -->
 <script type="text/javascript">
     RED.nodes.registerType("analog-switch-block", {
-        category: "control",
+        category: "bldgblocks control",
         color: "#301934",
         defaults: {
             name: { value: "" },

package/nodes/and-block.html

@@ -11,7 +11,7 @@
 
 <script type="text/javascript">
     RED.nodes.registerType("and-block", {
-        category: "control",
+        category: "bldgblocks control",
         color: "#301934",
         defaults: {
             name: { value: "" },

package/nodes/average-block.html

@@ -21,7 +21,7 @@
 
 <script type="text/javascript">
     RED.nodes.registerType("average-block", {
-        category: "control",
+        category: "bldgblocks control",
         color: "#301934",
         defaults: {
             name: { value: "" },

package/nodes/boolean-switch-block.html

@@ -9,7 +9,7 @@
 <!-- JavaScript Section -->
 <script type="text/javascript">
     RED.nodes.registerType("boolean-switch-block", {
-        category: "control",
+        category: "bldgblocks control",
         color: "#301934",
         defaults: {
             name: { value: "" },

package/nodes/boolean-to-number-block.html

@@ -13,7 +13,7 @@
 <!-- JavaScript Section -->
 <script type="text/javascript">
     RED.nodes.registerType("boolean-to-number-block", {
-        category: "control",
+        category: "bldgblocks control",
         color: "#301934",
         defaults: {
             name: { value: "" },

package/nodes/cache-block.html

@@ -13,7 +13,7 @@
 <!-- JavaScript Section: Registers the node and handles editor logic -->
 <script type="text/javascript">
     RED.nodes.registerType("cache-block", {
-        category: "control",
+        category: "bldgblocks control",
         color: "#301934",
         defaults: {
             name: { value: "" },

package/nodes/call-status-block.html

@@ -33,7 +33,7 @@
 <!-- JavaScript Section: Registers the node and handles editor logic -->
 <script type="text/javascript">
     RED.nodes.registerType("call-status-block", {
-        category: "control",
+        category: "bldgblocks control",
         color: "#301934",
         defaults: {
             name: { value: "" },

package/nodes/changeover-block.html

@@ -93,7 +93,7 @@
 
 <script type="text/javascript">
     RED.nodes.registerType("changeover-block", {
-        category: "control",
+        category: "bldgblocks control",
         color: "#301934",
         defaults: {
             name: { value: "" },

package/nodes/comment-block.html

@@ -19,7 +19,7 @@
 
 <script type="text/javascript">
     RED.nodes.registerType("comment-block", {
-        category: "control",
+        category: "bldgblocks control",
         color: "#301934",
         defaults: {
             name: { value: "comment" },

package/nodes/compare-block.html

@@ -13,7 +13,7 @@
 <!-- JavaScript Section: Registers the node and handles editor logic -->
 <script type="text/javascript">
     RED.nodes.registerType("compare-block", {
-        category: "control",
+        category: "bldgblocks control",
         color: "#301934",
         defaults: {
             name: { value: "" },

package/nodes/contextual-label-block.html

@@ -15,7 +15,7 @@
 
 <script type="text/javascript">
 RED.nodes.registerType("contextual-label-block", {
-    category: "control",
+    category: "bldgblocks control",
     color: "#301934",
     defaults: {
         name: { value: "" },

package/nodes/convert-block.html

@@ -58,7 +58,7 @@
 
 <script type="text/javascript">
     RED.nodes.registerType("convert-block", {
-        category: "control",
+        category: "bldgblocks control",
         color: "#301934",
         defaults: {
             name: { value: "" },

package/nodes/count-block.html

@@ -9,7 +9,7 @@
 <!-- JavaScript Section: Registers the node and handles editor logic -->
 <script type="text/javascript">
     RED.nodes.registerType("count-block", {
-        category: "control",
+        category: "bldgblocks control",
         color: "#301934",
         defaults: {
             name: { value: "" }
@@ -18,7 +18,7 @@
         outputs: 1,
         inputLabels: ["input"],
         outputLabels: ["count"],
-        icon: "font-awesome/fa-tally",
+        icon: "font-awesome/fa-calculator",
         paletteLabel: "count",
         label: function() {
             return this.name || "count";

package/nodes/delay-block.html

@@ -33,7 +33,7 @@
 <!-- JavaScript Section: Registers the node and handles editor logic -->
 <script type="text/javascript">
     RED.nodes.registerType("delay-block", {
-        category: "control",
+        category: "bldgblocks control",
         color: "#301934",
         defaults: {
             name: { value: "" },

package/nodes/divide-block.html

@@ -11,7 +11,7 @@
 
 <script type="text/javascript">
     RED.nodes.registerType("divide-block", {
-        category: "control",
+        category: "bldgblocks control",
         color: "#301934",
         defaults: {
             name: { value: "" },

package/nodes/edge-block.html

@@ -16,7 +16,7 @@
 <!-- JavaScript Section -->
 <script type="text/javascript">
     RED.nodes.registerType("edge-block", {
-        category: "control",
+        category: "bldgblocks control",
         color: "#301934",
         defaults: {
             name: { value: "" },

package/nodes/enum-switch-block.html

@@ -31,7 +31,7 @@
 
 <script type="text/javascript">
     RED.nodes.registerType("enum-switch-block", {
-        category: "control",
+        category: "bldgblocks control",
         color: "#301934",
         defaults: {
             name: { value: "" },

package/nodes/frequency-block.html

@@ -9,7 +9,7 @@
 <!-- JavaScript Section: Registers the node and handles editor logic -->
 <script type="text/javascript">
     RED.nodes.registerType("frequency-block", {
-        category: "control",
+        category: "bldgblocks control",
         color: "#301934",
         defaults: {
             name: { value: "" }

package/nodes/global-getter.html

@@ -26,7 +26,7 @@
     </div>
 
     <div class="form-row">
-        <label for="node-input-detail"><i class="fa fa-bolt"></i> Trigger</label>
+        <label for="node-input-detail"><i class="fa fa-book"></i> Detail</label>
         <select id="node-input-detail" style="width: 70%;">
             <option value="getValue">Get Simple Value</option>
             <option value="getObject">Get Full Object</option>
@@ -40,7 +40,7 @@
 
 <script type="text/javascript">
     RED.nodes.registerType('global-getter', {
-        category: 'control',
+        category: "bldgblocks control",
         color: '#3FADB5',
         defaults: {
             name: { value: "" },
@@ -56,7 +56,7 @@
             if (this.targetNode) {
                 const target = RED.nodes.node(this.targetNode);
                 if (target) {
-                    let lbl = target.path || target.name;
+                    let lbl = target.name || target.path;
                     if(lbl && lbl.startsWith("#") && lbl.includes(":")) {
                         lbl = lbl.substring(lbl.indexOf(":") + 1);
                     }
@@ -99,3 +99,34 @@
         }
     });
 </script>
+
+<!-- Help Section -->
+<script type="text/markdown" data-help-name="global-setter">
+Manage a global variable in a repeatable way.
+
+### Inputs 
+Retreived object will overwrite msg.
+
+### Outputs
+: payload (object) : The stored object with values and metadata.
+
+### Details
+Global variables are meant to be retrieved in other places, this necessarily means managing the same string in multiple places. 
+
+This node allows you to get a global variable anywhere from one source, while supporting rename and deletion.
+
+The source can be found using the search button. The payload property can be specified and can be set to only the value for chaining.
+
+Reactive updates means every time the source is updated those nodes will receive the new value via event.
+
+### Status
+- Green (dot): Configuration update
+- Blue (dot): State changed
+- Blue (ring): State unchanged
+- Red (ring): Error
+- Yellow (ring): Warning
+
+### References
+- [Node-RED Documentation](https://nodered.org/docs/)  
+- [GitHub Repository](https://github.com/BldgBlocks/node-red-contrib-buildingblocks-control.git)
+</script>

package/nodes/global-getter.js

@@ -1,4 +1,5 @@
 module.exports = function(RED) {
+    const utils = require('./utils')(RED);
     function GlobalGetterNode(config) {
         RED.nodes.createNode(this, config);
         const node = this;
@@ -6,75 +7,62 @@ module.exports = function(RED) {
         node.outputProperty = config.outputProperty || "payload";
         node.updates = config.updates;
         node.detail = config.detail;
-
+        
         let setterNode = null;
-        let retryInterval = null;
+        let retryAction = null;
+        let healthCheckAction = null;
         let updateListener = null;
         let retryCount = 0;
         const retryDelays = [0, 100, 500, 1000, 2000, 4000, 8000, 16000];
         const maxRetries = retryDelays.length - 1;
         
-        // --- HELPER: Process Wrapper and Send Msg ---
-        function sendValue(storedObject, msgToReuse) {
+        // --- Output Helper ---
+        function sendValue(storedObject, msgToReuse, done) {
             const msg = msgToReuse || {}; 
 
             if (storedObject !== undefined && storedObject !== null) {
-                
-                // CHECK: Is this our Wrapper Format? (Created by Global Setter)
-                if (storedObject && typeof storedObject === 'object' && storedObject.hasOwnProperty('value')) {
-                    
-                    // 1. Separate the Value from everything else (Rest operator)
-                    // 'attributes' will contain: priority, units, metadata, topic, etc.
-                    const { value, ...attributes } = storedObject;
-
-                    // 2. Set the Main Output (e.g. msg.payload = 75)
-                    RED.util.setMessageProperty(msg, node.outputProperty, value);
-
-                    // 3. Merge all attributes onto the msg root
-                    // This automatically handles priority, units, metadata, and any future fields
+                // Check if this is our custom wrapper object
+                if (storedObject && typeof storedObject === 'object' && storedObject.hasOwnProperty('value')) {                    
                     if (node.detail === "getObject") {
-                        Object.assign(msg, attributes);
+                        Object.assign(msg, storedObject);
                     }
-
+                    RED.util.setMessageProperty(msg, node.outputProperty, storedObject.value);
                 } else {
-                    // Handle Legacy/Raw values (not created by your Setter)
+                    // Legacy/Raw values
                     RED.util.setMessageProperty(msg, node.outputProperty, storedObject);
                     msg.metadata = { path: setterNode ? setterNode.varName : "unknown", legacy: true };
                 }
                 
-                // Visual Status
-                const valDisplay = RED.util.getMessageProperty(msg, node.outputProperty);
-                node.status({ fill: "blue", shape: "dot", text: `get: ${valDisplay}` });
+                let valDisplay = RED.util.getMessageProperty(msg, node.outputProperty);
+                valDisplay = typeof valDisplay === "number" ? valDisplay : valDisplay;
                 
-                node.send(msg);
-
+                utils.sendSuccess(node, msg, done, `get: ${valDisplay}`, null, "dot");
             } else {
-                node.status({ fill: "red", shape: "ring", text: "global variable undefined" });
+                utils.sendError(node, msg, done, "global variable undefined");
             }
         }
 
-        // --- HELPER: Manage Event Subscription ---
+        // --- Connection Logic ---
         function establishListener() {
             setterNode = RED.nodes.getNode(node.targetNodeId);
             
             if (setterNode && setterNode.varName && node.updates === 'always') {
                 if (updateListener) {
-                    // Remove existing listener if we're retrying
                     RED.events.removeListener("bldgblocks-global-update", updateListener);
                 }
                 
                 updateListener = function(evt) {
                     if (evt.key === setterNode.varName && evt.store === setterNode.storeName) {
-                        sendValue(evt.data, {}); 
+                        // Event Trigger: Pass null for done, as it's not a node input
+                        sendValue(evt.data, {}, null); 
                     }
                 };
                 
                 RED.events.on("bldgblocks-global-update", updateListener);
                 
-                // Clear retry interval once successful
-                if (retryInterval) {
-                    clearInterval(retryInterval);
-                    retryInterval = null;
+                if (retryAction) {
+                    clearInterval(retryAction);
+                    retryAction = null;
                 }
                 
                 node.status({ fill: "green", shape: "dot", text: "Connected" });
@@ -83,52 +71,67 @@ module.exports = function(RED) {
             return false;
         }
 
-        // --- HANDLE MANUAL INPUT ---
-        node.on('input', function(msg, send, done) {
+        function startHealthCheck() {
+            const check = () => {
+                const listeners = RED.events.listeners("bldgblocks-global-update");
+                const hasOurListener = listeners.includes(updateListener);
+                if (!hasOurListener) {
+                    node.warn("Event listener lost, reconnecting...");
+                    if (establishListener()) {
+                        node.status({ fill: "green", shape: "dot", text: "Reconnected" });
+                    }
+                }
+                setTimeout(check, 30000);
+            };
+            setTimeout(check, 30000);
+        }
+
+        function subscribeWithRetry() {
+            retryAction = () => {
+                if (retryCount >= maxRetries) {
+                    utils.sendError(node, null, null, "Connection failed");
+                    return;
+                }
+                if (establishListener()) {
+                    retryCount = 0;
+                    return; 
+                }
+                retryCount++;
+                setTimeout(retryAction, retryDelays[Math.min(retryCount, maxRetries - 1)]);
+            };
+            setTimeout(retryAction, retryDelays[0]);
+        }
+
+        // --- INPUT HANDLER ---
+        node.on('input', async function(msg, send, done) {
             send = send || function() { node.send.apply(node, arguments); };
 
-            if (setterNode && setterNode.varName) {
-                const globalContext = node.context().global;
-                const storedObject = globalContext.get(setterNode.varName, setterNode.storeName);
-                sendValue(storedObject, msg);
-            } else {
-                node.warn("Source node not found or not configured.");
-                node.status({ fill: "red", shape: "ring", text: "Source node not found" });
+            try {
+                setterNode ??= RED.nodes.getNode(node.targetNodeId);
+
+                if (setterNode && setterNode.varName) {
+                    // Async Get
+                    const storedObject = await utils.getGlobalState(node, setterNode.varName, setterNode.storeName);
+                    sendValue(storedObject, msg, done);
+                } else {
+                    node.warn("Source node not found or not configured.");
+                    utils.sendError(node, msg, done, "Source node not found");
+                }
+            } catch (err) {
+                node.error(err);
+                utils.sendError(node, msg, done, `Internal Error: ${err.message}`);
             }
-            
-            if (done) done();
         });
 
-        // --- HANDLE REACTIVE UPDATES ---
+        // --- INIT ---
         if (node.updates === 'always') {
-            if (!establishListener()) { 
-                // Recursive retry
-                const retry = () => {
-                    if (retryCount >= maxRetries) {
-                        node.error("Failed to connect to setter node after multiple attempts");
-                        node.status({ fill: "red", shape: "ring", text: "Connection failed" });
-                        return;
-                    }
-                    
-                    if (establishListener()) {
-                        retryCount = 0;
-                        return; // Success
-                    }
-                    
-                    retryCount++;
-                    setTimeout(retry, retryDelays[Math.min(retryCount, maxRetries - 1)]);
-                };
-                
-                // Try immediately
-                setTimeout(retry, retryDelays[0]);
-            }
+            subscribeWithRetry();
+            startHealthCheck();        
         }
 
-        // --- CLEANUP ---
         node.on('close', function(removed, done) {
-            if (retryInterval) {
-                clearInterval(retryInterval);
-            }
+            if (healthCheckAction) clearInterval(healthCheckAction);
+            if (retryAction) clearInterval(retryAction);
             if (removed && updateListener) {
                 RED.events.removeListener("bldgblocks-global-update", updateListener);
             }

package/nodes/global-setter.html

@@ -20,45 +20,56 @@
     <hr>
     
     <div class="form-row">
-        <label for="node-input-defaultValue" title="Static default value to ensure one exists. You may write to default through message configuration."><i class="fa fa-undo"></i> Default</label>
+        <label for="node-input-defaultValue" title="Manual default value to ensure one always exists. You may write to default through message configuration but may not set it to null."><i class="fa fa-undo"></i> Default</label>
         <input type="text" id="node-input-defaultValue" placeholder="e.g. 0 or false">
+        <input type="hidden" id="node-input-defaultValueType">
     </div>
 
     <div class="form-tips">
-        <b>Note:</b> This node writes to the selected <b>Priority Level</b>. The actual Global Variable value will be the highest active priority.
+        <b>Note:</b> This node writes to the selected <b>Priority</b>, manually, by msg or flow. The actual Global Variable value will be the highest active priority.
     </div>
 </script>
 
 <script type="text/javascript">
     RED.nodes.registerType('global-setter', {
-        category: 'control',
+        category: "bldgblocks control",
         color: '#E2D96E',
         defaults: {
             name: { value: "" },
             path: { value: "", required: true },
             property: { value: "payload", required: true },
             defaultValue: { value: "", required: true },
-            writePriority: { value: "16", required: true },
+            defaultValueType: { value: "num", required: true },
+            writePriority: { value: "default", required: true },
             writePriorityType: { value: "dropdown" }
         },
         inputs: 1,
         outputs: 1,
         icon: "font-awesome/fa-align-right",
         label: function() {
-            let lbl = this.path;
-            if (lbl && lbl.startsWith("#") && lbl.includes(":")) {
-                lbl = lbl.substring(lbl.indexOf(":") + 1);
+            let lbl = this.name || this.path;
+            if (lbl) {
+                if (lbl && lbl.startsWith("#") && lbl.includes(":")) {
+                    lbl = lbl.substring(lbl.indexOf(":") + 1);
+                }
+                return "set: " + lbl;
             }
-            return this.name || "set: " + lbl || "global set";
+            return this.name || "global set";
         },
         paletteLabel: "global set",
         oneditprepare: function() {
+            const node = this;
+
             // These are read as strings not evaluated typed-inputs.
             $("#node-input-path").typedInput({ types: ['global'] });
             // getMessageProperty handles msg access on the incoming message at the specified path.
             $("#node-input-property").typedInput({ types: ['msg'] });
             // Default for the default value, meaning it should only be manually set. You can still pass default values through messages.
-            $("#node-input-defaultValue").typedInput({ types: ['str','num','bool'] });
+            $("#node-input-defaultValue").typedInput({
+                default: "num",
+                types: ["str", "num", "bool", "json"],
+                typeField: "#node-input-defaultValueType"
+            }).typedInput("type", node.defaultValueType || "num").typedInput("value", node.defaultValue);
 
             $("#node-input-writePriority").typedInput({
                 default: "dropdown",
@@ -80,7 +91,7 @@
                         { value: "13", label: "13"},
                         { value: "14", label: "14"},
                         { value: "15", label: "15"},
-                        { value: "16", label: "16 (Schedule/Logic)"},
+                        { value: "16", label: "16 (Network Logic)"},
                         { value: "default", label: "default (fallback)"},
                     ]
                 }, "msg", "flow"],