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

package/docs/.vuepress/config.js

@@ -58,7 +58,16 @@ module.exports = {
       "/changelog/": [{ text: "Changelog", children: ["/changelog/README.md"] }],
     },
   },
-  head: [["link", { rel: "shortcut icon", type: "image/x-icon", href: "euro.png" }]],
+  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');",
+      },
+    ],
+  ],
   plugins: [
     [
       "@vuepress/register-components",

package/docs/changelog/README.md

@@ -6,6 +6,20 @@ sidebar: "auto"
 
 List the most significant changes, starting in version 1.0.9.
 
+## 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.
+- Fix the elvia-add-tariff node so time is correct. The Elvia API does not handle time zone on the request, so this must be corrected for.
+- Fix link to node-documentation in node edit dialogs.
+
+## 3.5.6
+
+- Update Elvia nodes so they use the new `digin` API. NB! There is no guarantee this is working right.
+
+## 3.5.5
+
+- Fix config storage for Best Save node
+
 ## 3.5.4
 
 - Fix bug in context selection

package/docs/examples/example-grid-tariff-capacity-part.md

@@ -0,0 +1,272 @@
+# Capacity part of grid tariff
+
+I Norway, there has been introduced a monthly fee for grid capacity. The purpose is to get people to avoid using large capacities at any time.
+The fee is calculated based on the average consumption per hour. The maximum average consumption for each day is calculated. Then the average of the three highest days for the month is used to decide your capacity fee.
+
+The capacity is divided in steps, so if your average of the 3 worst days is over the step limit, your fee is picked from that step.
+
+Here is an example how this can be controlled. The axample contains several features, and yuo may not want to use them all, so it is a good idea to read through it all before you decide how to use it.
+
+## Requirements
+
+You need the following to be able to use this example:
+
+- Tibber Pulse to measure consumption continuously.
+- Tibber subscription to get consumption data per hour.
+- Token to access Tibber API.
+- [Node-RED Companion Integration](https://github.com/zachowj/hass-node-red)
+- Tibber nodes in Node-RED.
+
+If you have the same information from other sources, you may be able to adapt the example.
+
+## Features
+
+- Show status as Ok, Warning or Alarm for the current consumption (estimate calculated for the current hour).
+- Show current step, that is the step that you already are on based on consumption previously this month.
+- Control sensors in HA that you can use to take action to reduce consumption the current hour.
+
+## Algorithm
+
+The algorithm is calculating a state that can be:
+
+- Ok - Current estimate will not bring you over to another step.
+- Warning - Current estimate may affect the step, if combined with high consumption later this month.
+- Alarm - Current estimate will bring you over to another step.
+
+The current consumption is measured continuously (every 2 seconds), along with the total consumption for the current hour until current time.
+The consumption for the rest of the current hour is estimated, assumed to be the same in average as the average consumption for the last minute (can be configured to several minutes). Based on this, the total consumption for the current hour is estimated.
+
+Then the current hour is compared to the other hours today. If it is not the worst, status is Ok, as it will not affect the fee.
+
+If the current hour is todays worst, it is ranked together with the other days this month. If today is ranked as 4 or better, where 1 is the worst this month, then status is Ok. It will not affect the fee.
+
+The `currentStep` is decided based on the 3 worst days, including today, but not considering the current hour.
+
+If today is ranked as 1, 2 or 3, it may affect the fee. Then the average of the three worst days, including this hour, is calculated. This is `currentMonthlyEstimate`. So, if the current hour is ranked as 3, and the `currentMonthlyEstimate` is still within `currentStep`, status is still Ok, as the current hour will not participate in braking the step limit.
+
+If today is ranked as 1, 2 or 3, and the `currentMonthlyEstimate` is over the `currentStep`, then the status is Alarm.
+
+Else the status is Warning. That is if today is ranked as 1 or 2, but `currentMonthlyEstimate` is still under `currentStep`. In this case, the current hour makes the situation worse, and can potentially participate in breaking the limit together with a worse hour coming later this month.
+
+## Output
+
+The last step in the flow provides the following output:
+
+| Name                   | Description                                                              |
+| ---------------------- | ------------------------------------------------------------------------ |
+| status                 | The status of the current hour (Ok, Warning or Alarm).                   |
+| highestPerDay          | An array with the worst hour for each day this month                     |
+| highestCounting        | An array with the 3 worst days this month, including passed hours today. |
+| highestToday           | The worst hour until now today, not including current hour.              |
+| currentMonthlyEstimate | The average of the three worst days, including this hour.                |
+| hourEstimate           | The estimate for the current hour.                                       |
+| currentStep            | The upper limit of the step we are currently on.                         |
+| currentHourRanking     | The rank of the current hour, from 0 to 4. See below.                    |
+
+### currentHourRanking
+
+The current hour ranking has the following meaning:
+
+| Value | Description                                                                        |
+| ----- | ---------------------------------------------------------------------------------- |
+| 0     | Not counting, since there has been another hour earlier today that is higher.      |
+| 1     | This is estimated to be the worst hour in the month.                               |
+| 2     | This is estimated to be the second worst hour in the month.                        |
+| 3     | This is estimated to be the third worst hour in the month.                         |
+| 4     | This hour is estimated to be the worst today, but not one of the top 3 this month. |
+
+::: warning
+The highest value here, 4, is based on the value of `MAX_COUNTING` in the `Find highest per day` node.
+If you change `MAX_COUNTING`, the values here will also change.
+:::
+
+### alarmLevel TODO
+
+| Value | Description                                                                                                                 |
+| ----- | --------------------------------------------------------------------------------------------------------------------------- |
+| 0     | There is nothing to worry about.                                                                                            |
+| 1     | The estimate for the current hour sets this as the second to worst hour this month, but it is still way under the next step |
+| 2     | The estimate for the current hour sets this as the worst hour this month, but it is still way under the next step           |
+| 3     | The estimate for the current hour is close to the limit for the next step                                                   |
+| 4     | The estimate for the current hour is very close to the limit for the next step                                              |
+| 5     | The estimate for the current hour is over the limit for the next step                                                       |
+| 6     | The estimate for the current hour is way over the limit for the next step                                                   |
+| 6     | This hour increases the estimate for the month                                                                              |
+
+hourEstimate
+maxToday
+highestCounting (1, 2, 3)
+highestCountingAverage
+nextStep
+
+hourEstimate < maxToday
+hourEstimate > maxToday && hourEstimate < highestCounting[2]
+maxToday < hourEstimate < nextStep
+maxToday < hourEstimate < highestCounting[2]
+maxToday < hourEstimate < highestCounting[1]
+maxToday < hourEstimate < highestCounting[0]
+
+You can define the limits for `close` and `very close` to the next step, and the limit for `way over` the next step.
+
+If the current hour is
+
+## Node description
+
+### Get live data
+
+This is a `tibber-feed` node. It sets up a subscription of live Tibber data from Tibber Pulse, and uses this data to run the automation. Tick the following check boxes:
+
+- Timestamp
+- Power
+- Accumulated consumption
+- Accumulated consumption last hour
+
+Uncheck all the others.
+
+If you do not use Tibber, but can get this information from another source, convert it to the following format and use it the same way as data from this node is used:
+
+```json
+{
+  "timestamp": "2022-06-12T14:42:00.000+02:00",
+  "power": 9503,
+  "accumulatedConsumption": 33.459665,
+  "accumulatedConsumptionLastHour": 7.046665
+}
+```
+
+### Build query for consumption
+
+This is a function node that is used to build a Tibber query. It runs for all the live data, takes the time and calculates how many hours there has been since the beginning of the month. It uses this number to build a Tibber query to get consumption per hour since the beginning of the month. It sends output only when first started and when the hour changes, so it initiates a Tibber query once per hour.
+
+::: warning Tibber Home Id
+This node needs the tibber home id, so you must find it in the [Tibber Developer Pages](https://developer.tibber.com/) and set the vale of `TIBBER_HOME_ID` in the beginning of the code.
+:::
+
+### Get consumption
+
+This is a `tibber-query` node used to get consumption per hour for passed hours. It takes a Tibber query as input, and sends the result as output. The query is built by the previous node.
+
+If you do not use Tibber, but can get this information from another source, convert it to the following format and use it the same way as data from this node is used:
+
+```json
+{
+  "viewer": {
+    "home": {
+      "consumption": {
+        "nodes": [
+          {
+            "from": "2022-06-01T00:00:00.000+02:00",
+            "consumption": 4.307
+          },
+          {
+            "from": "2022-06-01T01:00:00.000+02:00",
+            "consumption": 3.648
+          },
+          {
+            "from": "2022-06-01T02:00:00.000+02:00",
+            "consumption": 2.406
+          },
+          // ...
+          {
+            "from": "2022-06-12T12:00:00.000+02:00",
+            "consumption": 0.969
+          },
+          {
+            "from": "2022-06-12T13:00:00.000+02:00",
+            "consumption": 7.612
+          }
+        ]
+      }
+    }
+  }
+}
+```
+
+It must contain data for every hour from the beginning of the month until the last complete hour.
+
+### Collect estimate for hour
+
+This is a function node that receives all the live data and estimates the consumption for the rest of the current hour. It sums up the actual consumption from the beginning of the hour until the current time, and adds the estimate for the rest of the hour, giving a total estimate for the hour.
+
+In the beginning of the code, there is a constant `ESTIMATION_TIME_MINUTES` that you can use to decide how many minutes that is used
+to calculate assumed average consumption.
+
+The function keeps a buffer with all readings for the last period of length given with `ESTIMATION_TIME_MINUTES`.
+It uses this buffer to calculate the average consumption for the period. It uses the result and estimates the consumption for the rest of the hour, assuming that the consumption will be the same.
+
+As outputs it sends the following:
+
+| Name                   | Description                                                                                                                          |
+| ---------------------- | ------------------------------------------------------------------------------------------------------------------------------------ |
+| accumulatedConsumption | Accumulated consumption the current day.                                                                                             |
+| periodSec              | Period the average is calculated for, in seconds. It will increase in the beginning, until it reaches `ESTIMATION_TIME_MINUTES * 60` |
+| consumptionInPeriod    | Consumption in the last `periodSec` seconds. Used as estimate for the remaining of the hour.                                         |
+| timeLeftSec            | Number of seconds left in the current hour.                                                                                          |
+| consumptionLeft        | Estimated consumption the remaining of the hour.                                                                                     |
+| hourEstimate           | The estimated consumption for the total hour.                                                                                        |
+
+### Find highest per day
+
+Based on the result from the tibber query, gives the following output:
+
+| Name                   | Description                                                                                                                   |
+| ---------------------- | ----------------------------------------------------------------------------------------------------------------------------- |
+| highestPerDay          | The highest hour for each day until now this month, including current day.                                                    |
+| highestCounting        | The 3 highest days current month. Can be other than 3 by changing the `MAX_COUNTING` constant in the beginning of the script. |
+| highestToday           | The highest hour that has ended until now this day.                                                                           |
+| currentMonthlyEstimate | The average of the 3 highest days until now this month. That is the capacity that will be used unless it is increased.        |
+
+Output is sent when the query is run, that is on startup and when the hour changes.
+
+### Check for breach
+
+This is where numbers are evaluated to figure out if the current hour is in risk of breaching the limit for the next step.
+The output is as follows:
+
+| Name                   | Description                                                                         |
+| ---------------------- | ----------------------------------------------------------------------------------- |
+| status                 | The status of the current hour (Ok, Warning or Alarm).                              |
+| highestPerDay          | An array with the worst hour for each day this month                                |
+| highestCounting        | An array with the 3 worst days this month, including passed hours today.            |
+| highestToday           | The worst hour until now today, not including current hour.                         |
+| currentMonthlyEstimate | The average of the three worst days, including this hour.                           |
+| hourEstimate           | The estimate for the current hour.                                                  |
+| currentStep            | The upper limit of the step we are currently on.                                    |
+| currentHourRanking     | The rank of the current hour, from 1 to 4, where 4 is the lowest                    |
+| reductionRequired      | The power that must be reduced the rest of the hour in order to not break the limit |
+
+## Actions
+
+You may set up actions to be taken when the status is Warning or Alarm.
+For each action, specify priority and expected reduction in kW,
+as well as what data to send as output for that action.
+
+When a warning or an alarm has been on for a specified time, actions are taken.
+Actions are taken in prioritized order, until enough reduction is expected,
+so multiple actions may be taken at the same time.
+
+Actions are defined in an array in the beginning of the script.
+The first action has highest priority, that is it will be executed first.
+The rest follow in prioritized order.
+
+For each action, the following is specified:
+
+- sensor - The the entity id of the sensor that gives you the effect that will be reduced.
+- outputActivate - The data sent to the output to acticate the action.
+- outputDeactivate - The data sent to the output to deactivate the action.
+- activateOnWarning - true if this shall be activated on warning.
+
+The node has the same number of outputs as there are actions.
+The first output is for the first action, and so on.
+When an action is activated, the outputActivate data is sent to the corresponding output.
+When the hour is over, the action is deactivated.
+When an action is deativated, the outputDeactivate data is sent to the corresponding output.
+
+It is up to you to define how to use the actions.
+
+# TO DO
+
+- Implement actions
+- Make a safety margin in kW so we reduce a little more than necessary.
+- May need some kind of warning when hourEstimate > currentStep, even if currentMonthlyEstimate is not.
+- Maybe set reductionRequired to hourEstimate - currentStep in this case.

package/docs/nodes/ps-general-add-tariff.md

@@ -6,10 +6,17 @@ Node to add a value, for example a variable grid tariff, to the price before it
 
 ## Description
 
-This node is useful if there is an addition to the electricity price that varies over the day, as it might be for the grid tariff.
+This node is useful if there is an addition to the electricity price that varies over the day or the week, as it might be for the grid tariff.
 
 If there is one price for example from 22:00 to 06:00 every day, and another price from 06:00 to 22:00, this is the right node to use. It can be used for more than two periods, as long as the time it changes is the same every day.
 
+If the price is different for some days of the week, use two nodes in series, one for some days and one for the other days.
+
+::: warning Different days
+When using two nodes in series to support for example different rates for weekend than weekdays,
+make sure each day is handled by only one node, else both nodes will add to the price.
+:::
+
 Here is how this node is normally used:
 
 ![general flow](../images/add-tariff-flow.png)
@@ -28,6 +35,13 @@ You can have from 1 to 24 periods during the day, with different values to add f
 
 For each period, select the time of the day the value is valid from, and enter the value.
 
+### Days
+
+Check which days the price is valid for. For the price to be added, both the time and the day must be correct.
+
+If there is one price for Mon-Fri, and another price for Sat-Sun, use two nodes in series,
+where one handles Mon, Tue, Wed, Thu and Fri, and the other one Sat and Sun.
+
 ### Valid from date
 
 Fill in the first date the config is valid.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-red-contrib-power-saver",
-  "version": "3.5.4",
+  "version": "3.5.7",
   "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/elvia/elvia-add-tariff.html

@@ -72,5 +72,5 @@
   A node to get the tariff from Elvia and add it to the price before it is sent to the power saver strategy nodes.
   Use this node between the receive-price node and any of the strategy nodes.
 
-  Please read more in the [node documentation](https://ottopaulsen.github.io/node-red-contrib-power-saver/nodes/ps-elvia-add-tariff)
+  Please read more in the [node documentation](https://powersaver.no/nodes/ps-elvia-add-tariff)
 </script>

package/src/elvia/elvia-add-tariff.js

@@ -20,22 +20,24 @@ module.exports = function (RED) {
         );
         return;
       }
-      const fromTime = prices[0].start.substr(0, 19);
+      // Convert date to UTC to get correct parameter for the Elvia API (no timezone)
+      const fromTime = DateTime.fromISO(prices[0].start).toUTC().toISO().substring(0, 19);
       const toTime = DateTime.fromISO(prices[prices.length - 1].start)
         .plus({ hours: 1 })
+        .toUTC()
         .toISO()
-        .substr(0, 19);
+        .substring(0, 19);
 
       getTariffForPeriod(node, key, node.tariffKey, fromTime, toTime).then((json) => {
         const tariff = json;
-        const priceInfo = tariff.gridTariff.tariffPrice.priceInfo;
+        const priceInfo = tariff.gridTariff.tariffPrice.hours;
         if (priceInfo.length !== prices.length) {
           node.warn(`Elvia tariff count mismatch. Expected ${prices.length} items, but got ${priceInfo.length}`);
           node.status({ fill: "red", shape: "dot", text: "Tariff error" });
         } else {
           prices.forEach((p, i) => {
             p.powerPrice = p.value;
-            p.gridTariffVariable = priceInfo[i].variablePrice.total;
+            p.gridTariffVariable = priceInfo[i].energyPrice.total;
             p.value = roundPrice(p.powerPrice + p.gridTariffVariable);
           });
         }

package/src/elvia/elvia-api.js

@@ -2,7 +2,7 @@ const fetch = require("node-fetch");
 
 function ping(node, subscriptionKey, setResultStatus = true) {
   const url = "https://elvia.azure-api.net/grid-tariff/Ping";
-  const headers = { "Ocp-Apim-Subscription-Key": subscriptionKey };
+  const headers = { "X-API-Key": subscriptionKey };
   fetch(url, { headers }).then((res) => {
     if (setResultStatus) {
       setNodeStatus(node, res.status);
@@ -11,13 +11,14 @@ function ping(node, subscriptionKey, setResultStatus = true) {
 }
 
 function getTariff(node, subscriptionKey, tariffKey, range = "today", setResultStatus = true) {
-  const url = "https://elvia.azure-api.net/grid-tariff/api/1/tariffquery?TariffKey=" + tariffKey + "&Range=" + range;
+  const url =
+    "https://elvia.azure-api.net/grid-tariff/digin/api/1.0/tariffquery?TariffKey=" + tariffKey + "&Range=" + range;
   return get(node, subscriptionKey, url, setResultStatus);
 }
 
 function getTariffForPeriod(node, subscriptionKey, tariffKey, startTime, endTime, setResultStatus = true) {
   const url =
-    "https://elvia.azure-api.net/grid-tariff/api/1/tariffquery?TariffKey=" +
+    "https://elvia.azure-api.net/grid-tariff/digin/api/1.0/tariffquery?TariffKey=" +
     tariffKey +
     "&StartTime=" +
     startTime +
@@ -27,12 +28,12 @@ function getTariffForPeriod(node, subscriptionKey, tariffKey, startTime, endTime
 }
 
 function getTariffTypes(node, subscriptionKey, setResultStatus = true) {
-  const url = "https://elvia.azure-api.net/grid-tariff/api/1/tarifftype";
+  const url = "https://elvia.azure-api.net/grid-tariff/digin/api/1.0/tarifftype";
   return get(node, subscriptionKey, url, setResultStatus);
 }
 
 function get(node, subscriptionKey, url, setResultStatus) {
-  const headers = { "Ocp-Apim-Subscription-Key": subscriptionKey };
+  const headers = { "X-API-Key": subscriptionKey };
   return fetch(url, { headers }).then((res) => {
     if (setResultStatus && node) {
       setNodeStatus(node, res.status);

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

@@ -33,7 +33,9 @@ function addTariffToPrices(node, config, prices) {
   prices.forEach((p, i) => {
     const date = DateTime.fromISO(p.start.substr(0, 10));
     const hour = DateTime.fromISO(p.start).hour;
-    if (date >= validFrom && date <= validTo) {
+    const day = DateTime.fromISO(p.start).weekday;
+    const dayName = Object.keys(config.days)[day - 1];
+    if (date >= validFrom && date <= validTo && config.days[dayName]) {
       prices[i].value = roundPrice(prices[i].value + allHours[hour]);
     }
   });

package/src/general-add-tariff.html

@@ -1,6 +1,7 @@
 <script type="text/javascript">
   const dateRe = /^$|^\d{4}\-(0[1-9]|1[012])\-(0[1-9]|[12][0-9]|3[01])$/;
   const priceRe = /^(\d+\.\d*)|(\d+)$/;
+  const defaultDays = { Mon: true, Tue: true, Wed: true, Thu: true, Fri: true, Sat: true, Sun: true };
   RED.nodes.registerType("ps-general-add-tariff", {
     category: "Power Saver",
     color: "#a6bbcf",
@@ -17,6 +18,7 @@
       },
       validFrom: { value: null, required: false, validate: RED.validators.regex(dateRe) },
       validTo: { value: null, required: false, validate: RED.validators.regex(dateRe) },
+      days: { value: { ...defaultDays } },
     },
     hours: [
       "00",
@@ -46,7 +48,6 @@
     ],
     inputs: 1,
     outputs: 1,
-    periodCont: 2,
     icon: "font-awesome/fa-plus",
     color: "#FFCC66",
     label: function () {
@@ -124,7 +125,7 @@
           $("#node-input-fromTime-" + i).typedInput({
             types: [
               {
-                value: "fromtime",
+                value: "fromTime",
                 options: hours.map((h) => ({ value: h, label: h + ":00" })),
               },
             ],
@@ -140,10 +141,55 @@
         }
       };
 
+      const drawDays = function (days) {
+        const dayNames = Object.keys(days);
+        document.getElementById("node-input-days-container").replaceChildren();
+        for (let i = 0; i < dayNames.length; i++) {
+          let day = dayNames[i];
+
+          const id = `node-input-day-${i}`;
+          const label = createElement(
+            "label",
+            [
+              ["for", id],
+              ["style", " margin: 4px 10px 0px 2px;width: 30px; text-align: left;"],
+            ],
+            []
+          );
+          label.innerHTML = day;
+          const attrs = [
+            ["name", "node-input-day"],
+            ["type", "checkbox"],
+            ["id", id],
+            ["style", `width: 15px; margin: 2px 0px 5px 5px;`],
+          ];
+          if (days[day]) {
+            attrs.push(["checked", ""]);
+          }
+          const inp = createElement("input", attrs);
+          inp.value = dayNames[i];
+
+          const el = createElement("span", [["style", "text-align: right;"]], [inp, label]);
+
+          $("#node-input-days-container").append(el);
+
+          $("#node-input-day-" + i).change(function (e) {
+            days[day] = $(this).is(":checked");
+            RED.nodes.dirty(true);
+          });
+        }
+      };
+
       drawPeriods(this.periods);
       $("#add-period-button").on("click", () => {
         addPeriod(this.periods);
       });
+
+      if (!this.days) {
+        // To support nodes created before this was developed
+        this.days = { ...defaultDays };
+      }
+      drawDays(this.days);
     },
   });
 </script>
@@ -162,6 +208,11 @@
     <button type="button" id="add-period-button" class="red-ui-button">Add period</button>
   </div>
 
+  <div class="form-row">
+    <label for="node-input-days-container"><i class="fa fa-calendar-o"></i> Days</label>
+    <span id="node-input-days-container"></span>
+  </div>
+
   <h3>Optional:</h3>
 
   <div class="form-row">
@@ -182,5 +233,5 @@
   to the price before it is sent to the strategy nodes.
   Use this node between the receive-price node and any of the strategy nodes.
 
-  Please read more in the [node documentation](https://ottopaulsen.github.io/node-red-contrib-power-saver/nodes/ps-general-add-tariff)
+  Please read more in the [node documentation](https://powersaver.no/nodes/ps-general-add-tariff.html)
 </script>

package/src/general-add-tariff.js

@@ -12,6 +12,7 @@ module.exports = function (RED) {
       periods: config.periods,
       validFrom: config.validFrom,
       validTo: config.validTo,
+      days: config.days,
     };
     node.context().set("config", originalConfig);
 

package/src/power-saver.html

@@ -112,5 +112,5 @@
 <script type="text/markdown" data-help-name="power-saver">
   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/power-saver)
+  Please read more in the [node documentation](https://powersaver.no/nodes/power-saver)
 </script>

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-best-save.js

@@ -1,14 +1,12 @@
 const { countAtEnd, makeSchedule, getSavings, getDiff } = require("./utils");
 const { handleStrategyInput } = require("./handle-input");
 const { loadDayData } = require("./utils");
-
 const mostSavedStrategy = require("./strategy-best-save-functions");
 
 module.exports = function (RED) {
   function StrategyBestSaveNode(config) {
     RED.nodes.createNode(this, config);
     const node = this;
-
     node.status({});
 
     const originalConfig = {
@@ -19,7 +17,7 @@ module.exports = function (RED) {
       outputIfNoSchedule: config.outputIfNoSchedule === "true",
       contextStorage: config.contextStorage || "default",
     };
-    node.context().set("config", originalConfig, originalConfig.contextStorage);
+    node.context().set("config", originalConfig);
     node.contextStorage = originalConfig.contextStorage;
 
     node.on("close", function () {

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

@@ -177,5 +177,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

@@ -20,6 +20,8 @@ module.exports = function (RED) {
       contextStorage: config.contextStorage || "default",
     };
     node.context().set("config", originalConfig);
+    node.contextStorage = originalConfig.contextStorage;
+
 
     node.on("close", function () {
       clearTimeout(node.schedulingTimeout);

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" },
     ];