@bldgblocks/node-red-contrib-control 0.1.5 → 0.1.17

package/README.md

@@ -1,4 +1,4 @@
-# node-red-contrib-buildingblocks-control
+# @bldgblocks/node-red-contrib-control
 Sedona-inspired control nodes for stateful logic.
 
 This is a rather large node collection. Contributions are appreciated.

package/nodes/count-block.html

@@ -45,11 +45,11 @@ Counts rising edges (false-to-true transitions) in `msg.payload` (boolean), incr
 Resets count to 0 via `msg.context = "reset"` with `msg.payload = true`. 
 
 ### Status
-- Green (dot): Configuration
-- Blue (dot): Output, no alarm
-- Red (dot): Output with alarm
-- Red (ring): Errors
-- Yellow (ring): Unknown context
+- 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/)

package/nodes/delay-block.html

@@ -6,25 +6,27 @@
     </div>
     <div class="form-row">
         <label for="node-input-delayOn"><i class="fa fa-clock-o"></i> On Delay</label>
-        <input type="number" id="node-input-delayOn" placeholder="1000" min="0" step="1">
+        <input type="text" id="node-input-delayOn" placeholder="1000" min="0" step="1">
+        <input type="hidden" id="node-input-delayOnType">
+    </div>
+    <div>
         <select id="node-input-delayOnUnits">
             <option value="milliseconds">Milliseconds</option>
             <option value="seconds">Seconds</option>
             <option value="minutes">Minutes</option>
         </select>
-        <input type="hidden" id="node-input-delayOnType">
-
     </div>
     <div class="form-row">
         <label for="node-input-delayOff"><i class="fa fa-clock-o"></i> Off Delay</label>
-        <input type="number" id="node-input-delayOff" placeholder="1000" min="0" step="1">
+        <input type="text" id="node-input-delayOff" placeholder="1000" min="0" step="1">
+        <input type="hidden" id="node-input-delayOffType">
+    </div>
+    <div>
         <select id="node-input-delayOffUnits">
             <option value="milliseconds">Milliseconds</option>
             <option value="seconds">Seconds</option>
             <option value="minutes">Minutes</option>
         </select>
-        <input type="hidden" id="node-input-delayOffType">
-
     </div>
 </script>
 
@@ -52,6 +54,7 @@
             return this.name || "delay";
         },
         oneditprepare: function() {
+            const node = this;
             try {
                 // Initialize typed inputs
                 $("#node-input-delayOn").typedInput({
@@ -79,7 +82,7 @@ Delays boolean state transitions with configurable on/off delays.
 
 ### Inputs
 : context (string) : Configures node (`"reset"`, `"delayOn"`, `"delayOff"`). Unmatched values ignored silently.
-: payload (boolean | number) : Boolean for state change; number for delay config with `msg.context`.
+: payload (boolean | number) : Boolean for state change, number for delay config with `msg.context`.
 : *units* (string) : Units for delay context config (`"milliseconds"`, `"seconds"`, `"minutes"`).
 
 ### Outputs
@@ -89,14 +92,14 @@ Delays boolean state transitions with configurable on/off delays.
 ### Details
 Delays `msg.payload` boolean transitions, outputting `true` after `delayOn` ms for false-to-true or `false` after `delayOff` ms for true-to-false, 
 if the input state persists. Forwards the input message with updated `msg.payload`, removing `msg.context`. 
-Non-transition inputs (e.g., `true` when `state=true`) or state reversions cancel pending delays without output. 
+Non-transition inputs (e.g., `true` when `state=true`) do not cancel pending delays.
 
 ### Status
-- Green (dot): Configuration
-- Blue (dot): Output, no alarm
-- Red (dot): Output with alarm
-- Red (ring): Errors
-- Yellow (ring): Unknown context
+- 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/)

package/nodes/delay-block.js

@@ -5,25 +5,10 @@ module.exports = function(RED) {
 
         node.runtime = {
             name: config.name || "",
-            state: false
+            state: false,
+            desired: false
         };
 
-        if (isNaN(node.runtime.delayOn) || node.runtime.delayOn < 0) {
-            node.runtime.delayOn = 1000;
-            node.status({ fill: "red", shape: "ring", text: "invalid delayOn" });
-        }
-        if (isNaN(node.runtime.delayOff) || node.runtime.delayOff < 0) {
-            node.runtime.delayOff = 1000;
-            node.status({ fill: "red", shape: "ring", text: "invalid delayOff" });
-        }
-
-        // Set initial status
-        node.status({ 
-            fill: "green", 
-            shape: "dot", 
-            text: `On: ${node.runtime.delayOn}ms, Off: ${node.runtime.delayOff}ms` 
-        });
-
         let timeoutId = null;
 
         node.on("input", function(msg, send, done) {
@@ -56,6 +41,15 @@ module.exports = function(RED) {
                 return;
             }
 
+            if (isNaN(node.runtime.delayOn) || node.runtime.delayOn < 0) {
+                node.runtime.delayOn = 1000;
+                node.status({ fill: "red", shape: "ring", text: "invalid delayOn" });
+            }
+            if (isNaN(node.runtime.delayOff) || node.runtime.delayOff < 0) {
+                node.runtime.delayOff = 1000;
+                node.status({ fill: "red", shape: "ring", text: "invalid delayOff" });
+            }
+
             if (msg.hasOwnProperty("context")) {
                 if (msg.context === "reset") {
                     if (!msg.hasOwnProperty("payload") || typeof msg.payload !== "boolean") {
@@ -129,10 +123,15 @@ module.exports = function(RED) {
             }
 
             if (!node.runtime.state && inputValue === true) {
+                if (node.runtime.desired) {
+                    if (done) done();
+                    return;
+                }
                 if (timeoutId) {
                     clearTimeout(timeoutId);
                 }
                 node.status({ fill: "blue", shape: "ring", text: `awaiting true` });
+                node.runtime.desired = true;
                 timeoutId = setTimeout(() => {
                     node.runtime.state = true;
                     msg.payload = true;
@@ -142,10 +141,15 @@ module.exports = function(RED) {
                     timeoutId = null;
                 }, node.runtime.delayOn);
             } else if (node.runtime.state && inputValue === false) {
+                if (node.runtime.desired === false) {
+                    if (done) done();
+                    return;
+                }
                 if (timeoutId) {
                     clearTimeout(timeoutId);
                 }
                 node.status({ fill: "blue", shape: "ring", text: `awaiting false` });
+                node.runtime.desired = false;
                 timeoutId = setTimeout(() => {
                     node.runtime.state = false;
                     msg.payload = false;
@@ -160,7 +164,7 @@ module.exports = function(RED) {
                     timeoutId = null;
                     node.status({ fill: "blue", shape: "ring", text: `canceled awaiting ${node.runtime.state}` });
                 } else {
-                    node.status({ fill: "blue", shape: "ring", text: `awaiting ${inputValue}` });
+                    node.status({ fill: "blue", shape: "ring", text: `no change` });
                 }
             }
 

package/nodes/divide-block.js

@@ -8,7 +8,7 @@ module.exports = function(RED) {
         node.runtime = {
             name: config.name,
             slots: parseInt(config.slots),
-            inputs: Array(node.runtime.slots).fill(1).map(x => parseFloat(x)),
+            inputs: Array(config.slots).fill(1).map(x => parseFloat(x)),
             lastResult: null
         };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bldgblocks/node-red-contrib-control",
-  "version": "0.1.5",
+  "version": "0.1.17",
   "description": "Sedona-inspired control nodes for Node-RED",
   "keywords": [ "node-red", "sedona", "control", "hvac" ],
   "files": ["nodes/*.js", "nodes/*.html"],
@@ -26,7 +26,6 @@
         "contextual-label-block": "nodes/contextual-label-block.js",
         "convert-block": "nodes/convert-block.js",
         "count-block": "nodes/count-block.js",
-        "debounce-block": "nodes/debounce-block.js",
         "delay-block": "nodes/delay-block.js",
         "divide-block": "nodes/divide-block.js",
         "edge-block": "nodes/edge-block.js",

package/nodes/debounce-block.html

@@ -1,64 +0,0 @@
-<script type="text/html" data-template-name="debounce-block">
-    <div class="form-row">
-        <label for="node-input-period" title="Filter period in milliseconds (positive number, e.g., 1000)"><i class="fa fa-clock-o"></i> Filter Period (ms)</label>
-        <input type="text" id="node-input-period" placeholder="1000" min="0.001" step="any">
-        <input type="hidden" id="node-input-periodType">
-
-    </div>
-</script>
-
-<script type="text/javascript">
-    RED.nodes.registerType("debounce-block", {
-        category: "control",
-        color: "#301934",
-        defaults: {
-            name: { value: "" },
-            period: {
-                value: 1000,
-                required: true,
-                validate: function() { return true; }
-            },
-            periodType: { value: "num" }
-        },
-        inputs: 1,
-        outputs: 1,
-        inputLabels: ["input"],
-        outputLabels: ["output"],
-        icon: "font-awesome/fa-hourglass-half",
-        paletteLabel: "debounce",
-        label: function() {
-            return this.name || "debounce";
-        }
-    });
-</script>
-
-<script type="text/markdown" data-help-name="debounce-block">
-Debounces consecutive `true` payloads and passes `false` payloads immediately with a configurable filter period.
-
-### Inputs
-: context (string) : Configures filter period (`"period"`).
-: payload (boolean | number) : `true` for debounced output, `false` for immediate output.
-
-### Outputs
-: payload (boolean) : `true` after filter period elapses without new `true` payloads, `false` immediately. `msg.context` is consumed.
-
-### Details
-Filters consecutive `true` `msg.payload` inputs, outputting `true` after the filter period elapses without new `true` payloads. 
-
-Consecutive `true` payloads within the period reset the timer, delaying output. Outputs `false` `msg.payload` inputs immediately without debouncing. 
-
-Non-boolean payloads (e.g., strings, numbers) are ignored with an error status. 
-
-Tracks ignored `true` payloads, which increments for each `true` payload resetting an active timer, capped at 9999, resetting to 0 if exceeded or on redeployment. 
-
-### Status
-- Green (dot): Configuration
-- Blue (dot): Output, no alarm
-- Red (dot): Output with alarm
-- Red (ring): Errors
-- Yellow (ring): Unknown context
-
-### References
-- [Node-RED Documentation](https://nodered.org/docs/)
-- [GitHub Repository](https://github.com/BldgBlocks/node-red-contrib-buildingblocks-control.git)
-</script>

package/nodes/debounce-block.js

@@ -1,140 +0,0 @@
-module.exports = function(RED) {
-    function DebounceBlockNode(config) {
-        RED.nodes.createNode(this, config);
-        const node = this;
-
-        // Initialize runtime for editor display
-        node.runtime = {
-            debounceCount: 0
-        };
-
-        // Initialize state
-        let debounceTimer = null;
-        let lastOutput = null;
-
-        node.on("input", function(msg, send, done) {
-            send = send || function() { node.send.apply(node, arguments); };
-
-            // Evaluate all properties
-            try {
-                node.runtime.period = RED.util.evaluateNodeProperty(
-                    config.period, config.periodType, node, msg
-                );
-                node.runtime.period = parseFloat(node.runtime.period);
-
-                node.period = parseFloat(node.period);
-                if (isNaN(node.period) || node.period <= 0 || !isFinite(node.period)) {
-                    node.period = 1000;
-                    node.status({ fill: "yellow", shape: "ring", text: "invalid period, using 1000ms" });
-                }
-            } catch(err) {
-                node.status({ fill: "red", shape: "ring", text: "error evaluating properties" });
-                if (done) done(err);
-                return;
-            }
-
-            // Guard against invalid msg
-            if (!msg) {
-                node.status({ fill: "red", shape: "ring", text: "invalid message" });
-                if (done) done();
-                return;
-            }
-
-            // Handle msg.context
-            if (msg.hasOwnProperty("context")) {
-                if (!msg.hasOwnProperty("payload")) {
-                    node.status({ fill: "red", shape: "ring", text: "missing payload" });
-                    if (done) done();
-                    return;
-                }
-
-                if (msg.context === "period") {
-                    const newPeriod = parseFloat(msg.payload);
-                    if (isNaN(newPeriod) || newPeriod <= 0) {
-                        node.status({ fill: "red", shape: "ring", text: "invalid period" });
-                        if (done) done();
-                        return;
-                    }
-                    node.runtime.period = newPeriod;
-                    node.status({
-                        fill: "green",
-                        shape: "dot",
-                        text: `period: ${newPeriod.toFixed(0)} ms, bounced: ${node.runtime.debounceCount}`
-                    });
-                    if (done) done();
-                    return;
-                }
-
-                node.status({ fill: "yellow", shape: "ring", text: "unknown context" });
-                if (done) done();
-                return;
-            }
-
-            // Check for missing payload
-            if (!msg.hasOwnProperty("payload")) {
-                node.status({ fill: "red", shape: "ring", text: "missing payload" });
-                if (done) done();
-                return;
-            }
-
-            // Process false payloads immediately
-            if (msg.payload === false) {
-                const statusText = `in: false, out: false, bounced: ${node.runtime.debounceCount}`;
-                if (lastOutput === false) {
-                    node.status({ fill: "blue", shape: "ring", text: statusText });
-                } else {
-                    node.status({ fill: "blue", shape: "dot", text: statusText });
-                }
-                lastOutput = false;
-                delete msg.context;
-                send(msg);
-                if (done) done();
-                return;
-            }
-
-            // Process true payloads with debouncing
-            if (msg.payload === true) {
-                // Increment debounce counter if resetting an active timer
-                if (debounceTimer) {
-                    node.runtime.debounceCount++;
-                    if (node.runtime.debounceCount > 9999) {
-                        node.runtime.debounceCount = 0;
-                    }
-                }
-
-                // Clear existing timer
-                if (debounceTimer) {
-                    clearTimeout(debounceTimer);
-                }
-
-                // Set new debounce timer
-                debounceTimer = setTimeout(() => {
-                    debounceTimer = null;
-                    const statusText = `in: true, out: true, bounced: ${node.runtime.debounceCount}`;
-                    node.status({ fill: "blue", shape: "dot", text: statusText });
-                    lastOutput = true;
-                    delete msg.context;
-                    send(msg);
-                }, node.runtime.period);
-
-                if (done) done();
-                return;
-            }
-
-            // Ignore non-boolean payloads
-            node.status({ fill: "red", shape: "ring", text: "invalid payload" });
-            if (done) done();
-        });
-
-        node.on("close", function(done) {
-            if (debounceTimer) {
-                clearTimeout(debounceTimer);
-                debounceTimer = null;
-            }
-            
-            done();
-        });
-    }
-
-    RED.nodes.registerType("debounce-block", DebounceBlockNode);
-};