npm - node-red-contrib-power-saver - Versions diffs - 3.0.6 → 3.0.7 - Mend

node-red-contrib-power-saver 3.0.6 → 3.0.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (8) hide show

package/docs/changelog/README.md +5 -1
package/package.json +1 -1
package/src/handle-input.js +1 -7
package/src/power-saver.js +1 -5
package/src/receive-price-functions.js +2 -18
package/src/utils.js +6 -0
package/test/data/nordpool-events-state-2.json +288 -0
package/test/receive-price.test.js +5 -4

package/docs/changelog/README.md CHANGED Viewed

@@ -6,9 +6,13 @@ sidebar: "auto"
 List the most significant changes, starting in version 1.0.9.
+## 3.0.7
+- Fix Nord Pool current state node input.
 ## 3.0.6
-Remove non-existant node from package.json.
+- Remove non-existant node from package.json.
 ## 3.0.5

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "node-red-contrib-power-saver",
-  "version": "3.0.6",
+  "version": "3.0.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/handle-input.js CHANGED Viewed

@@ -1,5 +1,4 @@
-const { getEffectiveConfig } = require("./utils");
-const { extractPlanForDate } = require("./utils");
+const { extractPlanForDate, getEffectiveConfig, validationFailure } = require("./utils");
 const { DateTime } = require("luxon");
 function handleStrategyInput(node, msg, doPlanning) {
@@ -152,11 +151,6 @@ function validateInput(node, msg) {
   return true;
 }
-function validationFailure(node, message, status = null) {
-  node.status({ fill: "red", shape: "ring", text: status ?? message });
-  node.warn(message);
-}
 module.exports = {
   handleStrategyInput,
 };

package/src/power-saver.js CHANGED Viewed

@@ -8,6 +8,7 @@ const {
   getStartAtIndex,
   loadDayData,
   makeSchedule,
+  validationFailure,
 } = require("./utils");
 const { convertMsg } = require("./receive-price-functions");
 const { calculate } = require("./strategy-best-save-functions");
@@ -189,11 +190,6 @@ function makePlan(node, values, startTimes, onOffBefore, firstValueNextDay) {
   };
 }
-function validationFailure(node, message) {
-  node.status({ fill: "red", shape: "ring", text: message });
-  node.warn(message);
-}
 function validateMsg(node, msg) {
   if (!msg.payload && !msg.data?.new_state?.attributes) {
     validationFailure(node, "Payload missing");

package/src/receive-price-functions.js CHANGED Viewed

@@ -6,9 +6,6 @@ function getPriceData(node, msg) {
     return node.context().get("lastPriceData");
   }
-  if (!validateMsg(node, msg)) {
-    return null;
-  }
   const input = convertMsg(msg);
   if (!validateInput(node, input)) {
     return null;
@@ -20,19 +17,6 @@ function getPriceData(node, msg) {
   return { priceData, source };
 }
-function validateMsg(node, msg) {
-  if (!msg.payload && !msg.data?.new_state?.attributes) {
-    validationFailure(node, "Payload missing");
-    return false;
-  }
-  const payload = msg.data?.new_state?.attributes ?? msg.data?.attributes ?? msg.payload;
-  if (typeof payload !== "object") {
-    validationFailure(node, "Payload must be an object");
-    return false;
-  }
-  return true;
-}
 function validateInput(node, input) {
   ["today", "tomorrow"].forEach((arr) => {
     if (
@@ -80,9 +64,9 @@ function convertMsg(msg) {
           value: v.value,
           start: v.start,
         }));
-    } else if (msg.payload?.attributes && msg.payload?.attributes["raw_" + day]) {
+    } else if (msg.data?.attributes && msg.data?.attributes["raw_" + day]) {
       result.source = "Nordpool";
-      result[day] = msg.payload.attributes["raw_" + day]
+      result[day] = msg.data.attributes["raw_" + day]
         .filter((v) => v.value)
         .map((v) => ({
           value: v.value,

package/src/utils.js CHANGED Viewed

@@ -175,6 +175,11 @@ function getStartAtIndex(effectiveConfig, priceData, time) {
   }
 }
+function validationFailure(node, message, status = null) {
+  node.status({ fill: "red", shape: "ring", text: status ?? message });
+  node.warn(message);
+}
 module.exports = {
   booleanConfig,
   countAtEnd,
@@ -191,4 +196,5 @@ module.exports = {
   makeSchedule,
   roundPrice,
   sortedIndex,
+  validationFailure,
 };

package/test/data/nordpool-events-state-2.json ADDED Viewed

@@ -0,0 +1,288 @@
+{
+  "_msgid": "584656e8b6b08fc4",
+  "payload": "1.523",
+  "topic": "",
+  "data": {
+    "entity_id": "sensor.nordpool_kwh_krsand",
+    "state": "1.523",
+    "attributes": {
+      "current_price": 1.523,
+      "average": 2.602,
+      "off peak 1": 1.768,
+      "off peak 2": 1.633,
+      "peak": 3.977,
+      "min": 1.523,
+      "max": 4.582,
+      "unit": "kWh",
+      "currency": "NOK",
+      "country": "Norway",
+      "region": "Kr.sand",
+      "low price": true,
+      "tomorrow_valid": true,
+      "today": [
+        1.633, 1.584, 1.581, 1.583, 1.596, 1.661, 1.746, 2.763, 3.803, 3.921, 3.551, 4.172, 3.683, 3.742, 3.847, 4.315,
+        4.582, 2.202, 2.153, 1.803, 1.722, 1.716, 1.569, 1.523
+      ],
+      "tomorrow": [
+        1.588, 1.521, 1.492, 1.487, 1.497, 1.514, 1.583, 1.667, 1.729, 1.724, 1.707, 1.703, 1.692, 1.692, 1.692, 1.717,
+        1.72, 1.718, 1.679, 1.661, 1.629, 1.652, 1.612, 1.587
+      ],
+      "raw_today": [
+        {
+          "start": "2021-12-14T00:00:00+01:00",
+          "end": "2021-12-14T01:00:00+01:00",
+          "value": 1.633
+        },
+        {
+          "start": "2021-12-14T01:00:00+01:00",
+          "end": "2021-12-14T02:00:00+01:00",
+          "value": 1.584
+        },
+        {
+          "start": "2021-12-14T02:00:00+01:00",
+          "end": "2021-12-14T03:00:00+01:00",
+          "value": 1.581
+        },
+        {
+          "start": "2021-12-14T03:00:00+01:00",
+          "end": "2021-12-14T04:00:00+01:00",
+          "value": 1.583
+        },
+        {
+          "start": "2021-12-14T04:00:00+01:00",
+          "end": "2021-12-14T05:00:00+01:00",
+          "value": 1.596
+        },
+        {
+          "start": "2021-12-14T05:00:00+01:00",
+          "end": "2021-12-14T06:00:00+01:00",
+          "value": 1.661
+        },
+        {
+          "start": "2021-12-14T06:00:00+01:00",
+          "end": "2021-12-14T07:00:00+01:00",
+          "value": 1.746
+        },
+        {
+          "start": "2021-12-14T07:00:00+01:00",
+          "end": "2021-12-14T08:00:00+01:00",
+          "value": 2.763
+        },
+        {
+          "start": "2021-12-14T08:00:00+01:00",
+          "end": "2021-12-14T09:00:00+01:00",
+          "value": 3.803
+        },
+        {
+          "start": "2021-12-14T09:00:00+01:00",
+          "end": "2021-12-14T10:00:00+01:00",
+          "value": 3.921
+        },
+        {
+          "start": "2021-12-14T10:00:00+01:00",
+          "end": "2021-12-14T11:00:00+01:00",
+          "value": 3.551
+        },
+        {
+          "start": "2021-12-14T11:00:00+01:00",
+          "end": "2021-12-14T12:00:00+01:00",
+          "value": 4.172
+        },
+        {
+          "start": "2021-12-14T12:00:00+01:00",
+          "end": "2021-12-14T13:00:00+01:00",
+          "value": 3.683
+        },
+        {
+          "start": "2021-12-14T13:00:00+01:00",
+          "end": "2021-12-14T14:00:00+01:00",
+          "value": 3.742
+        },
+        {
+          "start": "2021-12-14T14:00:00+01:00",
+          "end": "2021-12-14T15:00:00+01:00",
+          "value": 3.847
+        },
+        {
+          "start": "2021-12-14T15:00:00+01:00",
+          "end": "2021-12-14T16:00:00+01:00",
+          "value": 4.315
+        },
+        {
+          "start": "2021-12-14T16:00:00+01:00",
+          "end": "2021-12-14T17:00:00+01:00",
+          "value": 4.582
+        },
+        {
+          "start": "2021-12-14T17:00:00+01:00",
+          "end": "2021-12-14T18:00:00+01:00",
+          "value": 2.202
+        },
+        {
+          "start": "2021-12-14T18:00:00+01:00",
+          "end": "2021-12-14T19:00:00+01:00",
+          "value": 2.153
+        },
+        {
+          "start": "2021-12-14T19:00:00+01:00",
+          "end": "2021-12-14T20:00:00+01:00",
+          "value": 1.803
+        },
+        {
+          "start": "2021-12-14T20:00:00+01:00",
+          "end": "2021-12-14T21:00:00+01:00",
+          "value": 1.722
+        },
+        {
+          "start": "2021-12-14T21:00:00+01:00",
+          "end": "2021-12-14T22:00:00+01:00",
+          "value": 1.716
+        },
+        {
+          "start": "2021-12-14T22:00:00+01:00",
+          "end": "2021-12-14T23:00:00+01:00",
+          "value": 1.569
+        },
+        {
+          "start": "2021-12-14T23:00:00+01:00",
+          "end": "2021-12-15T00:00:00+01:00",
+          "value": 1.523
+        }
+      ],
+      "raw_tomorrow": [
+        {
+          "start": "2021-12-15T00:00:00+01:00",
+          "end": "2021-12-15T01:00:00+01:00",
+          "value": 1.588
+        },
+        {
+          "start": "2021-12-15T01:00:00+01:00",
+          "end": "2021-12-15T02:00:00+01:00",
+          "value": 1.521
+        },
+        {
+          "start": "2021-12-15T02:00:00+01:00",
+          "end": "2021-12-15T03:00:00+01:00",
+          "value": 1.492
+        },
+        {
+          "start": "2021-12-15T03:00:00+01:00",
+          "end": "2021-12-15T04:00:00+01:00",
+          "value": 1.487
+        },
+        {
+          "start": "2021-12-15T04:00:00+01:00",
+          "end": "2021-12-15T05:00:00+01:00",
+          "value": 1.497
+        },
+        {
+          "start": "2021-12-15T05:00:00+01:00",
+          "end": "2021-12-15T06:00:00+01:00",
+          "value": 1.514
+        },
+        {
+          "start": "2021-12-15T06:00:00+01:00",
+          "end": "2021-12-15T07:00:00+01:00",
+          "value": 1.583
+        },
+        {
+          "start": "2021-12-15T07:00:00+01:00",
+          "end": "2021-12-15T08:00:00+01:00",
+          "value": 1.667
+        },
+        {
+          "start": "2021-12-15T08:00:00+01:00",
+          "end": "2021-12-15T09:00:00+01:00",
+          "value": 1.729
+        },
+        {
+          "start": "2021-12-15T09:00:00+01:00",
+          "end": "2021-12-15T10:00:00+01:00",
+          "value": 1.724
+        },
+        {
+          "start": "2021-12-15T10:00:00+01:00",
+          "end": "2021-12-15T11:00:00+01:00",
+          "value": 1.707
+        },
+        {
+          "start": "2021-12-15T11:00:00+01:00",
+          "end": "2021-12-15T12:00:00+01:00",
+          "value": 1.703
+        },
+        {
+          "start": "2021-12-15T12:00:00+01:00",
+          "end": "2021-12-15T13:00:00+01:00",
+          "value": 1.692
+        },
+        {
+          "start": "2021-12-15T13:00:00+01:00",
+          "end": "2021-12-15T14:00:00+01:00",
+          "value": 1.692
+        },
+        {
+          "start": "2021-12-15T14:00:00+01:00",
+          "end": "2021-12-15T15:00:00+01:00",
+          "value": 1.692
+        },
+        {
+          "start": "2021-12-15T15:00:00+01:00",
+          "end": "2021-12-15T16:00:00+01:00",
+          "value": 1.717
+        },
+        {
+          "start": "2021-12-15T16:00:00+01:00",
+          "end": "2021-12-15T17:00:00+01:00",
+          "value": 1.72
+        },
+        {
+          "start": "2021-12-15T17:00:00+01:00",
+          "end": "2021-12-15T18:00:00+01:00",
+          "value": 1.718
+        },
+        {
+          "start": "2021-12-15T18:00:00+01:00",
+          "end": "2021-12-15T19:00:00+01:00",
+          "value": 1.679
+        },
+        {
+          "start": "2021-12-15T19:00:00+01:00",
+          "end": "2021-12-15T20:00:00+01:00",
+          "value": 1.661
+        },
+        {
+          "start": "2021-12-15T20:00:00+01:00",
+          "end": "2021-12-15T21:00:00+01:00",
+          "value": 1.629
+        },
+        {
+          "start": "2021-12-15T21:00:00+01:00",
+          "end": "2021-12-15T22:00:00+01:00",
+          "value": 1.652
+        },
+        {
+          "start": "2021-12-15T22:00:00+01:00",
+          "end": "2021-12-15T23:00:00+01:00",
+          "value": 1.612
+        },
+        {
+          "start": "2021-12-15T23:00:00+01:00",
+          "end": "2021-12-16T00:00:00+01:00",
+          "value": 1.587
+        }
+      ],
+      "unit_of_measurement": "NOK/kWh",
+      "friendly_name": "nordpool_kwh_krsand_nok_3_10_025",
+      "icon": "mdi:flash"
+    },
+    "last_changed": "2021-12-14T22:00:00.034750+00:00",
+    "last_updated": "2021-12-14T22:00:00.034750+00:00",
+    "context": {
+      "id": "1c81d6655547e2889f0347188f45cf58",
+      "parent_id": null,
+      "user_id": null
+    },
+    "timeSinceChangedMs": 1286197,
+    "original_state": "1.523"
+  }
+}

package/test/receive-price.test.js CHANGED Viewed

@@ -96,8 +96,8 @@ describe("receive-price node", function () {
     });
   });
-  it("should convert nordpool current state prices", function (done) {
-    const nordpoolPrices = require("./data/nordpool-current-state-prices.json");
+  it("should convert nordpool complete current state data set", function (done) {
+    const nordpoolPrices = require("./data/nordpool-events-state-2.json");
     const convertedPrices = require("./data/converted-prices.json");
     convertedPrices.source = "Nordpool";
     const flow = [
@@ -113,10 +113,11 @@ describe("receive-price node", function () {
       const n1 = helper.getNode("n1");
       const n2 = helper.getNode("n2");
       n2.on("input", function (msg) {
-        expect(msg).toHaveProperty("payload", convertedPrices);
+        expect(msg.payload.priceData.length).toEqual(48);
+        expect(msg.payload.source).toEqual("Nordpool");
         done();
       });
-      n1.receive({ payload: nordpoolPrices });
+      n1.receive({ payload: nordpoolPrices.payload, data: nordpoolPrices.data });
     });
   });
 });