node-red-contrib-power-saver 3.6.1 → 4.0.0

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

@@ -1,3 +1,7 @@
+---
+next: ./ps-strategy-lowest-price.md
+---
+
 # ps-strategy-best-save
 
 ![ps-strategy-best-save](../images/node-ps-strategy-best-save.png)
@@ -6,7 +10,11 @@ Strategy node to postpone power consumption until the price is lower.
 
 ## Description
 
-This strategy turns off the hours where the price difference is largest compared to the next hour that is on. The idea is that the power you are not using when the switch is turned off, will be used immediately when the switch is turned on. This would fit well for turning off a water heater or another thermostat controlled heater.
+This strategy turns off the hours where the price difference is largest compared to the next hour that is on. The idea is that the power you are not using when the switch is turned off, will be used immediately when the switch is turned on (during the first hour). This would fit well for turning off a water heater or another thermostat controlled heater.
+
+::: danger 70°C
+Be aware that the norwegian [FHI](https://www.fhi.no/nettpub/legionellaveilederen/) recommends that the temperature in the water heater is at least 70°C.
+:::
 
 The picture at the bottom of the page, under [Integration with MagicMirror](#integration-with-magicmirror), illustrates this by the purple strokes, taking the price from the top of the price curve to the level of the first hour after the save-period.
 
@@ -14,14 +22,16 @@ The picture at the bottom of the page, under [Integration with MagicMirror](#int
 
 ![Best Save Config](../images/best-save-config.png)
 
-| Value                  | Description                                                                                                                                                          |
-| ---------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| Max per sequence       | Maximum number of hours to turn off in a sequence.                                                                                                                   |
-| Min recover            | Minimum hours to turn on immediately after a period when turned off the maximum number of hours that is allowed to be turned off                                     |
-| Min saving             | Minimum amount to save per kWh in order to bother turning it off. It is recommended to have some amount here, e.g. 2 cents / 2 øre. No point in saving 0.001, is it? |
-| 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).                                                                                                  |
-| Context storage        | Select context storage to save data to, if more than one is configured in the Node-RED `settings.js` file.                                                           |
+| Value                  |                                                                                                                                                                                                |
+| ---------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| Max per sequence       | Maximum number of hours to turn off in a sequence                                                                                                                                              |
+| Min recover            | Minimum hours to turn on immediately after a period when turned off the maximum number of hours that is allowed to be turned off                                                               |
+| Min saving             | Minimum amount to save per kWh in order to bother turning it off. It is recommended to have some amount here, e.g. 2 cents / 2 øre. No point in saving 0.001, is it?                           |
+| Output value for on    | Set what value to output on output 1 in order to turn on. Default is `boolean true`. You can also select a `number`, for example `1`, or a `string`, for example `on`, or any other value.     |
+| Output value for off   | Set what value to output on output 2 in order to turn off. Default is `boolean false`. You can also select a `number`, for example `0`, or a `string`, for example `off`, or any other value.  |
+| Send when rescheduling | Check this to make sure on or off output is sent immediately after rescheduling. If unchecked, the output is sent only if it has not been sent before, or is different from the current value. |
+| If no schedule, send   | What to do if there is no valid schedule any more (turn on or off). This value will be sent also before there is any valid schedule, or after the last hour there is price data for.           |
+| Context storage        | Select context storage to save data to, if more than one is configured in the Node-RED `settings.js` file.                                                                                     |
 
 ::: warning Min recover
 NB! The `Min recover` only has effect if the previous save-period is of length `Max per sequence`. If the save-period is shorter, the following on-period may be as short as one hour.
@@ -29,108 +39,28 @@ NB! The `Min recover` only has effect if the previous save-period is of length `
 
 ### 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:
+The following config values can be changed dynamically:
 
-```json
-"payload": {
-  "config": {
-    "contextStorage": "file",
-    "maxHoursToSaveInSequence": 4,
-    "minHoursOnAfterMaxSequenceSaved": 2,
-    "minSaving": 0.02,
-    "sendCurrentValueWhenRescheduling": true,
-    "outputIfNoSchedule": true,
-  }
-}
-```
-
-All the variables in the config object are optional. You can send only those you want to change.
-
-The config sent like this will be valid until a new config is sent the same way, or until the flow is restarted. On a restart, the original config set up in the node will be used.
-
-When a config is sent like this, and without price data, the schedule will be replanned based on the last previously received price data. If no price data has been received, no scheduling is done.
+| Name                               | Description                                              |
+| ---------------------------------- | -------------------------------------------------------- |
+| `contextStorage`                   | String                                                   |
+| `maxHoursToSaveInSequence`         | Number                                                   |
+| `minHoursOnAfterMaxSequenceSaved`  | Number                                                   |
+| `minSaving`                        | Number                                                   |
+| `outputIfNoSchedule`               | Legal values: `true`, `false`                            |
+| `sendCurrentValueWhenRescheduling` | Legal values: `true`, `false`                            |
+| `outputValueForOn`                 | See description in [Dynamic Config](./dynamic-config.md) |
+| `outputValueForOff`                | See description in [Dynamic Config](./dynamic-config.md) |
+| `outputValueForOntype`             | See description in [Dynamic Config](./dynamic-config.md) |
+| `outputValueForOfftype`            | See description in [Dynamic Config](./dynamic-config.md) |
+| `override`                         | Legal values: `"on"`, `"off"`, `"auto"`                  |
 
-However, you can send config and price data in the same message. Then both will be used.
+See [Dynamic Config](./dynamic-config.md) for details and how to send dynamic config.
 
 ### Dynamic commands
 
-You can dynamically send some commands to the node via its input, by using a `commands` object in the payload as described below.
-
-Commands can be sent together with config and/or price data, but the exact behavior is not defined.
-
-#### sendSchedule
-
-You can get the schedule sent to output 3 any time by sending a message like this to the node:
-
-```json
-"payload": {
-  "commands": {
-    "sendSchedule": true,
-  }
-}
-```
-
-When you do this, the current schedule is actually recalculated based on the last received data, and then sent to output 3 the same way as when it was originally planned.
-
-#### sendOutput
-
-You can get the node to send the current output to output 1 or 2 any time by sending a message like this to the node:
-
-```json
-"payload": {
-  "commands": {
-    "sendOutput": true,
-  }
-}
-```
-
-When you do this, the current schedule is actually recalculated based on the last received data. The current output is sent to output 1 or 2, and the schedule is sent to output 3.
-
-#### reset
-
-You can reset data the node has saved in context by sending this message:
-
-```json
-"payload": {
-  "commands": {
-    "reset": true,
-  }
-}
-```
-
-When you do this, all historical data the node has saved is deleted, including the current schedule, so the result will be
-that the node shows status "No price data". When new price data is received, a schedule is calculated without considering any history.
-
-The nodes config is not deleted, as the node depends on it to work.
-
-::: warning
-This operation cannot be undone.
-
-However, it is normally not a big loss, as you can just feed the node with new price data and start from scratch.
-:::
-
-#### replan
-
-By sending this command, you can have the node read the last received prices from the context storage,
-and make a plan based on those prices:
-
-```json
-"payload": {
-  "commands": {
-    "replan": true,
-  }
-}
-```
-
-If the context storage is `file` you can use this to create a new schedule after a restart,
-instead of fetching prices again.
-
-### Config saved in context
-
-The nodes config is saved in the nodes context.
-If dynamic config is sent as input, this replaces the saved config.
-It is the config that is saved in context that is used when calculating.
-When Node-RED starts or the flow is redeployed, the config defined in the node replaces the saved config and will be used when planning.
+You can send dynamic commands to this node, for example to make it resend output.
+See [Dynamic Commands](./dynamic-commands.md) for details and how to send dynamic commands.
 
 ## Input
 
@@ -151,11 +81,11 @@ There are three outputs. You use only those you need for your purpose.
 
 ### Output 1
 
-A payload with the word `true` is sent to output 1 whenever the power / switch shall be turned on.
+A payload with the value set in config, default `true`, is sent to output 1 whenever the power / switch shall be turned on.
 
 ### Output 2
 
-A payload with the word `false` is sent to output 2 whenever the power / switch shall be turned off.
+A payload with the value set in config, default `false` is sent to output 2 whenever the power / switch shall be turned off.
 
 ### Output 3
 
@@ -174,7 +104,12 @@ Example of output:
     {
       "time": "2021-09-30T01:00:00.000+02:00",
       "value": true,
-      "countHours": 2
+      "countHours": 23
+    },
+    {
+      "time": "2021-09-31T00:00:00.000+02:00",
+      "value": false,
+      "countHours": null
     }
   ],
   "hours": [
@@ -195,11 +130,12 @@ Example of output:
       "onOff": true,
       "start": "2021-09-30T02:00:00.000+02:00",
       "saving": null
-    }
+    } // ...
   ],
   "source": "Nord Pool",
   "config": {
     "contextStorage": "default",
+    "hasChanged": false,
     "maxHoursToSaveInSequence": 3,
     "minHoursOnAfterMaxSequenceSaved": "1",
     "minSaving": 0.001,

package/docs/nodes/ps-strategy-fixed-schedule.md

@@ -0,0 +1,101 @@
+---
+prev: ./ps-strategy-heat-capacitor
+next: ./ps-receive-price.md
+---
+
+# ps-strategy-fixed-schedule
+
+![ps-strategy-fixed-schedule](../images/node-ps-strategy-fixed-schedule.png)
+
+Strategy node to set a fixed schedule.
+This can be used by itself, but it is also perfect to combine with other strategies
+and the [Schedule Merger](./ps-schedule-merger.md) node in order to force periods of the day either on or off.
+
+## Description
+
+This strategy can be used to set a period of the day or the week fixed to on or off.
+
+The strategy was made together with the [Schedule Merger](./ps-schedule-merger.md) node,
+and can be used together with this in order to mask periods of the day from being
+affected by another schedule, primarily the Fixed Schedule or Lowest Price strategies.
+
+Here is an example of how to combine it with the Lowest Price node:
+
+![ps-strategy-fixed-schedule-example](../images/ps-strategy-fixed-schedule-example.png)
+
+## Configuration
+
+![Fixed Schedule Config](../images/fixed-schedule-config.png)
+
+| Value                  |                                                                                                                                                                                                                                                                                     |
+| ---------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| Schedule               | Decide from what time, and what value to set, for one or more periods during the day. It is working around the clock, so the value that is at the end of one day continues on the beginning of the next day, unless you change it at 00:00. Click `Add period` to get more periods. |
+| Days                   | Use this if you want the schedule to work only on specific days. For the other days, the value on the `If no schedule, send` setting is sent.                                                                                                                                       |
+| Valid from date        | If this is set, the schedule is not valid before this date.                                                                                                                                                                                                                         |
+| Valid to date          | If this is set, the schedule is not valid after this date.                                                                                                                                                                                                                          |
+| Output value for on    | Set what value to output on output 1 in order to turn on. Default is `boolean true`. You can also select a `number`, for example `1`, or a `string`, for example `on`, or any other value.                                                                                          |
+| Output value for off   | Set what value to output on output 2 in order to turn off. Default is `boolean false`. You can also select a `number`, for example `0`, or a `string`, for example `off`, or any other value.                                                                                       |
+| Send when rescheduling | Check this to make sure on or off output is sent immediately after rescheduling. If unchecked, the output is sent only if it has not been sent before, or is different from the current value.                                                                                      |
+| If no schedule, send   | What to do if there is no valid schedule any more (turn on or off). This value will be sent also before there is any valid schedule, or after the last hour there is price data for.                                                                                                |
+| Context storage        | Select context storage to save data to, if more than one is configured in the Node-RED `settings.js` file.                                                                                                                                                                          |
+
+### Dynamic config
+
+The following config values can be changed dynamically:
+
+| Name                               | Description                                              |
+| ---------------------------------- | -------------------------------------------------------- |
+| `contextStorage`                   | String                                                   |
+| `periods`                          | An array with periods. See below.                        |
+| `validFrom`                        | String with date in form `YYYY-MM-DD`                    |
+| `validTo`                          | String with date in form `YYYY-MM-DD`                    |
+| `days`                             | An array of days. See below.                             |
+| `outputIfNoSchedule`               | Legal values: `true`, `false`                            |
+| `sendCurrentValueWhenRescheduling` | Legal values: `true`, `false`                            |
+| `outputValueForOn`                 | See description in [Dynamic Config](./dynamic-config.md) |
+| `outputValueForOff`                | See description in [Dynamic Config](./dynamic-config.md) |
+| `outputValueForOntype`             | See description in [Dynamic Config](./dynamic-config.md) |
+| `outputValueForOfftype`            | See description in [Dynamic Config](./dynamic-config.md) |
+| `override`                         | Legal values: `"on"`, `"off"`, `"auto"`                  |
+
+See [Dynamic Config](./dynamic-config.md) for details and how to send dynamic config.
+
+### Dynamic commands
+
+You can send dynamic commands to this node, for example to make it resend output.
+See [Dynamic Commands](./dynamic-commands.md) for details and how to send dynamic commands.
+
+## Input
+
+The input is the [common strategy input format](./strategy-input.md).
+
+The node requires the price-data input in order to know what times to generate schedule for.
+This is especially important when merging the schedule using the Schedule Merger node,
+as all schedules that are merged must be for the exact same period.
+
+## Output
+
+There are three outputs. You use only those you need for your purpose.
+
+### Output 1
+
+A payload with the value set in config, default `true`, is sent to output 1 whenever the power / switch shall be turned on.
+
+### Output 2
+
+A payload with the value set in config, default `false` is sent to output 2 whenever the power / switch shall be turned off.
+
+### Output 3
+
+When a valid input is received, and the schedule is recalculated, the resulting schedule, as well as some other information, is sent to output 3. You can use this to see the plan and verify that it meets your expectations. You can also use it to display the schedule in any way you like.
+
+The aoutput is similar to the output from the other strategy nodes.
+
+## Usage ideas
+
+### Turn on every morning
+
+If you want to make sure that a switch is turned on at least 2 hours every morning from 04:00 to 06:00,
+even if you are using the Lowest Price node to turn it on only the 4 cheapest hours during
+the whole day, you can use this node to make sure it is on this period, and then merge it with the
+Lowest Price schedule using the Schedule Merger node with the `OR` function.

package/docs/nodes/ps-strategy-heat-capacitor.md

@@ -1,4 +1,9 @@
-# ps-strategy-heat-capacitor <Badge type="warning">Experimental</Badge>
+---
+prev: ./ps-strategy-lowest-price.md
+next: ./ps-strategy-fixed-schedule.md
+---
+
+# ps-strategy-heat-capacitor
 
 ![ps-strategy-lowest-price](../images/node-ps-strategy-heat-capacitor.png)
 

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

@@ -1,5 +1,6 @@
 ---
-next: ./ps-receive-price.md
+prev: ./ps-strategy-best-save.md
+next: ./ps-strategy-heat-capacitor.md
 ---
 
 # ps-strategy-lowest-price
@@ -16,17 +17,18 @@ The node can work on a specific period from 1 to 24 hours during a 24 hour perio
 
 ![Node Configuration](../images/lowest-price-config.png)
 
-| 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.                                     |
-| 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.      |
+| 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.                                                                                                                                                   |
+| 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.                                                                                                                                        |
+| Output value for on    | Set what value to output on output 1 in order to turn on. Default is `boolean true`. You can also select a `number`, for example `1`, or a `string`, for example `on`, or any other value.     |
+| Output value for off   | Set what value to output on output 2 in order to turn off. Default is `boolean false`. You can also select a `number`, for example `0`, or a `string`, for example `off`, or any other value.  |
+| Send when rescheduling | Check this to make sure on or off output is sent immediately after rescheduling. If unchecked, the output is sent only if it has not been sent before, or is different from the current value. |
+| If no schedule, send   | What to do if there is no valid schedule any more (turn on or off). This value will be sent also before there is any valid schedule, or after the last hour there is price data for.           |
+| Context storage        | Select context storage to save data to, if more than one is configured in the Node-RED `settings.js` file.                                                                                     |
 
 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.
 
@@ -64,117 +66,50 @@ 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:
-
-```json
-"payload": {
-  "config": {
-    "contextStorage": "file",
-    "fromTime": 10,
-    "toTime": 16,
-    "hoursOn": 3,
-    "maxPrice": null,
-    "doNotSplit": false,
-    "sendCurrentValueWhenRescheduling": true,
-    "outputIfNoSchedule": false,
-    "outputOutsidePeriod": false
-  }
-}
-```
-
-All the variables in the config object are optional. You can send only those you want to change.
-
-The config sent like this will be valid until a new config is sent the same way, or until the flow is restarted. On a restart, the original config set up in the node will be used.
-
-When a config is sent like this, and without price data, the schedule will be replanned based on the last previously received price data. If no price data has been received, no scheduling is done.
-
-However, you can send config and price data in the same message. Then both will be used .
+The following config values can be changed dynamically:
+
+| Name                               | Description                                              |
+| ---------------------------------- | -------------------------------------------------------- |
+| `contextStorage`                   | String                                                   |
+| `fromTime`                         | String with number, 2 digits, "00"-"23"                  |
+| `toTime`                           | String with number, 2 digits, "00"-"23"                  |
+| `hoursOn`                          | Number                                                   |
+| `maxPrice`                         | Number                                                   |
+| `outputIfNoSchedule`               | Legal values: `true`, `false`                            |
+| `outputIfNoSchedule`               | Legal values: `true`, `false`                            |
+| `doNotSplit`                       | Legal values: `true`, `false`                            |
+| `outputOutsidePeriod`              | Legal values: `true`, `false`                            |
+| `sendCurrentValueWhenRescheduling` | Legal values: `true`, `false`                            |
+| `outputValueForOn`                 | See description in [Dynamic Config](./dynamic-config.md) |
+| `outputValueForOff`                | See description in [Dynamic Config](./dynamic-config.md) |
+| `outputValueForOntype`             | See description in [Dynamic Config](./dynamic-config.md) |
+| `outputValueForOfftype`            | See description in [Dynamic Config](./dynamic-config.md) |
+| `override`                         | Legal values: `"on"`, `"off"`, `"auto"`                  |
+
+See [Dynamic Config](./dynamic-config.md) for details and how to send dynamic config.
 
 ### Dynamic commands
 
-You can dynamically send some commands to the node via its input, by using a `commands` object in the payload as described below.
-
-Commands can be sent together with config and/or price data, but the exact behavior is not defined.
-
-#### sendSchedule
-
-You can get the schedule sent to output 3 any time by sending a message like this to the node:
-
-```json
-"payload": {
-  "commands": {
-    "sendSchedule": true,
-  }
-}
-```
-
-When you do this, the current schedule is actually recalculated based on the last received data, and then sent to output 3 the same way as when it was originally planned.
-
-#### sendOutput
-
-You can get the node to send the current output to output 1 or 2 any time by sending a message like this to the node:
-
-```json
-"payload": {
-  "commands": {
-    "sendOutput": true,
-  }
-}
-```
-
-When you do this, the current schedule is actually recalculated based on the last received data. The current output is sent to output 1 or 2, and the schedule is sent to output 3.
-
-#### reset
-
-You can reset data the node has saved in context by sending this message:
-
-```json
-"payload": {
-  "commands": {
-    "reset": true,
-  }
-}
-```
-
-When you do this, all historical data the node has saved is deleted, including the current schedule, so the result will be
-that the node shows status "No price data". When new price data is received, a schedule is calculated without considering any history.
-
-The nodes config is not deleted, as the node depends on it to work.
-
-::: warning
-This operation cannot be undone.
+You can send dynamic commands to this node, for example to make it resend output.
+See [Dynamic Commands](./dynamic-commands.md) for details and how to send dynamic commands.
 
-However, it is normally not a big loss, as you can just feed the node with new price data and start from scratch.
-:::
-
-#### replan
+## Input
 
-By sending this command, you can have the node read the last received prices from the context storage,
-and make a plan based on those prices:
+The input is the [common strategy input format](./strategy-input.md)
 
-```json
-"payload": {
-  "commands": {
-    "replan": true,
-  }
-}
-```
+## Output
 
-If the context storage is `file` you can use this to create a new schedule after a restart,
-instead of fetching prices again.
+There are three outputs. You use only those you need for your purpose.
 
-### Config saved in context
+### Output 1
 
-The nodes config is saved in the nodes context.
-If dynamic config is sent as input, this replaces the saved config.
-It is the config that is saved in context that is used when calculating.
-When Node-RED starts or the flow is redeployed, the config defined in the node replaces the saved config and will be used when planning.
+A payload with the value set in config, default `true`, is sent to output 1 whenever the power / switch shall be turned on.
 
-## Input
+### Output 2
 
-The input is the [common strategy input format](./strategy-input.md)
+A payload with the value set in config, default `false` is sent to output 2 whenever the power / switch shall be turned off.
 
-## Output
+### Output 3
 
 When a valid input is received, and the schedule is recalculated, the resulting schedule, as well as some other information, is sent to output 3. You can use this to see the plan and verify that it meets your expectations. You can also use it to display the schedule in any way you like.
 
@@ -238,6 +173,7 @@ Example of output:
     "contextStorage": "default",
     "fromTime": "04",
     "toTime": "18",
+    "hasChanged": false,
     "hoursOn": "06",
     "doNotSplit": false,
     "sendCurrentValueWhenRescheduling": true,
@@ -298,7 +234,10 @@ This is an alternative to fetching new prices and send as input.
 
 ### Multiple nodes works together
 
-You can use multiple nodes simultanously, for different periods, if you want more hours on one part of the day than another part, or to make sure there are at least some hours on during each period.
+You can use multiple nodes simultanously, for different periods, for example if you want more hours on one part of the day than another part, or to make sure there are at least some hours on during each period. In this case set up one Lowest Price node for each period and
+combine the output from them into one schedule using the Schedule Merger node:
+
+![Combine two lowest price nodes](../images/combine-two-lowest-price.png)
 
 ### Highest price
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-red-contrib-power-saver",
-  "version": "3.6.1",
+  "version": "4.0.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": {
@@ -21,11 +21,12 @@
   ],
   "node-red": {
     "nodes": {
-      "power-saver": "src/power-saver.js",
       "ps-receive-price": "src/receive-price.js",
       "ps-strategy-best-save": "src/strategy-best-save.js",
       "ps-strategy-lowest-price": "src/strategy-lowest-price.js",
       "ps-strategy-heat-capacitor": "src/strategy-heat-capacitor.js",
+      "ps-strategy-fixed-schedule": "src/strategy-fixed-schedule.js",
+      "ps-schedule-merger": "src/schedule-merger.js",
       "ps-elvia-config": "src/elvia/elvia-config.js",
       "ps-elvia-tariff-types": "src/elvia/elvia-tariff-types.js",
       "ps-elvia-tariff": "src/elvia/elvia-tariff.js",
@@ -50,6 +51,7 @@
     "@vuepress/plugin-register-components": "^2.0.0-beta.36",
     "@vuepress/plugin-search": "^2.0.0-beta.38",
     "@vuepress/utils": "^2.0.0-beta.35",
+    "eslint": "^8.25.0",
     "expect": "^27.5.1",
     "mocha": "^9.2.0",
     "node-red": "^2.2.2",
@@ -61,6 +63,7 @@
     "floating-vue": "^2.0.0-beta.6",
     "lodash.clonedeep": "^4.5.0",
     "luxon": "^2.3.1",
+    "nano-time": "^1.0.0",
     "node-fetch": "^2.6.7"
   }
 }

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

@@ -6,7 +6,6 @@
       name: { value: "Add Elvia Grid Tariff" },
       elviaConfig: { value: "", type: "ps-elvia-config" },
       tariffKey: { value: "", required: true },
-      range: { value: "today", required: true },
     },
     inputs: 1,
     outputs: 1,
@@ -67,7 +66,7 @@
 </script>
 
 <script type="text/markdown" data-help-name="ps-elvia-add-tariff">
-  # Elvia Add Tariff (deprecated)
+  # Elvia Add Tariff
 
   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.

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

@@ -8,7 +8,6 @@ module.exports = function (RED) {
     this.elviaConfig = RED.nodes.getNode(config.elviaConfig);
     const key = this.elviaConfig.credentials.elviaSubscriptionKey;
     this.tariffKey = config.tariffKey;
-    this.range = config.range;
     const node = this;
     ping(node, key);
 
@@ -30,10 +29,9 @@ module.exports = function (RED) {
 
       getTariffForPeriod(node, key, node.tariffKey, fromTime, toTime).then((json) => {
         const tariff = json;
-        const priceInfo = tariff.gridTariff.tariffPrice.hours;
+        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;

package/src/elvia/elvia-api.js

@@ -38,7 +38,14 @@ function get(node, subscriptionKey, url, setResultStatus) {
     if (setResultStatus && node) {
       setNodeStatus(node, res.status);
     }
+    if (res.status === 500) {
+      console.error("Elvia internal server error (status 500)");
+      return;
+    }
     return res.json().then((json) => {
+      if (json.statusCode === 401) {
+        console.error("Elvia API error: " + json.message);
+      }
       return json;
     });
   });
@@ -51,6 +58,8 @@ function setNodeStatus(node, status) {
     node.status({ fill: "red", shape: "dot", text: "Unauthorized" });
   } else if (status === 403) {
     node.status({ fill: "red", shape: "dot", text: "Forbidden" });
+  } else if (status === 500) {
+    node.status({ fill: "red", shape: "dot", text: "Elvia server error" });
   }
 }