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

package/nodes/enum-switch-block.js

@@ -21,7 +21,7 @@ module.exports = function(RED) {
 
             // Guard against invalid msg
             if (!msg) {
-                node.status({ fill: "red", shape: "ring", text: "invalid message" });
+                utils.setStatusError(node, "invalid message");
                 if (done) done();
                 return;
             }  
@@ -34,7 +34,7 @@ module.exports = function(RED) {
                 // Check busy lock
                 if (node.isBusy) {
                     // Update status to let user know they are pushing too fast
-                    node.status({ fill: "yellow", shape: "ring", text: "busy - dropped msg" });
+                    utils.setStatusBusy(node, "busy - dropped msg");
                     if (done) done(); 
                     return;
                 }
@@ -57,7 +57,7 @@ module.exports = function(RED) {
                 matchAgainst = results[0];   
 
                 if (matchAgainst === undefined) {
-                    node.status({ fill: "red", shape: "ring", text: "property evaluation failed" });
+                    utils.setStatusError(node, "property evaluation failed");
                     if (done) done();
                     return;
                 }
@@ -97,7 +97,7 @@ module.exports = function(RED) {
                 
                 if (match) {
                     matched = true;
-                    node.status({ fill: "blue", shape: "dot", text: `Matched: ${rule.value}` });
+                    utils.setStatusChanged(node, `Matched: ${rule.value}`);
                 }
             }
 
@@ -113,9 +113,9 @@ module.exports = function(RED) {
             send(messages);
 
             if (!matched && rules.length > 0) {
-                node.status({ fill: "blue", shape: "ring", text: "No match" });
+                utils.setStatusUnchanged(node, "No match");
             } else if (rules.length === 0) {
-                node.status({ fill: "yellow", shape: "ring", text: "No rules configured" });
+                utils.setStatusWarn(node, "No rules configured");
             }
 
             if (done) done();

package/nodes/frequency-block.html

@@ -4,6 +4,10 @@
         <label for="node-input-name" title="Display name shown on the canvas"><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-inputProperty" title="Message property to read input from"><i class="fa fa-folder-open"></i> Input Property</label>
+        <input type="text" id="node-input-inputProperty" placeholder="payload">
+    </div>
 </script>
 
 <!-- JavaScript Section: Registers the node and handles editor logic -->
@@ -12,7 +16,8 @@
         category: "bldgblocks control",
         color: "#301934",
         defaults: {
-            name: { value: "" }
+            name: { value: "" },
+            inputProperty: { value: "payload" }
         },
         inputs: 1,
         outputs: 1,

package/nodes/frequency-block.js

@@ -1,39 +1,36 @@
 module.exports = function(RED) {
+    const utils = require('./utils')(RED);
+
     function FrequencyBlockNode(config) {
         RED.nodes.createNode(this, config);
         const node = this;
 
-        // Initialize runtime state
-        node.runtime = {
-            name: config.name || "",
-            lastIn: false,
-            lastEdge: 0,
-            completeCycle: false,
-            ppm: 0,
-            pph: 0,
-            ppd: 0,
-            pulseHistory: [], // Array to store {start: timestamp, duration: ms}
-            currentPulseStart: 0
-        };
-
-        node.status({ 
-            fill: "green", 
-            shape: "dot", 
-            text: "awaiting first pulse" 
-        });
+        // Initialize state
+        node.name = config.name || "";
+        node.inputProperty = config.inputProperty || "payload";
+        node.lastIn = false;
+        node.lastEdge = 0;
+        node.completeCycle = false;
+        node.ppm = 0;
+        node.pph = 0;
+        node.ppd = 0;
+        node.pulseHistory = []; // Array to store {start: timestamp, duration: ms}
+        node.currentPulseStart = 0;
+
+        utils.setStatusOK(node, "awaiting first pulse");
 
         function calculateDutyCycle(now, currentInputValue) {
             const oneHourAgo = now - 3600000;
             
             // Clean up pulses older than 1 hour
-            node.runtime.pulseHistory = node.runtime.pulseHistory.filter(pulse => {
+            node.pulseHistory = node.pulseHistory.filter(pulse => {
                 return (pulse.start + pulse.duration) > oneHourAgo;
             });
 
             let totalOnTime = 0;
             
             // Sum all pulse durations within the last hour
-            node.runtime.pulseHistory.forEach(pulse => {
+            node.pulseHistory.forEach(pulse => {
                 const pulseEnd = pulse.start + pulse.duration;
                 const effectiveStart = Math.max(pulse.start, oneHourAgo);
                 const effectiveEnd = Math.min(pulseEnd, now);
@@ -43,8 +40,8 @@ module.exports = function(RED) {
             });
 
             // Add current ongoing pulse if active
-            if (currentInputValue && node.runtime.currentPulseStart > 0) {
-                const currentPulseTime = Math.max(node.runtime.currentPulseStart, oneHourAgo);
+            if (currentInputValue && node.currentPulseStart > 0) {
+                const currentPulseTime = Math.max(node.currentPulseStart, oneHourAgo);
                 totalOnTime += (now - currentPulseTime);
             }
 
@@ -59,7 +56,7 @@ module.exports = function(RED) {
 
             // Guard against invalid message
             if (!msg) {
-                node.status({ fill: "red", shape: "ring", text: "invalid message" });
+                utils.setStatusError(node, "invalid message");
                 if (done) done();
                 return;
             }
@@ -67,46 +64,45 @@ module.exports = function(RED) {
             // Handle context updates
             if (msg.hasOwnProperty("context")) {
                 if (!msg.hasOwnProperty("payload")) {
-                    node.status({ fill: "red", shape: "ring", text: "missing payload for reset" });
+                    utils.setStatusError(node, "missing payload for reset");
                     if (done) done();
                     return;
                 }
                 if (msg.context === "reset") {
                     if (typeof msg.payload !== "boolean") {
-                        node.status({ fill: "red", shape: "ring", text: "invalid reset" });
+                        utils.setStatusError(node, "invalid reset");
                         if (done) done();
                         return;
                     }
                     if (msg.payload === true) {
-                        node.runtime.lastIn = false;
-                        node.runtime.lastEdge = 0;
-                        node.runtime.completeCycle = false;
-                        node.runtime.ppm = 0;
-                        node.runtime.pph = 0;
-                        node.runtime.ppd = 0;
-                        node.runtime.pulseHistory = [];
-                        node.runtime.currentPulseStart = 0;
-                        node.status({ fill: "green", shape: "dot", text: "reset" });
+                        node.lastIn = false;
+                        node.lastEdge = 0;
+                        node.completeCycle = false;
+                        node.ppm = 0;
+                        node.pph = 0;
+                        node.ppd = 0;
+                        node.pulseHistory = [];
+                        node.currentPulseStart = 0;
+                        utils.setStatusOK(node, "reset");
                     }
                     if (done) done();
                     return;
                 } else {
-                    node.status({ fill: "yellow", shape: "ring", text: "unknown context" });
+                    utils.setStatusWarn(node, "unknown context");
                     if (done) done("Unknown context");
                     return;
                 }
             }
 
             // Validate input payload
-            if (!msg.hasOwnProperty("payload")) {
-                node.status({ fill: "red", shape: "ring", text: "missing payload" });
-                if (done) done();
-                return;
+            let inputValue;
+            try {
+                inputValue = RED.util.getMessageProperty(msg, node.inputProperty);
+            } catch (err) {
+                inputValue = undefined;
             }
-
-            const inputValue = msg.payload;
             if (typeof inputValue !== "boolean") {
-                node.status({ fill: "red", shape: "ring", text: "invalid payload" });
+                utils.setStatusError(node, "invalid or missing input property");
                 if (done) done();
                 return;
             }
@@ -114,18 +110,18 @@ module.exports = function(RED) {
             const now = Date.now();
 
             // Track pulse edges for duty cycle
-            if (inputValue && !node.runtime.lastIn) {
+            if (inputValue && !node.lastIn) {
                 // Rising edge - start new pulse
-                node.runtime.currentPulseStart = now;
-            } else if (!inputValue && node.runtime.lastIn) {
+                node.currentPulseStart = now;
+            } else if (!inputValue && node.lastIn) {
                 // Falling edge - record completed pulse
-                if (node.runtime.currentPulseStart > 0) {
-                    const duration = now - node.runtime.currentPulseStart;
-                    node.runtime.pulseHistory.push({
-                        start: node.runtime.currentPulseStart,
+                if (node.currentPulseStart > 0) {
+                    const duration = now - node.currentPulseStart;
+                    node.pulseHistory.push({
+                        start: node.currentPulseStart,
                         duration: duration
                     });
-                    node.runtime.currentPulseStart = 0;
+                    node.currentPulseStart = 0;
                 }
             }
 
@@ -134,21 +130,21 @@ module.exports = function(RED) {
 
             // Initialize output
             let output = {
-                ppm: node.runtime.ppm,
-                pph: node.runtime.pph,
-                ppd: node.runtime.ppd,
+                ppm: node.ppm,
+                pph: node.pph,
+                ppd: node.ppd,
                 dutyCycle: dutyData.dutyCycle.toFixed(2),
                 onTime: dutyData.onTime
             };
 
             // Detect rising edge
-            if (inputValue && !node.runtime.lastIn) { 
+            if (inputValue && !node.lastIn) { 
                 // Rising edge: true and lastIn was false
-                if (!node.runtime.completeCycle) {
-                    node.runtime.completeCycle = true;
+                if (!node.completeCycle) {
+                    node.completeCycle = true;
                 } else {
                     // Compute period in minutes
-                    let periodMs = now - node.runtime.lastEdge;
+                    let periodMs = now - node.lastEdge;
                     let periodMin = periodMs / 60000;
                     if (periodMin > 0.001) {
                         // Minimum 0.6ms period (1000 pulses/sec)
@@ -161,29 +157,23 @@ module.exports = function(RED) {
                         output.pph = 60000;
                         output.ppd = 1440000;
                     }
-                    node.runtime.ppm = output.ppm;
-                    node.runtime.pph = output.pph;
-                    node.runtime.ppd = output.ppd;
+                    node.ppm = output.ppm;
+                    node.pph = output.pph;
+                    node.ppd = output.ppd;
                 }
-                node.runtime.lastEdge = now;
-                node.runtime.completeCycle = true;
-
-                node.status({
-                    fill: "blue",
-                    shape: "dot",
-                    text: `input: ${inputValue}, ppm: ${output.ppm.toFixed(2)}, pph: ${output.pph.toFixed(2)}, ppd: ${output.ppd.toFixed(2)}, duty: ${output.dutyCycle}%`
-                });
+                node.lastEdge = now;
+                node.completeCycle = true;
+
+                const edgeText = `input: ${inputValue}, ppm: ${output.ppm.toFixed(2)}, pph: ${output.pph.toFixed(2)}, ppd: ${output.ppd.toFixed(2)}, duty: ${output.dutyCycle}%`;
+                utils.setStatusChanged(node, edgeText);
                 send({ payload: output });
             } else {
-                node.status({
-                    fill: "blue",
-                    shape: "ring",
-                    text: `input: ${inputValue}, ppm: ${node.runtime.ppm.toFixed(2)}, pph: ${node.runtime.pph.toFixed(2)}, ppd: ${node.runtime.ppd.toFixed(2)}, duty: ${output.dutyCycle}%`
-                });
+                const noEdgeText = `input: ${inputValue}, ppm: ${node.ppm.toFixed(2)}, pph: ${node.pph.toFixed(2)}, ppd: ${node.ppd.toFixed(2)}, duty: ${output.dutyCycle}%`;
+                utils.setStatusUnchanged(node, noEdgeText);
             }
 
             // Update lastIn
-            node.runtime.lastIn = inputValue;
+            node.lastIn = inputValue;
 
             if (done) done();
         });

package/nodes/global-getter.html

@@ -22,7 +22,9 @@
     
     <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%;">
+        <input type="text" id="node-input-outputProperty" placeholder="payload">
+        <input type="hidden" id="node-input-outputPropertyType">
+        <input type="hidden" id="node-input-dropdownPath">
     </div>
 
     <div class="form-row">
@@ -34,7 +36,9 @@
     </div>
 
     <div class="form-tips">
-        <b>Note:</b> Targeting by Node ID allows the source path to change without breaking this link.
+        <b>Note:</b> Source path may change without breaking this link. 'Reactive' events do not cause disk reads.
+        Setter nodes will always write, on change, to its configured store and 'default' to ensure data stays 'in memory' during operation (avoids disk IO hammering).
+        'Manual' reads from 'default' store in memory first. Will fallback to 'persistent'.
     </div>
 </script>
 
@@ -46,6 +50,8 @@
             name: { value: "" },
             targetNode: { value: "", required: true },
             outputProperty: { value: "payload", required: true },
+            outputPropertyType: { value: "msg", required: true },
+            dropdownPath: { value: "", required: false },
             updates: { value: "always", required: true },
             detail: {value: "getObject", required: true }
         },
@@ -76,9 +82,11 @@
                     if (displayPath.startsWith("#") && displayPath.includes(":")) {
                         displayPath = displayPath.substring(displayPath.indexOf(":") + 1);
                     }
+                    
                     candidateNodes.push({
                         value: n.id,
-                        label: displayPath + (n.name ? ` (${n.name})` : "")
+                        label: displayPath + (n.name ? ` (${n.name})` : ""),
+                        path: displayPath
                     });
                 }
             });
@@ -88,8 +96,34 @@
             $("#node-input-targetNode").typedInput({
                 types: [{ value: "target", options: candidateNodes }]
             });
+            
+            $("#node-input-outputProperty").typedInput({
+                default: "msg",
+                types: ["msg", "flow",
+                    {
+                        value: "dropdown",
+                        options: [
+                            { value: "sourceToFlow", label: "Source To Flow"}
+                        ]
+                    }],
+                typeField: "#node-input-outputPropertyType"
+            }).typedInput("type", node.outputPropertyType || "msg").typedInput("value", node.outputProperty);
+
+            function updateOutputValue() {
+                const currentType = $("#node-input-outputProperty").typedInput("type");
+                
+                if (currentType === "dropdown" && node.outputProperty === "sourceToFlow") {
+                    const selectedSourceId = $("#node-input-targetNode").val();
+                    const selectedOption = candidateNodes.find(opt => opt.value === selectedSourceId);
+                    
+                    if (selectedOption && selectedOption.path) {
+                        $("#node-input-dropdownPath").val(selectedOption.path);
+                    }
+                }
+            }
 
-            $("#node-input-outputProperty").typedInput({ types: ['msg'] });
+            $("#node-input-targetNode").on("change", updateOutputValue);
+            $("#node-input-outputProperty").on("change", updateOutputValue);
 
             $("#node-config-find-source").on("click", function() {
                 const selectedId = $("#node-input-targetNode").val();
@@ -101,32 +135,34 @@
 </script>
 
 <!-- Help Section -->
-<script type="text/markdown" data-help-name="global-setter">
-Manage a global variable in a repeatable way.
+<script type="text/markdown" data-help-name="global-getter">
+Retrieve a global variable from a single source location.
 
 ### Inputs 
-Retreived object will overwrite msg.
+: any : Triggers retrieval of the global variable. Input message is passed through unchanged unless Manual trigger is disabled.
 
 ### Outputs
-: payload (object) : The stored object with values and metadata.
+: payload (object) : The retrieved global variable 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. 
+Global variables are meant to be retrieved in multiple places, which necessitates managing the same path in multiple locations. 
 
-This node allows you to get a global variable anywhere from one source, while supporting rename and deletion.
+This node allows you to get a global variable anywhere by referencing one source node, while automatically supporting renames and deletions without breaking downstream nodes.
 
-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.
+The Source reference will automatically resolve even if the source global-setter is renamed or moved to a different flow tab.
 
-Reactive updates means every time the source is updated those nodes will receive the new value via event.
+Trigger mode: Manual (On Input Only) reads from the in-memory 'default' store first, falling back to 'persistent' store. Reactive (On Input & Update) also triggers whenever the source variable is updated, without disk reads.
 
 ### Status
 - Green (dot): Configuration update
-- Blue (dot): State changed
+- Blue (dot): State changed  
 - Blue (ring): State unchanged
 - Red (ring): Error
 - Yellow (ring): Warning
 
 ### References
-- [Node-RED Documentation](https://nodered.org/docs/)  
+- [Node-RED Documentation](https://nodered.org/docs/)
 - [GitHub Repository](https://github.com/BldgBlocks/node-red-contrib-buildingblocks-control.git)
-</script>
+</script>
+
+

package/nodes/global-getter.js

@@ -5,6 +5,7 @@ module.exports = function(RED) {
         const node = this;
         node.targetNodeId = config.targetNode;
         node.outputProperty = config.outputProperty || "payload";
+        node.dropdownPath = config.dropdownPath || "";
         node.updates = config.updates;
         node.detail = config.detail;
         
@@ -18,7 +19,7 @@ module.exports = function(RED) {
         
         // --- Output Helper ---
         function sendValue(storedObject, msgToReuse, done) {
-            const msg = msgToReuse || {}; 
+            const msg = RED.util.cloneMessage(msgToReuse) || {};
 
             if (storedObject !== undefined && storedObject !== null) {
                 // Check if this is our custom wrapper object
@@ -26,15 +27,39 @@ module.exports = function(RED) {
                     if (node.detail === "getObject") {
                         Object.assign(msg, storedObject);
                     }
-                    RED.util.setMessageProperty(msg, node.outputProperty, storedObject.value);
+                    if (config.outputPropertyType === "flow" || config.outputPropertyType === "dropdown") {
+                        if (config.outputProperty === "sourceToFlow") {
+                            node.context().flow.set(node.dropdownPath, storedObject.value);
+                        } else {
+                            node.context().flow.set(node.outputProperty, storedObject.value);
+                        }
+                    } else {
+                        RED.util.setMessageProperty(msg, node.outputProperty, storedObject.value);
+                    }
                 } else {
                     // Legacy/Raw values
-                    RED.util.setMessageProperty(msg, node.outputProperty, storedObject);
+                    if (config.outputPropertyType === "flow" || config.outputPropertyType === "dropdown") {
+                        if (config.outputProperty === "sourceToFlow") {
+                            node.context().flow.set(node.dropdownPath, storedObject);
+                        } else {
+                            node.context().flow.set(node.outputProperty, storedObject);
+                        }
+                    } else {
+                        RED.util.setMessageProperty(msg, node.outputProperty, storedObject);
+                    }
                     msg.metadata = { path: setterNode ? setterNode.varName : "unknown", legacy: true };
                 }
                 
-                let valDisplay = RED.util.getMessageProperty(msg, node.outputProperty);
-                valDisplay = typeof valDisplay === "number" ? valDisplay : valDisplay;
+                let valDisplay = storedObject.value;
+                if (valDisplay === null) valDisplay = "null";
+                else if (valDisplay === undefined) valDisplay = "undefined";
+                else if (typeof valDisplay === "object") valDisplay = JSON.stringify(valDisplay);
+                else valDisplay = typeof valDisplay === "number" ? valDisplay : valDisplay;
+                
+                // Trim to 64 characters with ellipsis
+                if (valDisplay.length > 64) {
+                    valDisplay = valDisplay.substring(0, 64) + "...";
+                }
                 
                 utils.sendSuccess(node, msg, done, `get: ${valDisplay}`, null, "dot");
             } else {
@@ -48,7 +73,7 @@ module.exports = function(RED) {
             
             if (setterNode && setterNode.varName && node.updates === 'always') {
                 if (updateListener) {
-                    RED.events.removeListener("bldgblocks-global-update", updateListener);
+                    RED.events.removeListener("bldgblocks:global:value-changed", updateListener);
                 }
                 
                 updateListener = function(evt) {
@@ -58,14 +83,14 @@ module.exports = function(RED) {
                     }
                 };
                 
-                RED.events.on("bldgblocks-global-update", updateListener);
+                RED.events.on("bldgblocks:global:value-changed", updateListener);
                 
                 if (retryAction) {
                     clearInterval(retryAction);
                     retryAction = null;
                 }
                 
-                node.status({ fill: "green", shape: "dot", text: "Connected" });
+                utils.setStatusOK(node, "Connected");
                 return true;
             }
             return false;
@@ -73,12 +98,12 @@ module.exports = function(RED) {
 
         function startHealthCheck() {
             const check = () => {
-                const listeners = RED.events.listeners("bldgblocks-global-update");
+                const listeners = RED.events.listeners("bldgblocks:global:value-changed");
                 const hasOurListener = listeners.includes(updateListener);
                 if (!hasOurListener) {
                     node.warn("Event listener lost, reconnecting...");
                     if (establishListener()) {
-                        node.status({ fill: "green", shape: "dot", text: "Reconnected" });
+                        utils.setStatusOK(node, "Reconnected");
                     }
                 }
                 setTimeout(check, 30000);
@@ -110,8 +135,13 @@ module.exports = function(RED) {
                 setterNode ??= RED.nodes.getNode(node.targetNodeId);
 
                 if (setterNode && setterNode.varName) {
-                    // Async Get
-                    const storedObject = await utils.getGlobalState(node, setterNode.varName, setterNode.storeName);
+                    // Async Get - required default store to keep values in memory for polled getter nodes. 
+                    // 'persistent' for cross reboot storage.
+                    let storedObject = await utils.getGlobalState(node, setterNode.varName, 'default');
+                    if (!storedObject) {
+                        // Fallback to persistent store if not found in default. Should not happen normally.
+                        storedObject = await utils.getGlobalState(node, setterNode.varName, setterNode.storeName);
+                    }
                     sendValue(storedObject, msg, done);
                 } else {
                     node.warn("Source node not found or not configured.");
@@ -133,7 +163,7 @@ module.exports = function(RED) {
             if (healthCheckAction) clearInterval(healthCheckAction);
             if (retryAction) clearInterval(retryAction);
             if (removed && updateListener) {
-                RED.events.removeListener("bldgblocks-global-update", updateListener);
+                RED.events.removeListener("bldgblocks:global:value-changed", updateListener);
             }
             done();
         });

package/nodes/global-setter.html

@@ -5,7 +5,7 @@
     </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" style="width: 70%;" placeholder="furnace/outputs/heat">
+        <input type="text" id="node-input-path" placeholder="furnace/outputs/heat">
     </div>
     <div class="form-row">
         <label for="node-input-property"><i class="fa fa-ellipsis-h"></i> Input</label>