node-red-contrib-power-saver 1.0.3 → 1.0.7

package/LICENSE

@@ -0,0 +1 @@
+MIT

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-red-contrib-power-saver",
-  "version": "1.0.3",
+  "version": "1.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": {
@@ -16,6 +16,10 @@
       "power-saver": "power-saver.js"
     }
   },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/ottopaulsen/node-red-contrib-power-saver.git"
+  },
   "devDependencies": {
     "expect": "^27.0.2",
     "lodash.clonedeep": "^4.5.0",

package/power-saver.js

@@ -4,17 +4,6 @@ const mostSavedStrategy = require("./mostSavedStrategy");
 
 let schedulingTimeout = null;
 
-// TODO
-
-// Round savings
-// Add min saving
-// Put all output in one array with price, start, saving and onOff.
-
-// Accept input directly from tibber, nordpool and payload with converted values.
-// Make tests for all these.
-// Update doc with Tibber.
-// Make examples.
-
 module.exports = function (RED) {
   function PowerSaverNode(config) {
     RED.nodes.createNode(this, config);
@@ -46,6 +35,7 @@ module.exports = function (RED) {
 
       const today = input.today;
       const tomorrow = input.tomorrow;
+      const source = input.source;
 
       clearTimeout(schedulingTimeout);
 
@@ -63,13 +53,13 @@ module.exports = function (RED) {
       const startTimesToday = today.map((d) => d.start);
       const startTimesTomorrow = tomorrow.map((d) => d.start);
 
-      planToday = makePlan(
+      const planToday = makePlan(
         node,
         valuesToday,
         startTimesToday,
         dataYesterday.onOff
       );
-      planTomorrow = makePlan(
+      const planTomorrow = makePlan(
         node,
         valuesTomorrow,
         startTimesTomorrow,
@@ -91,6 +81,7 @@ module.exports = function (RED) {
         payload: {
           schedule,
           hours,
+          source,
         },
       };
 
@@ -193,7 +184,7 @@ function validateMsg(node, msg) {
     validationFailure(node, "Payload missing");
     return false;
   }
-  const payload = msg.payload ?? msg.data.new_state.attributes;
+  const payload = msg.data?.new_state?.attributes ?? msg.payload;
   if (typeof payload !== "object") {
     validationFailure(node, "Payload must be an object");
     return false;

package/test/mostSavedStrategy.test.js

@@ -6,7 +6,7 @@ const prices = require("./data/prices");
 describe("mostSavedStrategy", () => {
   it("saves correct hours", () => {
     const values = prices.today.map((p) => p.value);
-    expect(mostSavedStrategy.calculate(values, 6, 3, 1)).toEqual([
+    expect(mostSavedStrategy.calculate(values, 6, 3, 1, 0.001)).toEqual([
       true,
       true,
       false,
@@ -18,7 +18,7 @@ describe("mostSavedStrategy", () => {
       true,
       true,
     ]);
-    expect(mostSavedStrategy.calculate(values, 4, 3, 1)).toEqual([
+    expect(mostSavedStrategy.calculate(values, 4, 3, 1, 0.001)).toEqual([
       true,
       true,
       true,
@@ -30,7 +30,7 @@ describe("mostSavedStrategy", () => {
       true,
       true,
     ]);
-    expect(mostSavedStrategy.calculate(values, 5, 2, 1)).toEqual([
+    expect(mostSavedStrategy.calculate(values, 5, 2, 1, 0.001)).toEqual([
       true,
       true,
       false,
@@ -42,7 +42,7 @@ describe("mostSavedStrategy", () => {
       true,
       true,
     ]);
-    expect(mostSavedStrategy.calculate(values, 5, 2, 3)).toEqual([
+    expect(mostSavedStrategy.calculate(values, 5, 2, 3, 0.001)).toEqual([
       true,
       true,
       true,
@@ -54,7 +54,7 @@ describe("mostSavedStrategy", () => {
       true,
       true,
     ]);
-    expect(mostSavedStrategy.calculate(values, 5, 2, 0)).toEqual([
+    expect(mostSavedStrategy.calculate(values, 5, 2, 0, 0.001)).toEqual([
       true,
       true,
       false,
@@ -67,7 +67,9 @@ describe("mostSavedStrategy", () => {
       true,
     ]);
     const values2 = prices.tomorrow.map((p) => p.value);
-    expect(mostSavedStrategy.calculate(values2, 5, 2, 1, true, 1)).toEqual([
+    expect(
+      mostSavedStrategy.calculate(values2, 5, 2, 1, 0.001, true, 1)
+    ).toEqual([
       false,
       false,
       true,
@@ -79,7 +81,9 @@ describe("mostSavedStrategy", () => {
       true,
       true,
     ]);
-    expect(mostSavedStrategy.calculate(values2, 5, 2, 1, false, 1)).toEqual([
+    expect(
+      mostSavedStrategy.calculate(values2, 5, 2, 1, 0.001, false, 1)
+    ).toEqual([
       true,
       false,
       true,

package/test/power-saver.test.js

@@ -72,6 +72,7 @@ describe("power-saver Node", function () {
         id: "n1",
         type: "power-saver",
         name: "test name",
+        minSaving: 0.001,
         wires: [["n3"], ["n4"], ["n2"]],
       },
       { id: "n2", type: "helper" },
@@ -84,6 +85,8 @@ describe("power-saver Node", function () {
       const n3 = helper.getNode("n3");
       const n4 = helper.getNode("n4");
       n2.on("input", function (msg) {
+        console.log(JSON.stringify(msg, null, 2));
+        console.log(JSON.stringify(plan.schedule, null, 2));
         expect(msg.payload).toHaveProperty("schedule", plan.schedule);
         n1.warn.should.not.be.called;
         // done();