smart-nodes 0.3.13 → 0.3.22

package/README.md

@@ -167,7 +167,7 @@ This control parses a text and performs actions to the selected and matching sma
 
 [ text ] is optional
 
--   Turn on [the light in] the living room and int the kitchen off
+-   Turn on [the light in] the living room and the kitchen off
 -   Open [the shutter in] the kitchen and turn studio off
 -   Close [the shutter in the] sleeping room
 -   Living room to 10 %

package/central/central.js

@@ -69,6 +69,8 @@ module.exports = function (RED)
             // Send cloned message to all linked nodes
             config.links.forEach(link =>
             {
+                // console.log(node.id + " -> " + link);
+                // console.log(newMsg);
                 RED.events.emit("node:" + link, newMsg);
             });
         });

package/delay/delay.js

@@ -103,7 +103,7 @@ module.exports = function (RED)
 
             if (delay_only_on_change)
             {
-                if (timeout)
+                if (timeout != null)
                 {
                     // current delay runs already for the same payload, so don't start a new one.
                     if (next_payload == msg.payload)
@@ -137,7 +137,7 @@ module.exports = function (RED)
             // No delay if 0 or smaller
             if (delayMs <= 0)
             {
-                node.status({ fill: "yellow", shape: "dot", text: (new Date()).toLocaleString() + ": " + "Sended msg.topic = '" + (msg.topic ?? "null") + "' msg.payload = '" + (msg.payload ?? "null") });
+                node.status({ fill: "yellow", shape: "dot", text: (new Date()).toLocaleString() + ": " + "Sended msg.topic = '" + +msg.topic + "' msg.payload = '" + msg.payload + "'" });
                 nodeSettings.lastMessage = msg
 
                 if (config.save_state)
@@ -148,10 +148,11 @@ module.exports = function (RED)
             }
 
             // start new timeout
-            node.status({ fill: "yellow", shape: "ring", text: (new Date()).toLocaleString() + ": " + "Forward msg.topic = '" + (msg.topic ?? "null") + "' msg.payload = '" + (msg.payload ?? "null") + "' in " + helper.formatMsToStatus(delayMs, "at") });
+            node.status({ fill: "yellow", shape: "ring", text: (new Date()).toLocaleString() + ": " + "Forward msg.topic = '" + msg.topic + "' msg.payload = '" + msg.payload + "' in " + helper.formatMsToStatus(delayMs, "at") });
             timeout = setTimeout(() =>
             {
-                node.status({ fill: "yellow", shape: "dot", text: (new Date()).toLocaleString() + ": " + "Sended msg.topic = '" + (msg.topic ?? "null") + "' msg.payload = '" + (msg.payload ?? "null") });
+                timeout = null;
+                node.status({ fill: "yellow", shape: "dot", text: (new Date()).toLocaleString() + ": " + "Sended msg.topic = '" + msg.topic + "' msg.payload = '" + msg.payload + "'" });
                 nodeSettings.lastMessage = msg
 
                 if (config.save_state)
@@ -165,7 +166,7 @@ module.exports = function (RED)
         {
             setTimeout(() =>
             {
-                node.status({ fill: "yellow", shape: "dot", text: (new Date()).toLocaleString() + ": " + "Sended msg.topic = '" + (nodeSettings.lastMessage.topic ?? "null") + "' msg.payload = '" + (nodeSettings.lastMessage.payload ?? "null") });
+                node.status({ fill: "yellow", shape: "dot", text: (new Date()).toLocaleString() + ": " + "Sended msg.topic = '" + nodeSettings.lastMessage.topic + "' msg.payload = '" + nodeSettings.lastMessage.payload + "'" });
                 node.send(nodeSettings.lastMessage);
             }, 10000);
         }

package/forwarder/forwarder.js

@@ -88,6 +88,14 @@ module.exports = function (RED)
                 node.status({ fill: "red", shape: "dot", text: (new Date()).toLocaleString() + ": Forwarding disabled" });
         }
 
+        if (config.save_state && config.resend_on_start && nodeSettings.lastMessage != null)
+        {
+            setTimeout(() =>
+            {
+                node.send(nodeSettings.lastMessage);
+            }, 10000);
+        }
+
         setStatus();
     }
 

package/hysteresis/hysteresis.js

@@ -12,6 +12,8 @@ module.exports = function (RED)
         var nodeSettings = {
             active: null,
             lastMessage: null,
+            setpoint: parseFloat(config.setpoint),
+            hysteresis: parseFloat(config.hysteresis)
         };
 
         if (config.save_state)
@@ -42,8 +44,6 @@ module.exports = function (RED)
         }
 
         // 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);
 
@@ -63,7 +63,7 @@ module.exports = function (RED)
             switch (realTopic)
             {
                 case "setpoint":
-                    setpoint = value;
+                    nodeSettings.setpoint = value;
                     node.status({ fill: nodeSettings.active ? "green" : "red", shape: "ring", text: (new Date()).toLocaleString() + ": New setpoint: " + value + "" });
 
                     if (config.save_state)
@@ -71,7 +71,7 @@ module.exports = function (RED)
                     break;
 
                 case "hysteresis":
-                    hysteresis = value;
+                    nodeSettings.hysteresis = value;
                     node.status({ fill: nodeSettings.active ? "green" : "red", shape: "ring", text: (new Date()).toLocaleString() + ": New hysteresis: " + value + "" });
 
                     if (config.save_state)
@@ -96,22 +96,22 @@ module.exports = function (RED)
                     break;
 
                 default:
-                    if (value >= setpoint + hysteresis && nodeSettings.active !== true)
+                    if (value >= nodeSettings.setpoint + nodeSettings.hysteresis && nodeSettings.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;
+                        nodeSettings.lastMessage = createMessage(out_higher ?? msg, value);
 
                         if (config.save_state)
                             smartContext.set(node.id, nodeSettings);
 
                         node.send([nodeSettings.lastMessage, null]);
                     }
-                    else if (value <= setpoint - hysteresis && nodeSettings.active !== false)
+                    else if (value <= nodeSettings.setpoint - nodeSettings.hysteresis && nodeSettings.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;
+                        nodeSettings.lastMessage = createMessage(out_lower ?? msg, value);
 
                         if (config.save_state)
                             smartContext.set(node.id, nodeSettings);
@@ -130,6 +130,18 @@ module.exports = function (RED)
         {
         });
 
+        let createMessage = (msg, value) =>
+        {
+            return Object.assign({}, msg, {
+                smart_info: {
+                    active: nodeSettings.active,
+                    hysteresis: nodeSettings.hysteresis,
+                    setpoint: nodeSettings.setpoint,
+                    last_value: value
+                }
+            })
+        };
+
         if (config.save_state && config.resend_on_start && nodeSettings.active != null && nodeSettings.lastMessage != null)
         {
             setTimeout(() =>

package/light-control/light-control.js

@@ -27,7 +27,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
@@ -62,7 +62,9 @@ module.exports = function (RED)
                 case "status":
                     // Make sure it is bool
                     msg.payload = !!msg.payload;
-                    doRestartTimer = nodeSettings.last_value != msg.payload;
+
+                    if (nodeSettings.last_value == msg.payload && max_time_on_timeout != null)
+                        doRestartTimer = false;
 
                     nodeSettings.last_value = msg.payload;
                     break;
@@ -178,7 +180,9 @@ 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();
@@ -216,10 +220,10 @@ module.exports = function (RED)
             }
             else if (nodeSettings.last_value)
             {
-                if (isPermanent || isMotion || current_timeout_ms <= 0)
+                if (isPermanent || isMotion || timeout_end_date == null)
                     node.status({ fill: "green", shape: "dot", text: (new Date()).toLocaleString() + ": 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: (new Date()).toLocaleString() + ": Wait " + helper.formatDateToStatus(timeout_end_date, "until") + " for auto off" });
             }
             else
             {
@@ -234,10 +238,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 (nodeSettings.last_value)
+            startAutoOffIfNeeded(helper.getTimeInMsFromString(max_time_on));
+
         setStatus();
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "smart-nodes",
-    "version": "0.3.13",
+    "version": "0.3.22",
     "description": "Smart Nodes",
     "keywords": [
         "node-red",

package/scene-control/scene-control.js

@@ -263,9 +263,17 @@ 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 (getCurrentScene() != 0)
+            startAutoOffIfNeeded(helper.getTimeInMsFromString(max_time_on));
+
+        status();
     }
     RED.nodes.registerType("smart_scene-control", SceneControlNode);
 };

package/scheduler/scheduler.html

@@ -14,6 +14,16 @@
     <div class="form-row node-scheduler-schedules-row">
         <ol id="node-scheduler-schedules"></ol>
     </div>
+    <hr/>
+    <h4 style="margin: 0.5rem 0;">Systemstart</h4>
+    <div class="form-row">
+        <input type="checkbox" id="node-input-save_state" style="width: 20px;" />
+        <label for="node-input-save_state" style="width: calc(100% - 30px);">Zustand speichern</label>
+    </div>
+    <div class="form-row" id="resend_on_start_row">
+        <input type="checkbox" id="node-input-resend_on_start" style="width: 20px;" />
+        <label for="node-input-resend_on_start" style="width: calc(100% - 30px);">Letze Nachricht 10 Sekunden nach dem Start senden</label>
+    </div>
 </script>
 
 <script type="text/html" data-template-scheduler-row="">
@@ -117,6 +127,8 @@
                     return true;
                 },
             },
+            save_state: { value: true },
+            resend_on_start: { value: true }
         },
         inputs: 1,
         outputs: 1,
@@ -129,6 +141,15 @@
         {
             let node = this;
 
+            $("#node-input-save_state").on("change", ev =>
+            {
+                if (ev.target.checked)
+                    $("#resend_on_start_row").show();
+                else
+                    $("#resend_on_start_row").hide();
+            });
+            $("#node-input-save_state").trigger("change");
+
             /**
              * prepare schedule
              */

package/scheduler/scheduler.js

@@ -8,13 +8,26 @@ module.exports = function (RED)
         const smartContext = require("../persistence.js")(RED);
         const helper = require("../smart_helper.js");
 
-        var nodeSettings = Object.assign({}, {
+        var nodeSettings = {
             enabled: config.enabled,
-        }, smartContext.get(node.id));
+            lastMessage: null,
+        };
 
-        let timeouts = [];
-        let nextEvents = [];
+        if (config.save_state)
+        {
+            // load old saved values
+            nodeSettings = Object.assign(nodeSettings, smartContext.get(node.id));
+        }
+        else
+        {
+            // delete old saved values
+            smartContext.del(node.id);
+        }
+
+        let timeout = null;
+        let nextEvent = null;
 
+        // prepare schedules
         setTimeout(() =>
         {
             for (let i = 0; i < config.schedules.length; i++)
@@ -26,7 +39,7 @@ module.exports = function (RED)
             }
 
             if (nodeSettings.enabled)
-                initTimeouts();
+                initNextTimeout();
 
             setStatus();
         }, 1000);
@@ -41,6 +54,8 @@ module.exports = function (RED)
                         return;
 
                     nodeSettings.enabled = true;
+                    if (config.save_state)
+                        smartContext.set(node.id, nodeSettings);
                     break;
 
                 case "disable":
@@ -48,6 +63,8 @@ module.exports = function (RED)
                         return;
 
                     nodeSettings.enabled = false;
+                    if (config.save_state)
+                        smartContext.set(node.id, nodeSettings);
                     break;
 
                 case "set_state":
@@ -55,6 +72,8 @@ module.exports = function (RED)
                         return;
 
                     nodeSettings.enabled = !!msg.payload;
+                    if (config.save_state)
+                        smartContext.set(node.id, nodeSettings);
                     break;
 
                 default:
@@ -72,57 +91,42 @@ module.exports = function (RED)
 
         node.on("close", function ()
         {
-            clearTimeouts();
+            if (timeout != null)
+            {
+                clearTimeout(timeout);
+                timeout = null;
+            }
         });
 
-        let clearTimeouts = () =>
+        let initNextTimeout = () =>
         {
-            for (let i = 0; i < timeouts.length; i++)
+            let minIndex = null;
+            for (let i = 0; i < config.schedules.length; i++)
             {
-                if (timeouts[i] != 0)
+                config.schedules[i].nextEvent = calcNextEvent(i);
+                if (config.schedules[i].nextEvent != null)
                 {
-                    clearTimeout(timeouts[i]);
-                    timeouts[i] = 0;
+                    if (minIndex == null || config.schedules[i].nextEvent < config.schedules[minIndex].nextEvent)
+                        minIndex = i;
                 }
             }
-        }
 
-        let initTimeouts = () =>
-        {
-            for (let i = 0; i < config.schedules.length; i++)
+            // No events defined
+            if (minIndex == null)
             {
-                initTimeout(i, config.schedules[i]);
-            }
-        }
-
-        let initTimeout = (i, schedule) =>
-        {
-            if (!nodeSettings.enabled)
+                nextEvent = null;
                 return;
-
-            let waitTime = getWaitInMs(i, schedule);
-            if (waitTime != null)
-            {
-                if (timeouts[i])
-                    clearTimeout(timeouts[i]);
-
-                timeouts[i] = setTimeout(raiseEvent, waitTime, i, schedule);
             }
-        }
 
-        let raiseEvent = (i, schedule) =>
-        {
-            if (!nodeSettings.enabled)
-                return;
-
-            timeouts[i] = 0;
-            node.send(schedule.message);
-            initTimeout(i, schedule);
-            setStatus();
+            nextEvent = config.schedules[minIndex].nextEvent;
+            let waitTime = nextEvent.getTime() - (new Date()).getTime();
+            timeout = setTimeout(raiseEvent, waitTime, minIndex);
         }
 
-        let getWaitInMs = (i, schedule) =>
+        let calcNextEvent = i =>
         {
+            const schedule = config.schedules[i];
+
             // If no day is checked then we cannot it is never raised
             if (!schedule.days || schedule.days.length == 0)
                 return null;
@@ -148,26 +152,51 @@ module.exports = function (RED)
             }
 
             // find next day when the event should be raised
-            let possibleDays = schedule.days.filter(d => findNextDay ? d > now.getDay() : d >= now.getDay());
-            if (possibleDays.length == 0)
-                possibleDays = Math.min(...schedule.days);
+            let possibleDay = schedule.days.filter(d => findNextDay ? d > now.getDay() : d >= now.getDay());
+            if (possibleDay.length == 0)
+                possibleDay = Math.min(...schedule.days);
             else
-                possibleDays = Math.min(...possibleDays);
+                possibleDay = Math.min(...possibleDay);
 
             let nextEvent = new Date(
                 now.getFullYear(),
                 now.getMonth(),
                 now.getDate() + (
-                    possibleDays < now.getDay() ? 7 - now.getDay() + possibleDays : possibleDays - now.getDay()
+                    findNextDay ?
+                        possibleDay <= now.getDay() ? 7 - now.getDay() + possibleDay : possibleDay - now.getDay()
+                        :
+                        possibleDay < now.getDay() ? 7 - now.getDay() + possibleDay : possibleDay - now.getDay()
                 ),
                 schedule.hour,
                 schedule.minute,
                 schedule.second
             );
 
-            nextEvents[i] = nextEvent;
+            // console.log({
+            //     i,
+            //     findNextDay,
+            //     nextEvent
+            // });
 
-            return nextEvent.getTime() - now.getTime();
+            return nextEvent;
+        }
+
+        let raiseEvent = i =>
+        {
+            const schedule = config.schedules[i];
+
+            if (!nodeSettings.enabled)
+                return;
+
+            timeout = null;
+            node.send(schedule.message);
+            nodeSettings.lastMessage = schedule.message;
+
+            if (config.save_state)
+                smartContext.set(node.id, nodeSettings);
+
+            initNextTimeout();
+            setStatus();
         }
 
         let setStatus = () =>
@@ -180,7 +209,7 @@ module.exports = function (RED)
                     text: (new Date()).toLocaleString() + ": Scheduler disabled"
                 });
             }
-            else if (nextEvents.filter(d => d).lenght == 0)
+            else if (nextEvent == null)
             {
                 node.status({
                     fill: "red",
@@ -191,7 +220,6 @@ module.exports = function (RED)
             else
             {
                 // filter out empty values
-                let nextEvent = new Date(Math.min(...nextEvents.filter(d => d)));
                 let time = nextEvent.getTime() - (new Date()).getTime();
                 time = Math.ceil(time / 1000) * 1000;
 
@@ -203,6 +231,13 @@ module.exports = function (RED)
             }
         }
 
+        if (config.save_state && config.resend_on_start && nodeSettings.lastMessage != null)
+        {
+            setTimeout(() =>
+            {
+                node.send(nodeSettings.lastMessage);
+            }, 10000);
+        }
     }
 
     RED.nodes.registerType("smart_scheduler", SchedulerNode);

package/shutter-complex-control/shutter-complex-control.js

@@ -388,6 +388,8 @@ 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 });
             });
         };

package/shutter-control/shutter-control.js

@@ -206,6 +206,8 @@ 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 });
             });
         };

package/smart_helper.js

@@ -151,6 +151,42 @@ module.exports = {
         if (value > 0)
             result = value + "." + result;
 
+        return result;
+    },
+    formatDateToStatus(date, timeConcatWord = null)
+    {
+        let result = "";
+
+        if (timeConcatWord)
+            result = " " + timeConcatWord + " " + date.getHours() + ":" + ("" + date.getMinutes()).padStart(2, "0") + ":" + ("" + date.getSeconds()).padStart(2, "0");
+
+        let value = date - new Date();
+        if (value <= 0)
+            return "0:00" + result;
+
+        // value in sec
+        value = parseInt(value / 1000, 10);
+        result = (value % 60) + result;
+        if (value % 60 < 10)
+            result = "0" + result;
+
+        // value in min
+        value = parseInt(value / 60, 10);
+        result = (value % 60) + ":" + result;
+        if (value % 60 < 10)
+            result = "0" + result;
+
+        // value in hour
+        value = parseInt(value / 60, 10);
+        result = (value % 24) + ":" + result;
+        if (value % 24 < 10)
+            result = "0" + result;
+
+        // value in days
+        value = parseInt(value / 24, 10);
+        if (value > 0)
+            result = value + "." + result;
+
         return result;
     }
 };

package/text-exec/text-exec.js

@@ -286,12 +286,12 @@ module.exports = function (RED)
         {
             if (action != null && affectedNodes.length > 0)
             {
-                for (const node of affectedNodes)
+                for (const targetNode of affectedNodes)
                 {
-                    if (mode == "light" && !["smart_light-control", "smart_scene-control"].includes(node.type))
+                    if (mode == "light" && !["smart_light-control", "smart_scene-control"].includes(targetNode.type))
                         continue;
 
-                    if (mode == "shutter" && !["smart_shutter-control", "smart_shutter-complex-control"].includes(node.type))
+                    if (mode == "shutter" && !["smart_shutter-control", "smart_shutter-complex-control"].includes(targetNode.type))
                         continue;
 
                     // node.log("Notify node " + node.id);
@@ -299,11 +299,17 @@ module.exports = function (RED)
                     {
                         // console.log({ "topic": action, "payload": number });
                         if (number != null)
-                            RED.events.emit("node:" + node.id, { "topic": action, "payload": number });
+                        {
+                            // console.log(node.id + " -> " + targetNode.id);
+                            // console.log({ "topic": action, "payload": number });
+                            RED.events.emit("node:" + targetNode.id, { "topic": action, "payload": number });
+                        }
                     }
                     else
                     {
-                        RED.events.emit("node:" + node.id, { "topic": action });
+                        // console.log(node.id + " -> " + targetNode.id);
+                        // console.log({ "topic": action });
+                        RED.events.emit("node:" + targetNode.id, { "topic": action });
                     }
                 }