@bldgblocks/node-red-contrib-control 0.1.24 → 0.1.26

package/README.md

@@ -32,7 +32,7 @@ The help section of every node describes the expected msg.context (data tag) for
 An 'and' block set to 4 slots must recieve `true` values on each inX at some point to evaluate to a `true` output. Where as, an 'or' block set to 4 inputs could have any input trigger a `true` evaluation. However, a remaining `true` would prevent evaluating to `false`. So the flow may look like 4 small tagging nodes configured in1,in2,in3,in4 connecting to the 'and' block and just wiring your branches of logic to those inputs. You can also negate or have multiple connected to an input and you can watch as each comes in to evaluate. Just try to keep it clean.
 
 ## Install
-##### Via NodeRED Palette Manager (Not Yet Available)
+##### Via NodeRED Palette Manager
 
 Search for the package name and add to your project.
 

package/nodes/on-change-block.html

@@ -46,7 +46,7 @@ Filters redundant messages based on value changes and a configurable period.
 
 ### Inputs
 : payload (any) : Input value to compare.
-: context (string, optional) : Configures period (`"period"`) or queries state (`"status"`). Unknown `msg.context` is ignored
+: context (string, optional) : Configures period (`"period"`) or queries state (`"status"`).
 : payload (number | any, for `context`) : Non-negative number for `"period"` (ms), any for `"status"`.
 
 ### Outputs

package/nodes/on-change-block.js

@@ -9,13 +9,12 @@ module.exports = function(RED) {
         node.runtime = {
             name: config.name,
             lastValue: null,
-            blockTimer: null,
-            pendingMsg: null
+            blockTimer: null
         };
 
         // Evaluate typed-input properties
         try {
-            node.runtime.period = RED.util.evaluateNodeProperty( node.runtime.period, node.runtime.periodType, node );
+            node.runtime.period = RED.util.evaluateNodeProperty( config.period, config.periodType, node );
             node.runtime.period = parseFloat(node.runtime.period);
         } catch (err) {
             node.status({ fill: "red", shape: "ring", text: "error evaluating properties" });
@@ -45,14 +44,13 @@ module.exports = function(RED) {
 
             // Acceptable fallbacks
             if (isNaN(node.runtime.period) || node.runtime.period < 0) {
-                node.runtime.period = 0;
+                node.runtime.period = config.period;
                 node.status({ fill: "red", shape: "ring", text: "invalid period, using 0" });
             }
 
             // Handle context updates
             if (msg.hasOwnProperty("context") && typeof msg.context === "string") {
-                const contextLower = msg.context.toLowerCase();
-                if (contextLower === "period") {
+                if (msg.context === "period") {
                     if (!msg.hasOwnProperty("payload")) {
                         node.status({ fill: "red", shape: "ring", text: "missing payload for period" });
                         if (done) done();
@@ -74,7 +72,7 @@ module.exports = function(RED) {
                     if (done) done();
                     return;
                 }
-                if (contextLower === "status") {
+                if (msg.context === "status") {
                     send({
                         payload: {
                             period: node.runtime.period,
@@ -114,9 +112,8 @@ module.exports = function(RED) {
                 return false;
             }
 
-            // Handle input during filter period
+            // Block if in filter period
             if (node.runtime.blockTimer) {
-                node.runtime.pendingMsg = RED.util.cloneMessage(msg);
                 node.status({
                     fill: "blue",
                     shape: "ring",
@@ -126,49 +123,27 @@ module.exports = function(RED) {
                 return;
             }
 
-            // Allow no-change output if period > 0, othewise only on change
-            if (!isEqual(currentValue, node.runtime.lastValue) || node.runtime.period > 0) {
-                node.runtime.lastValue = RED.util.cloneMessage(currentValue);
-                node.status({
-                    fill: "blue",
-                    shape: "dot",
-                    text: `out: ${JSON.stringify(currentValue).slice(0, 20)}`
-                });
-                send(msg);
-
-                // Start filter period if applicable
-                if (node.runtime.period > 0) {
-                    node.runtime.blockTimer = setTimeout(() => {
-                        node.runtime.blockTimer = null;
-                        if (node.runtime.pendingMsg) {
-                            const pendingValue = node.runtime.pendingMsg.payload;
-                            if (!isEqual(pendingValue, node.runtime.lastValue)) {
-                                node.runtime.lastValue = RED.util.cloneMessage(pendingValue);
-                                node.status({
-                                    fill: "blue",
-                                    shape: "dot",
-                                    text: `out: ${JSON.stringify(pendingValue).slice(0, 20)}`
-                                });
-                                send(node.runtime.pendingMsg);
-                            } else {
-                                node.status({
-                                    fill: "blue",
-                                    shape: "ring",
-                                    text: `Filter period expired`
-                                });
-                            }
-                            node.runtime.pendingMsg = null;
-                        } else {
-                            node.status({});
-                        }
-                    }, node.runtime.period);
+            // period === 0 means only ever on change, not equal outside of filter period sends an update message
+            if (isEqual(currentValue, node.runtime.lastValue)) {
+                if (node.runtime.period === 0) {
+                    if (done) done();
+                    return;
                 }
-            } else {
-                node.status({
-                    fill: "blue",
-                    shape: "ring",
-                    text: `unchanged: ${JSON.stringify(currentValue).slice(0, 20)}`
-                });
+            }
+
+            node.runtime.lastValue = currentValue;
+            send(msg);
+
+            // Start filter period if applicable
+            if (node.runtime.period > 0) {
+                node.runtime.blockTimer = setTimeout(() => {
+                    node.runtime.blockTimer = null;
+                    node.status({
+                        fill: "blue",
+                        shape: "ring",
+                        text: `Filter period expired`
+                    });
+                }, node.runtime.period);
             }
 
             if (done) done();

package/package.json

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