node-red-contrib-power-saver 5.1.0 → 5.1.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-red-contrib-power-saver",
-  "version": "5.1.0",
+  "version": "5.1.2",
   "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/handle-output.js

@@ -123,30 +123,30 @@ function collapseMinutes(minutes) {
 
   const result = [];
   let currentValue = minutes[0];
-  let count = 1;
   let startIndex = 0;
 
   for (let i = 1; i < minutes.length; i++) {
-    if (itemsEqual(minutes[i], currentValue)) {
-      count++;
-    } else {
+    if (!itemsEqual(minutes[i], currentValue)) {
+      const groupStartMs = new Date(currentValue.start).getTime();
+      const nextStartMs = new Date(minutes[i].start).getTime();
+      const count = Math.round((nextStartMs - groupStartMs) / 60000);
       result.push({ ...currentValue, count, startIndex });
       currentValue = minutes[i];
-      count = 1;
       startIndex = i;
     }
   }
 
-  result.push({ ...currentValue, count, startIndex });
-
+  const lastRecord = minutes[minutes.length - 1];
+  const lastCount = lastRecord.end
+    ? Math.round((new Date(lastRecord.end).getTime() - new Date(currentValue.start).getTime()) / 60000)
+    : null;
+  result.push({ ...currentValue, count: lastCount, startIndex });
   return result;
-
-
-
 }
 
 module.exports = {
   handleOutput,
   shallSendOutput,
   strategyShallSendSchedule,
+  collapseMinutes,
 };