@bldgblocks/node-red-contrib-control 0.1.29 → 0.1.30

package/nodes/global-getter.html

@@ -3,22 +3,33 @@
         <label for="node-input-name"><i class="fa fa-tag"></i> Name</label>
         <input type="text" id="node-input-name" placeholder="Name">
     </div>
+    
     <div class="form-row">
         <label for="node-input-targetNode"><i class="fa fa-crosshairs"></i> Source</label>
-        <input type="text" id="node-input-targetNode" style="width:70%;">
+        <input type="text" id="node-input-targetNode" style="width: calc(70% - 45px);">
+        <button id="node-config-find-source" class="editor-button" style="margin-left: 5px; width: 40px;" title="Find Source Node">
+            <i class="fa fa-search"></i>
+        </button>
     </div>
+    
+    <div class="form-row">
+        <label for="node-input-outputProperty"><i class="fa fa-arrow-right"></i> Output</label>
+        <input type="text" id="node-input-outputProperty" placeholder="payload" style="width:70%;">
+    </div>
+
     <div class="form-tips">
-        Targeting by Node ID allows the source path to change without breaking this link.
+        <b>Note:</b> Targeting by Node ID allows the source path to change without breaking this link.
     </div>
 </script>
 
 <script type="text/javascript">
     RED.nodes.registerType('global-getter', {
         category: 'control',
-        color: '#301934',
+        color: '#3FADB5',
         defaults: {
             name: { value: "" },
-            targetNode: { value: "", required: true } 
+            targetNode: { value: "", required: true },
+            outputProperty: { value: "payload", required: true }
         },
         inputs: 1,
         outputs: 1,
@@ -27,10 +38,9 @@
             if (this.targetNode) {
                 const target = RED.nodes.node(this.targetNode);
                 if (target) {
-                    // Display the path, removing the #store: prefix for readability in the label if present
                     let lbl = target.path || target.name;
                     if(lbl && lbl.includes(":")) {
-                        lbl = lbl.split(":").pop();
+                        lbl = lbl.split(":")[3];
                     }
                     return "Get: " + lbl;
                 }
@@ -41,6 +51,7 @@
         oneditprepare: function() {
             const node = this;
             
+            // 1. Populate Dropdown
             let candidateNodes = [];
             RED.nodes.eachNode(function(n) {
                 if (n.type === 'global-setter') {
@@ -61,6 +72,22 @@
                     options: candidateNodes
                 }]
             });
+
+            // 2. Output Property Selector
+            $("#node-input-outputProperty").typedInput({
+                types: ['msg']
+            });
+
+            // 3. Find Button Logic
+            $("#node-config-find-source").on("click", function() {
+                const selectedId = $("#node-input-targetNode").val();
+                if (selectedId) {
+                    // Node-RED API to jump to a node
+                    RED.view.reveal(selectedId);
+                } else {
+                    RED.notify("Please select a source node first.", "warning");
+                }
+            });
         }
     });
 </script>
@@ -70,11 +97,14 @@
 Manage a global variable in a repeatable way.
 
 ### Inputs 
+: source (any) : Select the source 'global-setter' node to get the variable from.
+: output (string) : The output property to store the variable value in.
 
 ### Outputs
 : payload (any) : The global variable value
 : topic (string) : The variable name/path used to store the value.
-: globalMetadata (object) : Metadata about the global variable (store, path).
+: units (string) : The units associated with the value, if any. Also supports nested units at `msg.<inputProperty>.units`.
+: metadata (object) : Metadata about the global variable (store, path).
 
 ### Details
 Global variables are meant to be retrieved in other places, this necessarily means managing the same string in multiple places. 
@@ -83,6 +113,8 @@ This node allows you to get a global variable while supporting rename and deleti
 
 It links to a `global-setter` node by Node ID, so if that node's path is changed, this node will still work.
 
+Configurable output property allows chaining multiple getters in series if only interested in the value.
+
 ### Status
 - Green (dot): Configuration update
 - Blue (dot): State changed

package/nodes/global-getter.js

@@ -3,34 +3,43 @@ module.exports = function(RED) {
         RED.nodes.createNode(this, config);
         const node = this;
         node.targetNodeId = config.targetNode;
+        node.outputProperty = config.outputProperty || "payload";
 
         node.on('input', function(msg) {
             const setterNode = RED.nodes.getNode(node.targetNodeId);
 
             if (setterNode && setterNode.varName) {
                 const globalContext = node.context().global;
-                
-                // Retrieve the wrapper object
                 const storedObject = globalContext.get(setterNode.varName, setterNode.storeName);
                 
                 if (storedObject !== undefined) {
-                    // CHECK: Is this our wrapper format?
+                    let val = storedObject;
+                    let units = null;
+                    let meta = {};
+
+                    // CHECK: Is this wrapper format?
                     if (storedObject && typeof storedObject === 'object' && storedObject.hasOwnProperty('value') && storedObject.hasOwnProperty('meta')) {
                         // Yes: Unwrap it
-                        msg.payload = storedObject.value;
-                        msg.globalMetadata = storedObject.meta; // Expose the ID/Metadata here
+                        val = storedObject.value;
+                        units = storedObject.units;
+                        meta = storedObject.meta;
                     } else {
-                        // No: It's legacy/raw data, just pass it through
-                        msg.payload = storedObject;
+                        // Legacy/Raw: Metadata is limited
+                        meta = { path: setterNode.varName, legacy: true };
                     }
                     
-                    msg.topic = setterNode.varName; 
+                    RED.util.setMessageProperty(msg, node.outputProperty, val);
+                    
+                    msg.topic = setterNode.varName;
+                    
+                    msg.units = units;
+
+                    msg.metadata = meta; 
                     
-                    node.status({ fill: "blue", shape: "dot", text: `Get: ${msg.payload}` });
+                    node.status({ fill: "blue", shape: "dot", text: `Get: ${val}` });
                     node.send(msg);
                 } else {
-                    // Variable exists in config but not in memory yet
-                    // Optional: warn or just do nothing
+                    node.status({ fill: "red", shape: "ring", text: "Global variable undefined" });
                 }
             } else {
                 node.warn("Source node not found or not configured.");
@@ -39,4 +48,4 @@ module.exports = function(RED) {
         });
     }
     RED.nodes.registerType("global-getter", GlobalGetterNode);
-}
+}

package/nodes/global-setter.html

@@ -5,32 +5,36 @@
     </div>
     <div class="form-row">
         <label for="node-input-path"><i class="fa fa-sitemap"></i> Global Path</label>
-        <input type="text" id="node-input-path" placeholder="furnace/outputs/heat">
+        <input type="text" id="node-input-path" style="width: 70%;" placeholder="furnace/outputs/heat">
+    </div>
+    <div class="form-row">
+        <label for="node-input-property"><i class="fa fa-ellipsis-h"></i> Input Property</label>
+        <input type="text" id="node-input-property" style="width:70%;">
     </div>
     <div class="form-tips">
-        <b>Note:</b> Use the dropdown inside the Path input to select a specific Context Store (File, Memory, etc). 
-        When this node is redeployed or deleted, it will automatically remove (prune) the variable from that store.
+        <b>Note:</b> Use the dropdown inside the Path input to select a specific Context Store. 
+        When this node is redeployed or deleted, it will automatically remove the variable from memory.
     </div>
 </script>
 
 <script type="text/javascript">
     RED.nodes.registerType('global-setter', {
         category: 'control',
-        color: '#301934',
+        color: '#E2D96E',
         defaults: {
             name: { value: "" },
-            path: { value: "", required: true }
+            path: { value: "", required: true },
+            property: { value: "payload", required: true }
         },
         inputs: 1,
         outputs: 1,
         icon: "font-awesome/fa-align-right",
         label: function() {
-            // Remove #store: prefix for cleaner label
             let lbl = this.path;
             if (lbl && lbl.startsWith("#") && lbl.includes(":")) {
                 lbl = lbl.split(":")[3];
             }
-            return this.name || lbl || "global set";
+            return this.name || "Set: " + lbl || "global set";
         },
         paletteLabel: "global set",
         oneditprepare: function() {
@@ -38,6 +42,11 @@
             $("#node-input-path").typedInput({
                 types: ['global']
             });
+
+            // Input Property Selector
+            $("#node-input-property").typedInput({
+                types: ['msg']
+            });
         }
     });
 </script>
@@ -48,6 +57,8 @@ Manage a global variable in a repeatable way.
 
 ### Inputs 
 : payload (any) : Input payload is passed through unchanged.
+: property (string) : The input property where the value is taken from.
+: units (string) : The units associated with the value, if any. Also supports nested units at `msg.<inputProperty>.units`.
 
 ### Outputs
 : payload (any) : Original payload.

package/nodes/global-setter.js

@@ -7,32 +7,50 @@ module.exports = function(RED) {
         
         node.varName = parsed.key;
         node.storeName = parsed.store;
+        node.inputProperty = config.property;
 
         node.on('input', function(msg) {
             if (node.varName) {
-                const globalContext = node.context().global;
-                
-                // Create a clean wrapper object to store in global context
-                const storedObject = {
-                    value: msg.payload,
-                    meta: {
-                        sourceId: node.id,
-                        sourceName: node.name || config.path,
-                        topic: msg.topic,
-                        ts: Date.now()
+                // READ from the configured property
+                const valueToStore = RED.util.getMessageProperty(msg, node.inputProperty);
+
+                if (valueToStore !== undefined) {
+                    const globalContext = node.context().global;
+
+                    // 1. Try to find units in the standard location (msg.units)
+                    // 2. If not found, check if the input property itself is an object containing .units
+                    let capturedUnits = msg.units; 
+                    
+                    // Optional: Deep check if msg.payload was an object that contained units
+                    if (!capturedUnits && typeof valueToStore === 'object' && valueToStore !== null && valueToStore.units) {
+                         capturedUnits = valueToStore.units;
                     }
-                };
-                
-                globalContext.set(node.varName, storedObject, node.storeName);
+                    
+                    // Create wrapper with simplified metadata
+                    const storedObject = {
+                        value: valueToStore,
+                        topic: node.varName,
+                        units: capturedUnits,
+                        meta: {
+                            sourceId: node.id,
+                            sourceName: node.name || config.path,
+                            sourcePath: node.varName,
+                            lastSet: new Date().toISOString()
+                        }
+                    };
+                    
+                    node.status({ fill: "blue", shape: "dot", text: `Set: ${storedObject.value}` });
+                    globalContext.set(node.varName, storedObject, node.storeName);
+                }
             }
 
-            node.status({ fill: "blue", shape: "dot", text: `Set: ${msg.payload}` });
             node.send(msg);
         });
 
         // CLEANUP
         node.on('close', function(removed, done) {
-            if (node.varName) {
+            // Do NOT prune if Node-RED is simply restarting or deploying.
+            if (removed && node.varName) {
                 const globalContext = node.context().global;
                 globalContext.set(node.varName, undefined, node.storeName); 
             }

package/nodes/units-block.js

@@ -41,7 +41,7 @@ module.exports = function(RED) {
             unit: config.unit
         };
 
-        // Validate configuration (Req 8)
+        // Validate configuration
         if (!validUnits.includes(node.runtime.unit)) {
             node.runtime.unit = "°F";
             node.status({ fill: "red", shape: "ring", text: "invalid unit, using °F" });
@@ -83,11 +83,12 @@ module.exports = function(RED) {
                 }
 
                 // Process input
-                const outputMsg = RED.util.cloneMessage(msg);
                 const payloadPreview = msg.payload !== null ? (typeof msg.payload === "number" ? msg.payload.toFixed(2) : JSON.stringify(msg.payload).slice(0, 20)) : "none";
 
                 node.status({ fill: "blue", shape: "dot", text: `in: ${payloadPreview} unit: ${node.runtime.unit}` });
-                send(outputMsg);
+
+                msg.units = node.runtime.unit;
+                send(msg);
                 if (done) done();
             } catch (error) {
                 node.status({ fill: "red", shape: "ring", text: "processing error" });

package/package.json

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