node-red-contrib-power-saver 3.2.2 → 3.3.2

package/test/data/reconfigResult.js

@@ -1,5 +1,7 @@
 module.exports = {
   schedule: [
+    { time: "2021-06-20T01:50:00.000+02:00", value: false },
+    { time: "2021-06-20T01:50:00.020+02:00", value: true },
     { time: "2021-06-20T01:50:00.080+02:00", value: false },
     { time: "2021-06-20T01:50:00.110+02:00", value: true },
     { time: "2021-06-20T01:50:00.180+02:00", value: false },
@@ -8,308 +10,68 @@ module.exports = {
     { time: "2021-06-20T01:50:00.250+02:00", value: true },
     { time: "2021-06-20T01:50:00.330+02:00", value: false },
     { time: "2021-06-20T01:50:00.360+02:00", value: true },
-    { time: "2021-06-20T01:50:00.400+02:00", value: false },
-    { time: "2021-06-20T01:50:00.430+02:00", value: true },
-    { time: "2021-06-20T01:50:00.460+02:00", value: false },
-    { time: "2021-06-20T01:50:00.470+02:00", value: true },
+    { time: "2021-06-20T01:50:00.410+02:00", value: false },
+    { time: "2021-06-20T01:50:00.440+02:00", value: true },
   ],
   hours: [
-    {
-      price: 0.2494,
-      onOff: false,
-      start: "2021-06-20T01:50:00.000+02:00",
-      saving: 0.0395,
-    },
-    {
-      price: 0.2209,
-      onOff: false,
-      start: "2021-06-20T01:50:00.010+02:00",
-      saving: 0.011,
-    },
-    {
-      price: 0.2099,
-      onOff: true,
-      start: "2021-06-20T01:50:00.020+02:00",
-      saving: null,
-    },
-    {
-      price: 0.219,
-      onOff: true,
-      start: "2021-06-20T01:50:00.030+02:00",
-      saving: null,
-    },
-    {
-      price: 0.2614,
-      onOff: true,
-      start: "2021-06-20T01:50:00.040+02:00",
-      saving: null,
-    },
-    {
-      price: 0.4426,
-      onOff: true,
-      start: "2021-06-20T01:50:00.050+02:00",
-      saving: null,
-    },
-    {
-      price: 0.5433,
-      onOff: true,
-      start: "2021-06-20T01:50:00.060+02:00",
-      saving: null,
-    },
-    {
-      price: 0.5667,
-      onOff: true,
-      start: "2021-06-20T01:50:00.070+02:00",
-      saving: null,
-    },
-    {
-      price: 0.5847,
-      onOff: false,
-      start: "2021-06-20T01:50:00.080+02:00",
-      saving: 0.0723,
-    },
-    {
-      price: 0.5762,
-      onOff: false,
-      start: "2021-06-20T01:50:00.090+02:00",
-      saving: 0.0638,
-    },
-    {
-      price: 0.5391,
-      onOff: false,
-      start: "2021-06-20T01:50:00.100+02:00",
-      saving: 0.0267,
-    },
-    {
-      price: 0.5124,
-      onOff: true,
-      start: "2021-06-20T01:50:00.110+02:00",
-      saving: null,
-    },
-    {
-      price: 0.504,
-      onOff: true,
-      start: "2021-06-20T01:50:00.120+02:00",
-      saving: null,
-    },
-    {
-      price: 0.5057,
-      onOff: true,
-      start: "2021-06-20T01:50:00.130+02:00",
-      saving: null,
-    },
-    {
-      price: 0.5066,
-      onOff: true,
-      start: "2021-06-20T01:50:00.140+02:00",
-      saving: null,
-    },
-    {
-      price: 0.5136,
-      onOff: true,
-      start: "2021-06-20T01:50:00.150+02:00",
-      saving: null,
-    },
-    {
-      price: 0.5143,
-      onOff: true,
-      start: "2021-06-20T01:50:00.160+02:00",
-      saving: null,
-    },
-    {
-      price: 0.5306,
-      onOff: true,
-      start: "2021-06-20T01:50:00.170+02:00",
-      saving: null,
-    },
-    {
-      price: 0.5534,
-      onOff: false,
-      start: "2021-06-20T01:50:00.180+02:00",
-      saving: 0.0043,
-    },
-    {
-      price: 0.5511,
-      onOff: false,
-      start: "2021-06-20T01:50:00.190+02:00",
-      saving: 0.002,
-    },
-    {
-      price: 0.5491,
-      onOff: true,
-      start: "2021-06-20T01:50:00.200+02:00",
-      saving: null,
-    },
-    {
-      price: 0.5485,
-      onOff: true,
-      start: "2021-06-20T01:50:00.210+02:00",
-      saving: null,
-    },
-    {
-      price: 0.5481,
-      onOff: false,
-      start: "2021-06-20T01:50:00.220+02:00",
-      saving: 0.1285,
-    },
-    {
-      price: 0.5218,
-      onOff: false,
-      start: "2021-06-20T01:50:00.230+02:00",
-      saving: 0.1022,
-    },
-    {
-      price: 0.4533,
-      onOff: false,
-      start: "2021-06-20T01:50:00.240+02:00",
-      saving: 0.0337,
-    },
-    {
-      price: 0.4196,
-      onOff: true,
-      start: "2021-06-20T01:50:00.250+02:00",
-      saving: null,
-    },
-    {
-      price: 0.4037,
-      onOff: true,
-      start: "2021-06-20T01:50:00.260+02:00",
-      saving: null,
-    },
-    {
-      price: 0.3829,
-      onOff: true,
-      start: "2021-06-20T01:50:00.270+02:00",
-      saving: null,
-    },
-    {
-      price: 0.4555,
-      onOff: true,
-      start: "2021-06-20T01:50:00.280+02:00",
-      saving: null,
-    },
-    {
-      price: 0.4721,
-      onOff: true,
-      start: "2021-06-20T01:50:00.290+02:00",
-      saving: null,
-    },
-    {
-      price: 0.4903,
-      onOff: true,
-      start: "2021-06-20T01:50:00.300+02:00",
-      saving: null,
-    },
-    {
-      price: 0.5028,
-      onOff: true,
-      start: "2021-06-20T01:50:00.310+02:00",
-      saving: null,
-    },
-    {
-      price: 0.5163,
-      onOff: true,
-      start: "2021-06-20T01:50:00.320+02:00",
-      saving: null,
-    },
-    {
-      price: 0.5264,
-      onOff: false,
-      start: "2021-06-20T01:50:00.330+02:00",
-      saving: 0.0193,
-    },
-    {
-      price: 0.5346,
-      onOff: false,
-      start: "2021-06-20T01:50:00.340+02:00",
-      saving: 0.0275,
-    },
-    {
-      price: 0.5224,
-      onOff: false,
-      start: "2021-06-20T01:50:00.350+02:00",
-      saving: 0.0153,
-    },
-    {
-      price: 0.5071,
-      onOff: true,
-      start: "2021-06-20T01:50:00.360+02:00",
-      saving: null,
-    },
-    {
-      price: 0.5045,
-      onOff: true,
-      start: "2021-06-20T01:50:00.370+02:00",
-      saving: null,
-    },
-    {
-      price: 0.5024,
-      onOff: true,
-      start: "2021-06-20T01:50:00.380+02:00",
-      saving: null,
-    },
-    {
-      price: 0.5038,
-      onOff: true,
-      start: "2021-06-20T01:50:00.390+02:00",
-      saving: null,
-    },
-    {
-      price: 0.5118,
-      onOff: false,
-      start: "2021-06-20T01:50:00.400+02:00",
-      saving: 0.0063,
-    },
-    {
-      price: 0.5111,
-      onOff: false,
-      start: "2021-06-20T01:50:00.410+02:00",
-      saving: 0.0056,
-    },
-    {
-      price: 0.5108,
-      onOff: false,
-      start: "2021-06-20T01:50:00.420+02:00",
-      saving: 0.0053,
-    },
-    {
-      price: 0.5055,
-      onOff: true,
-      start: "2021-06-20T01:50:00.430+02:00",
-      saving: null,
-    },
-    {
-      price: 0.5042,
-      onOff: true,
-      start: "2021-06-20T01:50:00.440+02:00",
-      saving: null,
-    },
-    {
-      price: 0.5259,
-      onOff: true,
-      start: "2021-06-20T01:50:00.450+02:00",
-      saving: null,
-    },
-    {
-      price: 0.5282,
-      onOff: false,
-      start: "2021-06-20T01:50:00.460+02:00",
-      saving: 0.003,
-    },
-    {
-      price: 0.5252,
-      onOff: true,
-      start: "2021-06-20T01:50:00.470+02:00",
-      saving: null,
-    },
+    { price: 0.2494, onOff: false, start: "2021-06-20T01:50:00.000+02:00", saving: 0.0395 },
+    { price: 0.2209, onOff: false, start: "2021-06-20T01:50:00.010+02:00", saving: 0.011 },
+    { price: 0.2099, onOff: true, start: "2021-06-20T01:50:00.020+02:00", saving: null },
+    { price: 0.219, onOff: true, start: "2021-06-20T01:50:00.030+02:00", saving: null },
+    { price: 0.2614, onOff: true, start: "2021-06-20T01:50:00.040+02:00", saving: null },
+    { price: 0.4426, onOff: true, start: "2021-06-20T01:50:00.050+02:00", saving: null },
+    { price: 0.5433, onOff: true, start: "2021-06-20T01:50:00.060+02:00", saving: null },
+    { price: 0.5667, onOff: true, start: "2021-06-20T01:50:00.070+02:00", saving: null },
+    { price: 0.5847, onOff: false, start: "2021-06-20T01:50:00.080+02:00", saving: 0.0723 },
+    { price: 0.5762, onOff: false, start: "2021-06-20T01:50:00.090+02:00", saving: 0.0638 },
+    { price: 0.5391, onOff: false, start: "2021-06-20T01:50:00.100+02:00", saving: 0.0267 },
+    { price: 0.5124, onOff: true, start: "2021-06-20T01:50:00.110+02:00", saving: null },
+    { price: 0.504, onOff: true, start: "2021-06-20T01:50:00.120+02:00", saving: null },
+    { price: 0.5057, onOff: true, start: "2021-06-20T01:50:00.130+02:00", saving: null },
+    { price: 0.5066, onOff: true, start: "2021-06-20T01:50:00.140+02:00", saving: null },
+    { price: 0.5136, onOff: true, start: "2021-06-20T01:50:00.150+02:00", saving: null },
+    { price: 0.5143, onOff: true, start: "2021-06-20T01:50:00.160+02:00", saving: null },
+    { price: 0.5306, onOff: true, start: "2021-06-20T01:50:00.170+02:00", saving: null },
+    { price: 0.5534, onOff: false, start: "2021-06-20T01:50:00.180+02:00", saving: 0.0043 },
+    { price: 0.5511, onOff: false, start: "2021-06-20T01:50:00.190+02:00", saving: 0.002 },
+    { price: 0.5491, onOff: true, start: "2021-06-20T01:50:00.200+02:00", saving: null },
+    { price: 0.5485, onOff: true, start: "2021-06-20T01:50:00.210+02:00", saving: null },
+    { price: 0.5481, onOff: false, start: "2021-06-20T01:50:00.220+02:00", saving: 0.1285 },
+    { price: 0.5218, onOff: false, start: "2021-06-20T01:50:00.230+02:00", saving: 0.1022 },
+    { price: 0.4533, onOff: false, start: "2021-06-20T01:50:00.240+02:00", saving: 0.0337 },
+    { price: 0.4196, onOff: true, start: "2021-06-20T01:50:00.250+02:00", saving: null },
+    { price: 0.4037, onOff: true, start: "2021-06-20T01:50:00.260+02:00", saving: null },
+    { price: 0.3829, onOff: true, start: "2021-06-20T01:50:00.270+02:00", saving: null },
+    { price: 0.4555, onOff: true, start: "2021-06-20T01:50:00.280+02:00", saving: null },
+    { price: 0.4721, onOff: true, start: "2021-06-20T01:50:00.290+02:00", saving: null },
+    { price: 0.4903, onOff: true, start: "2021-06-20T01:50:00.300+02:00", saving: null },
+    { price: 0.5028, onOff: true, start: "2021-06-20T01:50:00.310+02:00", saving: null },
+    { price: 0.5163, onOff: true, start: "2021-06-20T01:50:00.320+02:00", saving: null },
+    { price: 0.5264, onOff: false, start: "2021-06-20T01:50:00.330+02:00", saving: 0.0193 },
+    { price: 0.5346, onOff: false, start: "2021-06-20T01:50:00.340+02:00", saving: 0.0275 },
+    { price: 0.5224, onOff: false, start: "2021-06-20T01:50:00.350+02:00", saving: 0.0153 },
+    { price: 0.5071, onOff: true, start: "2021-06-20T01:50:00.360+02:00", saving: null },
+    { price: 0.5045, onOff: true, start: "2021-06-20T01:50:00.370+02:00", saving: null },
+    { price: 0.5024, onOff: true, start: "2021-06-20T01:50:00.380+02:00", saving: null },
+    { price: 0.5038, onOff: true, start: "2021-06-20T01:50:00.390+02:00", saving: null },
+    { price: 0.5118, onOff: true, start: "2021-06-20T01:50:00.400+02:00", saving: null },
+    { price: 0.5111, onOff: false, start: "2021-06-20T01:50:00.410+02:00", saving: 0.0069 },
+    { price: 0.5108, onOff: false, start: "2021-06-20T01:50:00.420+02:00", saving: 0.0066 },
+    { price: 0.5055, onOff: false, start: "2021-06-20T01:50:00.430+02:00", saving: 0.0013 },
+    { price: 0.5042, onOff: true, start: "2021-06-20T01:50:00.440+02:00", saving: null },
+    { price: 0.5259, onOff: true, start: "2021-06-20T01:50:00.450+02:00", saving: null },
+    { price: 0.5282, onOff: true, start: "2021-06-20T01:50:00.460+02:00", saving: null },
+    { price: 0.5252, onOff: true, start: "2021-06-20T01:50:00.470+02:00", saving: null },
   ],
   source: undefined,
   config: {
     maxHoursToSaveInSequence: 3,
-    minHoursOnAfterMaxSequenceSaved: 2,
+    minHoursOnAfterMaxSequenceSaved: 5,
     minSaving: 0.001,
     sendCurrentValueWhenRescheduling: undefined,
     outputIfNoSchedule: false,
-    scheduleOnlyFromCurrentTime: true,
   },
+  time: "2021-06-20T01:50:00.045+02:00",
+  version: "3.2.3",
+  current: true,
 };

package/test/data/reconfigResult_old2.js

@@ -0,0 +1,75 @@
+module.exports = {
+  schedule: [
+    { time: "2021-06-20T01:50:00.080+02:00", value: false },
+    { time: "2021-06-20T01:50:00.110+02:00", value: true },
+    { time: "2021-06-20T01:50:00.180+02:00", value: false },
+    { time: "2021-06-20T01:50:00.200+02:00", value: true },
+    { time: "2021-06-20T01:50:00.220+02:00", value: false },
+    { time: "2021-06-20T01:50:00.250+02:00", value: true },
+    { time: "2021-06-20T01:50:00.330+02:00", value: false },
+    { time: "2021-06-20T01:50:00.360+02:00", value: true },
+    { time: "2021-06-20T01:50:00.400+02:00", value: false },
+    { time: "2021-06-20T01:50:00.430+02:00", value: true },
+    { time: "2021-06-20T01:50:00.460+02:00", value: false },
+    { time: "2021-06-20T01:50:00.470+02:00", value: true },
+  ],
+  hours: [
+    { price: 0.2494, onOff: false, start: "2021-06-20T01:50:00.000+02:00", saving: 0.0395 },
+    { price: 0.2209, onOff: false, start: "2021-06-20T01:50:00.010+02:00", saving: 0.011 },
+    { price: 0.2099, onOff: true, start: "2021-06-20T01:50:00.020+02:00", saving: null },
+    { price: 0.219, onOff: true, start: "2021-06-20T01:50:00.030+02:00", saving: null },
+    { price: 0.2614, onOff: true, start: "2021-06-20T01:50:00.040+02:00", saving: null },
+    { price: 0.4426, onOff: true, start: "2021-06-20T01:50:00.050+02:00", saving: null },
+    { price: 0.5433, onOff: true, start: "2021-06-20T01:50:00.060+02:00", saving: null },
+    { price: 0.5667, onOff: true, start: "2021-06-20T01:50:00.070+02:00", saving: null },
+    { price: 0.5847, onOff: false, start: "2021-06-20T01:50:00.080+02:00", saving: 0.0723 },
+    { price: 0.5762, onOff: false, start: "2021-06-20T01:50:00.090+02:00", saving: 0.0638 },
+    { price: 0.5391, onOff: false, start: "2021-06-20T01:50:00.100+02:00", saving: 0.0267 },
+    { price: 0.5124, onOff: true, start: "2021-06-20T01:50:00.110+02:00", saving: null },
+    { price: 0.504, onOff: true, start: "2021-06-20T01:50:00.120+02:00", saving: null },
+    { price: 0.5057, onOff: true, start: "2021-06-20T01:50:00.130+02:00", saving: null },
+    { price: 0.5066, onOff: true, start: "2021-06-20T01:50:00.140+02:00", saving: null },
+    { price: 0.5136, onOff: true, start: "2021-06-20T01:50:00.150+02:00", saving: null },
+    { price: 0.5143, onOff: true, start: "2021-06-20T01:50:00.160+02:00", saving: null },
+    { price: 0.5306, onOff: true, start: "2021-06-20T01:50:00.170+02:00", saving: null },
+    { price: 0.5534, onOff: false, start: "2021-06-20T01:50:00.180+02:00", saving: 0.0043 },
+    { price: 0.5511, onOff: false, start: "2021-06-20T01:50:00.190+02:00", saving: 0.002 },
+    { price: 0.5491, onOff: true, start: "2021-06-20T01:50:00.200+02:00", saving: null },
+    { price: 0.5485, onOff: true, start: "2021-06-20T01:50:00.210+02:00", saving: null },
+    { price: 0.5481, onOff: false, start: "2021-06-20T01:50:00.220+02:00", saving: 0.1285 },
+    { price: 0.5218, onOff: false, start: "2021-06-20T01:50:00.230+02:00", saving: 0.1022 },
+    { price: 0.4533, onOff: false, start: "2021-06-20T01:50:00.240+02:00", saving: 0.0337 },
+    { price: 0.4196, onOff: true, start: "2021-06-20T01:50:00.250+02:00", saving: null },
+    { price: 0.4037, onOff: true, start: "2021-06-20T01:50:00.260+02:00", saving: null },
+    { price: 0.3829, onOff: true, start: "2021-06-20T01:50:00.270+02:00", saving: null },
+    { price: 0.4555, onOff: true, start: "2021-06-20T01:50:00.280+02:00", saving: null },
+    { price: 0.4721, onOff: true, start: "2021-06-20T01:50:00.290+02:00", saving: null },
+    { price: 0.4903, onOff: true, start: "2021-06-20T01:50:00.300+02:00", saving: null },
+    { price: 0.5028, onOff: true, start: "2021-06-20T01:50:00.310+02:00", saving: null },
+    { price: 0.5163, onOff: true, start: "2021-06-20T01:50:00.320+02:00", saving: null },
+    { price: 0.5264, onOff: false, start: "2021-06-20T01:50:00.330+02:00", saving: 0.0193 },
+    { price: 0.5346, onOff: false, start: "2021-06-20T01:50:00.340+02:00", saving: 0.0275 },
+    { price: 0.5224, onOff: false, start: "2021-06-20T01:50:00.350+02:00", saving: 0.0153 },
+    { price: 0.5071, onOff: true, start: "2021-06-20T01:50:00.360+02:00", saving: null },
+    { price: 0.5045, onOff: true, start: "2021-06-20T01:50:00.370+02:00", saving: null },
+    { price: 0.5024, onOff: true, start: "2021-06-20T01:50:00.380+02:00", saving: null },
+    { price: 0.5038, onOff: true, start: "2021-06-20T01:50:00.390+02:00", saving: null },
+    { price: 0.5118, onOff: false, start: "2021-06-20T01:50:00.400+02:00", saving: 0.0063 },
+    { price: 0.5111, onOff: false, start: "2021-06-20T01:50:00.410+02:00", saving: 0.0056 },
+    { price: 0.5108, onOff: false, start: "2021-06-20T01:50:00.420+02:00", saving: 0.0053 },
+    { price: 0.5055, onOff: true, start: "2021-06-20T01:50:00.430+02:00", saving: null },
+    { price: 0.5042, onOff: true, start: "2021-06-20T01:50:00.440+02:00", saving: null },
+    { price: 0.5259, onOff: true, start: "2021-06-20T01:50:00.450+02:00", saving: null },
+    { price: 0.5282, onOff: false, start: "2021-06-20T01:50:00.460+02:00", saving: 0.003 },
+    { price: 0.5252, onOff: true, start: "2021-06-20T01:50:00.470+02:00", saving: null },
+  ],
+  source: undefined,
+  config: {
+    maxHoursToSaveInSequence: 3,
+    minHoursOnAfterMaxSequenceSaved: 2,
+    minSaving: 0.001,
+    sendCurrentValueWhenRescheduling: undefined,
+    outputIfNoSchedule: false,
+    scheduleOnlyFromCurrentTime: true,
+  },
+};

package/test/data/tibber-result-end-0-24h.json

@@ -317,6 +317,7 @@
     "outputIfNoSchedule": false,
     "outputOutsidePeriod": false
   },
+  "sentOnCommand": false,
   "time": "2021-10-11T10:00:00.000+02:00",
   "version": "1.2.3"
 }

package/test/data/tibber-result-end-0.json

@@ -165,6 +165,7 @@
     "outputIfNoSchedule": false,
     "outputOutsidePeriod": false
   },
+  "sentOnCommand": false,
   "time": "2021-10-11T10:00:00.000+02:00",
   "version": "1.2.3"
 }

package/test/send-config-input.test.js

@@ -5,7 +5,6 @@ const { DateTime } = require("luxon");
 const prices = require("./data/converted-prices.json");
 const result = require("./data/best-save-result.json");
 const reconfigResult = require("./data/reconfigResult");
-const adjustedResult = require("./data/adjustedResult");
 const { testPlan, equalPlan } = require("./test-utils");
 const { makeFlow, makePayload } = require("./strategy-best-save-test-utils");
 const cloneDeep = require("lodash.clonedeep");
@@ -50,9 +49,8 @@ describe("send config as input", () => {
       n1.receive({ payload: makePayload(prices, testPlan.time) });
     });
   });
-  it("should schedule only from selected time", function (done) {
+  it("should use another minHoursOnAfterMaxSequenceSaved", function (done) {
     const flow = makeFlow(3, 2);
-    flow[0].scheduleOnlyFromCurrentTime = false;
     const changeTime = DateTime.fromISO("2021-06-20T01:50:00.045+02:00");
     let pass = 1;
     helper.load(bestSave, flow, function () {
@@ -65,14 +63,14 @@ describe("send config as input", () => {
             expect(equalPlan(result, msg.payload)).toBeTruthy();
             n1.receive({
               payload: {
-                config: { scheduleOnlyFromCurrentTime: true },
+                config: { minHoursOnAfterMaxSequenceSaved: 5 },
                 time: changeTime,
               },
             });
             break;
           case 2:
             pass++;
-            reconfigResult.config.scheduleOnlyFromCurrentTime = true;
+            reconfigResult.config.minHoursOnAfterMaxSequenceSaved = 5;
             expect(equalPlan(reconfigResult, msg.payload)).toBeTruthy();
             const payload = makePayload(prices, testPlan.time);
             payload.time = changeTime;
@@ -87,38 +85,6 @@ describe("send config as input", () => {
       n1.receive({ payload: makePayload(prices, testPlan.time) });
     });
   });
-  it("should correct savings for passed hours", function (done) {
-    const flow = makeFlow(3, 2);
-    const changeTime = DateTime.fromISO("2021-06-20T01:50:00.045+02:00");
-    let pass = 1;
-    helper.load(bestSave, flow, function () {
-      const n1 = helper.getNode("n1");
-      const n2 = helper.getNode("n2");
-      n2.on("input", function (msg) {
-        switch (pass) {
-          case 1:
-            pass++;
-            expect(equalPlan(result, msg.payload)).toBeTruthy();
-            n1.receive({
-              payload: {
-                config: {
-                  maxHoursToSaveInSequence: 5,
-                  minSaving: 0.25,
-                  scheduleOnlyFromCurrentTime: true,
-                },
-                time: changeTime,
-              },
-            });
-            break;
-          case 2:
-            pass++;
-            expect(equalPlan(adjustedResult, msg.payload)).toBeTruthy();
-            done();
-        }
-      });
-      n1.receive({ payload: makePayload(prices, testPlan.time) });
-    });
-  });
   it("should accept config and price-data together", function (done) {
     const flow = makeFlow(3, 2);
     let pass = 1;

package/test/strategy-best-save-test-utils.js

@@ -1,7 +1,7 @@
 const cloneDeep = require("lodash.clonedeep");
 const { DateTime } = require("luxon");
 
-function makeFlow(maxHoursToSaveInSequence, minHoursOnAfterMaxSequenceSaved) {
+function makeFlow(maxHoursToSaveInSequence, minHoursOnAfterMaxSequenceSaved, sendCurrentValueWhenRescheduling = false) {
   return [
     {
       id: "n1",
@@ -9,6 +9,7 @@ function makeFlow(maxHoursToSaveInSequence, minHoursOnAfterMaxSequenceSaved) {
       name: "test name",
       maxHoursToSaveInSequence,
       minHoursOnAfterMaxSequenceSaved,
+      sendCurrentValueWhenRescheduling,
       minSaving: 0.001,
       wires: [["n3"], ["n4"], ["n2"]],
     },

package/test/strategy-best-save.test.js

@@ -5,8 +5,9 @@ const helper = require("node-red-node-test-helper");
 const bestSave = require("../src/strategy-best-save.js");
 const prices = require("./data/converted-prices.json");
 const result = require("./data/best-save-result.json");
-const { testPlan: plan } = require("./test-utils");
+const { testPlan: plan, equalPlan } = require("./test-utils");
 const { makeFlow } = require("./strategy-best-save-test-utils");
+const { version } = require("../package.json");
 
 helper.init(require.resolve("node-red"));
 
@@ -61,6 +62,11 @@ describe("ps-strategy-best-save node", function () {
   });
   it("should send new schedule on output 3", function (done) {
     const flow = makeFlow(3, 2);
+    const expected = cloneDeep(result);
+    expected.version = version;
+    expected.time = plan.time;
+    expected.source = "Tibber";
+    expected.current = false;
     helper.load(bestSave, flow, function () {
       const n1 = helper.getNode("n1");
       const n2 = helper.getNode("n2");
@@ -69,22 +75,22 @@ describe("ps-strategy-best-save node", function () {
       let countOn = 0;
       let countOff = 0;
       n2.on("input", function (msg) {
-        expect(msg).toHaveProperty("payload", result);
+        expect(equalPlan(expected, msg.payload)).toBeTruthy();
         n1.warn.should.not.be.called;
+        setTimeout(() => {
+          console.log("countOn = " + countOn + ", countOff = " + countOff);
+          expect(countOn).toEqual(7);
+          expect(countOff).toEqual(7);
+          done();
+        }, 900);
       });
       n3.on("input", function (msg) {
         countOn++;
         expect(msg).toHaveProperty("payload", true);
-        if (countOn === 7 && countOff === 7) {
-          done();
-        }
       });
       n4.on("input", function (msg) {
         countOff++;
         expect(msg).toHaveProperty("payload", false);
-        if (countOn === 7 && countOff === 7) {
-          done();
-        }
       });
       n1.receive({ payload: makePayload(prices, plan.time) });
     });

package/test/test-utils.js

@@ -81,13 +81,7 @@ function equalPlan(expected, actual) {
     });
   });
 
-  [
-    "maxHoursToSaveInSequence",
-    "minHoursOnAfterMaxSequenceSaved",
-    "minSaving",
-    "outputIfNoSchedule",
-    "scheduleOnlyFromCurrentTime",
-  ].forEach((key) => {
+  ["maxHoursToSaveInSequence", "minHoursOnAfterMaxSequenceSaved", "minSaving", "outputIfNoSchedule"].forEach((key) => {
     if (expected.config[key] != actual.config[key]) {
       console.log(
         "Different config values for " + key + ": Expected " + expected.config[key] + ", got " + actual.config[key]

package/test/utils.test.js

@@ -196,37 +196,4 @@ describe("utils", () => {
     };
     expect(extractPlanForDate(plan, "2021-06-20T01:50:00.000+02:00")).toEqual(part1);
   });
-
-  it("can get the correct startAt index", () => {
-    const config = { scheduleOnlyFromCurrentTime: true };
-    const time = DateTime.fromISO("2021-06-20T01:50:00.012+02:00");
-    const priceData = [
-      {
-        start: "2021-06-20T01:50:00.000+02:00",
-      },
-      {
-        start: "2021-06-20T01:50:00.010+02:00",
-      },
-      {
-        start: "2021-06-21T01:50:00.180+02:00",
-      },
-      {
-        start: "2021-06-21T01:50:00.190+02:00",
-      },
-    ];
-    expect(
-      // Start on 0
-      getStartAtIndex({ scheduleOnlyFromCurrentTime: false }, priceData, time)
-    ).toEqual(0);
-    expect(getStartAtIndex(config, priceData, time)).toEqual(2);
-    expect(
-      // Start exactly on time
-      getStartAtIndex(config, priceData, DateTime.fromISO("2021-06-20T01:50:00.010+02:00"))
-    ).toEqual(1);
-    expect(getStartAtIndex(config, priceData, DateTime.fromISO("2021-06-20T01:50:00.011+02:00"))).toEqual(2);
-    expect(
-      // Start later than all data
-      getStartAtIndex(config, priceData, DateTime.fromISO("2021-06-21T01:50:00.200+02:00"))
-    ).toEqual(4);
-  });
 });