node-red-contrib-boolean-logic-ultimate 1.0.36 → 1.0.40

package/.vscode/launch.json

@@ -0,0 +1,17 @@
+{
+    // Usare IntelliSense per informazioni sui possibili attributi.
+    // Al passaggio del mouse vengono visualizzate le descrizioni degli attributi esistenti.
+    // Per altre informazioni, visitare: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "type": "pwa-node",
+            "request": "launch",
+            "name": "Launch Program",
+            "skipFiles": [
+                "<node_internals>/**"
+            ],
+            "program": "${workspaceFolder}/boolean-logic-ultimate/BooleanLogicUltimate.js"
+        }
+    ]
+}

package/CHANGELOG.md

@@ -1,6 +1,18 @@
 # node-red-contrib-boolean-logic-ultimate
 [![Donate via PayPal](https://img.shields.io/badge/Donate-PayPal-blue.svg?style=flat-square)](https://www.paypal.me/techtoday) 
 
+<p>
+<b>Version 1.0.40</b> Januart 2022<br/>
+- NEW: Boolean Logic Ultimate: Delay option added. See the readme on gitHub.</br>
+</p>
+<p>
+<b>Version 1.0.39</b> November 2021<br/>
+- FIX a possible issue when msg.payload is numeric.</br>
+</p>
+<p>
+<b>Version 1.0.38</b> November 2021<br/>
+- All nodes does accept "on" and "off" as input, converting it in "true" and "false" values (Homeassistant friendly).</br>
+</p>
 <p>
 <b>Version 1.0.36</b> November 2021<br/>
 - ImpulseUltimate: NEW: added <b>restart</b> command, to restart the sequence from scratch.</br>

package/README.md

@@ -15,9 +15,15 @@ A set of Node-RED enhanced boolean logic, with persisten values after reboot and
 > Wellcome! First of all thank you for your interest in my nodes. This is a set of logic nodes, to overcome the simplicity of the default node-red boolean logic nodes.
 Hope you enjoy that and if you're in trouble, please ask!
 
+<br/>
+<br/>
+
 ## CHANGELOG
 * See <a href="https://github.com/Supergiovane/node-red-contrib-boolean-logic-ultimate/blob/master/CHANGELOG.md">here the changelog</a>
 
+<br/>
+<br/>
+
 # BOOLEAN LOGIC
 
 <img src='https://raw.githubusercontent.com/Supergiovane/node-red-contrib-boolean-logic-ultimate/master/img/bl1.png' width='60%'>
@@ -49,7 +55,9 @@ The node performs some checks on the incoming boolean payloads and outputs all r
 If you need ***"NAND"*** or ***"NOR"*** gate, just put an **InvertUltimate** node respectively after the "AND" or "OR" pin.
 
 The node can have a persistent input: the input values are retained after a node-red reboot. That means, that if you reboot your node-red, you don't need to wait all inputs to arrive and initialize the node, before the node can output a payload.<br/>
-You can also set the default values of the topic inputs.
+You can also set the default values of the topic inputs.<br/>
+The node can convert arbitrary input values to true/false. It supports Homeassistant ***"on"*** and ***"off"*** as well. For enabling auto conversion, please be sure to disable **Reject non boolean (true/false) input values** <br/>
+
 
 
 ### CONFIGURATION
@@ -82,6 +90,17 @@ Every time you create a node or modify the node, all inputs are set to undefined
 If checked, the input values are retained after a node-red reboot. That means, that if you reboot your node-red, you don't need to wait all inputs to arrive and initialize the node, before the node can output a payload.<br/>
 Every time you modify the node's config, <b>the retained values are cleared</b>.<br/>
 
+**Reject non boolean (true/false) input values**
+
+If checked, the node will accept only boolean true/false values. Otherwise, it will try to convert the payload to a logic value true/false (including "on" and "off" values, sent, for example, from HomeAssistant).<br/>
+
+**Delay evaluation (msec)**
+
+Delays the evaluation until this time (in milliseconds) is elapsed. Each time a message or "topic trigger message" (see **Trigger mode**) arrives, the delay is restarted.<br/>
+This option is useful for debouncing pourposes or simply for adding some delay.<br/>
+For example, you can turn on a light if the room is occupied for a long time, allowing people to fast transit repeatedly, without the need of turning the light on.<br/>
+Another example, if you have many sensors changing state rapidly, you can wait until these sensor reach a quiet state, then evaluate the inputs.<br/>
+
 **INPUT MSG TO THE NODE**
 
 <code>
@@ -97,7 +116,8 @@ Resets all inputs to undefined.
 
 # INTERRUPT FLOWS ULTIMATE
 
-Whenever this node receives a payload = false from a specific topic, it stops output messages to the flow. As soon it receives payload = true from this topic, the output messages start to flow out again.
+Whenever this node receives a payload = false from a specific topic, it stops output messages to the flow. As soon it receives payload = true from this topic, the output messages start to flow out again.<br/>
+The node tries to convert any arbitrary input value to a valid boolean value. It converts Homeassistant ***"on"*** and ***"off"*** to true/false values as well.<br/>
 
 <img src='https://raw.githubusercontent.com/Supergiovane/node-red-contrib-boolean-logic-ultimate/master/img/if0.png' width='60%'>
 
@@ -129,7 +149,8 @@ This allow to save the state of a node and then replay it back whenever you want
 # INVERT ULTIMATE
 
 Outputs the inverted input. For example true -> false<br />
-The input message is preserved and passed to the output pin, changing only the topic and the payload. If the input message has it's own topic, it'll be preserved as well.
+The input message is preserved and passed to the output pin, changing only the topic and the payload. If the input message has it's own topic, it'll be preserved as well.<br/>
+The node tries to convert any arbitrary input value to a valid boolean value. It converts Homeassistant ***"on"*** and ***"off"*** to true/false values as well.<br/>
 
 <br/>
 <br/>
@@ -142,7 +163,8 @@ The input message is preserved and passed to the output pin, changing only the t
 This node has 2 outputs.<br />
 If the input payload is true, the node will send <code>true</code> on output 1 and nothing on oputput 2<br />
 If the input payload is false, the node will send nothing on output 1, and <code>false</code> on oputput 2<br />
-The input message is preserved and passed to the output pin, changing only the topic and the payload. If the input message has it's own topic, it'll be preserved as well.
+The input message is preserved and passed to the output pin, changing only the topic and the payload. If the input message has it's own topic, it'll be preserved as well.<br/>
+The node tries to convert any arbitrary input value to a valid boolean value. It converts Homeassistant ***"on"*** and ***"off"*** to true/false values as well.<br/>
 
 <br/>
 <br/>
@@ -251,13 +273,13 @@ The pourpose of this node is to send a sequence of pulsed commands to for exampl
 
 **Avaiable Commands**<br />
 Commands are to be wrote in the format: command:value. For example ***send:200***, ***wait:2000***. Each row represents a command.<br />
-<b>send</b><br />
+<br /><b>send</b><br />
 sends a value. For example: ***send:true*** or ***send:100*** or ***send:Hello***<br />
-<b>wait</b><br />
+<br /><b>wait</b><br />
 wait for specified time (in milliseconds). For example ***wait:500*** waits for 500 milliseconds<br />
-<b>restart</b><br />
+<br /><b>restart</b><br />
 Restart the sequence from the beginning. Use ***restart*** alone, without **:** and extra value. For example ***restart*** <br />
-<b>//</b><br />
+<br /><b>//</b><br />
 comment. For example: ***// This opens the garage***. The comment are ignored, so you can write what you want.<br />
 <br />
 

package/boolean-logic-ultimate/BlinkerUltimate.html

@@ -74,26 +74,12 @@
 
 <script type="text/x-red" data-help-name="BlinkerUltimate">
 	<p>
-        <a href="https://www.paypal.me/techtoday" target="_blank"><img src='https://img.shields.io/badge/Donate-PayPal-blue.svg?style=flat-square' width='30%'></a>
+        SEE THE README FOR HELP CONFIGURING THE NODE
     </p>
 
-	</p>
-	Output PIN1 : outputs the value true/false<br/>
-	Output PIN2 : outputs the inverted value false/true<br/>
 	<p>
-
-	<p>The meaning of this node is to blink a light or something else.<br/>
-	<p>Pass msg.payload = true to start blinking</br>
-	Pass msg.payload = false to stop blinking</br>
-	Pass msg.interval = 2000 to change the blinking interval</br>
-	</p>
-	PIN1 stop behavior : when the blinker receives the stop message, you can select the behavior of the pin1<br/>
-	PIN2 stop behavior : when the blinker receives the stop message, you can select the behavior of the pin2<br/>
-	Autostart : whenever node-red starts, the node can either start blinking or not<br/>
-	<p>
-
+		<a href="https://github.com/Supergiovane/node-red-contrib-boolean-logic-ultimate" target="_blank">Click here to learn how to configure the node.</a>
 	</p>
-    
 
 	<a href="https://www.paypal.me/techtoday" target="_blank"><img src='https://img.shields.io/badge/Donate-PayPal-blue.svg?style=flat-square' width='30%'></a>
 

package/boolean-logic-ultimate/BlinkerUltimate.js

@@ -75,6 +75,11 @@ module.exports = function (RED) {
 				res = value;
 			}
 			else if (typeof value === 'number' || typeof value === 'string') {
+
+				if (typeof value === "string" && value.toLowerCase() === "on") return true;
+				if (typeof value === "string" && value.toLowerCase() === "off") return false;
+
+
 				// Is it formated as a decimal number?
 				if (decimal.test(value)) {
 					var v = parseFloat(value);

package/boolean-logic-ultimate/BooleanLogicUltimate.html

@@ -33,7 +33,14 @@
 						return v !== undefined && v.length > 0;
 					}
 			},
-			restrictinputevaluation:{ value: true }
+			restrictinputevaluation: { value: true },
+			delayEvaluation: {
+				value: 0,
+				validate:
+					function (v) {
+						return !isNaN(parseInt(v)) && parseInt(v) >= 0;
+					}
+			}
 		},
 		inputs: 1,
 		outputs: 3,
@@ -165,88 +172,24 @@
 		<input type="checkbox" id="node-input-restrictinputevaluation" style="display:inline-block; width:auto; vertical-align:top;">
 		&nbsp<label style="width:auto" for="node-input-restrictinputevaluation"> Reject non boolean (true/false) input values</label>
 	</div>
-
-</script>
-
-<script type="text/x-red" data-help-name="BooleanLogicUltimate">
-	<p>
-        <a href="https://www.paypal.me/techtoday" target="_blank"><img src='https://img.shields.io/badge/Donate-PayPal-blue.svg?style=flat-square' width='30%'></a>
-        
-	</p>
-	
-	<p>The node performs Boolean logic on the incoming payloads.<br/>
-	<a href="https://www.paypal.me/techtoday" target="_blank"><img src='https://img.shields.io/badge/Donate-PayPal-blue.svg?style=flat-square' width='30%'></a>
-	<br/><br/>
-	The node performs some checks on the incoming boolean payloads and outputs results at the same time, as follow:<br/>
-	- Output "AND": true or false<br/>
-	- Output "OR": true or false<br/>
-	- Output "XOR": true or false<br/>
-	
-	If you need ***"NAND"*** or ***"NOR"*** gate, just put an **InvertUltimate** node respectively after the "AND" or "OR" pin.
-	
-	<b>Inputs count</b><br />
-	Set the number of different topics to be evaluated. The node will output a message to the flow, after this number of different topics arrives.<br/>
-	<b> Remember: each input topic must be different. For example, if you set this field to 3, the node expects 3 different topics.</b><br/>
-
-	<br/>
-	Changing the topic is usually only needed when chaining multiple boolean nodes after each other becuse the topics will then all be the same when delivered to the nodes further down the chain.<br/>
-	<br/>
-	The node expects a fixed number of topics (configured in the settings) on which it will operate. It will only output a value 
-	when it has seen the expected number of topics. If it ever sees more than the configured number of topics it will log a message then reset its state and start over.<br/>
-	<b> Remember: each input topic must be different. For example, if you set "Inputs count" to 3, the node expects 3 different topics.</b><br/>
-	<br/><br/>
-	<b>Filter output result</b><br />
-	<ol>	
-		<li>Output both 'true' and 'false' results: Standard behaviour, the node will output <b>true</b> and <b>false</b> whenever it receives an input and calculate the boolean logics as output.</li>
-		<li>Output only 'true' results: whenever the node receives an input, it outputs a payload <b>true</b> only if the result of the logic is true. <b>False</b> results are filtered out.</li>
-	</ol>
-	<b>filtered</b>: shown on label, means that the node will pass out only <code>true</code> values (Output only 'true' results). <br/>
-	<br/><br/>
+	<div class="form-row">
+        <label for="node-input-delayEvaluation"><i class="fa fa-hourglass-o"></i> Delay evaluation (msec)</label>
+		<input style="width:100px" type="text" id="node-input-delayEvaluation" placeholder="0">
+	</div>
 	
-	<b>Trigger mode</b><br />
-	The node can acts ad a standard boolean logic or as single topic triggered boolean logic.<br/>
-	As single topic triggered boolean logic, the node will evaluate the inputs (and thus will output a payload) only if a specified topic input arrives.<br/>
-	In a coding perspectives, it acts as follows:<br/>
-	<code>
-		if (msg.topic == specified topic)<br/>
-		{<br/>
-			If (all other inputs are true) -> outputs true otherwise false<br/>
-		}<br/>
-	</code>
-	<ol>	
-		<li>All topics: standard behaviour, the node will output <b>true</b> and <b>false</b> by evaluating all inputs. Each input change will trigger the node output.</li>
-		<li>Single topic + only eval others: <u>only whenever the node receives a msg input with the <b>specified topic</b> (having payload = true)</u>, it starts the evaluation of all other inputs as well and outputs the evaluated payload. If the node receives a msg input other than the <b>specified topic</b>), it only retains it's value for the boolean evaluation.</li>
-	</ol>
-	Example of trigger mode = Single topic + eval other inputs:	<b>SEE THE README FOR AN EXAMPLE</b>
-	<br/><br/>
-
-	<b>	If input states are undefined</b><br />
-	Every time you create a node or modify the node, all inputs are set to undefined. This means that the node will wait the arrive of all topics (for example 3 topics, if you've selected 3 topics in the option), before it can output a payload. This can be a problem if your logic must be operative as soon as you deploy the flow. To overcome this problem, you can "initialize" all the undefined inputs with True or False.
-	<ol>	
-		<li>Leave undefined: Standard behaviour, the node will wait all the "undefined" topics to arrive, then starts a flow with the result.</li>
-		<li>True or False: The node is immediately operative, by force the initialization of the "undefined" inputs with "true" or "false".</li>
-	</ol>
 	<br/>
-
-	<b>Remember latest input values after reboot</b><br />
-	If checked, the input values are retained after a node-red reboot. That means, that if you reboot your node-red, you don't need to wait all inputs to arrive and initialize the node, before the node can output a payload.<br/>
-	Every time you modify the node's config, <b>the retained values are cleared</b>.<br/>
 	<br/>
-
-	<b>Reject non boolean (true/false) input values</b><br />
-	If checked, the node will accept only boolean true/false values. Otherwise, it will try to convert the payload to a logic value true/false.<br/>
 	<br/>
-	
+</script>
 
-	<i>	How inputs are handled:</i><br />
-	All incoming msg.payloads are converted into a boolean value according to the following rules (this applies to all boolean logic nodes):
-	<ol>	
-		<li>Boolean values are taken as-is.</li>
-		<li>For numbers, 0 evaluates to false, all other numbers evaluates to true.</li>
-		<li>Strings are converted to numbers if they match the format of a decimal value, then the same rule as for numbers are applied. If it does not match, it evaluates to false. Also, the string "true" evaluates to true.</li>
-	</ol>
-	<br>
-	The XOR operation operates in a one, and only one mode, i.e. (A ^ B) ^ C ... ^ n
+<script type="text/x-red" data-help-name="BooleanLogicUltimate">
+	<p>
+        SEE THE README FOR HELP CONFIGURING THE NODE
+    </p>
 
+	<p>
+		<a href="https://github.com/Supergiovane/node-red-contrib-boolean-logic-ultimate" target="_blank">Click here to learn how to configure the node.</a>
 	</p>
+
+	<a href="https://www.paypal.me/techtoday" target="_blank"><img src='https://img.shields.io/badge/Donate-PayPal-blue.svg?style=flat-square' width='30%'></a>
 </script>

package/boolean-logic-ultimate/BooleanLogicUltimate.js

@@ -10,6 +10,9 @@ module.exports = function (RED) {
 		node.sInitializeWith = typeof node.config.sInitializeWith === "undefined" ? "WaitForPayload" : node.config.sInitializeWith;
 		node.persistPath = path.join(RED.settings.userDir, "booleanlogicultimatepersist"); // 26/10/2020 Contains the path for the states dir.
 		node.restrictinputevaluation = config.restrictinputevaluation === undefined ? false : config.restrictinputevaluation;
+		node.delayEvaluation = config.delayEvaluation === undefined ? 0 : config.delayEvaluation; // 26/01/2022 Starts evaluating the inputs only after this amount of time is elapsed, after the last msg input or trigger
+		node.timerDelayEvaluation = null;
+		node.inputMessage = {}; // 26/01/2022 input message is stored here.
 
 		function setNodeStatus({ fill, shape, text }) {
 			var dDate = new Date();
@@ -63,6 +66,13 @@ module.exports = function (RED) {
 			setNodeStatus({ fill: "yellow", shape: "dot", text: "Waiting for input states" });
 		}
 
+		// Starts the evaluation delay timer, if needed
+		node.startTimerDelayEvaluation = () => {
+			if (node.timerDelayEvaluation !== null) clearTimeout(node.timerDelayEvaluation);
+			node.timerDelayEvaluation = setTimeout(() => {
+				outputResult();
+			}, node.delayEvaluation);
+		}
 
 		// 14/08/2019 If some inputs are to be initialized, create a dummy items in the array
 		initUndefinedInputs();
@@ -77,18 +87,18 @@ module.exports = function (RED) {
 				return;
 			}
 
-			// 28/08/2020 inform user about undefined topic or payload
-			if (!msg.hasOwnProperty("topic") || typeof (msg.topic) == "undefined") {
+			// 15/11/2021 inform user about undefined topic or payload
+			if (!msg.hasOwnProperty("topic") || msg.topic === undefined || msg.topic === null) {
 				setNodeStatus({ fill: "red", shape: "dot", text: "Received invalid topic!" });
 				return;
 			}
-			// 28/08/2020 inform user about undefined topic or payload
-			if (!msg.hasOwnProperty("payload") || typeof (msg.payload) == "undefined") {
-				setNodeStatus({ fill: "red", shape: "dot", text: "Received invalid payload from " + msg.topic });
+			// 15/11/2021 inform user about undefined topic or payload
+			if (!msg.hasOwnProperty("payload") || msg.payload === undefined || msg.payload === null) {
+				setNodeStatus({ fill: "red", shape: "dot", text: "Received invalid payload from " + msg.topic || "" });
 				return;
 			}
 
-			// 12/08/2021 Restrict only to true/false and 0/1
+			// 12/08/2021 Restrict only to true/false 
 			if (node.restrictinputevaluation) {
 				if (msg.payload !== true && msg.payload !== false) {
 					setNodeStatus({ fill: "red", shape: "dot", text: "Received non boolean value from " + msg.topic });
@@ -128,21 +138,21 @@ module.exports = function (RED) {
 					RED.log.error("BooleanLogicUltimate: unable to write to the filesystem. Check wether the user running node-red, has write permission to the filesysten. " + error.message);
 				}
 			}
+			node.inputMessage = msg; // 26/01/2022 Store MSG to be used in the outputResult function.
 
 			// Do we have as many inputs as we expect?
 			var keyCount = Object.keys(node.jSonStates).length;
-
 			if (keyCount == node.config.inputCount) {
 
-				var resAND = CalculateResult("AND");
-				var resOR = CalculateResult("OR");
-				var resXOR = CalculateResult("XOR");
+				// var resAND = CalculateResult("AND");
+				// var resOR = CalculateResult("OR");
+				// var resXOR = CalculateResult("XOR");
 
-				if (node.config.filtertrue == "onlytrue") {
-					if (!resAND) { resAND = null };
-					if (!resOR) { resOR = null };
-					if (!resXOR) { resXOR = null };
-				}
+				// if (node.config.filtertrue == "onlytrue") {
+				// 	if (!resAND) { resAND = null };
+				// 	if (!resOR) { resOR = null };
+				// 	if (!resXOR) { resXOR = null };
+				// }
 
 				// Operation mode evaluation
 				if (node.config.outputtriggeredby == "onlyonetopic") {
@@ -150,12 +160,22 @@ module.exports = function (RED) {
 						&& node.config.triggertopic !== ""
 						&& msg.hasOwnProperty("topic") && msg.topic !== ""
 						&& node.config.triggertopic === msg.topic) {
-						SetResult(resAND, resOR, resXOR, node.config.topic, msg);
+						if (node.delayEvaluation > 0) {
+							node.startTimerDelayEvaluation();
+							setNodeStatus({ fill: "blue", shape: "ring", text: "Delay Eval " + node.delayEvaluation + "ms" });
+						} else {
+							outputResult();	
+						}						
 					} else {
 						setNodeStatus({ fill: "grey", shape: "ring", text: "Saved (" + (msg.hasOwnProperty("topic") ? msg.topic : "empty input topic") + ") " + value });
 					}
 				} else {
-					SetResult(resAND, resOR, resXOR, node.config.topic, msg);
+					if (node.delayEvaluation > 0) {
+						node.startTimerDelayEvaluation();
+						setNodeStatus({ fill: "blue", shape: "ring", text: "Delay Eval " + node.delayEvaluation + "ms" });
+					} else {
+						outputResult();	
+					}	
 				}
 			}
 			else if (keyCount > node.config.inputCount) {
@@ -263,6 +283,10 @@ module.exports = function (RED) {
 				res = value;
 			}
 			else if (typeof value === 'number' || typeof value === 'string') {
+
+				if (typeof value === "string" && value.toLowerCase() === "on") return true;
+				if (typeof value === "string" && value.toLowerCase() === "off") return false;
+
 				// Is it formated as a decimal number?
 				if (decimal.test(value)) {
 					var v = parseFloat(value);
@@ -276,30 +300,41 @@ module.exports = function (RED) {
 			return res;
 		};
 
-		function SetResult(_valueAND, _valueOR, _valueXOR, optionalTopic, _msg) {
-			setNodeStatus({ fill: "green", shape: "dot", text: "(AND)" + (_valueAND !== null ? _valueAND : "---") + " (OR)" + (_valueOR !== null ? _valueOR : "---") + " (XOR)" + (_valueXOR !== null ? _valueXOR : "---") });
+		function outputResult() {
+			let optionalTopic = node.config.topic;
+			let calculatedValueAND = CalculateResult("AND");
+			let calculatedValueOR = CalculateResult("OR");
+			let calculatedValueXOR = CalculateResult("XOR");
+
+			if (node.config.filtertrue == "onlytrue") {
+				if (!calculatedValueAND) { calculatedValueAND = null };
+				if (!calculatedValueOR) { calculatedValueOR = null };
+				if (!calculatedValueXOR) { calculatedValueXOR = null };
+			}
+
+			setNodeStatus({ fill: "green", shape: "dot", text: "(AND)" + (calculatedValueAND !== null ? calculatedValueAND : "---") + " (OR)" + (calculatedValueOR !== null ? calculatedValueOR : "---") + " (XOR)" + (calculatedValueXOR !== null ? calculatedValueXOR : "---") });
 
 			var msgAND = null;
-			if (_valueAND != null) {
-				msgAND = RED.util.cloneMessage(_msg);
+			if (calculatedValueAND != null) {
+				msgAND = RED.util.cloneMessage(node.inputMessage);
 				msgAND.topic = optionalTopic === undefined ? "result" : optionalTopic;
 				msgAND.operation = "AND";
-				msgAND.payload = _valueAND;
+				msgAND.payload = calculatedValueAND;
 
 			}
 			var msgOR = null;
-			if (_valueOR != null) {
-				msgOR = RED.util.cloneMessage(_msg);
+			if (calculatedValueOR != null) {
+				msgOR = RED.util.cloneMessage(node.inputMessage);
 				msgOR.topic = optionalTopic === undefined ? "result" : optionalTopic;
 				msgOR.operation = "OR";
-				msgOR.payload = _valueOR;
+				msgOR.payload = calculatedValueOR;
 			}
 			var msgXOR = null;
-			if (_valueXOR != null) {
-				msgXOR = RED.util.cloneMessage(_msg);
+			if (calculatedValueXOR != null) {
+				msgXOR = RED.util.cloneMessage(node.inputMessage);
 				msgXOR.topic = optionalTopic === undefined ? "result" : optionalTopic;
 				msgXOR.operation = "XOR";
-				msgXOR.payload = _valueXOR;
+				msgXOR.payload = calculatedValueXOR;
 			}
 			node.send([msgAND, msgOR, msgXOR]);
 

package/boolean-logic-ultimate/FilterUltimate.html

@@ -40,20 +40,20 @@
 		<br/>        
 	</div>
 	<div class="form-row">
-        <label for="node-input-name"><i class="icon-tag"></i> Name (topic)</label>
+        <label for="node-input-name"><i class="icon-tag"></i> Name</label>
         <input type="text" id="node-input-name" placeholder="Name">
     </div>
 </script>
 
 <script type="text/x-red" data-help-name="FilterUltimate">
 	<p>
-        <a href="https://www.paypal.me/techtoday" target="_blank"><img src='https://img.shields.io/badge/Donate-PayPal-blue.svg?style=flat-square' width='30%'></a>
-       
-	</p>
-	
-    <p>The node emits on output "true", only input payloads that are true<br/>
-	and on the output "false", only input payload that are false.
+        SEE THE README FOR HELP CONFIGURING THE NODE
+    </p>
+
+	<p>
+		<a href="https://github.com/Supergiovane/node-red-contrib-boolean-logic-ultimate" target="_blank">Click here to learn how to configure the node.</a>
 	</p>
+
 	<a href="https://www.paypal.me/techtoday" target="_blank"><img src='https://img.shields.io/badge/Donate-PayPal-blue.svg?style=flat-square' width='30%'></a>
 
 </script>

package/boolean-logic-ultimate/FilterUltimate.js

@@ -13,11 +13,9 @@ module.exports = function (RED) {
 		setNodeStatus({ fill: "grey", shape: "dot", text: "Waiting" });
 		this.on('input', function (msg) {
 
-			if (!msg.hasOwnProperty("topic")) {
-				msg.topic = node.config.name || "";
-			}
-			if (!msg.hasOwnProperty("payload" || msg.payload === undefined)) {
-				setNodeStatus({ fill: "red", shape: "dot", text: "No payload property from " + msg.topic });
+			// 15/11/2021 inform user about undefined topic or payload
+			if (!msg.hasOwnProperty("payload") || msg.payload === undefined || msg.payload === null) {
+				setNodeStatus({ fill: "red", shape: "dot", text: "Received invalid payload from " + msg.topic || "" });
 				return;
 			}
 
@@ -26,7 +24,7 @@ module.exports = function (RED) {
 				bRes = ToBoolean(msg.payload);
 			} catch (error) {
 			}
-			
+
 			if (bRes === undefined || bRes === null) {
 				setNodeStatus({ fill: "red", shape: "dot", text: "Received non convertible boolean value " + msg.payload + " from " + msg.topic });
 				return;
@@ -43,7 +41,7 @@ module.exports = function (RED) {
 				setNodeStatus({ fill: "green", shape: "dot", text: "(Send) false" });
 				node.send([null, msgOut]);
 			}
-			
+
 		});
 
 
@@ -56,6 +54,10 @@ module.exports = function (RED) {
 				res = value;
 			}
 			else if (typeof value === 'number' || typeof value === 'string') {
+
+				if (typeof value === "string" && value.toLowerCase() === "on") return true;
+				if (typeof value === "string" && value.toLowerCase() === "off") return false;
+
 				// Is it formated as a decimal number?
 				if (decimal.test(value)) {
 					var v = parseFloat(value);

package/boolean-logic-ultimate/ImpulseUltimate.html

@@ -75,26 +75,13 @@
 
 <script type="text/x-red" data-help-name="ImpulseUltimate">
 	<p>
-        <a href="https://www.paypal.me/techtoday" target="_blank"><img src='https://img.shields.io/badge/Donate-PayPal-blue.svg?style=flat-square' width='30%'></a>
-        
-	</p>
-	<p>
-		The node executes the commands you write in the JSON.<br/>
-		Avaiable commands are: send, wait (in milliseconds), restart (restarts the sequence) and // (for comment).<br/>
-		For example<br/><br/>
-		// Blink a light
-		send:true<br/>
-		wait:2000<br/>
-		send:false<br/>	
-		wait:2000<br/>
-		restart<br/>
-		For a complete list of avaiable commands, see the gitHub Homepage.
-	</div>		
-	</p>
+        SEE THE README FOR HELP CONFIGURING THE NODE
+    </p>
+
 	<p>
-	<b>Input Message</b><br/>
-	Send true to start executing the program<br/>
-	Send false to stop execution<br/>
+		<a href="https://github.com/Supergiovane/node-red-contrib-boolean-logic-ultimate" target="_blank">Click here to learn how to configure the node.</a>
 	</p>
+
+	<a href="https://www.paypal.me/techtoday" target="_blank"><img src='https://img.shields.io/badge/Donate-PayPal-blue.svg?style=flat-square' width='30%'></a>
 	
 </script>

package/boolean-logic-ultimate/InjectUltimate.html

@@ -77,13 +77,13 @@
 
 <script type="text/x-red" data-help-name="InjectUltimate">
     <p>
-        <a href="https://www.paypal.me/techtoday" target="_blank"><img src='https://img.shields.io/badge/Donate-PayPal-blue.svg?style=flat-square' width='30%'></a>
-        
+        SEE THE README FOR HELP CONFIGURING THE NODE
     </p>
-    
-    <p>This node sends TRUE on output 1, FALSE on putput 2 and a TOGGLED value (true/false) on output 3, on every click of the button.<br/>
-	The status indicator represents the output value.
-    </p>
-    <a href="https://www.paypal.me/techtoday" target="_blank"><img src='https://img.shields.io/badge/Donate-PayPal-blue.svg?style=flat-square' width='30%'></a>
+
+	<p>
+		<a href="https://github.com/Supergiovane/node-red-contrib-boolean-logic-ultimate" target="_blank">Click here to learn how to configure the node.</a>
+	</p>
+
+	<a href="https://www.paypal.me/techtoday" target="_blank"><img src='https://img.shields.io/badge/Donate-PayPal-blue.svg?style=flat-square' width='30%'></a>
 
 </script>

package/boolean-logic-ultimate/InterruptFlowUltimate.html

@@ -63,20 +63,13 @@
 
 <script type="text/x-red" data-help-name="InterruptFlowUltimate">
 	<p>
-        <a href="https://www.paypal.me/techtoday" target="_blank"><img src='https://img.shields.io/badge/Donate-PayPal-blue.svg?style=flat-square' width='30%'></a>
-       
+        SEE THE README FOR HELP CONFIGURING THE NODE
     </p>
-	<p>The meaning of this node is to interrupt/reactivate flow messages.<br/>
-	Normally, passes the input messages to the output. If you send a payload with a specific topic (you can set it on the node properties), the node stops sending output messages.<br/>
-	It can also save the last message received and play later. This is useful if you wish to restore previous state to, for example, a light actuator.<br/>
-	Please see the <a href="https://github.com/Supergiovane/node-red-contrib-boolean-logic-ultimate" target="_blank">README</a> on github for examples.
-	</p>
+
 	<p>
-	The node will stop output messages, if it receives a payload = false <b>from the specified topic</b>.<br/>
-	The node will resume output messages, if it receives a payload = true <b>from the specified topic</b>.<br/>
-	Other that that, as soon as you send payload = false <b>from the specified topic</b>, the node stores the last received payload internally
-	The node will output the current stored message plus an added property <b>isReplay</b> = true, if it receives a <b>play</b> = true from the specified topic.<br/>
+		<a href="https://github.com/Supergiovane/node-red-contrib-boolean-logic-ultimate" target="_blank">Click here to learn how to configure the node.</a>
 	</p>
+
 	<a href="https://www.paypal.me/techtoday" target="_blank"><img src='https://img.shields.io/badge/Donate-PayPal-blue.svg?style=flat-square' width='30%'></a>
 
 </script>

package/boolean-logic-ultimate/InterruptFlowUltimate.js

@@ -26,11 +26,21 @@ module.exports = function (RED) {
 				// 06/11/2019 
 				if (!msg.hasOwnProperty("topic") || msg.topic === undefined) msg.topic = "NoTopicReceived";
 				sIncomingTopic = msg.topic.replace(/[`~!@#$%^&*()_|+\-=?;:'",.<>\{\}\[\]\\\/]/gi, ''); // Cut unwanted Characters
-				if (sIncomingTopic == node.sTriggerTopic) {
-					if (msg.payload !== true && msg.payload !== false) {
-						setNodeStatus({ fill: "red", shape: "dot", text: "Received non boolean value from " + sIncomingTopic });
+				if (sIncomingTopic === node.sTriggerTopic) {
+
+					// 15/11/2021 inform user about undefined topic or payload
+					if (!msg.hasOwnProperty("payload") || msg.payload === undefined || msg.payload === null) {
+						setNodeStatus({ fill: "red", shape: "dot", text: "Received invalid payload from " + msg.topic || "" });
 						return;
 					}
+
+					msg.payload = ToBoolean(msg.payload); // 15/11/2021 Convert input to boolean.
+
+					// if (msg.payload !== true && msg.payload !== false) {
+					// 	setNodeStatus({ fill: "red", shape: "dot", text: "Received non boolean value from " + sIncomingTopic });
+					// 	return;
+					// }
+
 					if (msg.hasOwnProperty("play")) {
 						node.currentMsg.isReplay = true;
 						setNodeStatus({ fill: "yellow", shape: "dot", text: "-> replay" });
@@ -72,8 +82,11 @@ module.exports = function (RED) {
 				res = value;
 			}
 			else if (typeof value === 'number' || typeof value === 'string') {
-				// Is it formated as a decimal number?
 
+				if (typeof value === "string" && value.toLowerCase() === "on") return true;
+				if (typeof value === "string" && value.toLowerCase() === "off") return false;
+
+				// Is it formated as a decimal number?
 				if (decimal.test(value)) {
 					var v = parseFloat(value);
 					res = v != 0;

package/boolean-logic-ultimate/InvertUltimate.html

@@ -34,13 +34,13 @@
 
 <script type="text/x-red" data-help-name="InvertUltimate">
     <p>
-        <a href="https://www.paypal.me/techtoday" target="_blank"><img src='https://img.shields.io/badge/Donate-PayPal-blue.svg?style=flat-square' width='30%'></a>
-
-    </p>
-    
-    <p>A node that emits the inverted input value.<br/>
-	The status indicator represents the output value.
+        SEE THE README FOR HELP CONFIGURING THE NODE
     </p>
-    <a href="https://www.paypal.me/techtoday" target="_blank"><img src='https://img.shields.io/badge/Donate-PayPal-blue.svg?style=flat-square' width='30%'></a>
+
+	<p>
+		<a href="https://github.com/Supergiovane/node-red-contrib-boolean-logic-ultimate" target="_blank">Click here to learn how to configure the node.</a>
+	</p>
+
+	<a href="https://www.paypal.me/techtoday" target="_blank"><img src='https://img.shields.io/badge/Donate-PayPal-blue.svg?style=flat-square' width='30%'></a>
 
 </script>

package/boolean-logic-ultimate/InvertUltimate.js

@@ -14,32 +14,34 @@ module.exports = function (RED) {
 
 		this.on('input', function (msg) {
 
-			if (msg.hasOwnProperty("payload") && msg.payload !== undefined && msg.payload !== null) {
 
-				// 11/11/2021 Clone input message and replace only relevant topics
+			// 15/11/2021 inform user about undefined topic or payload
+			if (!msg.hasOwnProperty("payload") || msg.payload === undefined || msg.payload === null) {
+				setNodeStatus({ fill: "red", shape: "dot", text: "Received invalid payload from " + msg.topic || "" });
+				return;
+			}
 
-				var bRes = null;
-				try {
-					bRes = ToBoolean(msg.payload);
-				} catch (error) {
-				}
-				if (bRes === undefined || bRes === null) {
-					setNodeStatus({ fill: "red", shape: "dot", text: "Received non convertible boolean value " + msg.payload + " from " + msg.topic });
-					return;
-				}
 
-				var msgOUt = RED.util.cloneMessage(msg);
-				try {
-					msgOUt.payload = !bRes;
-					setNodeStatus({ fill: "green", shape: "dot", text: "(Send) " + msgOUt.payload });
-					node.send(msgOUt);
-				} catch (error) {
-					setNodeStatus({ fill: "red", shape: "dot", text: "Unable to invert the input payload " + bRes });
-				}
+			// 11/11/2021 Clone input message and replace only relevant topics
+			var bRes = null;
+			try {
+				bRes = ToBoolean(msg.payload);
+			} catch (error) {
+			}
+			if (bRes === undefined || bRes === null) {
+				setNodeStatus({ fill: "red", shape: "dot", text: "Received non convertible boolean value " + msg.payload + " from " + msg.topic });
+				return;
+			}
 
-			} else {
-				setNodeStatus({ fill: "red", shape: "dot", text: "No payload from " + msg.topic });
+			var msgOUt = RED.util.cloneMessage(msg);
+			try {
+				msgOUt.payload = !bRes;
+				setNodeStatus({ fill: "green", shape: "dot", text: "(Send) " + msgOUt.payload });
+				node.send(msgOUt);
+			} catch (error) {
+				setNodeStatus({ fill: "red", shape: "dot", text: "Unable to invert the input payload " + bRes });
 			}
+
 		});
 
 
@@ -52,6 +54,10 @@ module.exports = function (RED) {
 				res = value;
 			}
 			else if (typeof value === 'number' || typeof value === 'string') {
+
+				if (typeof value === "string" && value.toLowerCase() === "on") return true;
+				if (typeof value === "string" && value.toLowerCase() === "off") return false;
+
 				// Is it formated as a decimal number?
 				if (decimal.test(value)) {
 					var v = parseFloat(value);

package/boolean-logic-ultimate/SimpleOutputUltimate.html

@@ -46,14 +46,14 @@
 </script>
 
 <script type="text/x-red" data-help-name="SimpleOutputUltimate">
-    <p>
-        <a href="https://www.paypal.me/techtoday" target="_blank"><img src='https://img.shields.io/badge/Donate-PayPal-blue.svg?style=flat-square' width='30%'></a>
-        
+	<p>
+        SEE THE README FOR HELP CONFIGURING THE NODE
     </p>
-    
-    <p>This node replaces the input payload by sendind a message with payload TRUE on output 1 and FALSE on output 2.<br/>
-	
-    </p>
-    <a href="https://www.paypal.me/techtoday" target="_blank"><img src='https://img.shields.io/badge/Donate-PayPal-blue.svg?style=flat-square' width='30%'></a>
+
+	<p>
+		<a href="https://github.com/Supergiovane/node-red-contrib-boolean-logic-ultimate" target="_blank">Click here to learn how to configure the node.</a>
+	</p>
+
+	<a href="https://www.paypal.me/techtoday" target="_blank"><img src='https://img.shields.io/badge/Donate-PayPal-blue.svg?style=flat-square' width='30%'></a>
 
 </script>

package/boolean-logic-ultimate/StatusUltimate.html

@@ -41,13 +41,14 @@
 </script>
 
 <script type="text/x-red" data-help-name="StatusUltimate">
-    <p>
-        <a href="https://www.paypal.me/techtoday" target="_blank"><img src='https://img.shields.io/badge/Donate-PayPal-blue.svg?style=flat-square' width='30%'></a>
-        
-    </p>
-    
-    <p>This node simply shows the status of the selected msg property<br/>
-	
+	<p>
+        SEE THE README FOR HELP CONFIGURING THE NODE
     </p>
+
+	<p>
+		<a href="https://github.com/Supergiovane/node-red-contrib-boolean-logic-ultimate" target="_blank">Click here to learn how to configure the node.</a>
+	</p>
+
+	<a href="https://www.paypal.me/techtoday" target="_blank"><img src='https://img.shields.io/badge/Donate-PayPal-blue.svg?style=flat-square' width='30%'></a>
     
 </script>

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "node-red-contrib-boolean-logic-ultimate",
-    "version": "1.0.36",
+    "version": "1.0.40",
     "description": "A set of Node-RED enhanced boolean logic node, flow interruption node, blinker node, invert node, filter node, with persisten values after reboot and more.",
     "author": "Supergiovane (https://github.com/Supergiovane)",
     "dependencies": {