node-red-contrib-boolean-logic-ultimate 1.1.3 → 1.1.6

package/CHANGELOG.md

@@ -3,6 +3,14 @@
 
 # CHANGELOG
 
+<p>
+<b>Version 1.1.6</b> April 2024<br/>
+- Math node: in SUBTRACT mode, now you must set a msg.topic to start subtracting from.</br>
+</p>
+<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>

package/boolean-logic-ultimate/SumUltimate.html

@@ -11,8 +11,8 @@
             },
             math: {
                 value: "sum"
-            }
-            
+            },
+            subtractstartfrom: { value: "" }
         },
         inputs: 1,
         outputs: 1,
@@ -24,10 +24,17 @@
         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'] });
+            $("#node-input-math").on('change', function () {
+                if ($("#node-input-math").val() === "subtract") {
+                    $("#divSubtractFirst").show()
+                } else {
+                    $("#divSubtractFirst").hide()
+                }
+            })
+        }
     });
 </script>
 
@@ -54,15 +61,20 @@
             <option value="subtract">Subtract</option>
 		</select>
 	</div>
+    <div class="form-row" id="divSubtractFirst" hidden>
+        <label for="node-input-subtractstartfrom"><i class="icon-tag"></i> Subtract from</label>
+        <input type="text" id="node-input-subtractstartfrom" placeholder="Type the msg.topic. See the help.">
+    </div>
 </script>
 
 <script type="text/markdown" data-help-name="SumUltimate">
-<p>The pourpose of this node is to do maths on the incoming values. Each incoming message MUST HAVE OWN TOPIC.</p>
+<p>The pourpose of this node is to do maths on the incoming values. Each incoming message MUST HAVE OWN TOPIC, that means, each inbound **msg.topic** must be **different**.</p>
 
 |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. |
+| Subtract from | Only visible when the *operation* is **subtract**. The *msg.topic* indicating the start number for subtraction. This can be, for example, ***SolarPower***, indicating the power from wich you could subtract the house power consumption and obtain the power you sell to the grid. Remember, each inbound msg.topic to be subtracted must be different.|
 
 <br/>
 <br/>

package/boolean-logic-ultimate/SumUltimate.js

@@ -4,7 +4,8 @@ module.exports = function (RED) {
 		this.config = config;
 		var node = this;
 		node.math = config.math === undefined ? "sum" : config.math;
-		this.topics = {};
+		node.subtractstartfrom = config.subtractstartfrom === undefined ? "" : config.subtractstartfrom;
+		node.topics = [];
 
 		function setNodeStatus({ fill, shape, text }) {
 			let dDate = new Date();
@@ -31,7 +32,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 +51,60 @@ module.exports = function (RED) {
 
 					// Sum
 					if (!isNaN(ret) && isFinite(ret)) {
-						node.topics[msg.topic.toString()] = ret;
+						let oFound = node.topics.find(a => a.id === msg.topic.toString());
+						if (oFound === undefined) {
+							node.topics.push({ id: msg.topic.toString(), val: ret });
+						} else {
+							oFound.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]);
+							let risultato = 0;
+							if (node.subtractstartfrom !== "") {
+								try {
+									risultato = node.topics.find(m => m.id === node.subtractstartfrom).val;
+								} catch (error) {
+									setNodeStatus({ fill: "grey", shape: "ring", text: "Waiting for " + node.subtractstartfrom });
+									return;
 								}
+							} else {
+								setNodeStatus({ fill: "red", shape: "ring", text: "Please specify the topic form subtract to." });
+								return;
 							}
-							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];
+							quantita = 1;
+							for (let index = 0; index < node.topics.length; index++) {
+								if (node.topics[index].id !== node.subtractstartfrom) {
+									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.3",
+    "version": "1.1.6",
     "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": {