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

package/nodes/global-getter.html

@@ -12,7 +12,6 @@
         </button>
     </div>
 
-    <!-- NEW: Trigger Mode Selection -->
     <div class="form-row">
         <label for="node-input-updates"><i class="fa fa-bolt"></i> Trigger</label>
         <select id="node-input-updates" style="width: 70%;">
@@ -26,6 +25,14 @@
         <input type="text" id="node-input-outputProperty" placeholder="payload" style="width:70%;">
     </div>
 
+    <div class="form-row">
+        <label for="node-input-detail"><i class="fa fa-bolt"></i> Trigger</label>
+        <select id="node-input-detail" style="width: 70%;">
+            <option value="getValue">Get Simple Value</option>
+            <option value="getObject">Get Full Object</option>
+        </select>
+    </div>
+
     <div class="form-tips">
         <b>Note:</b> Targeting by Node ID allows the source path to change without breaking this link.
     </div>
@@ -39,7 +46,8 @@
             name: { value: "" },
             targetNode: { value: "", required: true },
             outputProperty: { value: "payload", required: true },
-            updates: { value: "always", required: true }
+            updates: { value: "always", required: true },
+            detail: {value: "getObject", required: true }
         },
         inputs: 1,
         outputs: 1,

package/nodes/global-getter.js

@@ -5,14 +5,20 @@ module.exports = function(RED) {
         node.targetNodeId = config.targetNode;
         node.outputProperty = config.outputProperty || "payload";
         node.updates = config.updates;
+        node.detail = config.detail;
 
-        const setterNode = RED.nodes.getNode(node.targetNodeId);
+        let setterNode = null;
+        let retryInterval = 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) {
             const msg = msgToReuse || {}; 
 
-            if (storedObject !== undefined) {
+            if (storedObject !== undefined && storedObject !== null) {
                 
                 // CHECK: Is this our Wrapper Format? (Created by Global Setter)
                 if (storedObject && typeof storedObject === 'object' && storedObject.hasOwnProperty('value')) {
@@ -26,7 +32,9 @@ module.exports = function(RED) {
 
                     // 3. Merge all attributes onto the msg root
                     // This automatically handles priority, units, metadata, and any future fields
-                    Object.assign(msg, attributes);
+                    if (node.detail === "getObject") {
+                        Object.assign(msg, attributes);
+                    }
 
                 } else {
                     // Handle Legacy/Raw values (not created by your Setter)
@@ -36,7 +44,7 @@ module.exports = function(RED) {
                 
                 // Visual Status
                 const valDisplay = RED.util.getMessageProperty(msg, node.outputProperty);
-                node.status({ fill: "blue", shape: "dot", text: `Get: ${valDisplay}` });
+                node.status({ fill: "blue", shape: "dot", text: `get: ${valDisplay}` });
                 
                 node.send(msg);
 
@@ -45,7 +53,37 @@ module.exports = function(RED) {
             }
         }
 
-        // --- 1. HANDLE MANUAL INPUT ---
+        // --- HELPER: Manage Event Subscription ---
+        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, {}); 
+                    }
+                };
+                
+                RED.events.on("bldgblocks-global-update", updateListener);
+                
+                // Clear retry interval once successful
+                if (retryInterval) {
+                    clearInterval(retryInterval);
+                    retryInterval = null;
+                }
+                
+                node.status({ fill: "green", shape: "dot", text: "Connected" });
+                return true;
+            }
+            return false;
+        }
+
+        // --- HANDLE MANUAL INPUT ---
         node.on('input', function(msg, send, done) {
             send = send || function() { node.send.apply(node, arguments); };
 
@@ -61,24 +99,40 @@ module.exports = function(RED) {
             if (done) done();
         });
 
-        // --- 2. HANDLE REACTIVE UPDATES ---
-        let updateListener = null;
-
-        if (node.updates === 'always' && setterNode && setterNode.varName) {
-            updateListener = function(evt) {
-                if (evt.key === setterNode.varName && evt.store === setterNode.storeName) {
-                    // Pass data directly from event
-                    sendValue(evt.data, {}); 
-                }
-            };
-            RED.events.on("bldgblocks-global-update", updateListener);
+        // --- HANDLE REACTIVE UPDATES ---
+        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]);
+            }
         }
 
         // --- CLEANUP ---
-        node.on('close', function() {
-            if (updateListener) {
+        node.on('close', function(removed, done) {
+            if (retryInterval) {
+                clearInterval(retryInterval);
+            }
+            if (removed && updateListener) {
                 RED.events.removeListener("bldgblocks-global-update", updateListener);
             }
+            done();
         });
     }
     RED.nodes.registerType("global-getter", GlobalGetterNode);

package/nodes/global-setter.js

@@ -60,7 +60,7 @@ module.exports = function(RED) {
                 evaluations.push(
                     utils.requiresEvaluation(config.writePriorityType) 
                         ? utils.evaluateNodeProperty( config.writePriority, config.writePriorityType, node, msg )
-                        : Promise.resolve(config.writePriority),
+                        : Promise.resolve(node.writePriority),
                 );
 
                 const results = await Promise.all(evaluations);   
@@ -118,6 +118,10 @@ module.exports = function(RED) {
                         if (done) done();
                         return;
                     }
+                    
+                    if (inputValue !== undefined) {
+                        state.priority[node.writePriority] = inputValue;
+                    }
                 }
                 
                 // Ensure defaultValue always has a value
@@ -125,11 +129,6 @@ module.exports = function(RED) {
                     state.defaultValue = node.defaultValue;
                 }
 
-                // Update Specific Priority Slot
-                if (inputValue !== undefined) {
-                     state.priority[node.writePriority] = inputValue;
-                }
-
                 // Calculate Winner
                 state.value = calculateWinner(state);
 
@@ -166,6 +165,7 @@ module.exports = function(RED) {
 
         node.on('close', function(removed, done) {
             if (removed && node.varName) {
+                //RED.events.removeAllListeners("bldgblocks-global-update");
                 const globalContext = node.context().global;
                 globalContext.set(node.varName, undefined, node.storeName); 
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bldgblocks/node-red-contrib-control",
-  "version": "0.1.31",
+  "version": "0.1.32",
   "description": "Sedona-inspired control nodes for Node-RED",
   "keywords": [ "node-red", "sedona", "control", "hvac" ],
   "files": ["nodes/*.js", "nodes/*.html"],