node-red-contrib-boolean-logic-ultimate 1.1.12 → 1.1.15

package/CHANGELOG.md

@@ -3,9 +3,17 @@
 
 # CHANGELOG
 
+<p>
+<b>Version 1.1.15</b> August 2024<br/>
+- Railway Switcher: now you can choose between 5 different output instead of 2.</br>
+</p>
+<p>
+<b>Version 1.1.14</b> Mai 2024<br/>
+- FIX: inject node: fixed an error in JSON.parse.</br>
+</p>
 <p>
 <b>Version 1.1.12</b> Mai 2024<br/>
-- FIX: fixed the empty JSON for old injectUltimate nodes.</br>
+- FIX: inject node: fixed the empty JSON for old injectUltimate nodes.</br>
 </p>
 <p>
 <b>Version 1.1.11</b> Mai 2024<br/>

package/README.md

@@ -428,27 +428,57 @@ Any message that arrives on input, will be passwd through to the output with the
 
 # RAILWAY SWITCH ULTIMATE
 
-The railway switcher, switches the input msg flow to one ot the two outputs (upper or lower).
+The railway switcher, redirect the incoming messages to one ot the avaiable output pins, just like a railway jinction switch.
 
 <img src='https://raw.githubusercontent.com/Supergiovane/node-red-contrib-boolean-logic-ultimate/master/img/railroadSwitchScambio.png' width='80%'>
 
 ### NODE CONFIGURATION
 
+
 |Property|Description|
 |--|--|
-| Switcher topic | Whenever the node receives a payload from this **topic**, it switches the input messages to an output. |
+| Switcher topic | Whenever the node receives a payload from this **topic**, it redirects the input messages to a choosen output PIN. |
 | With 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"* |
-| Then | This property, allow you to auto toggle the selected start state after some time. |
+| Translator | Translates the incoming <code>payload</code> value. This allows the compatibility with, for example, **HomeAssistant** nodes. |
 
-<br/>
+### Inputs
 
-</br>
-</br>
+The *Switcher topic* controls where the railway switch must be switched, between the output PINs.  
+Once an output PIN has been choosen, all messages passing through the node will be deviated to te choosen output PIN.
 
-**INPUT MSG WITH "TRIGGER" TOPIC**
+: topic (string|number) : this is the topic of the switcher message.
+: payload (number|boolean) : this is the ouput PIN selector, base 0 (0 is the first output PIN). 
 
-Pass <code>msg.payload = false</code> switches the msg input to the UPPER output</br>
-Pass <code>msg.payload = true</code> switches the msg input to the LOWER output</br>
+### JSON switcher message
+
+Take the example where you choosen such properties:  
+**Switcher topic**: "switcher"  
+**With Input**: "payload"  
+this JSON input message redirects all input messages to the first PIN  
+
+```json
+{
+	topic:"switcher",
+	payload:0
+}
+```
+this JSON input message redirects all input messages to the second PIN  
+ 
+```json
+{
+	topic:"switcher",
+	payload:1
+}
+```
+
+this JSON input message redirects all input messages to the third PIN, and so on... 
+ 
+```json
+{
+	topic:"switcher",
+	payload:2
+}
+```
 
 </br>
 
@@ -458,7 +488,7 @@ See the example below.<br/>
 
 Copy and paste it into your flow
 ```javascript
-[{"id":"a6993d5187f05c0a","type":"RailwaySwitchUltimate","z":"e5b506b72b42922e","name":"Railway Switch","triggertopic":"trigger","initializewith":"0","autoToggle":"0","x":490,"y":180,"wires":[["51e7df8da0bd8d67"],["7f33b14e12c91744"]]},{"id":"2e3014226290f678","type":"InjectUltimate","z":"e5b506b72b42922e","name":"Sample message","topic":"Train","curVal":true,"x":180,"y":140,"wires":[["a6993d5187f05c0a"],[],[]]},{"id":"f6f80cd77a65073e","type":"InjectUltimate","z":"e5b506b72b42922e","name":"Railway switcher","topic":"trigger","curVal":true,"x":180,"y":220,"wires":[[],[],["a6993d5187f05c0a"]]},{"id":"51e7df8da0bd8d67","type":"debug","z":"e5b506b72b42922e","name":"Upper railway","active":true,"tosidebar":true,"console":false,"tostatus":true,"complete":"true","targetType":"full","statusVal":"topic","statusType":"msg","x":720,"y":140,"wires":[]},{"id":"7f33b14e12c91744","type":"debug","z":"e5b506b72b42922e","name":"Lower railway","active":true,"tosidebar":true,"console":false,"tostatus":true,"complete":"true","targetType":"full","statusVal":"topic","statusType":"msg","x":720,"y":220,"wires":[]},{"id":"8716120e94a7b6ee","type":"comment","z":"e5b506b72b42922e","name":"Switch between railways","info":"","x":190,"y":80,"wires":[]}]
+[{"id":"8243309f7c926112","type":"RailwaySwitchUltimate","z":"aa3efc585a6c7b9b","name":"Railway Switch","triggertopic":"switcher","initializewith":"3","payloadPropName":"payload","translatorConfig":"","x":350,"y":260,"wires":[["7f5a2c19a9ef64c8"],["5a35a650b225d910"],[],[],[]]},{"id":"d7bbc077bc20f4ea","type":"InjectUltimate","z":"aa3efc585a6c7b9b","name":"Junction switcher to Rail 0","topic":"","curVal":true,"outputJSON":"{ \n\t\"payload\":0,\n\t\"topic\":\"switcher\"\n}","x":350,"y":80,"wires":[[],[],[],["8243309f7c926112"]]},{"id":"5656d0c2ba66ed5e","type":"InjectUltimate","z":"aa3efc585a6c7b9b","name":"Junction switcher to Rail 1","topic":"","curVal":true,"outputJSON":"{ \n\t\"payload\":\"1\",\n\t\"topic\":\"switcher\"\n}","x":350,"y":160,"wires":[[],[],[],["8243309f7c926112"]]},{"id":"2253336fa8374c78","type":"InjectUltimate","z":"aa3efc585a6c7b9b","name":"Train","topic":"","curVal":true,"outputJSON":"{ \n\t\"payload\":\"hello\",\n\t\"topic\":\"I'm a train!\"\n}","x":110,"y":280,"wires":[["8243309f7c926112"],[],[],[]]},{"id":"7f5a2c19a9ef64c8","type":"debug","z":"aa3efc585a6c7b9b","name":"Rail 0","active":true,"tosidebar":true,"console":false,"tostatus":true,"complete":"payload","targetType":"msg","statusVal":"payload","statusType":"auto","x":590,"y":260,"wires":[]},{"id":"5a35a650b225d910","type":"debug","z":"aa3efc585a6c7b9b","name":"Rail 1","active":true,"tosidebar":true,"console":false,"tostatus":true,"complete":"payload","targetType":"msg","statusVal":"payload","statusType":"auto","x":590,"y":300,"wires":[]}]
 ```
 
 

package/boolean-logic-ultimate/InjectUltimate.js

@@ -33,14 +33,15 @@ module.exports = function (RED) {
 			let msgFalse = { payload: false, topic: node.topic };
 			let msgToggled = { payload: node.curVal, topic: node.topic };
 			node.curVal = !node.curVal;
+			let jRet;
 			try {
-				node.outputJSON = JSON.parse(node.outputJSON);
+				jRet = JSON.parse(node.outputJSON);
 				if (node.outputJSON.topic === undefined) node.outputJSON.topic = node.topic; // Add topic if not present
 			} catch (error) {
 				setNodeStatus({ fill: "red", shape: "dot", text: "JSON error " + error.trace });
 				RED.log.error("injectUltimate: node.outputJSON = JSON.parse(node.outputJSON) error:" + error.trace);
 			}
-			node.send([msgTrue, msgFalse, msgToggled, node.outputJSON]);
+			node.send([msgTrue, msgFalse, msgToggled, jRet]);
 		}
 
 		function setNodeStatus({ fill, shape, text }) {

package/boolean-logic-ultimate/RailwaySwitchUltimate.html

@@ -4,26 +4,15 @@
 		color: '#ff8080',
 		defaults: {
 			name: { value: "Railway Switch" },
-			triggertopic: { value: "trigger" },
-			initializewith: { value: "0" },
-			autoToggle: { value: "0" },
+			triggertopic: { value: "switcher" },
+			initializewith: { value: "1" },
 			payloadPropName: { value: "payload", required: false },
-			translatorConfig: { type: "translator-config", required: false }			
+			translatorConfig: { type: "translator-config", required: false }
 		},
 		inputs: 1,
-		outputs: 2,
+		outputs: 5,
 		outputLabels: function (i) {
-			var ret = "";
-			switch (i) {
-				case 0:
-					return "Upper PIN";
-					break;
-				case 1:
-					return "Lower PIN";
-					break;
-				default:
-					break;
-			}
+			return "PIN " + i;
 		},
 		icon: "font-awesome/fa-train",
 		label:
@@ -60,59 +49,72 @@
         <label for="node-input-payloadPropName"><i class="fa fa-ellipsis-h"></i> With Input</label>
 		<input type="text" id="node-input-payloadPropName">
     </div>
-	<div><i>An input msg having this topic and msg true or false<br/>will trigger the railway switch between the two output PINs<br/>
-		false switches to the upper PIN<br/>
-		true switches to the lower PIN<br/>
-	</i></div>
-	<br/>
 	<div class="form-row">
         <label style="width:160px" for="node-input-initializewith"><i class="fa fa-home"></i> At node-red start</label>
         <select type="text" id="node-input-initializewith" placeholder="" style="width:250px">
-			<option value="0">Flow messages to the upper PIN</option>
-			<option value="1">Flow messages to the lower PIN</option>			
+			<option value="0">PIN 0</option>
+			<option value="1">PIN 1</option>			
+			<option value="2">PIN 2</option>
+			<option value="3">PIN 3</option>
+			<option value="4">PIN 4</option>
 		</select>	
 	</div>
 	<div class="form-row">
-		<label style="width:160px" for="node-input-autoToggle"><i class="fa fa-hourglass-o"></i> Then</label>
-		<select type="text" id="node-input-autoToggle" placeholder="" style="width:250px">
-			<option value="0">Nothing</option>
-			<option value="10">Toggle above option after 10 seconds</option>
-			<option value="20">Toggle above option after 20 seconds</option>
-			<option value="30">Toggle above option after 30 seconds</option>
-			<option value="40">Toggle above option after 40 seconds</option>
-			<option value="50">Toggle above option after 50 seconds</option>
-			<option value="60">Toggle above option after 60 seconds</option>
-			<option value="90">Toggle above option after 90 seconds</option>
-			<option value="120">Toggle above option after 120 seconds</option>
-		</select>
-	</div>
-	<div class="form-row">
-		<br />
-		<b>Translator</b>
-		<br />
 		<label for="node-input-translatorConfig">
-			<font color="green" size="4px"><i class="fa fa-sign-in" aria-hidden="true"></i></font> Input
+			<font color="green" size="4px"><i class="fa fa-sign-in" aria-hidden="true"></i></font> Translator
 		</label>
 		<input type="text" id="node-input-translatorConfig" />
 	</div>
 </script>
 
 <script type="text/markdown" data-help-name="RailwaySwitchUltimate">
-<p>The railway switcher, switches the input msg flow to one ot the two outputs (upper or lower).</p>
+<p>The railway switcher, redirect the incoming messages to one ot the avaiable output pins, just like a railway jinction switch.</p>
 
 |Property|Description|
 |--|--|
-| Switcher topic | Whenever the node receives a payload from this **topic**, it switches the input messages to an output. |
+| Switcher topic | Whenever the node receives a payload from this **topic**, it redirects the input messages to a choosen output PIN. |
 | With 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"* |
-| Then | This property, allow you to auto toggle the selected start state after some time. |
-| Translator Input | Translates the incoming <code>payload</code> value, to true/false. This allows the compatibility with, for example, **HomeAssistant** nodes. |
+| Translator | Translates the incoming <code>payload</code> value. This allows the compatibility with, for example, **HomeAssistant** nodes. |
+
+### Inputs
+
+The *Switcher topic* controls where the railway switch must be switched, between the output PINs.  
+Once an output PIN has been choosen, all messages passing through the node will be deviated to te choosen output PIN.
+
+: topic (string|number) : this is the topic of the switcher message.
+: payload (number|boolean) : this is the ouput PIN selector, base 0 (0 is the first output PIN). 
+
+### JSON switcher message
+
+Take the example where you choosen such properties:  
+**Switcher topic**: "switcher"  
+**With Input**: "payload"  
+this JSON input message redirects all input messages to the first PIN  
 
-* Input messages
+```json
+{
+	topic:"switcher",
+	payload:0
+}
+```
+this JSON input message redirects all input messages to the second PIN  
+ 
+```json
+{
+	topic:"switcher",
+	payload:1
+}
+```
 
-Explanation of the input msg, having the <code>msg.topic</code> equal to the *Switcher by topic* property:
+this JSON input message redirects all input messages to the third PIN, and so on... 
+ 
+```json
+{
+	topic:"switcher",
+	payload:2
+}
+```
 
-Pass <code>msg.payload = false</code> switches the msg input to the UPPER output</br>
-Pass <code>msg.payload = true</code> switches the msg input to the LOWER output</br>
 
 <br/>
 

package/boolean-logic-ultimate/RailwaySwitchUltimate.js

@@ -8,11 +8,8 @@ module.exports = function (RED) {
       node.config.triggertopic.replace(
         /[`~!@#$%^&*()_|+\-=?;:'",.<>\{\}\[\]\\\/]/gi,
         ""
-      ) || "trigger"; // Topic controlling the iRailway
-    node.iRailway = Number(node.config.initializewith); // Railway selector
-    node.autoToggle =
-      config.autoToggle === undefined ? 0 : parseInt(config.autoToggle); // Auto toggle the selected "initializewith" after a while (useful for homekit bridged, that sends junk after start)
-    node.timerAutoToggle = null;
+      ) || "trigger"; // Topic controlling the sRailway
+    node.sRailway = String(node.config.initializewith); // Railway selector
 
     function setNodeStatus({ fill, shape, text }) {
       let dDate = new Date();
@@ -30,30 +27,13 @@ module.exports = function (RED) {
     }
 
     node.alignStatus = () => {
-      let sAutoToggle =
-        node.autoToggle > 0 ? " (Autotoggle in " + node.autoToggle + "s)" : "";
-      if (node.iRailway === 0) {
-        setNodeStatus({
-          fill: "green",
-          shape: "dot",
-          text: "-> UPPER PIN" + sAutoToggle,
-        });
-      } else {
-        setNodeStatus({
-          fill: "blue",
-          shape: "dot",
-          text: "-> LOWER PIN" + sAutoToggle,
-        });
-      }
-    };
+      setNodeStatus({
+        fill: "green",
+        shape: "dot",
+        text: "-> PIN " + node.sRailway,
+      });
 
-    if (node.autoToggle > 0) {
-      node.timerAutoToggle = setTimeout(() => {
-        node.autoToggle = 0;
-        node.iRailway === 0 ? (node.iRailway = 1) : (node.iRailway = 0);
-        node.alignStatus();
-      }, node.autoToggle * 1000);
-    }
+    };
 
     node.alignStatus();
 
@@ -83,36 +63,29 @@ module.exports = function (RED) {
             });
             return;
           }
-
-          msg.payload = utils.ToBoolean(
+          sPayload = String(sPayload); // Must be always a string
+          msg.payload = utils.ToAny(
             sPayload,
             RED.nodes.getNode(config.translatorConfig) // Retrieve the config node. It can be null, but it's handled in utils.js;
-          ); 
+          );
           if (msg.payload === undefined) return null;
-          if (node.timerAutoToggle !== null)
-            // 28/01/2022 Stop autotoggle
-            clearInterval(node.timerAutoToggle);
 
-          if (msg.payload === false) node.iRailway = 0;
-          if (msg.payload === true) node.iRailway = 1;
-          if (node.iRailway === 0) {
-            setNodeStatus({
-              fill: "green",
-              shape: "dot",
-              text: "-> UPPER PIN",
-            });
-          } else {
-            setNodeStatus({ fill: "blue", shape: "dot", text: "-> LOWER PIN" });
-          }
+          // Backward compatibility
+          // Pass msg.payload = false switches the msg input to the UPPER output
+          // Pass msg.payload = true switches the msg input to the LOWER output
+          if (msg.payload === false) msg.payload = '0';
+          if (msg.payload === true) msg.payload = '1';
+          node.sRailway = msg.payload;
+          node.alignStatus();
           return; // DONT'S SEND THIS MESSAGE
         }
       }
       node.currentMsg = RED.util.cloneMessage(msg);
-      if (node.iRailway === 0) {
-        node.send([msg, null]);
-      } else {
-        node.send([null, msg]);
-      }
+      if (node.sRailway === "0") node.send([msg, null, null, null, null]);
+      if (node.sRailway === "1") node.send([null, msg, null, null, null]);
+      if (node.sRailway === "2") node.send([null, null, msg, null, null]);
+      if (node.sRailway === "3") node.send([null, null, null, msg, null]);
+      if (node.sRailway === "4") node.send([null, null, null, null, msg]);
     });
   }
 

package/boolean-logic-ultimate/utils.js

@@ -14,7 +14,7 @@ module.exports.ToBoolean = function ToBoolean(value, _configTranslationNode) {
       }
       for (let index = 0; index < translationTable.length; index++) {
         let inputPayloadToBeTranslated = translationTable[index].split(":")[0];
-        let outputBoolean = Boolean(translationTable[index].split(":")[1]);
+        //let outputBoolean = Boolean(translationTable[index].split(":")[1]);
         if (
           value.toLowerCase() === inputPayloadToBeTranslated.toLowerCase() &&
           inputPayloadToBeTranslated.toLowerCase() !== ""
@@ -38,6 +38,33 @@ module.exports.ToBoolean = function ToBoolean(value, _configTranslationNode) {
   }
 };
 
+module.exports.ToAny = function ToAny(value, _configTranslationNode) {
+
+  try {
+    let translationTable = [];
+    if (_configTranslationNode === null) {
+      // Don't do translation, because the default translation input may contin unwanted translations
+      return value;
+    } else {
+      translationTable = _configTranslationNode.commandText.split("\n");
+    }
+    for (let index = 0; index < translationTable.length; index++) {
+      let inputPayloadToBeTranslated = translationTable[index].split(":")[0];
+      //let outputBoolean = Boolean(translationTable[index].split(":")[1]);
+      if (
+        String(value).toLowerCase() === inputPayloadToBeTranslated.toLowerCase() &&
+        inputPayloadToBeTranslated.toLowerCase() !== ""
+      ) {
+        return translationTable[index].split(":")[1];
+      }
+    }
+    return value;
+  } catch (error) {
+    console.log("Boolean-Logic-Ultimate:utils:toAny: " + error.message);
+  }
+
+};
+
 module.exports.fetchFromObject = function fetchFromObject(
   _msg,
   _payloadPropName

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "node-red-contrib-boolean-logic-ultimate",
-    "version": "1.1.12",
+    "version": "1.1.15",
     "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": {