node-red-contrib-power-saver 5.1.1 → 5.1.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-red-contrib-power-saver",
-  "version": "5.1.1",
+  "version": "5.1.3",
   "description": "A module for Node-RED that you can use to turn on and off a switch based on power prices",
   "main": "index.js",
   "scripts": {

package/src/handle-input.js

@@ -82,7 +82,8 @@ function makePlanFromPriceData(node, msg, config, doPlanning, calcSavings) {
     onOff: onOff[i],
     saving: savings[i],
   }));
-  const schedule = makeSchedule(onOff, startTimes, endTime);
+  const fullSchedule = makeSchedule(onOff, startTimes, endTime);
+  const schedule = trimScheduleToStart(fullSchedule, priceData[0].start);
   addLastSwitchIfNoSchedule(schedule, minutes, config);
 
   plan = {
@@ -158,6 +159,19 @@ function loadDataJustBefore(node, dateDayBefore) {
   };
 }
 
+function trimScheduleToStart(schedule, startTime) {
+  const startDT = DateTime.fromISO(startTime);
+  const idx = schedule.findIndex((e) => DateTime.fromISO(e.time) >= startDT);
+  if (idx === -1) return schedule;
+  const trimmed = schedule.slice(idx);
+  if (DateTime.fromISO(trimmed[0].time) > startDT) {
+    const initialState = (idx > 0 ? schedule[idx - 1] : schedule[0]).value;
+    const countMinutes = DateTime.fromISO(trimmed[0].time).diff(startDT, "minutes").minutes;
+    trimmed.unshift({ time: startDT.toISO(), value: initialState, countMinutes });
+  }
+  return trimmed;
+}
+
 function deleteSavedScheduleBefore(node, day, checkDays = 0) {
   let date = day;
   let data = null;

package/src/light-saver.js

@@ -201,6 +201,10 @@ module.exports = function (RED) {
 
         // Set lights to night level after delay
         nightActivationTimer = setTimeout(() => {
+          if (state.timedOut || !funcs.isNightMode(nodeConfig)) {
+            debugLog("Skipping night level change: lights are off or night mode no longer active");
+            return;
+          }
           debugLog("Applying night level to lights");
           const level = funcs.findCurrentLevel(nodeConfig, nodeWrapper);
           if (level !== null) {
@@ -223,6 +227,10 @@ module.exports = function (RED) {
 
         // Set lights to away level after delay
         awayActivationTimer = setTimeout(() => {
+          if (state.timedOut || !funcs.isAwayMode(nodeConfig)) {
+            debugLog("Skipping away level change: lights are off or away mode no longer active");
+            return;
+          }
           debugLog("Applying away level to lights");
           const level =
             nodeConfig.awaySensor.level !== null && nodeConfig.awaySensor.level !== undefined

package/src/utils.js

@@ -215,7 +215,7 @@ function loadDayData(node, date) {
   // Load saved schedule for the date (YYYY-MM-DD)
   // Return null if not found
   const key = date.toISODate();
-  const saved = node.context().get(key);
+  const saved = node.context().get(key, node.contextStorage);
   const res = saved ?? {
     schedule: [],
     minutes: [],