smart-nodes 0.3.15 → 0.3.26

package/hysteresis/hysteresis.js

@@ -1,36 +1,39 @@
-
 module.exports = function (RED)
 {
+    "use strict";
+
     function HysteresisNode(config)
     {
         const node = this;
         RED.nodes.createNode(node, config);
 
-        const smartContext = require("../persistence.js")(RED);
+        const smart_context = require("../persistence.js")(RED);
         const helper = require("../smart_helper.js");
 
-        var nodeSettings = {
+        var node_settings = {
             active: null,
-            lastMessage: null,
+            last_message: null,
+            setpoint: parseFloat(config.setpoint),
+            hysteresis: parseFloat(config.hysteresis)
         };
 
         if (config.save_state)
         {
             // load old saved values
-            nodeSettings = Object.assign(nodeSettings, smartContext.get(node.id));
+            node_settings = Object.assign(node_settings, smart_context.get(node.id));
 
-            switch (nodeSettings.active)
+            switch (node_settings.active)
             {
                 case true:
-                    node.status({ fill: "green", shape: "dot", text: (new Date()).toLocaleString() + ": Load last state: Higher" });
+                    node.status({ fill: "green", shape: "dot", text: helper.getCurrentTimeForStatus() + ": Load last state: Higher" });
                     break;
 
                 case false:
-                    node.status({ fill: "red", shape: "dot", text: (new Date()).toLocaleString() + ": Load last state: Lower" });
+                    node.status({ fill: "red", shape: "dot", text: helper.getCurrentTimeForStatus() + ": Load last state: Lower" });
                     break;
 
                 default:
-                    node.status({ fill: "yellow", shape: "ring", text: (new Date()).toLocaleString() + ": No last state available" });
+                    node.status({ fill: "yellow", shape: "ring", text: helper.getCurrentTimeForStatus() + ": No last state available" });
                     break;
             }
         }
@@ -38,12 +41,10 @@ module.exports = function (RED)
         {
             // delete old saved values
             node.status({});
-            smartContext.del(node.id);
+            smart_context.del(node.id);
         }
 
         // dynamic config
-        let setpoint = parseFloat(config.setpoint);
-        let hysteresis = parseFloat(config.hysteresis);
         let out_higher = helper.evaluateNodeProperty(RED, config.out_higher, config.out_higher_type);
         let out_lower = helper.evaluateNodeProperty(RED, config.out_lower, config.out_lower_type);
 
@@ -52,75 +53,75 @@ module.exports = function (RED)
         node.on("input", function (msg)
         {
             let value = parseFloat(msg.payload);
-            let realTopic = helper.getTopicName(msg.topic);
+            let real_topic = helper.getTopicName(msg.topic);
 
-            if (isNaN(value) && realTopic !== "resend")
+            if (isNaN(value) && real_topic !== "resend")
             {
                 // node.error("Invalid payload: " + msg.payload);
                 return;
             }
 
-            switch (realTopic)
+            switch (real_topic)
             {
                 case "setpoint":
-                    setpoint = value;
-                    node.status({ fill: nodeSettings.active ? "green" : "red", shape: "ring", text: (new Date()).toLocaleString() + ": New setpoint: " + value + "" });
+                    node_settings.setpoint = value;
+                    node.status({ fill: node_settings.active ? "green" : "red", shape: "ring", text: helper.getCurrentTimeForStatus() + ": New setpoint: " + value + "" });
 
                     if (config.save_state)
-                        smartContext.set(node.id, nodeSettings);
+                        smart_context.set(node.id, node_settings);
                     break;
 
                 case "hysteresis":
-                    hysteresis = value;
-                    node.status({ fill: nodeSettings.active ? "green" : "red", shape: "ring", text: (new Date()).toLocaleString() + ": New hysteresis: " + value + "" });
+                    node_settings.hysteresis = value;
+                    node.status({ fill: node_settings.active ? "green" : "red", shape: "ring", text: helper.getCurrentTimeForStatus() + ": New hysteresis: " + value + "" });
 
                     if (config.save_state)
-                        smartContext.set(node.id, nodeSettings);
+                        smart_context.set(node.id, node_settings);
                     break;
 
                 case "resend":
-                    if (nodeSettings.active === true && nodeSettings.lastMessage != null)
+                    if (node_settings.active === true && node_settings.last_message != null)
                     {
-                        node.status({ fill: "green", shape: "dot", text: (new Date()).toLocaleString() + ": Resend higher value" });
-                        node.send([nodeSettings.lastMessage, null]);
+                        node.status({ fill: "green", shape: "dot", text: helper.getCurrentTimeForStatus() + ": Resend higher value" });
+                        node.send([node_settings.last_message, null]);
                     }
-                    else if (nodeSettings.active === false && nodeSettings.lastMessage != null)
+                    else if (node_settings.active === false && node_settings.last_message != null)
                     {
-                        node.status({ fill: "red", shape: "dot", text: (new Date()).toLocaleString() + ": Resend lower value" });
-                        node.send([null, nodeSettings.lastMessage]);
+                        node.status({ fill: "red", shape: "dot", text: helper.getCurrentTimeForStatus() + ": Resend lower value" });
+                        node.send([null, node_settings.last_message]);
                     }
                     else
                     {
-                        node.status({ fill: "yellow", shape: "ring", text: (new Date()).toLocaleString() + ": No resend, state is unknown" });
+                        node.status({ fill: "yellow", shape: "ring", text: helper.getCurrentTimeForStatus() + ": No resend, state is unknown" });
                     }
                     break;
 
                 default:
-                    if (value >= setpoint + hysteresis && nodeSettings.active !== true)
+                    if (value >= node_settings.setpoint + node_settings.hysteresis && node_settings.active !== true)
                     {
-                        node.status({ fill: "green", shape: "dot", text: (new Date()).toLocaleString() + ": Turned higher by value " + value + "" });
-                        nodeSettings.active = true;
-                        nodeSettings.lastMessage = out_higher ?? msg;
+                        node.status({ fill: "green", shape: "dot", text: helper.getCurrentTimeForStatus() + ": Turned higher by value " + value + "" });
+                        node_settings.active = true;
+                        node_settings.last_message = createMessage(out_higher ?? msg, value);
 
                         if (config.save_state)
-                            smartContext.set(node.id, nodeSettings);
+                            smart_context.set(node.id, node_settings);
 
-                        node.send([nodeSettings.lastMessage, null]);
+                        node.send([node_settings.last_message, null]);
                     }
-                    else if (value <= setpoint - hysteresis && nodeSettings.active !== false)
+                    else if (value <= node_settings.setpoint - node_settings.hysteresis && node_settings.active !== false)
                     {
-                        node.status({ fill: "red", shape: "dot", text: (new Date()).toLocaleString() + ": Turned lower by value " + value + "" });
-                        nodeSettings.active = false;
-                        nodeSettings.lastMessage = out_lower ?? msg;
+                        node.status({ fill: "red", shape: "dot", text: helper.getCurrentTimeForStatus() + ": Turned lower by value " + value + "" });
+                        node_settings.active = false;
+                        node_settings.last_message = createMessage(out_lower ?? msg, value);
 
                         if (config.save_state)
-                            smartContext.set(node.id, nodeSettings);
+                            smart_context.set(node.id, node_settings);
 
-                        node.send([null, nodeSettings.lastMessage]);
+                        node.send([null, node_settings.last_message]);
                     }
                     else
                     {
-                        node.status({ fill: nodeSettings.active ? "green" : "red", shape: "ring", text: (new Date()).toLocaleString() + ": No change by value " + value + "" });
+                        node.status({ fill: node_settings.active ? "green" : "red", shape: "ring", text: helper.getCurrentTimeForStatus() + ": No change by value " + value + "" });
                     }
                     break;
             }
@@ -130,14 +131,26 @@ module.exports = function (RED)
         {
         });
 
-        if (config.save_state && config.resend_on_start && nodeSettings.active != null && nodeSettings.lastMessage != null)
+        let createMessage = (msg, value) =>
+        {
+            return Object.assign({}, msg, {
+                smart_info: {
+                    active: node_settings.active,
+                    hysteresis: node_settings.hysteresis,
+                    setpoint: node_settings.setpoint,
+                    last_value: value
+                }
+            })
+        };
+
+        if (config.save_state && config.resend_on_start && node_settings.active != null && node_settings.last_message != null)
         {
             setTimeout(() =>
             {
-                if (nodeSettings.active)
-                    node.send([nodeSettings.lastMessage, null]);
+                if (node_settings.active)
+                    node.send([node_settings.last_message, null]);
                 else
-                    node.send([null, nodeSettings.lastMessage]);
+                    node.send([null, node_settings.last_message]);
             }, 10000);
         }
     }

package/light-control/light-control.js

@@ -1,11 +1,13 @@
 module.exports = function (RED)
 {
+    "use strict";
+
     function LightControlNode(config)
     {
         const node = this;
         RED.nodes.createNode(node, config);
 
-        const smartContext = require("../persistence.js")(RED);
+        const smart_context = require("../persistence.js")(RED);
         const helper = require("../smart_helper.js");
 
         // used from text-exec node
@@ -15,9 +17,9 @@ module.exports = function (RED)
             node.exec_text_names = [];
 
         // persistent values
-        var nodeSettings = Object.assign({}, {
+        var node_settings = Object.assign({}, {
             last_value: false,
-        }, smartContext.get(node.id));
+        }, smart_context.get(node.id));
 
         // dynamic config
         let max_time_on = helper.getTimeInMs(config.max_time_on, config.max_time_on_unit);
@@ -27,7 +29,7 @@ module.exports = function (RED)
         let max_time_on_timeout = null;
         let isPermanent = false;
         let isMotion = false;
-        let current_timeout_ms = 0;
+        let timeout_end_date = null;
         let alarm_active = false;
 
         // central handling
@@ -44,7 +46,7 @@ module.exports = function (RED)
             handleTopic(msg);
 
             setStatus();
-            smartContext.set(node.id, nodeSettings);
+            smart_context.set(node.id, node_settings);
         });
 
         node.on("close", function ()
@@ -62,9 +64,11 @@ module.exports = function (RED)
                 case "status":
                     // Make sure it is bool
                     msg.payload = !!msg.payload;
-                    doRestartTimer = nodeSettings.last_value != msg.payload;
 
-                    nodeSettings.last_value = msg.payload;
+                    if (node_settings.last_value == msg.payload && max_time_on_timeout != null)
+                        doRestartTimer = false;
+
+                    node_settings.last_value = msg.payload;
                     break;
 
                 case "off":
@@ -72,7 +76,7 @@ module.exports = function (RED)
                     if (msg.payload === false)
                         return;
 
-                    nodeSettings.last_value = false;
+                    node_settings.last_value = false;
                     break;
 
                 case "on":
@@ -80,19 +84,19 @@ module.exports = function (RED)
                     if (msg.payload === false)
                         return;
 
-                    nodeSettings.last_value = true;
+                    node_settings.last_value = true;
                     break;
 
                 case "set":
                     // Make sure it is bool
                     msg.payload = !!msg.payload;
-                    nodeSettings.last_value = msg.payload;
+                    node_settings.last_value = msg.payload;
                     break;
 
                 case "set_permanent":
                     // Make sure it is bool
                     msg.payload = !!msg.payload;
-                    nodeSettings.last_value = msg.payload;
+                    node_settings.last_value = msg.payload;
                     isPermanent = msg.payload;
                     break;
 
@@ -104,16 +108,16 @@ module.exports = function (RED)
                     if (msg.payload == false)
                     {
                         // It already was off, so don't turn on
-                        if (nodeSettings.last_value == false)
+                        if (node_settings.last_value == false)
                             return;
 
                         // If time is set to 0, then turn off immediately
                         if (helper.getTimeInMsFromString(msg.time_on ?? max_time_on) == 0)
-                            nodeSettings.last_value = false;
+                            node_settings.last_value = false;
                     }
                     else
                     {
-                        nodeSettings.last_value = true;
+                        node_settings.last_value = true;
                     }
                     break;
 
@@ -129,7 +133,7 @@ module.exports = function (RED)
                     if (msg.payload === false)
                         return;
 
-                    nodeSettings.last_value = !nodeSettings.last_value;
+                    node_settings.last_value = !node_settings.last_value;
                     break;
             }
 
@@ -144,24 +148,24 @@ module.exports = function (RED)
                 switch (alarm_action)
                 {
                     case "ON":
-                        nodeSettings.last_value = true;
+                        node_settings.last_value = true;
                         break;
 
                     default:
                     case "OFF":
-                        nodeSettings.last_value = false;
+                        node_settings.last_value = false;
                         break;
                 }
             }
 
             if (alarm_active || helper.getTopicName(msg.topic) != "status")
-                node.send({ payload: nodeSettings.last_value });
+                node.send({ payload: node_settings.last_value });
 
             // Output is on, now
-            if (nodeSettings.last_value && doRestartTimer)
+            if (node_settings.last_value && doRestartTimer)
                 startAutoOffIfNeeded(helper.getTimeInMsFromString(msg.time_on ?? max_time_on));
 
-            notifyCentral(nodeSettings.last_value);
+            notifyCentral(node_settings.last_value);
         }
 
         let startAutoOffIfNeeded = origTimeMs =>
@@ -178,24 +182,26 @@ module.exports = function (RED)
                 timeMs = max_time_on;
             }
 
-            current_timeout_ms = timeMs;
+            // calculate end date for status message
+            timeout_end_date = new Date();
+            timeout_end_date.setMilliseconds(timeout_end_date.getMilliseconds() + timeMs);
 
             // Stop if any timeout is set
             stopAutoOff();
 
             // 0 = Always on
-            if (timeMs <= 0 || isPermanent || isMotion || !nodeSettings.last_value)
+            if (timeMs <= 0 || isPermanent || isMotion || !node_settings.last_value)
                 return;
 
             max_time_on_timeout = setTimeout(() =>
             {
                 max_time_on_timeout = null;
-                nodeSettings.last_value = false;
+                node_settings.last_value = false;
                 node.send({ payload: false });
                 notifyCentral(false);
 
                 setStatus();
-                smartContext.set(node.id, nodeSettings);
+                smart_context.set(node.id, node_settings);
             }, timeMs);
         };
 
@@ -212,18 +218,18 @@ module.exports = function (RED)
         {
             if (alarm_active)
             {
-                node.status({ fill: "red", shape: "dot", text: (new Date()).toLocaleString() + ": ALARM is active" });
+                node.status({ fill: "red", shape: "dot", text: helper.getCurrentTimeForStatus() + ": ALARM is active" });
             }
-            else if (nodeSettings.last_value)
+            else if (node_settings.last_value)
             {
-                if (isPermanent || isMotion || current_timeout_ms <= 0)
-                    node.status({ fill: "green", shape: "dot", text: (new Date()).toLocaleString() + ": On" });
+                if (isPermanent || isMotion || timeout_end_date == null)
+                    node.status({ fill: "green", shape: "dot", text: helper.getCurrentTimeForStatus() + ": On" });
                 else if (max_time_on_timeout)
-                    node.status({ fill: "yellow", shape: "ring", text: (new Date()).toLocaleString() + ": Wait " + helper.formatMsToStatus(current_timeout_ms, "until") + " for auto off" });
+                    node.status({ fill: "yellow", shape: "ring", text: helper.getCurrentTimeForStatus() + ": Wait " + helper.formatDateToStatus(timeout_end_date, "until") + " for auto off" });
             }
             else
             {
-                node.status({ fill: "red", shape: "dot", text: (new Date()).toLocaleString() + ": Off" });
+                node.status({ fill: "red", shape: "dot", text: helper.getCurrentTimeForStatus() + ": Off" });
             }
         }
 
@@ -234,10 +240,16 @@ module.exports = function (RED)
 
             config.links.forEach(link =>
             {
+                // console.log(node.id + " -> " + link);
+                // console.log({ source: node.id, state: state });
                 RED.events.emit("node:" + link, { source: node.id, state: state });
             });
         }
 
+        // After node red restart, start also the timeout
+        if (node_settings.last_value)
+            startAutoOffIfNeeded(helper.getTimeInMsFromString(max_time_on));
+
         setStatus();
     }
 

package/logic/logic.html

@@ -10,7 +10,9 @@
             inverts: { value: "" },
             invert_output: { value: false },
             out_false: { value: '{"topic": ""}' },
+            out_false_type: { value: 'json' },
             out_true: { value: '{"topic": ""}' },
+            out_true_type: { value: 'json' },
             save_state: { value: true },
             resend_on_start: { value: true }
         },
@@ -66,12 +68,24 @@
 
             $("#node-input-out_true").typedInput({
                 type: "json",
-                types: ["json"]
+                types: ["json", {
+                    value: "null",
+                    label: "Nichts senden",
+                    icon: "fa fa-times",
+                    hasValue: false,
+                }],
+                typeField: "#node-input-out_true_type"
             });
 
             $("#node-input-out_false").typedInput({
                 type: "json",
-                types: ["json"]
+                types: ["json", {
+                    value: "null",
+                    label: "Nichts senden",
+                    icon: "fa fa-times",
+                    hasValue: false,
+                }],
+                typeField: "#node-input-out_false_type"
             });
 
             $("#node-input-save_state").on("change", ev =>
@@ -137,10 +151,12 @@
     <div class="form-row">
         <label for="node-input-out_true"><i class="fa fa-check-circle"></i> Wahr</label>
         <input type="text" id="node-input-out_true"/>
+        <input type="hidden" id="node-input-out_true_type">
     </div>
     <div class="form-row">
         <label for="node-input-out_false"><i class="fa fa-times-circle"></i> Falsch</label>
         <input type="text" id="node-input-out_false" />
+        <input type="hidden" id="node-input-out_false_type">
     </div>
     <div class="form-row">
         <span><strong>Hinweis:</strong> <code>msg.payload</code> wird automatisch auf das Logik-Ergebnis gesetzt.</span>

package/logic/logic.js

@@ -1,17 +1,19 @@
 module.exports = function (RED)
 {
+    "use strict";
+
     function LogicNode(config)
     {
         const node = this;
         RED.nodes.createNode(node, config);
 
-        const smartContext = require("../persistence.js")(RED);
+        const smart_context = require("../persistence.js")(RED);
         const helper = require("../smart_helper.js");
 
         // dynamic config
         let logic = config.logic;
-        let out_true = helper.evaluateNodeProperty(RED, config.out_true, "json");
-        let out_false = helper.evaluateNodeProperty(RED, config.out_false, "json");
+        let out_true = helper.evaluateNodeProperty(RED, config.out_true, config.out_true_type || "json");
+        let out_false = helper.evaluateNodeProperty(RED, config.out_false, config.out_false_type || "json");
         let logic_inputs = config.logic_inputs;
         let inverts = config.inverts.split(",").map(n => parseInt(n));
         let invert_output = config.invert_output;
@@ -19,7 +21,7 @@ module.exports = function (RED)
         // runtime values
 
 
-        var nodeSettings = {
+        var node_settings = {
             input_states: Array.from({ length: logic_inputs }).fill(false),
             last_message: null,
         };
@@ -27,12 +29,12 @@ module.exports = function (RED)
         if (config.save_state)
         {
             // load old saved values
-            nodeSettings = Object.assign(nodeSettings, smartContext.get(node.id));
+            node_settings = Object.assign(node_settings, smart_context.get(node.id));
         }
         else
         {
             // delete old saved values
-            smartContext.del(node.id);
+            smart_context.del(node.id);
         }
 
         node.on("input", function (msg)
@@ -51,9 +53,9 @@ module.exports = function (RED)
             }
 
             if (inverts.includes(input))
-                nodeSettings.input_states[input - 1] = !msg.payload;
+                node_settings.input_states[input - 1] = !msg.payload;
             else
-                nodeSettings.input_states[input - 1] = !!msg.payload; // !! => Convert to boolean
+                node_settings.input_states[input - 1] = !!msg.payload; // !! => Convert to boolean
 
             setStatus();
             let result = getResult();
@@ -61,23 +63,23 @@ module.exports = function (RED)
             if (invert_output ? !result : result)
             {
                 result = out_true;
-                result.payload = true;
+                if (result !== null)
+                    result.payload = true;
             }
             else
             {
                 result = out_false;
-                result.payload = false;
+                if (result !== null)
+                    result.payload = false;
             }
 
-            if (nodeSettings.last_message?.payload != result.payload)
-            {
-                nodeSettings.last_message = result;
-
+            if (result !== null && node_settings.last_message?.payload != result.payload)
                 node.send(result);
-            }
+
+            node_settings.last_message = result;
 
             if (config.save_state)
-                smartContext.set(node.id, nodeSettings);
+                smart_context.set(node.id, node_settings);
         });
 
         node.on("close", function ()
@@ -94,7 +96,7 @@ module.exports = function (RED)
                     result = true;
                     for (let i = 0; i < logic_inputs; i++)
                     {
-                        const element = nodeSettings.input_states[i];
+                        const element = node_settings.input_states[i];
                         if (element == false)
                         {
                             result = false;
@@ -107,7 +109,7 @@ module.exports = function (RED)
                     result = false;
                     for (let i = 0; i < logic_inputs; i++)
                     {
-                        const element = nodeSettings.input_states[i];
+                        const element = node_settings.input_states[i];
                         if (element == true)
                         {
                             result = true;
@@ -122,7 +124,7 @@ module.exports = function (RED)
 
                     for (let i = 0; i < logic_inputs; i++)
                     {
-                        const element = nodeSettings.input_states[i];
+                        const element = node_settings.input_states[i];
                         if (element && oneTrue)
                         {
                             result = false;
@@ -145,7 +147,7 @@ module.exports = function (RED)
             for (let i = 0; i < logic_inputs; i++)
             {
                 let invert = inverts.includes(i + 1);
-                const element = nodeSettings.input_states[i];
+                const element = node_settings.input_states[i];
 
                 state.push((invert ? "!" + (!element) : "" + element));
             }
@@ -153,14 +155,14 @@ module.exports = function (RED)
             let result = getResult();
             let resultText = (invert_output ? "!" : "") + result;
 
-            node.status({ fill: "yellow", shape: "ring", text: (new Date()).toLocaleString() + ": [" + state.join(", ") + "] => " + resultText });
+            node.status({ fill: "yellow", shape: "ring", text: helper.getCurrentTimeForStatus() + ": [" + state.join(", ") + "] => " + resultText });
         }
 
-        if (config.save_state && config.resend_on_start && nodeSettings.last_message != null)
+        if (config.save_state && config.resend_on_start && node_settings.last_message != null)
         {
             setTimeout(() =>
             {
-                node.send(nodeSettings.last_message);
+                node.send(node_settings.last_message);
             }, 10000);
         }
 

package/long-press-control/long-press-control.js

@@ -1,5 +1,7 @@
 module.exports = function (RED)
 {
+    "use strict";
+
     function LongPressControlNode(config)
     {
         const node = this;
@@ -22,7 +24,7 @@ module.exports = function (RED)
         {
             if (msg.payload)
             {
-                node.status({ fill: "yellow", shape: "ring", text: (new Date()).toLocaleString() + ": Wait for button release..." });
+                node.status({ fill: "yellow", shape: "ring", text: helper.getCurrentTimeForStatus() + ": Wait for button release..." });
                 on_time = Date.now();
                 startAutoLongPress();
             }
@@ -36,13 +38,13 @@ module.exports = function (RED)
 
                 if (pressTime < long_press_ms)
                 {
-                    node.status({ fill: "green", shape: "dot", text: (new Date()).toLocaleString() + ": Last was short" });
+                    node.status({ fill: "green", shape: "dot", text: helper.getCurrentTimeForStatus() + ": Last was short" });
                     if (short)
                         node.send([short, null]);
                 }
                 else
                 {
-                    node.status({ fill: "green", shape: "dot", text: (new Date()).toLocaleString() + ": Last was long" });
+                    node.status({ fill: "green", shape: "dot", text: helper.getCurrentTimeForStatus() + ": Last was long" });
                     if (long)
                         node.send([null, long]);
                 }
@@ -55,7 +57,7 @@ module.exports = function (RED)
             max_time_on_timeout = setTimeout(() =>
             {
                 on_time = null;
-                node.status({ fill: "green", shape: "dot", text: (new Date()).toLocaleString() + ": Last was long" });
+                node.status({ fill: "green", shape: "dot", text: helper.getCurrentTimeForStatus() + ": Last was long" });
                 node.send([null, long]);
             }, long_press_ms);
         };