node-red-contrib-power-saver 3.5.5 → 3.6.0

package/src/receive-price.html

@@ -26,5 +26,5 @@
   A node to receive price data from one of the supported sources,
   and adapt it for calculation in the Power Saver strategy nodes.
 
-  Please read more in the [node documentation](https://ottopaulsen.github.io/node-red-contrib-power-saver/nodes/ps-receive-price)
+  Please read more in the [node documentation](https://powersaver.no/nodes/ps-receive-price)
 </script>

package/src/strategy-best-save.html

@@ -105,5 +105,5 @@
 <script type="text/markdown" data-help-name="ps-strategy-best-save">
   A node you can use to save money by turning off and on a switch based on power prices.
 
-  Please read more in the [node documentation](https://ottopaulsen.github.io/node-red-contrib-power-saver/nodes/ps-strategy-best-save)
+  Please read more in the [node documentation](https://powersaver.no/nodes/ps-strategy-best-save)
 </script>

package/src/strategy-heat-capacitor.html

@@ -79,7 +79,5 @@
   | Cooling Boost [C] | An extra decrease in temperature to the setpoint for the divestment period |
   | Min Savings       | The minimum amount of savings required for a buy/sell cycle.               |
 
-  
-  Please read more in the [node documentation](https://ottopaulsen.github.io/node-red-contrib-power-saver/nodes/ps-strategy-heat-capacitor)
-
+  Please read more in the [node documentation](https://powersaver.no/nodes/ps-strategy-heat-capacitor)
 </script>

package/src/strategy-lowest-price.html

@@ -43,6 +43,14 @@
         value: "12",
         required: true,
       },
+      maxPrice: {
+        value: null,
+        required: false,
+        validate: function (v) {
+          console.log("validating " + v);
+          return v == null || v == "" || (!isNaN(parseFloat(v)) && isFinite(v));
+        },
+      },
       doNotSplit: {
         value: "false",
         required: true,
@@ -145,6 +153,10 @@
       <label for="node-input-hoursOn"><i class="fa fa-arrows-h"></i> Hours on</label>
       <input type="text" id="node-input-hoursOn" style="width: 80px">
   </div>
+  <div class="form-row">
+    <label for="node-input-maxPrice"><i class="fa fa-minus"></i> Max price</label>
+    <input type="text" id="node-input-maxPrice" placeholder="Max price" style="width: 80px">
+  </div>
   <div class="form-row">
       <label for="node-input-doNotSplit">Consecutive on-period</label>
       <input type="checkbox" id="node-input-doNotSplit" style="display:inline-block; width:22px; vertical-align:top;">
@@ -177,5 +189,5 @@
 <script type="text/markdown" data-help-name="ps-strategy-lowest-price">
   A node to turn on a switch the hours when the price is lowest.
 
-  Please read more in the [node documentation](https://ottopaulsen.github.io/node-red-contrib-power-saver/nodes/ps-strategy-lowest-price)
+  Please read more in the [node documentation](https://powersaver.no/nodes/ps-strategy-lowest-price)
 </script>

package/src/strategy-lowest-price.js

@@ -13,6 +13,7 @@ module.exports = function (RED) {
       fromTime: config.fromTime,
       toTime: config.toTime,
       hoursOn: parseInt(config.hoursOn),
+      maxPrice: config.maxPrice == null || config.maxPrice == "" ? null : parseFloat(config.maxPrice),
       doNotSplit: booleanConfig(config.doNotSplit),
       sendCurrentValueWhenRescheduling: booleanConfig(config.sendCurrentValueWhenRescheduling),
       outputIfNoSchedule: booleanConfig(config.outputIfNoSchedule),
@@ -22,7 +23,6 @@ module.exports = function (RED) {
     node.context().set("config", originalConfig);
     node.contextStorage = originalConfig.contextStorage;
 
-
     node.on("close", function () {
       clearTimeout(node.schedulingTimeout);
     });
@@ -123,8 +123,17 @@ function makePlan(node, values, onOff, fromIndex, toIndex) {
   const res = node.doNotSplit
     ? getBestContinuous(valuesInPeriod, node.hoursOn)
     : getBestX(valuesInPeriod, node.hoursOn);
+  const sumPriceOn = res.reduce((p, v, i) => {
+    return p + (v ? valuesInPeriod[i] : 0);
+  }, 0);
+  const average = sumPriceOn / node.hoursOn;
   res.forEach((v, i) => {
-    onOff[fromIndex + i] = v;
+    onOff[fromIndex + i] =
+      node.maxPrice == null
+        ? v
+        : node.doNotSplit
+        ? v && average <= node.maxPrice
+        : v && valuesInPeriod[i] <= node.maxPrice;
   });
   return onOff;
 }

package/src/utils.js

@@ -138,13 +138,16 @@ function countAtEnd(arr, value) {
 function makeSchedule(onOff, startTimes, initial = null) {
   const res = [];
   let prev = initial;
+  let prevRecord;
   for (let i = 0; i < startTimes.length; i++) {
     const value = onOff[i];
-    if (value !== prev) {
+    if (value !== prev || i === 0) {
       const time = startTimes[i];
-      res.push({ time, value });
+      prevRecord = { time, value, countHours: 0 };
+      res.push(prevRecord);
       prev = value;
     }
+    prevRecord.countHours++;
   }
   return res;
 }

package/test/data/lowest-price-result-cont-max-fail.json

@@ -0,0 +1,14 @@
+{
+  "schedule": [{ "time": "2021-10-11T00:00:00.000+02:00", "value": false, "countHours": 48 }],
+  "config": {
+    "contextStorage": "default",
+    "doNotSplit": true,
+    "fromTime": "10",
+    "hoursOn": 4,
+    "maxPrice": 0.23,
+    "outputIfNoSchedule": true,
+    "outputOutsidePeriod": false,
+    "sendCurrentValueWhenRescheduling": true,
+    "toTime": "20"
+  }
+}

package/test/data/lowest-price-result-cont-max.json

@@ -0,0 +1,20 @@
+{
+  "schedule": [
+    { "time": "2021-10-11T00:00:00.000+02:00", "value": false, "countHours": 11 },
+    { "time": "2021-10-11T11:00:00.000+02:00", "value": true, "countHours": 4 },
+    { "time": "2021-10-11T15:00:00.000+02:00", "value": false, "countHours": 21 },
+    { "time": "2021-10-12T12:00:00.000+02:00", "value": true, "countHours": 4 },
+    { "time": "2021-10-12T16:00:00.000+02:00", "value": false, "countHours": 8 }
+  ],
+  "config": {
+    "contextStorage": "default",
+    "doNotSplit": true,
+    "fromTime": "10",
+    "hoursOn": 4,
+    "maxPrice": 1,
+    "outputIfNoSchedule": true,
+    "outputOutsidePeriod": false,
+    "sendCurrentValueWhenRescheduling": true,
+    "toTime": "20"
+  }
+}

package/test/data/lowest-price-result-cont.json

@@ -1,16 +1,17 @@
 {
   "schedule": [
-    { "time": "2021-10-11T00:00:00.000+02:00", "value": false },
-    { "time": "2021-10-11T11:00:00.000+02:00", "value": true },
-    { "time": "2021-10-11T15:00:00.000+02:00", "value": false },
-    { "time": "2021-10-12T12:00:00.000+02:00", "value": true },
-    { "time": "2021-10-12T16:00:00.000+02:00", "value": false }
+    { "time": "2021-10-11T00:00:00.000+02:00", "value": false, "countHours": 11 },
+    { "time": "2021-10-11T11:00:00.000+02:00", "value": true, "countHours": 4 },
+    { "time": "2021-10-11T15:00:00.000+02:00", "value": false, "countHours": 21 },
+    { "time": "2021-10-12T12:00:00.000+02:00", "value": true, "countHours": 4 },
+    { "time": "2021-10-12T16:00:00.000+02:00", "value": false, "countHours": 8 }
   ],
   "config": {
     "contextStorage": "default",
     "doNotSplit": true,
     "fromTime": "10",
     "hoursOn": 4,
+    "maxPrice": null,
     "outputIfNoSchedule": true,
     "outputOutsidePeriod": false,
     "sendCurrentValueWhenRescheduling": true,

package/test/data/lowest-price-result-missing-end.json

@@ -3,15 +3,18 @@
     "schedule": [
       {
         "time": "2021-12-15T00:00:00+01:00",
-        "value": false
+        "value": false,
+        "countHours": 22
       },
       {
         "time": "2021-12-15T22:00:00+01:00",
-        "value": true
+        "value": true,
+        "countHours": 3
       },
       {
         "time": "2021-12-16T01:00:00+01:00",
-        "value": false
+        "value": false,
+        "countHours": 23
       }
     ],
     "hours": [
@@ -310,6 +313,7 @@
       "fromTime": "22",
       "toTime": "08",
       "hoursOn": 3,
+      "maxPrice": null,
       "doNotSplit": true,
       "sendCurrentValueWhenRescheduling": true,
       "outputIfNoSchedule": false,

package/test/data/lowest-price-result-split-allday.json

@@ -1,19 +1,20 @@
 {
   "schedule": [
-    { "time": "2021-10-11T00:00:00.000+02:00", "value": true },
-    { "time": "2021-10-11T06:00:00.000+02:00", "value": false },
-    { "time": "2021-10-11T12:00:00.000+02:00", "value": true },
-    { "time": "2021-10-11T14:00:00.000+02:00", "value": false },
-    { "time": "2021-10-12T00:00:00.000+02:00", "value": true },
-    { "time": "2021-10-12T07:00:00.000+02:00", "value": false },
-    { "time": "2021-10-12T14:00:00.000+02:00", "value": true },
-    { "time": "2021-10-12T15:00:00.000+02:00", "value": false }
+    { "time": "2021-10-11T00:00:00.000+02:00", "value": true, "countHours": 6 },
+    { "time": "2021-10-11T06:00:00.000+02:00", "value": false, "countHours": 6 },
+    { "time": "2021-10-11T12:00:00.000+02:00", "value": true, "countHours": 2 },
+    { "time": "2021-10-11T14:00:00.000+02:00", "value": false, "countHours": 10 },
+    { "time": "2021-10-12T00:00:00.000+02:00", "value": true, "countHours": 7 },
+    { "time": "2021-10-12T07:00:00.000+02:00", "value": false, "countHours": 7 },
+    { "time": "2021-10-12T14:00:00.000+02:00", "value": true, "countHours": 1 },
+    { "time": "2021-10-12T15:00:00.000+02:00", "value": false, "countHours": 9 }
   ],
   "config": {
     "contextStorage": "default",
     "doNotSplit": false,
     "fromTime": "00",
     "hoursOn": 8,
+    "maxPrice": null,
     "outputIfNoSchedule": true,
     "outputOutsidePeriod": false,
     "sendCurrentValueWhenRescheduling": true,

package/test/data/lowest-price-result-split-allday10.json

@@ -1,18 +1,19 @@
 {
   "schedule": [
-    { "time": "2021-10-11T00:00:00.000+02:00", "value": true },
-    { "time": "2021-10-11T10:00:00.000+02:00", "value": false },
-    { "time": "2021-10-11T12:00:00.000+02:00", "value": true },
-    { "time": "2021-10-11T14:00:00.000+02:00", "value": false },
-    { "time": "2021-10-12T00:00:00.000+02:00", "value": true },
-    { "time": "2021-10-12T08:00:00.000+02:00", "value": false },
-    { "time": "2021-10-12T10:00:00.000+02:00", "value": true }
+    { "time": "2021-10-11T00:00:00.000+02:00", "value": true, "countHours": 10 },
+    { "time": "2021-10-11T10:00:00.000+02:00", "value": false, "countHours": 2 },
+    { "time": "2021-10-11T12:00:00.000+02:00", "value": true, "countHours": 2 },
+    { "time": "2021-10-11T14:00:00.000+02:00", "value": false, "countHours": 10 },
+    { "time": "2021-10-12T00:00:00.000+02:00", "value": true, "countHours": 8 },
+    { "time": "2021-10-12T08:00:00.000+02:00", "value": false, "countHours": 2 },
+    { "time": "2021-10-12T10:00:00.000+02:00", "value": true, "countHours": 14 }
   ],
   "config": {
     "contextStorage": "default",
     "doNotSplit": false,
     "fromTime": "10",
     "hoursOn": 10,
+    "maxPrice": null,
     "outputIfNoSchedule": true,
     "outputOutsidePeriod": false,
     "sendCurrentValueWhenRescheduling": true,

package/test/data/lowest-price-result-split-max.json

@@ -0,0 +1,22 @@
+{
+  "schedule": [
+    { "time": "2021-10-11T00:00:00.000+02:00", "value": false, "countHours": 12 },
+    { "time": "2021-10-11T12:00:00.000+02:00", "value": true, "countHours": 3 },
+    { "time": "2021-10-11T15:00:00.000+02:00", "value": false, "countHours": 21 },
+    { "time": "2021-10-12T12:00:00.000+02:00", "value": true, "countHours": 4 },
+    { "time": "2021-10-12T16:00:00.000+02:00", "value": false, "countHours": 3 },
+    { "time": "2021-10-12T19:00:00.000+02:00", "value": true, "countHours": 1 },
+    { "time": "2021-10-12T20:00:00.000+02:00", "value": false, "countHours": 4 }
+  ],
+  "config": {
+    "contextStorage": "default",
+    "doNotSplit": false,
+    "fromTime": "10",
+    "hoursOn": 6,
+    "maxPrice": 0.51,
+    "outputIfNoSchedule": true,
+    "outputOutsidePeriod": false,
+    "sendCurrentValueWhenRescheduling": true,
+    "toTime": "20"
+  }
+}

package/test/data/lowest-price-result-split.json

@@ -1,18 +1,19 @@
 {
   "schedule": [
-    { "time": "2021-10-11T00:00:00.000+02:00", "value": false },
-    { "time": "2021-10-11T11:00:00.000+02:00", "value": true },
-    { "time": "2021-10-11T17:00:00.000+02:00", "value": false },
-    { "time": "2021-10-12T12:00:00.000+02:00", "value": true },
-    { "time": "2021-10-12T16:00:00.000+02:00", "value": false },
-    { "time": "2021-10-12T18:00:00.000+02:00", "value": true },
-    { "time": "2021-10-12T20:00:00.000+02:00", "value": false }
+    { "time": "2021-10-11T00:00:00.000+02:00", "value": false, "countHours": 11 },
+    { "time": "2021-10-11T11:00:00.000+02:00", "value": true, "countHours": 6 },
+    { "time": "2021-10-11T17:00:00.000+02:00", "value": false, "countHours": 19 },
+    { "time": "2021-10-12T12:00:00.000+02:00", "value": true, "countHours": 4 },
+    { "time": "2021-10-12T16:00:00.000+02:00", "value": false, "countHours": 2 },
+    { "time": "2021-10-12T18:00:00.000+02:00", "value": true, "countHours": 2 },
+    { "time": "2021-10-12T20:00:00.000+02:00", "value": false, "countHours": 4 }
   ],
   "config": {
     "contextStorage": "default",
     "doNotSplit": false,
     "fromTime": "10",
     "hoursOn": 6,
+    "maxPrice": null,
     "outputIfNoSchedule": true,
     "outputOutsidePeriod": false,
     "sendCurrentValueWhenRescheduling": true,

package/test/data/nordpool-3-days-result.json

@@ -2,23 +2,28 @@
   "schedule": [
     {
       "time": "2022-01-03T00:00:00+01:00",
-      "value": false
+      "value": false,
+      "countHours": 28
     },
     {
       "time": "2022-01-04T04:00:00+01:00",
-      "value": true
+      "value": true,
+      "countHours": 1
     },
     {
       "time": "2022-01-04T05:00:00+01:00",
-      "value": false
+      "value": false,
+      "countHours": 22
     },
     {
       "time": "2022-01-05T03:00:00+01:00",
-      "value": true
+      "value": true,
+      "countHours": 1
     },
     {
       "time": "2022-01-05T04:00:00+01:00",
-      "value": false
+      "value": false,
+      "countHours": 20
     }
   ],
   "hours": [

package/test/data/result.js

@@ -3,38 +3,47 @@ module.exports = {
     {
       time: "2021-06-20T01:50:00.000+02:00",
       value: true,
+      countHours: 3,
     },
     {
       time: "2021-06-20T01:50:00.030+02:00",
       value: false,
+      countHours: 2,
     },
     {
       time: "2021-06-20T01:50:00.050+02:00",
       value: true,
+      countHours: 1,
     },
     {
       time: "2021-06-20T01:50:00.060+02:00",
       value: false,
+      countHours: 2,
     },
     {
       time: "2021-06-20T01:50:00.080+02:00",
       value: true,
+      countHours: 1,
     },
     {
       time: "2021-06-20T01:50:00.090+02:00",
       value: false,
+      countHours: 3,
     },
     {
       time: "2021-06-20T01:50:00.120+02:00",
       value: true,
+      countHours: 3,
     },
     {
       time: "2021-06-20T01:50:00.150+02:00",
       value: false,
+      countHours: 3,
     },
     {
       time: "2021-06-20T01:50:00.180+02:00",
       value: true,
+      countHours: 2,
     },
   ],
   hours: [

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

@@ -2,19 +2,23 @@
   "schedule": [
     {
       "time": "2021-12-14T00:00:00.000+01:00",
-      "value": false
+      "value": false,
+      "countHours": 21
     },
     {
       "time": "2021-12-14T21:00:00.000+01:00",
-      "value": true
+      "value": true,
+      "countHours": 3
     },
     {
       "time": "2021-12-15T00:00:00.000+01:00",
-      "value": false
+      "value": false,
+      "countHours": 21
     },
     {
       "time": "2021-12-15T21:00:00.000+01:00",
-      "value": true
+      "value": true,
+      "countHours": 3
     }
   ],
   "hours": [
@@ -313,6 +317,7 @@
     "fromTime": "16",
     "toTime": "00",
     "hoursOn": 3,
+    "maxPrice": null,
     "doNotSplit": false,
     "sendCurrentValueWhenRescheduling": true,
     "outputIfNoSchedule": false,

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

@@ -2,11 +2,13 @@
   "schedule": [
     {
       "time": "2021-12-14T00:00:00.000+01:00",
-      "value": false
+      "value": false,
+      "countHours": 21
     },
     {
       "time": "2021-12-14T21:00:00.000+01:00",
-      "value": true
+      "value": true,
+      "countHours": 3
     }
   ],
   "hours": [
@@ -161,6 +163,7 @@
     "fromTime": "16",
     "toTime": "00",
     "hoursOn": 3,
+    "maxPrice": null,
     "doNotSplit": false,
     "sendCurrentValueWhenRescheduling": true,
     "outputIfNoSchedule": false,

package/test/data/tibber-result.json

@@ -2,59 +2,73 @@
   "schedule": [
     {
       "time": "2021-10-11T00:00:00.000+02:00",
-      "value": false
+      "value": false,
+      "countHours": 2
     },
     {
       "time": "2021-10-11T02:00:00.000+02:00",
-      "value": true
+      "value": true,
+      "countHours": 5
     },
     {
       "time": "2021-10-11T07:00:00.000+02:00",
-      "value": false
+      "value": false,
+      "countHours": 4
     },
     {
       "time": "2021-10-11T11:00:00.000+02:00",
-      "value": true
+      "value": true,
+      "countHours": 7
     },
     {
       "time": "2021-10-11T18:00:00.000+02:00",
-      "value": false
+      "value": false,
+      "countHours": 2
     },
     {
       "time": "2021-10-11T20:00:00.000+02:00",
-      "value": true
+      "value": true,
+      "countHours": 1
     },
     {
       "time": "2021-10-11T21:00:00.000+02:00",
-      "value": false
+      "value": false,
+      "countHours": 4
     },
     {
       "time": "2021-10-12T01:00:00.000+02:00",
-      "value": true
+      "value": true,
+      "countHours": 8
     },
     {
       "time": "2021-10-12T09:00:00.000+02:00",
-      "value": false
+      "value": false,
+      "countHours": 4
     },
     {
       "time": "2021-10-12T13:00:00.000+02:00",
-      "value": true
+      "value": true,
+      "countHours": 3
     },
     {
       "time": "2021-10-12T16:00:00.000+02:00",
-      "value": false
+      "value": false,
+      "countHours": 4
     },
     {
       "time": "2021-10-12T20:00:00.000+02:00",
-      "value": true
+      "value": true,
+      "countHours": 2
     },
     {
       "time": "2021-10-12T22:00:00.000+02:00",
-      "value": false
+      "value": false,
+      "countHours": 1
     },
     {
       "time": "2021-10-12T23:00:00.000+02:00",
-      "value": true
+      "value": true,
+      "countHours": 1
     }
   ],
   "hours": [

package/test/general-add-tariff-functions.test.js

@@ -45,6 +45,7 @@ describe("general-add-tariff-functions", () => {
         { start: "06", value: 10 },
         { start: "22", value: 11 },
       ],
+      days: { Mon: true, Tue: true, Wed: true, Thu: true, Fri: true, Sat: true, Sun: true },
     };
     const values = [];
     fillResult(values, 0, 5, 21);
@@ -75,6 +76,7 @@ describe("general-add-tariff-functions", () => {
         { start: "06", value: 10 },
         { start: "22", value: 11 },
       ],
+      days: { Mon: true, Tue: true, Wed: true, Thu: true, Fri: true, Sat: true, Sun: true },
     };
     const values = [];
     fillResult(values, 0, 23, 10);

package/test/general-add-tariff.test.js

@@ -24,7 +24,7 @@ const prices = {
     },
     {
       value: 2.1,
-      start: "2021-10-12T00:00:00.000+02:00",
+      start: "2021-10-12T00:00:00.000+02:00", // Tuesday
     },
     {
       value: 2.2,
@@ -66,6 +66,7 @@ describe("general-add-tariff node", function () {
           { start: "01", value: "0.50" },
           { start: "03", value: "0.80" },
         ],
+        days: { Mon: true, Tue: true, Wed: true, Thu: true, Fri: true, Sat: true, Sun: true },
       },
       { id: "n2", type: "helper" },
     ];
@@ -89,6 +90,41 @@ describe("general-add-tariff node", function () {
       n1.receive({ payload });
     });
   });
+  it("should add to price only for correct days", function (done) {
+    const flow = [
+      {
+        id: "n1",
+        type: "ps-general-add-tariff",
+        name: "Add tariff",
+        wires: [["n2"]],
+        periods: [
+          { start: "01", value: "0.50" },
+          { start: "03", value: "0.80" },
+        ],
+        days: { Mon: true, Tue: false, Wed: true, Thu: true, Fri: true, Sat: true, Sun: true },
+      },
+      { id: "n2", type: "helper" },
+    ];
+    const result = cloneDeep(prices);
+    result.priceData[0].value = 1.0;
+    result.priceData[1].value = 0.8;
+    result.priceData[2].value = 0.6;
+    result.priceData[3].value = 2.0345;
+    result.priceData[4].value = 2.1;
+    result.priceData[5].value = 2.2;
+    result.config = { abc: 123 };
+    helper.load(addTariff, flow, function () {
+      const n1 = helper.getNode("n1");
+      const n2 = helper.getNode("n2");
+      n2.on("input", function (msg) {
+        expect(msg).toHaveProperty("payload", result);
+        done();
+      });
+      const payload = cloneDeep(prices);
+      payload.config = { abc: 123 };
+      n1.receive({ payload });
+    });
+  });
   it("should add to price when only first day is valid", function (done) {
     const flow = [
       {
@@ -100,6 +136,7 @@ describe("general-add-tariff node", function () {
           { start: "01", value: "0.50" },
           { start: "03", value: "0.80" },
         ],
+        days: { Mon: true, Tue: true, Wed: true, Thu: true, Fri: true, Sat: true, Sun: true },
         validFrom: "2021-10-11",
         validTo: "2021-10-11",
       },
@@ -134,6 +171,7 @@ describe("general-add-tariff node", function () {
           { start: "01", value: "0.50" },
           { start: "03", value: "0.80" },
         ],
+        days: { Mon: true, Tue: true, Wed: true, Thu: true, Fri: true, Sat: true, Sun: true },
         validFrom: "2021-10-12",
       },
       { id: "n2", type: "helper" },
@@ -163,6 +201,7 @@ describe("general-add-tariff node", function () {
         name: "Add tariff",
         wires: [["n2"]],
         periods: [{ start: "01", value: "0.50" }],
+        days: { Mon: true, Tue: true, Wed: true, Thu: true, Fri: true, Sat: true, Sun: true },
       },
       { id: "n2", type: "helper" },
     ];