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

package/docs/.vuepress/config.js

@@ -58,16 +58,7 @@ module.exports = {
       "/changelog/": [{ text: "Changelog", children: ["/changelog/README.md"] }],
     },
   },
-  head: [
-    ["link", { rel: "shortcut icon", type: "image/x-icon", href: "euro.png" }],
-    ["script", { async: true, src: "https://www.googletagmanager.com/gtag/js?id=G-Z2QNNCDQZG" }],
-    [
-      "script",
-      {
-        src: "window.dataLayer = window.dataLayer || []; function gtag(){dataLayer.push(arguments); } gtag('js', new Date()); gtag('config', 'G-Z2QNNCDQZG');",
-      },
-    ],
-  ],
+  head: [["link", { rel: "shortcut icon", type: "image/x-icon", href: "euro.png" }]],
   plugins: [
     [
       "@vuepress/register-components",
@@ -76,5 +67,6 @@ module.exports = {
       },
     ],
     ["@vuepress/plugin-search"],
+    ["@vuepress/google-analytics", { ga: "G-Z2QNNCDQZG" }],
   ],
 };

package/docs/changelog/README.md

@@ -6,6 +6,11 @@ sidebar: "auto"
 
 List the most significant changes, starting in version 1.0.9.
 
+## 3.6.0
+
+- New feature `Max price` for Lowest Price node. Can be set to only turn on if prices is below or equal to the max price.
+- New value in output 3 from the Lowest Price and Best Save nodes, `countHours`, telling the number of hours that the value will stay.
+
 ## 3.5.7
 
 - Add day-filter to general-add-tariff node so it can add one tariff for some days, and another tariff for other days.

package/docs/nodes/ps-strategy-best-save.md

@@ -168,11 +168,13 @@ Example of output:
   "schedule": [
     {
       "time": "2021-09-30T00:00:00.000+02:00",
-      "value": false
+      "value": false,
+      "countHours": 1
     },
     {
       "time": "2021-09-30T01:00:00.000+02:00",
-      "value": true
+      "value": true,
+      "countHours": 2
     }
   ],
   "hours": [

package/docs/nodes/ps-strategy-lowest-price.md

@@ -18,13 +18,14 @@ The node can work on a specific period from 1 to 24 hours during a 24 hour perio
 
 | Value                  | Description                                                                      |
 | ---------------------- | -------------------------------------------------------------------------------- |
-| From Time              | The start time of the selected period.                                           |
-| To Time                | The end time of the selected period.                                             |
-| Hours On               | The number of hours that shall be turned on.                                     |
-| Consecutive On-Period  | Check this if you need the on-period to be consecutive.                          |
-| Send When Rescheduling | Check this to make sure on or off output is sent immediately after rescheduling. |
-| If No Schedule, Send   | What to do if there is no valid schedule any more (turn on or off).              |
-| Outside Period, Send   | Select the value to send outside the selected period.                            |
+| From time              | The start time of the selected period.                                           |
+| To time                | The end time of the selected period.                                             |
+| Hours on               | The number of hours that shall be turned on.                                     |
+| Max price              | If set, does not turn on if price is over this limit. See below.                 |
+| Consecutive on-period  | Check this if you need the on-period to be consecutive.                          |
+| Send when rescheduling | Check this to make sure on or off output is sent immediately after rescheduling. |
+| If no schedule, send   | What to do if there is no valid schedule any more (turn on or off).              |
+| Outside period, send   | Select the value to send outside the selected period.                            |
 | Context storage        | Select context storage to save data to, if you want other than the default.      |
 
 If you want to use a period of 24 hours, set the From Time and To Time to the same value. The time you select is significant in the way that it decides which 24 hours that are considered when finding the hours with lowest price.
@@ -49,6 +50,18 @@ Unless the period you select is 24 hours (`From Time` and `To Time` are the same
 If you select a period for example from 10:00 to 02:00, it may not be possible to calculate before the period starts. This is because electricity prices for the next day (in the Nord Pool area) normally are received around 13:00. The node cannot calculate the period until it has price data for the whole period.
 :::
 
+::: warning Max price
+Use this to set a maximum price for hours to be on.
+Leave this blank if you don't understand how it works.!
+If this is set, the number of hours on may be less then configured for `Hours on`.
+
+If `Consecutive on period` is off (not checked), hours will be turned on only if the price is below or equal to `Max price`.
+
+If `Consecutive on period` is on (checked), hours will be turned on only if the average price for the whole period is below or equal to `Max price`. If the average price for the hours that are supposed to be turned on is higher then `Max price`, then **all hours** will be off. This is to make sure that if the switch (or whatever you have connected) is turned on, it is turned on the whole period.
+
+If you leave `Max price` blank, it has no effect.
+:::
+
 ### Dynamic config
 
 It is possible to change config dynamically by sending a config message to the node. The config messages has a payload with a config object like this example:
@@ -57,12 +70,13 @@ It is possible to change config dynamically by sending a config message to the n
 "payload": {
   "config": {
     "contextStorage": "file",
-    "fromTime" : 10,
-    "toTime" : 16,
-    "hoursOn" : 3,
-    "doNotSplit" : false,
-    "sendCurrentValueWhenRescheduling" : true,
-    "outputIfNoSchedule" : false,
+    "fromTime": 10,
+    "toTime": 16,
+    "hoursOn": 3,
+    "maxPrice": null,
+    "doNotSplit": false,
+    "sendCurrentValueWhenRescheduling": true,
+    "outputIfNoSchedule": false,
     "outputOutsidePeriod": false
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-red-contrib-power-saver",
-  "version": "3.5.7",
+  "version": "3.6.0",
   "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": {
@@ -46,6 +46,7 @@
   },
   "devDependencies": {
     "@vuepress/bundler-vite": "^2.0.0-beta.36",
+    "@vuepress/plugin-google-analytics": "^2.0.0-beta.36",
     "@vuepress/plugin-register-components": "^2.0.0-beta.36",
     "@vuepress/plugin-search": "^2.0.0-beta.38",
     "@vuepress/utils": "^2.0.0-beta.35",

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

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/power-saver.test.js

@@ -85,14 +85,17 @@ describe("power-saver Node", function () {
       {
         time: "2021-06-20T01:50:00.000+02:00",
         value: true,
+        countHours: 7,
       },
       {
         time: "2021-06-20T01:50:00.070+02:00",
         value: false,
+        countHours: 2,
       },
       {
         time: "2021-06-20T01:50:00.090+02:00",
         value: true,
+        countHours: 1,
       },
     ];
     const flow = makeFlow(4, 2);
@@ -121,14 +124,17 @@ describe("power-saver Node", function () {
       {
         time: "2021-06-20T01:50:00.000+02:00",
         value: true,
+        countHours: 7,
       },
       {
         time: "2021-06-20T01:50:00.070+02:00",
         value: false,
+        countHours: 4,
       },
       {
         time: "2021-06-20T01:50:00.110+02:00",
         value: true,
+        countHours: 9,
       },
     ];
     const flow = makeFlow(4, 2);

package/test/strategy-lowest-price.test.js

@@ -91,6 +91,55 @@ describe("ps-strategy-lowest-price node", function () {
       n1.receive({ payload: makePayload(prices, time) });
     });
   });
+  it("should plan correct continuous schedule with max price ok", function (done) {
+    const resultContinuousMax = require("./data/lowest-price-result-cont-max.json");
+    const flow = makeFlow(4, 1.0);
+    helper.load(lowestPrice, flow, function () {
+      const n1 = helper.getNode("n1");
+      const n2 = helper.getNode("n2");
+      n2.on("input", function (msg) {
+        expect(msg.payload).toHaveProperty("schedule", resultContinuousMax.schedule);
+        expect(msg.payload).toHaveProperty("config", resultContinuousMax.config);
+        n1.warn.should.not.be.called;
+        done();
+      });
+      const time = DateTime.fromISO(prices.priceData[10].start);
+      n1.receive({ payload: makePayload(prices, time) });
+    });
+  });
+  it("should plan correct continuous schedule with max price too high", function (done) {
+    const resultContinuousMax = require("./data/lowest-price-result-cont-max-fail.json");
+    const flow = makeFlow(4, 0.23);
+    helper.load(lowestPrice, flow, function () {
+      const n1 = helper.getNode("n1");
+      const n2 = helper.getNode("n2");
+      n2.on("input", function (msg) {
+        expect(msg.payload).toHaveProperty("schedule", resultContinuousMax.schedule);
+        expect(msg.payload).toHaveProperty("config", resultContinuousMax.config);
+        n1.warn.should.not.be.called;
+        done();
+      });
+      const time = DateTime.fromISO(prices.priceData[10].start);
+      n1.receive({ payload: makePayload(prices, time) });
+    });
+  });
+  it("should plan correct splitted schedule with max price", function (done) {
+    const resultSplittedMax = require("./data/lowest-price-result-split-max.json");
+    const flow = makeFlow(6, 0.51);
+    flow[0].doNotSplit = false;
+    helper.load(lowestPrice, flow, function () {
+      const n1 = helper.getNode("n1");
+      const n2 = helper.getNode("n2");
+      n2.on("input", function (msg) {
+        expect(msg.payload).toHaveProperty("schedule", resultSplittedMax.schedule);
+        expect(msg.payload).toHaveProperty("config", resultSplittedMax.config);
+        n1.warn.should.not.be.called;
+        done();
+      });
+      const time = DateTime.fromISO(prices.priceData[10].start);
+      n1.receive({ payload: makePayload(prices, time) });
+    });
+  });
   it("should plan correct for all day period - 00-00", function (done) {
     const resultAllDay = require("./data/lowest-price-result-split-allday.json");
     const flow = makeFlow(8);
@@ -186,12 +235,14 @@ describe("ps-strategy-lowest-price node", function () {
         const schedule = cloneDeep(resultSplitted.schedule);
         const config = cloneDeep(resultSplitted.config);
         schedule[0].value = true;
-        schedule.splice(1, 0, { time: "2021-10-11T10:00:00.000+02:00", value: false });
-        schedule.splice(4, 0, { time: "2021-10-11T20:00:00.000+02:00", value: true });
-        schedule.splice(5, 0, { time: "2021-10-12T10:00:00.000+02:00", value: false });
+        schedule.splice(1, 0, { time: "2021-10-11T10:00:00.000+02:00", value: false, countHours: 10 });
+        schedule.splice(4, 0, { time: "2021-10-11T20:00:00.000+02:00", value: true, countHours: 14 });
+        schedule.splice(5, 0, { time: "2021-10-12T10:00:00.000+02:00", value: false, countHours: 14 });
         schedule.splice(schedule.length - 1, 1);
         config.outputOutsidePeriod = true;
-        expect(msg.payload).toHaveProperty("schedule", schedule);
+        const res = msg.payload.schedule.map((s) => ({ time: s.time, value: s.value }));
+        const exp = schedule.map((s) => ({ time: s.time, value: s.value }));
+        expect(res).toEqual(exp);
         expect(msg.payload).toHaveProperty("config", config);
         n1.warn.should.not.be.called;
         done();
@@ -218,7 +269,9 @@ describe("ps-strategy-lowest-price node", function () {
         schedule.splice(schedule.length, 0, { time: "2021-10-12T20:00:00.000+02:00", value: true });
         // schedule.splice(schedule.length - 1, 1);
         config.outputOutsidePeriod = true;
-        expect(msg.payload).toHaveProperty("schedule", schedule);
+        const res = msg.payload.schedule.map((s) => ({ time: s.time, value: s.value }));
+        const exp = schedule.map((s) => ({ time: s.time, value: s.value }));
+        expect(res).toEqual(exp);
         expect(msg.payload).toHaveProperty("config", config);
         n1.warn.should.not.be.called;
         done();
@@ -228,7 +281,7 @@ describe("ps-strategy-lowest-price node", function () {
     });
   });
   it("should work with 0 hours on", function (done) {
-    const result = [{ time: "2021-10-11T00:00:00.000+02:00", value: false }];
+    const result = [{ time: "2021-10-11T00:00:00.000+02:00", value: false, countHours: 48 }];
     const flow = makeFlow(0);
     helper.load(lowestPrice, flow, function () {
       const n1 = helper.getNode("n1");
@@ -244,11 +297,11 @@ describe("ps-strategy-lowest-price node", function () {
   });
   it("should work with 0 hours on outside on", function (done) {
     const result = [
-      { 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-11T20:00:00.000+02:00", value: true },
-      { time: "2021-10-12T10:00:00.000+02:00", value: false },
-      { time: "2021-10-12T20: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: 10 },
+      { time: "2021-10-11T20:00:00.000+02:00", value: true, countHours: 14 },
+      { time: "2021-10-12T10:00:00.000+02:00", value: false, countHours: 10 },
+      { time: "2021-10-12T20:00:00.000+02:00", value: true, countHours: 4 },
     ];
     const flow = makeFlow(0);
     flow[0].outputOutsidePeriod = true;
@@ -266,11 +319,11 @@ describe("ps-strategy-lowest-price node", function () {
   });
   it("should work with 1 hours on", function (done) {
     const result = [
-      { time: "2021-10-11T00:00:00.000+02:00", value: false },
-      { time: "2021-10-11T12:00:00.000+02:00", value: true },
-      { time: "2021-10-11T13: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: false, countHours: 12 },
+      { time: "2021-10-11T12:00:00.000+02:00", value: true, countHours: 1 },
+      { time: "2021-10-11T13:00:00.000+02:00", value: false, countHours: 25 },
+      { 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 },
     ];
     const flow = makeFlow(1);
     helper.load(lowestPrice, flow, function () {
@@ -287,11 +340,11 @@ describe("ps-strategy-lowest-price node", function () {
   });
   it("should work with 24 hours on", function (done) {
     const result = [
-      { time: "2021-10-11T00:00:00.000+02:00", value: false },
-      { time: "2021-10-11T10:00:00.000+02:00", value: true },
-      { time: "2021-10-11T20:00:00.000+02:00", value: false },
-      { time: "2021-10-12T10: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: 10 },
+      { time: "2021-10-11T10:00:00.000+02:00", value: true, countHours: 10 },
+      { time: "2021-10-11T20:00:00.000+02:00", value: false, countHours: 14 },
+      { time: "2021-10-12T10:00:00.000+02:00", value: true, countHours: 10 },
+      { time: "2021-10-12T20:00:00.000+02:00", value: false, countHours: 4 },
     ];
     const flow = makeFlow(24);
     helper.load(lowestPrice, flow, function () {
@@ -311,9 +364,9 @@ describe("ps-strategy-lowest-price node", function () {
     const oneDayPrices = {};
     oneDayPrices.priceData = prices.priceData.filter((d) => d.start.startsWith("2021-10-11"));
     const result = [
-      { time: "2021-10-11T00:00:00.000+02:00", value: false },
-      { time: "2021-10-11T12:00:00.000+02:00", value: true },
-      { time: "2021-10-11T13:00:00.000+02:00", value: false },
+      { 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: 1 },
+      { time: "2021-10-11T13:00:00.000+02:00", value: false, countHours: 11 },
     ];
     const flow = makeFlow(1);
     helper.load(lowestPrice, flow, function () {
@@ -340,7 +393,7 @@ describe("ps-strategy-lowest-price node", function () {
   });
 
   it("should handle hours on > period", function (done) {
-    const result = [{ time: "2021-10-11T00:00:00.000+02:00", value: true }];
+    const result = [{ time: "2021-10-11T00:00:00.000+02:00", value: true, countHours: 48 }];
     const flow = [
       {
         id: "n1",
@@ -388,11 +441,11 @@ describe("ps-strategy-lowest-price node", function () {
   });
   it("should handle hours on > period, false outside", function (done) {
     const result = [
-      { time: "2021-10-11T00:00:00.000+02:00", value: false },
-      { time: "2021-10-11T17:00:00.000+02:00", value: true },
-      { time: "2021-10-11T22:00:00.000+02:00", value: false },
-      { time: "2021-10-12T17:00:00.000+02:00", value: true },
-      { time: "2021-10-12T22:00:00.000+02:00", value: false },
+      { time: "2021-10-11T00:00:00.000+02:00", value: false, countHours: 17 },
+      { time: "2021-10-11T17:00:00.000+02:00", value: true, countHours: 5 },
+      { time: "2021-10-11T22:00:00.000+02:00", value: false, countHours: 19 },
+      { time: "2021-10-12T17:00:00.000+02:00", value: true, countHours: 5 },
+      { time: "2021-10-12T22:00:00.000+02:00", value: false, countHours: 2 },
     ];
     const flow = [
       {
@@ -451,6 +504,7 @@ describe("ps-strategy-lowest-price node", function () {
         fromTime: "16",
         toTime: "00",
         hoursOn: 3,
+        maxPrice: null,
         doNotSplit: false,
         sendCurrentValueWhenRescheduling: true,
         outputIfNoSchedule: false,
@@ -485,6 +539,7 @@ describe("ps-strategy-lowest-price node", function () {
         fromTime: "16",
         toTime: "00",
         hoursOn: 3,
+        maxPrice: null,
         doNotSplit: false,
         sendCurrentValueWhenRescheduling: true,
         outputIfNoSchedule: false,
@@ -519,6 +574,7 @@ describe("ps-strategy-lowest-price node", function () {
         fromTime: "22",
         toTime: "08",
         hoursOn: 3,
+        maxPrice: null,
         doNotSplit: true,
         sendCurrentValueWhenRescheduling: true,
         outputIfNoSchedule: false,
@@ -544,7 +600,7 @@ describe("ps-strategy-lowest-price node", function () {
   });
 });
 
-function makeFlow(hoursOn) {
+function makeFlow(hoursOn, maxPrice = null) {
   return [
     {
       id: "n1",
@@ -553,6 +609,7 @@ function makeFlow(hoursOn) {
       fromTime: "10",
       toTime: "20",
       hoursOn: hoursOn,
+      maxPrice: maxPrice,
       doNotSplit: true,
       sendCurrentValueWhenRescheduling: true,
       outputIfNoSchedule: true,

package/test/utils.test.js

@@ -70,18 +70,19 @@ describe("utils", () => {
       "2021-06-20T09:00:00+02:00",
     ];
     expect(makeSchedule(onOff, startTimes)).toEqual([
-      { time: "2021-06-20T05:00:00+02:00", value: false },
-      { time: "2021-06-20T07:00:00+02:00", value: true },
-      { time: "2021-06-20T09:00:00+02:00", value: false },
+      { time: "2021-06-20T05:00:00+02:00", value: false, countHours: 2 },
+      { time: "2021-06-20T07:00:00+02:00", value: true, countHours: 2 },
+      { time: "2021-06-20T09:00:00+02:00", value: false, countHours: 1 },
     ]);
     expect(makeSchedule(onOff, startTimes, true)).toEqual([
-      { time: "2021-06-20T05:00:00+02:00", value: false },
-      { time: "2021-06-20T07:00:00+02:00", value: true },
-      { time: "2021-06-20T09:00:00+02:00", value: false },
+      { time: "2021-06-20T05:00:00+02:00", value: false, countHours: 2 },
+      { time: "2021-06-20T07:00:00+02:00", value: true, countHours: 2 },
+      { time: "2021-06-20T09:00:00+02:00", value: false, countHours: 1 },
     ]);
     expect(makeSchedule(onOff, startTimes, false)).toEqual([
-      { time: "2021-06-20T07:00:00+02:00", value: true },
-      { time: "2021-06-20T09:00:00+02:00", value: false },
+      { time: "2021-06-20T05:00:00+02:00", value: false, countHours: 2 }, // Right???
+      { time: "2021-06-20T07:00:00+02:00", value: true, countHours: 2 },
+      { time: "2021-06-20T09:00:00+02:00", value: false, countHours: 1 },
     ]);
   });