node-red-contrib-power-saver 3.5.3 → 3.5.6

package/docs/.vuepress/config.js

@@ -49,6 +49,7 @@ module.exports = {
             "/examples/example-tibber-mqtt.md",
             "/examples/example-heat-capacitor.md",
             "/examples/example-cascade-temperature-control.md",
+            "/examples/example-visualize-on-off/example-visualize-on-off.md",
           ],
         },
       ],

package/docs/changelog/README.md

@@ -6,6 +6,19 @@ sidebar: "auto"
 
 List the most significant changes, starting in version 1.0.9.
 
+## 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
+- Add example for visualization in Lovelace
+
 ## 3.5.3
 
 - Fix a couple of bugs in how context is used.

package/docs/examples/README.md

@@ -10,6 +10,8 @@
 
 [Cascade temperature control](./example-cascade-temperature-control)
 
+[Visualize on/off, price and consumption in Lovelace](example-visualize-on-off/example-visualize-on-off)
+
 ## User provided examples
 
 [Output schedule to a sensor entity](./example-next-schedule-entity.md) (by Stefan)

package/docs/examples/example-visualize-on-off/example-visualize-on-off.md

@@ -0,0 +1,41 @@
+# Lovelace Visualization
+
+The source of this example is made by Kim Storøy, and Otto Paulsen has written the documentation and made some changes to the files.
+
+![Lovelace image](./lovelace.jpg)
+
+## Introduction
+
+With this example you can visualize the schedule together with the price and the consumption in Lovelace, as shown above.
+
+## Installation
+
+You need the following installed before you can use this example:
+
+- The [Node-RED Companion Integration](https://github.com/zachowj/hass-node-red).
+- The [apexcharts-card](https://github.com/RomRider/apexcharts-card)
+- The Tibber integration (Configuration -> Integrations)
+
+If you don't already have them, install them first.
+
+In Node-RED, select `Import` from the menu, and paste the code for nodes below. Connect them like this:
+
+![nodes](./nodes.png)
+
+In Lovelace, use the Lovelace code below for the new card.
+Replace the `sensor.accumulated_consumption_current_hour_your_address`
+with the correct name for your corresponding sensor in your Tibber integration.
+
+### Code
+
+::: details Nodes
+
+@[code](./nodes.json)
+
+:::
+
+::: details Lovelace
+
+@[code](./lovelace.yaml)
+
+:::

package/docs/examples/example-visualize-on-off/lovelace.yaml

@@ -0,0 +1,89 @@
+type: custom:apexcharts-card
+header:
+  show: true
+  title: Pris 48t + Forbruk + Powersaver
+now:
+  show: true
+  label: Nå
+graph_span: 2d
+span:
+  start: day
+apex_config:
+  stroke:
+    width: 2
+  dataLabels:
+    enabled: true
+  fill:
+    type: gradient
+    gradient:
+      shadeIntensity: 1
+      inverseColors: false
+      opacityFrom: 0.45
+      opacityTo: 0.05
+      stops:
+        - 10
+        - 50
+        - 75
+        - 1000
+  legend:
+    show: false
+  yaxis:
+    - id: price
+      show: true
+      decimalsInFloat: 1
+      floating: false
+      forceNiceScale: true
+      extend_to: end
+    - id: usage
+      show: true
+      opposite: true
+      decimalsInFloat: 1
+      floating: false
+      forceNiceScale: true
+      extend_to: end
+    - id: powersaver
+      show: false
+      decimalsInFloat: 0
+      floating: false
+      extend_to: now
+series:
+  - entity: sensor.powersaver
+    yaxis_id: price
+    extend_to: now
+    name: Pris
+    type: area
+    curve: smooth
+    color: tomato
+    show:
+      legend_value: false
+    data_generator: |
+      return entity.attributes.hours.map((entry) => {
+        return [new Date(entry.start), entry.price];
+      });
+  - entity: sensor.accumulated_consumption_current_hour_xxxx
+    yaxis_id: usage
+    type: column
+    name: Forbruk
+    group_by:
+      func: max
+    show:
+      legend_value: false
+  - entity: sensor.powersaver
+    data_generator: |
+      return entity.attributes.hours.map((entry) => {
+        return [new Date(entry.start), entry.onOff];
+      });
+    yaxis_id: powersaver
+    name: ' '
+    type: area
+    color: rgb(0, 255, 0)
+    opacity: 0.2
+    stroke_width: 0
+    curve: stepline
+    group_by:
+      func: min
+    show:
+      legend_value: false
+      in_header: false
+      name_in_header: false
+      datalabels: false

package/docs/examples/example-visualize-on-off/nodes.json

@@ -0,0 +1,88 @@
+[
+  {
+    "id": "eab799518168f5a3",
+    "type": "ha-entity",
+    "z": "d938c47f.3398f8",
+    "name": "Info fra PS til HA",
+    "server": "ec4a12a1.b2be9",
+    "version": 2,
+    "debugenabled": false,
+    "outputs": 1,
+    "entityType": "sensor",
+    "config": [
+      {
+        "property": "name",
+        "value": "Powersaver"
+      },
+      {
+        "property": "device_class",
+        "value": ""
+      },
+      {
+        "property": "icon",
+        "value": ""
+      },
+      {
+        "property": "unit_of_measurement",
+        "value": ""
+      },
+      {
+        "property": "state_class",
+        "value": ""
+      },
+      {
+        "property": "last_reset",
+        "value": ""
+      }
+    ],
+    "state": "payload",
+    "stateType": "str",
+    "attributes": [
+      {
+        "property": "Schedule",
+        "value": "payload.schedule",
+        "valueType": "msg"
+      },
+      {
+        "property": "Hours",
+        "value": "payload.hours",
+        "valueType": "msg"
+      },
+      {
+        "property": "Control",
+        "value": "payload.hours[0].onOff",
+        "valueType": "str"
+      },
+      {
+        "property": "Current",
+        "value": "payload.current",
+        "valueType": "str"
+      }
+    ],
+    "resend": true,
+    "outputLocation": "payload",
+    "outputLocationType": "none",
+    "inputOverride": "allow",
+    "outputOnStateChange": false,
+    "outputPayload": "",
+    "outputPayloadType": "str",
+    "x": 830,
+    "y": 630,
+    "wires": [[]]
+  },
+  {
+    "id": "cad33a63f66ef72e",
+    "type": "function",
+    "z": "d938c47f.3398f8",
+    "name": "Convert true/false to 1/0",
+    "func": "msg.payload.hours.forEach(h => h.onOff = h.onOff ? \"1\" : \"0\")\nreturn msg;",
+    "outputs": 1,
+    "noerr": 0,
+    "initialize": "",
+    "finalize": "",
+    "libs": [],
+    "x": 550,
+    "y": 630,
+    "wires": [["eab799518168f5a3", "37a23d88cfc668f2"]]
+  }
+]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-red-contrib-power-saver",
-  "version": "3.5.3",
+  "version": "3.5.6",
   "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.js

@@ -28,14 +28,14 @@ module.exports = function (RED) {
 
       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/handle-input.js

@@ -4,6 +4,8 @@ const { version } = require("../package.json");
 
 function handleStrategyInput(node, msg, doPlanning) {
   const effectiveConfig = getEffectiveConfig(node, msg);
+  // Store config variables in node
+  Object.keys(effectiveConfig).forEach((key) => (node[key] = effectiveConfig[key]));
 
   if (!validateInput(node, msg)) {
     return;
@@ -23,9 +25,6 @@ function handleStrategyInput(node, msg, doPlanning) {
     deleteSavedScheduleBefore(node, DateTime.now().plus({ days: 2 }), 100);
   }
 
-  // Store config variables in node
-  Object.keys(effectiveConfig).forEach((key) => (node[key] = effectiveConfig[key]));
-
   let { priceData, source } = getPriceData(node, msg);
   if (!priceData) {
     // Use last saved price data

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-lowest-price.js

@@ -19,7 +19,9 @@ module.exports = function (RED) {
       outputOutsidePeriod: booleanConfig(config.outputOutsidePeriod),
       contextStorage: config.contextStorage || "default",
     };
-    node.context().set("config", originalConfig, originalConfig.contextStorage);
+    node.context().set("config", originalConfig);
+    node.contextStorage = originalConfig.contextStorage;
+
 
     node.on("close", function () {
       clearTimeout(node.schedulingTimeout);

package/src/utils.js

@@ -57,14 +57,18 @@ function getDiff(large, small) {
 }
 
 function getEffectiveConfig(node, msg) {
-  const res = node.context().get("config", node.contextStorage);
+  const res = node.context().get("config");
+  if (!res) {
+    node.error("Node has no config");
+    return {};
+  }
   const isConfigMsg = !!msg?.payload?.config;
   if (isConfigMsg) {
     const inputConfig = msg.payload.config;
     Object.keys(inputConfig).forEach((key) => {
       res[key] = inputConfig[key];
     });
-    node.context().set("config", res, node.contextStorage);
+    node.context().set("config", res);
   }
   return res;
 }