node-red-contrib-boolean-logic-ultimate 1.1.2 → 1.1.5

package/CHANGELOG.md

@@ -3,6 +3,14 @@
 
 # CHANGELOG
 
+<p>
+<b>Version 1.1.5</b> April 2024<br/>
+- Math node: fixed an issue with the "subtract" operator. See contestual help in the node-red help tab.</br>
+</p>
+<p>
+<b>Version 1.1.3</b> March 2024<br/>
+- Comparator node: NEW: you can now reset both input values to *undefined*, by sending **msg.reset = true**.</br>
+</p>
 <p>
 <b>Version 1.1.2</b> January 2024<br/>
 - NEW: added "normal" and "violated" as default accepted inputs, for compatibility with Home Assistant.</br>

package/README.md

@@ -21,24 +21,9 @@ A set of Node-RED enhanced boolean logic and utility nodes, with persistent valu
 <br/>
 <br/>
 
-### COMPATIBLES INPUT VALUES
-Other than true/false, all nodes accepts these strings and convert it to true/false. All nodes are compatible with Homeassistant output strings.
-|Input|Translated into|
-|--|--|
-| "on" | true |
-| "off" | false |
-| "active" | true |
-| "inactive" | false |
-| "open" | true |
-| "closed" or "close" | false |
-| "true" | true |
-| "false" | false |
-| "1" | true |
-| "0" | false |
-| "home" | true |
-| "not_home" | false |
-
-You can add your own translation command, thanks to the translator-config node.
+### HOME ASSISTANT COMPATIBLES INPUT VALUES
+Other than true/false, all nodes accepts [Homeassistant](https://www.home-assistant.io) output strings.  
+You can **even add your own input translation word list**, thanks to the translator-config node.
 
 <br/>
 <br/>

package/boolean-logic-ultimate/BooleanLogicUltimate.html

@@ -66,10 +66,10 @@
 				if (this.delayEvaluation === 0 || this.delayEvaluation === "0" || this.delayEvaluation === "" || this.delayEvaluation === undefined) {
 					delayEvaluation = "";
 				} else {
-					delayEvaluation = "d(" + this.delayEvaluation + ")";
+					delayEvaluation = " (delay " + (this.delayEvaluation / 1000) + "s)";
 				}
 				if (typeof this.outputtriggeredby !== "undefined") trigger = this.outputtriggeredby === "all" ? "" : "t(" + this.triggertopic + ")";
-				label = "Gate " + this.inputCount + filtered + delayEvaluation + trigger;
+				label = "Gate (" + this.inputCount + " input)" + filtered + delayEvaluation + trigger;
 				if (this.name !== undefined && this.name.length > 0) {
 					label += " (" + this.name + ")";
 				}

package/boolean-logic-ultimate/Comparator.html

@@ -17,7 +17,7 @@
             },
             topic2: {
                 value: "", required: true
-            }           
+            }
         },
         inputs: 1,
         outputs: 1,
@@ -84,9 +84,13 @@
 | Comparator | It's the comparator. It compares the Topic 1 against the Topic 2. |
 | Topic 2 | It's the second topic to be evaluated against the first topic. |
 
-<br/>
 
-### Outputs
+### Input
+
+: reset (boolean) : `msg.reset = true` is used to reset both input values to ***undefined***. The node will execute only the *reset* command, regardless of other message properties.
+
+
+### Output
 
 1. Standard output
 : payload (boolean) : the standard output of the command.

package/boolean-logic-ultimate/Comparator.js

@@ -6,7 +6,7 @@ module.exports = function (RED) {
     node.math = config.math === undefined ? "===" : config.math;
     node.topic1Value = undefined;
     node.topic2Value = undefined;
-    
+
     function setNodeStatus({ fill, shape, text }) {
       let dDate = new Date();
       node.status({
@@ -41,6 +41,16 @@ module.exports = function (RED) {
     }
 
     node.on("input", function (msg) {
+      if (msg.hasOwnProperty("reset")) {
+        node.topic1Value = undefined;
+        node.topic2Value = undefined;
+        setNodeStatus({
+          fill: "grey",
+          shape: "ring",
+          text: "Reset",
+        });
+        return;
+      }
       if (!msg.hasOwnProperty("topic")) {
         setNodeStatus({
           fill: "red",

package/boolean-logic-ultimate/SumUltimate.html

@@ -12,7 +12,7 @@
             math: {
                 value: "sum"
             }
-            
+
         },
         inputs: 1,
         outputs: 1,
@@ -24,10 +24,10 @@
         paletteLabel: function () {
             return "MathUltimate";
         },
-		oneditprepare: function () {
-			if ($("#node-input-property").val() === "") $("#node-input-property").val("payload");
-			$("#node-input-property").typedInput({ default: 'msg', types: ['msg'] });
-		}
+        oneditprepare: function () {
+            if ($("#node-input-property").val() === "") $("#node-input-property").val("payload");
+            $("#node-input-property").typedInput({ default: 'msg', types: ['msg'] });
+        }
     });
 </script>
 
@@ -62,7 +62,7 @@
 |Property|Description|
 |--|--|
 | Input | It's the msg property to be evaluated. *By default, it is *payload*, but you can also specify other properties, for example "payload.value"* |
-| Operation | Operation to be performed. |
+| Operation | Operation to be performed. For **subtract** operation, the **first topic** arriving to the node is the number to subtract to.|
 
 <br/>
 <br/>

package/boolean-logic-ultimate/SumUltimate.js

@@ -4,7 +4,7 @@ module.exports = function (RED) {
 		this.config = config;
 		var node = this;
 		node.math = config.math === undefined ? "sum" : config.math;
-		this.topics = {};
+		node.topics = [];
 
 		function setNodeStatus({ fill, shape, text }) {
 			let dDate = new Date();
@@ -31,7 +31,7 @@ module.exports = function (RED) {
 
 			// handle reset
 			if (msg.hasOwnProperty("reset")) {
-				node.topics = {};
+				node.topics = [];
 				setNodeStatus({ fill: "grey", shape: "ring", text: "Reset" });
 				return;
 			}
@@ -50,52 +50,45 @@ module.exports = function (RED) {
 
 					// Sum
 					if (!isNaN(ret) && isFinite(ret)) {
-						node.topics[msg.topic.toString()] = ret;
+						if (node.topics.find(a => a.id === msg.topic.toString()) === undefined) {
+							node.topics.push({ id: msg.topic.toString(), val: ret });
+						}
 
 						var quantita = 0;
-
+						let somma = 0;
 						if (node.math === "sum") {
-							let somma = Object.keys(node.topics).reduce(function (a, b) {
+							node.topics.forEach((item) => {
+								somma += item.val;
 								++quantita;
-								return a + node.topics[b];
-							}, 0);
+							});
 							msg.payload = somma; // Sum
 							msg.average = somma / quantita; // Average
 							msg.measurements = quantita; // Topics	
 						} else if (node.math === "multiply") {
-							let moltiplicazione = Object.keys(node.topics).reduce(function (a, b) {
-								try {
+
+							let moltiplicazione = 1;
+							node.topics.forEach((item) => {
+								if (item.val !== 0) {
+									moltiplicazione *= item.val;
 									++quantita;
-									return (a > 0 ? a : 1) * node.topics[b]; // Avoid returning zero everytime	
-								} catch (error) {
-									setNodeStatus({ fill: "red", shape: "ring", text: "Error " + error.message });
-									return 0;
 								}
-							}, 0);
+							});
 							msg.payload = moltiplicazione; // Sum
-							msg.average = undefined; // Average
+							msg.average = moltiplicazione / quantita; // Average
 							msg.measurements = quantita; // Topics	
 						} else if (node.math === "subtract") {
-							let values = []
-							for (let row in node.topics) {
-								if (node.topics.hasOwnProperty(row)) {
-									++quantita;
-									values.push(node.topics[row]);
-								}
-							}
-							function orderReverseNumbers(a, b) {
-								return b - a;
-							}
-							values.sort(orderReverseNumbers)
-							let risultato = values[0]
-							for (let index = 1; index < values.length; index++) {
-								risultato -= values[index];
+
+							let risultato = node.topics[0].val;
+							quantita = 1;
+							for (let index = 1; index < node.topics.length; index++) {
+								risultato -= node.topics[index].val;
+								++quantita;
 							}
+
 							msg.payload = risultato; // Sum
 							msg.average = risultato / quantita; // Average
 							msg.measurements = quantita; // Topics	
 						}
-
 						// overwrite topic if configured
 						if (config.name) {
 							msg.topic = config.name;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "node-red-contrib-boolean-logic-ultimate",
-    "version": "1.1.2",
+    "version": "1.1.5",
     "description": "A set of Node-RED enhanced boolean logic and utility nodes, flow interruption, blinker, invert, filter, toggle etc.., with persistent values after reboot. Compatible also with Homeassistant values.",
     "author": "Supergiovane (https://github.com/Supergiovane)",
     "dependencies": {