smart-nodes 0.3.13 → 0.3.15

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/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)
@@ -151,6 +151,7 @@ module.exports = function (RED)
             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") });
             timeout = setTimeout(() =>
             {
+                timeout = null;
                 node.status({ fill: "yellow", shape: "dot", text: (new Date()).toLocaleString() + ": " + "Sended msg.topic = '" + (msg.topic ?? "null") + "' msg.payload = '" + (msg.payload ?? "null") });
                 nodeSettings.lastMessage = msg
 

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/package.json

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

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);