node-red-contrib-power-saver 4.1.3 → 4.1.4

package/test/strategy-best-save.test.js

@@ -1,6 +1,6 @@
 const cloneDeep = require("lodash.clonedeep");
 const { DateTime } = require("luxon");
-const expect = require("expect");
+const expect = require("chai").expect;
 const helper = require("node-red-node-test-helper");
 const bestSave = require("../src/strategy-best-save.js");
 const prices = require("./data/converted-prices.json");
@@ -27,7 +27,7 @@ describe("ps-strategy-best-save node", function () {
     const flow = [{ id: "n1", type: "ps-strategy-best-save", name: "test name" }];
     helper.load(bestSave, flow, function () {
       const n1 = helper.getNode("n1");
-      expect(n1).toHaveProperty("name", "test name");
+      expect(n1).to.have.property("name", "test name");
       done();
     });
   });
@@ -76,22 +76,22 @@ describe("ps-strategy-best-save node", function () {
       let countOn = 0;
       let countOff = 0;
       n2.on("input", function (msg) {
-        expect(equalPlan(expected, msg.payload)).toBeTruthy();
+        expect(equalPlan(expected, msg.payload)).to.equal(true);
         n1.warn.should.not.be.called;
         setTimeout(() => {
           console.log("countOn = " + countOn + ", countOff = " + countOff);
-          expect(countOn).toEqual(7);
-          expect(countOff).toEqual(7);
+          expect(countOn).to.equal(7);
+          expect(countOff).to.equal(7);
           done();
         }, 900);
       });
       n3.on("input", function (msg) {
         countOn++;
-        expect(msg).toHaveProperty("payload", true);
+        expect(msg).to.have.deep.property("payload", true);
       });
       n4.on("input", function (msg) {
         countOff++;
-        expect(msg).toHaveProperty("payload", false);
+        expect(msg).to.have.deep.property("payload", false);
       });
       n1.receive({ payload: makePayload(prices, plan.time) });
     });
@@ -120,19 +120,19 @@ describe("ps-strategy-best-save node", function () {
           case 2:
             setTimeout(() => {
               console.log("countOn = " + countOn + ", countOff = " + countOff);
-              expect(countOn).toEqual(0);
-              expect(countOff).toEqual(1);
+              expect(countOn).to.equal(0);
+              expect(countOff).to.equal(1);
               done();
             }, 100);
         }
       });
       n3.on("input", function (msg) {
         countOn++;
-        expect(msg).toHaveProperty("payload", true);
+        expect(msg).to.have.deep.property("payload", true);
       });
       n4.on("input", function (msg) {
         countOff++;
-        expect(msg).toHaveProperty("payload", false);
+        expect(msg).to.have.deep.property("payload", false);
       });
       const payload = {
         ...convertedPrices,
@@ -158,25 +158,25 @@ describe("ps-strategy-best-save node", function () {
       let countOn = 0;
       let countOff = 0;
       n2.on("input", function (msg) {
-        expect(equalPlan(expected, msg.payload)).toBeTruthy();
+        expect(equalPlan(expected, msg.payload)).to.equal(true);
         n1.warn.should.not.be.called;
         if (!timeoutSet) {
           timeoutSet = true;
           setTimeout(() => {
             console.log("countOn = " + countOn + ", countOff = " + countOff);
-            expect(countOn).toEqual(2);
-            expect(countOff).toEqual(2);
+            expect(countOn).to.equal(2);
+            expect(countOff).to.equal(2);
             done();
           }, 900);
         }
       });
       n3.on("input", function (msg) {
         countOn++;
-        expect(msg).toHaveProperty("payload", true);
+        expect(msg).to.have.deep.property("payload", true);
       });
       n4.on("input", function (msg) {
         countOff++;
-        expect(msg).toHaveProperty("payload", false);
+        expect(msg).to.have.deep.property("payload", false);
         if (countOff === 2) {
           n1.receive({ payload: { config: { override: "on" }, time: plan.time } });
         }
@@ -196,20 +196,20 @@ describe("ps-strategy-best-save node", function () {
       const n3 = helper.getNode("n3");
       const n4 = helper.getNode("n4");
       n2.on("input", function (msg) {
-        expect(msg.payload.config.outputValueForOn).toEqual(1);
-        expect(msg.payload.config.outputValueForOff).toEqual(0);
-        expect(msg.payload.config.outputValueForOntype).toEqual("num");
-        expect(msg.payload.config.outputValueForOfftype).toEqual("num");
+        expect(msg.payload.config.outputValueForOn).to.equal(1);
+        expect(msg.payload.config.outputValueForOff).to.equal(0);
+        expect(msg.payload.config.outputValueForOntype).to.equal("num");
+        expect(msg.payload.config.outputValueForOfftype).to.equal("num");
         n1.warn.should.not.be.called;
         setTimeout(() => {
           done();
         }, 100);
       });
       n3.on("input", function (msg) {
-        expect(msg).toHaveProperty("payload", 1);
+        expect(msg).to.have.deep.property("payload", 1);
       });
       n4.on("input", function (msg) {
-        expect(msg).toHaveProperty("payload", 0);
+        expect(msg).to.have.deep.property("payload", 0);
       });
       n1.receive({ payload: makePayload(prices, plan.time) });
     });
@@ -226,20 +226,20 @@ describe("ps-strategy-best-save node", function () {
       const n3 = helper.getNode("n3");
       const n4 = helper.getNode("n4");
       n2.on("input", function (msg) {
-        expect(msg.payload.config.outputValueForOn).toEqual("on");
-        expect(msg.payload.config.outputValueForOff).toEqual("off");
-        expect(msg.payload.config.outputValueForOntype).toEqual("str");
-        expect(msg.payload.config.outputValueForOfftype).toEqual("str");
+        expect(msg.payload.config.outputValueForOn).to.equal("on");
+        expect(msg.payload.config.outputValueForOff).to.equal("off");
+        expect(msg.payload.config.outputValueForOntype).to.equal("str");
+        expect(msg.payload.config.outputValueForOfftype).to.equal("str");
         n1.warn.should.not.be.called;
         setTimeout(() => {
           done();
         }, 100);
       });
       n3.on("input", function (msg) {
-        expect(msg).toHaveProperty("payload", "on");
+        expect(msg).to.have.deep.property("payload", "on");
       });
       n4.on("input", function (msg) {
-        expect(msg).toHaveProperty("payload", "off");
+        expect(msg).to.have.deep.property("payload", "off");
       });
       n1.receive({ payload: makePayload(prices, plan.time) });
     });

package/test/strategy-fixed-schedule.test.js

@@ -1,6 +1,6 @@
 const cloneDeep = require("lodash.clonedeep");
 const { DateTime } = require("luxon");
-const expect = require("expect");
+const expect = require("chai").expect;
 const helper = require("node-red-node-test-helper");
 const fixedSchedule = require("../src/strategy-fixed-schedule.js");
 const prices = require("./data/converted-prices.json");
@@ -24,7 +24,7 @@ describe("ps-strategy-fixed-schedule node", function () {
     const flow = [{ id: "n1", type: "ps-strategy-fixed-schedule", name: "test name" }];
     helper.load(fixedSchedule, flow, function () {
       const n1 = helper.getNode("n1");
-      expect(n1).toHaveProperty("name", "test name");
+      expect(n1).to.have.property("name", "test name");
       done();
     });
   });
@@ -36,7 +36,7 @@ describe("ps-strategy-fixed-schedule node", function () {
       const n1 = helper.getNode("n1");
       const n2 = helper.getNode("n2");
       n2.on("input", function (msg) {
-        expect(equalPlan(expected, msg.payload)).toBeTruthy();
+        expect(equalPlan(expected, msg.payload)).to.equal(true);
         n1.warn.should.not.be.called;
         done();
       });
@@ -57,7 +57,7 @@ describe("ps-strategy-fixed-schedule node", function () {
       const n1 = helper.getNode("n1");
       const n2 = helper.getNode("n2");
       n2.on("input", function (msg) {
-        expect(equalPlan(expected, msg.payload)).toBeTruthy();
+        expect(equalPlan(expected, msg.payload)).to.equal(true);
         n1.warn.should.not.be.called;
         done();
       });
@@ -85,7 +85,7 @@ describe("ps-strategy-fixed-schedule node", function () {
       const n1 = helper.getNode("n1");
       const n2 = helper.getNode("n2");
       n2.on("input", function (msg) {
-        expect(equalSchedule(expected, msg.payload.schedule)).toBeTruthy();
+        expect(equalSchedule(expected, msg.payload.schedule)).to.equal(true);
         done();
       });
       n1.receive({ payload: prices, time: prices.priceData[0].start });

package/test/strategy-heat-capacitor-node.test.js

@@ -1,11 +1,12 @@
 "use strict";
 const cloneDeep = require("lodash.clonedeep");
 const { DateTime } = require("luxon");
-const expect = require("expect");
+const expect = require("chai").expect;
 const helper = require("node-red-node-test-helper");
 const node = require("../src/strategy-heat-capacitor.js");
 const prices = require("./data/converted-prices.json");
 const multiTrade = require("./data/multiple-trades.json");
+const nanTest = require("./data/heat-capacitor-prices-NaN-test.json");
 
 helper.init(require.resolve("node-red"));
 
@@ -24,7 +25,7 @@ describe("ps-strategy-heat-capacitor node", function () {
     const flow = [{ id: "n1", type: "ps-strategy-heat-capacitor", name: "Temp. Adj." }];
     helper.load(node, flow, function () {
       const n1 = helper.getNode("n1");
-      expect(n1).toHaveProperty("name", "Temp. Adj.");
+      expect(n1).to.have.property("name", "Temp. Adj.");
       done();
     });
   });
@@ -76,15 +77,15 @@ describe("ps-strategy-heat-capacitor node", function () {
           },
         },
       });
-      expect(n1).toHaveProperty("timeHeat1C", 1);
-      expect(n1).toHaveProperty("timeCool1C", 2);
-      expect(n1).toHaveProperty("boostTempHeat", 6);
-      expect(n1).toHaveProperty("boostTempCool", 7);
-      expect(n1).toHaveProperty("setpoint", 3);
-      expect(n1).toHaveProperty("maxTempAdjustment", 4);
-      expect(n1).toHaveProperty("minSavings", 5);
+      expect(n1).to.have.property("timeHeat1C", 1);
+      expect(n1).to.have.property("timeCool1C", 2);
+      expect(n1).to.have.property("boostTempHeat", 6);
+      expect(n1).to.have.property("boostTempCool", 7);
+      expect(n1).to.have.property("setpoint", 3);
+      expect(n1).to.have.property("maxTempAdjustment", 4);
+      expect(n1).to.have.property("minSavings", 5);
       n1.receive({ payload: { config: { setpoint: 24 } } });
-      expect(n1).toHaveProperty("setpoint", 24);
+      expect(n1).to.have.property("setpoint", 24);
       done();
     });
   });
@@ -98,12 +99,12 @@ describe("ps-strategy-heat-capacitor node", function () {
       const n3 = helper.getNode("n3");
       let bothReceived = false;
       n2.on("input", function (msg) {
-        expect(msg).toHaveProperty("payload", 22.5);
+        expect(msg).to.have.deep.property("payload", 22.5);
         n1.warn.should.not.be.called;
         bothReceived ? done() : (bothReceived = true);
       });
       n3.on("input", function (msg) {
-        expect(msg).toHaveProperty("payload", -0.5);
+        expect(msg).to.have.deep.property("payload", -0.5);
         n1.warn.should.not.be.called;
         bothReceived ? done() : (bothReceived = true);
       });
@@ -121,17 +122,23 @@ describe("ps-strategy-heat-capacitor node", function () {
       const n1 = helper.getNode("n1");
       const n2 = helper.getNode("n2");
       const n3 = helper.getNode("n3");
+      const n4 = helper.getNode("n4");
+      const n5 = helper.getNode("n5");
       let bothReceived = false;
       n2.on("input", function (msg) {
-        expect(msg).toHaveProperty("payload", 24.5);
+        expect(msg).to.have.deep.property("payload", 24.5);
         n1.warn.should.not.be.called;
         bothReceived ? done() : (bothReceived = true);
       });
       n3.on("input", function (msg) {
-        expect(msg).toHaveProperty("payload", 1.5);
+        expect(msg).to.have.deep.property("payload", 1.5);
         n1.warn.should.not.be.called;
         bothReceived ? done() : (bothReceived = true);
       });
+      n5.on("input", function (msg) {
+        expect(msg).to.have.deep.property("payload.current_setpoint", 24.5);
+        n1.warn.should.not.be.called;
+      });
       const time = DateTime.fromISO(multiTrade.priceData[4].start).plus({ minutes: 10 });
       multiTrade.time = time;
       n1.receive({ payload: multiTrade });
@@ -144,10 +151,101 @@ describe("ps-strategy-heat-capacitor node", function () {
       const n1 = helper.getNode("n1");
       n1.receive({ payload: multiTrade });
       n1.receive({ payload: prices });
-      expect(n1.priceData.length).toEqual(72);
+      expect(n1.priceData.length).to.equal(72);
       done();
     });
   });
+
+  it("should plan correctly, NaN test", function (done) {
+    const result = 0.5;
+    const flow = [
+      {
+        id: "n1",
+        type: "ps-strategy-heat-capacitor",
+        name: "Temp. Adj.",
+        timeHeat1C: 480,
+        timeCool1C: 360,
+        boostTempHeat: 2,
+        boostTempCool: 2,
+        setpoint: 20,
+        maxTempAdjustment: 1,
+        minSavings: 0.08,
+        wires: [["n2"], ["n3"], ["n4"], ["n5"]],
+      },
+      { id: "n2", type: "helper" },
+      { id: "n3", type: "helper" },
+      { id: "n4", type: "helper" },
+      { id: "n5", type: "helper" },
+    ];
+    helper.load(node, flow, function () {
+      const n1 = helper.getNode("n1");
+      const n2 = helper.getNode("n2");
+      const n3 = helper.getNode("n3");
+      const n4 = helper.getNode("n4");
+      const n5 = helper.getNode("n5");
+      let bothReceived = false;
+      n2.on("input", function (msg) {
+        expect(msg).to.have.deep.property("payload", 17);
+        n1.warn.should.not.be.called;
+        bothReceived ? done() : (bothReceived = true);
+      });
+      n3.on("input", function (msg) {
+        expect(msg).to.have.deep.property("payload", -3);
+        n1.warn.should.not.be.called;
+        bothReceived ? done() : (bothReceived = true);
+      });
+      n5.on("input", function (msg) {
+        expect(msg).to.have.deep.property("payload.current_setpoint", 17);
+        n1.warn.should.not.be.called;
+      });
+      const time = DateTime.fromISO("2022-12-06T10:51:48.126+01:00");
+      nanTest.time = time;
+      n1.receive({ payload: nanTest });
+    });
+  });
+
+  it("should support dynamic commands", function (done) {
+    const result = 0.5;
+    const flow = makeFlow();
+    helper.load(node, flow, function () {
+      const n1 = helper.getNode("n1");
+      const n2 = helper.getNode("n2");
+      const n3 = helper.getNode("n3");
+      const n4 = helper.getNode("n4");
+      const n5 = helper.getNode("n5");
+      const numInputs = [0, 0, 0, 0];
+      const expectedNumInputs = [2, 2, 2, 2];
+      function testNumInputs() {
+        if (numInputs.every((e, i) => e === expectedNumInputs[i])) {
+          done();
+        }
+      }
+      n2.on("input", function (msg) {
+        numInputs[0]++;
+        testNumInputs();
+      });
+      n3.on("input", function (msg) {
+        numInputs[1]++;
+        testNumInputs();
+      });
+      n4.on("input", function (msg) {
+        numInputs[2]++;
+        testNumInputs();
+      });
+      n5.on("input", function (msg) {
+        numInputs[3]++;
+        testNumInputs();
+      });
+      const time = DateTime.fromISO(multiTrade.priceData[4].start).plus({ minutes: 10 });
+      const outputCommand = { payload: { commands: { sendOutput: true } } };
+      const scheduleCommand = { payload: { commands: { sendSchedule: true } } };
+      multiTrade.time = time;
+
+      n1.receive({ payload: multiTrade });
+      n1.receive(outputCommand);
+      n1.receive(scheduleCommand);
+    });
+  });
 });
 
 function makeFlow() {
@@ -163,11 +261,12 @@ function makeFlow() {
       setpoint: 23,
       maxTempAdjustment: 0.5,
       minSavings: 0.08,
-      wires: [["n2"], ["n3"], ["n4"]],
+      wires: [["n2"], ["n3"], ["n4"], ["n5"]],
     },
     { id: "n2", type: "helper" },
     { id: "n3", type: "helper" },
     { id: "n4", type: "helper" },
+    { id: "n5", type: "helper" },
   ];
 }
 

package/test/strategy-heat-capacitor.test.js

@@ -1,6 +1,6 @@
 "use strict";
 const { DateTime } = require("luxon");
-const expect = require("expect");
+const expect = require("chai").expect;
 const {
   calculateSchedule,
   calculateOpportunities,
@@ -17,6 +17,7 @@ describe("ps-strategy-heat-capacitor-functions", () => {
   //User input
   const timeHeat1C = 60;
   const timeCool1C = 40;
+  const setpoint = 23;
   const maxTempAdjustment = 1;
   const boostTempHeat = 1;
   const boostTempCool = 1;
@@ -37,7 +38,7 @@ describe("ps-strategy-heat-capacitor-functions", () => {
     let result = calculateOpportunities(my_prices, my_buy_pattern, 1);
     //Remove float precisions errors by rounding
     result = result.map((x) => Math.round(x * 1000000) / 1000000);
-    expect(result).toEqual(Array(56).fill(my_prices[0]));
+    expect(result).to.eql(Array(56).fill(my_prices[0]));
   });
 
   it("Can find procurement pattern", () => {
@@ -49,7 +50,7 @@ describe("ps-strategy-heat-capacitor-functions", () => {
 
     const my_buy_sell = findBestBuySellPattern(buy_prices, buy_pattern.length, sell_prices, sell_pattern.length);
 
-    expect(my_buy_sell).toEqual([
+    expect(my_buy_sell).to.eql([
       [0, 141],
       [100, 240],
     ]);
@@ -65,7 +66,7 @@ describe("ps-strategy-heat-capacitor-functions", () => {
     const sell_prices = calculateOpportunities(my_prices, sell_pattern, 1);
     const result = calculateValueDictList(my_buy_sell_indexes, buy_prices, sell_prices, start_date);
 
-    expect(result[0].sellDate).toEqual(start_date.plus({ minutes: 131 }));
+    expect(result[0].sellDate).to.eql(start_date.plus({ minutes: 131 }));
   });
 
   it("DictList test at decreasing end", () => {
@@ -79,13 +80,14 @@ describe("ps-strategy-heat-capacitor-functions", () => {
       my_buy_sell,
       buy_prices,
       sell_prices,
+      setpoint,
       maxTempAdjustment,
       boostTempHeat,
       boostTempCool,
       buy_pattern.length,
       sell_pattern.length
     );
-    expect(my_schedule.temperatures[my_schedule.temperatures.length - 1]).toEqual(-maxTempAdjustment);
+    expect(my_schedule.temperatures[my_schedule.temperatures.length - 1]).to.equal(-maxTempAdjustment);
   });
 
   it("Check removal of low benefit buy-sell pairs", () => {
@@ -98,6 +100,6 @@ describe("ps-strategy-heat-capacitor-functions", () => {
     //Should remove the sell at 1.05 and the re-buy at 1 (only 0.05 difference)
     const compare = [my_buy_sell[0].slice(0, 2), [my_buy_sell[1][0], my_buy_sell[1][2]]];
 
-    expect(result).toEqual(compare);
+    expect(result).to.eql(compare);
   });
 });

package/test/strategy-lowest-price-3days.test.js

@@ -1,6 +1,6 @@
 const cloneDeep = require("lodash.clonedeep");
 const { DateTime } = require("luxon");
-const expect = require("expect");
+const expect = require("chai").expect;
 const helper = require("node-red-node-test-helper");
 const lowestPrice = require("../src/strategy-lowest-price.js");
 const prices = require("./data/nordpool-3-days-prices.json");
@@ -24,7 +24,7 @@ describe("ps-strategy-lowest-price with data day before", function () {
     const flow = [{ id: "n1", type: "ps-strategy-lowest-price", name: "test name" }];
     helper.load(lowestPrice, flow, function () {
       const n1 = helper.getNode("n1");
-      expect(n1).toHaveProperty("name", "test name");
+      expect(n1).to.have.property("name", "test name");
       done();
     });
   });
@@ -41,7 +41,7 @@ describe("ps-strategy-lowest-price with data day before", function () {
       let count = 0;
       n2.on("input", function (msg) {
         if (count === 1) {
-          expect(msg.payload).toHaveProperty("schedule", result.schedule);
+          expect(msg.payload).to.have.deep.property("schedule", result.schedule);
           done();
         }
         count++;
@@ -72,7 +72,7 @@ describe("ps-strategy-lowest-price with data day before", function () {
       let count = 0;
       n2.on("input", function (msg) {
         if (count === 1) {
-          expect(msg.payload).toHaveProperty("schedule", res.schedule);
+          expect(msg.payload).to.have.deep.property("schedule", res.schedule);
           done();
         }
         count++;

package/test/strategy-lowest-price-functions.test.js

@@ -1,5 +1,5 @@
 const { DateTime } = require("luxon");
-const expect = require("expect");
+const expect = require("chai").expect;
 const { getBestContinuous, getBestX } = require("../src/strategy-lowest-price-functions");
 const convertedPrices = require("./data/converted-prices.json");
 const cloneDeep = require("lodash.clonedeep");
@@ -10,31 +10,31 @@ describe("strategy-lowest-price-functions", () => {
     const result = cloneDeep(values).fill(false);
     result.fill(true, 0, 6);
     result.fill(true, 24, 31);
-    expect(getBestX(values, 13)).toEqual(result);
+    expect(getBestX(values, 13)).to.eql(result);
     const values1 = convertedPrices.priceData.slice(0, 12).map((p) => p.value);
     const result1 = cloneDeep(values1).fill(false);
-    expect(getBestX(values1, 1)).toEqual(cloneDeep(result1).fill(true, 2, 3));
-    expect(getBestX(values1, 3)).toEqual(cloneDeep(result1).fill(true, 1, 4));
+    expect(getBestX(values1, 1)).to.eql(cloneDeep(result1).fill(true, 2, 3));
+    expect(getBestX(values1, 3)).to.eql(cloneDeep(result1).fill(true, 1, 4));
     const values2 = convertedPrices.priceData.slice(24, 28).map((p) => p.value);
     const result2 = cloneDeep(values2).fill(false);
-    expect(getBestX(values2, 1)).toEqual(cloneDeep(result2).fill(true, 3, 4));
-    expect(getBestX(values2, 3)).toEqual(cloneDeep(result2).fill(true, 1, 4));
+    expect(getBestX(values2, 1)).to.eql(cloneDeep(result2).fill(true, 3, 4));
+    expect(getBestX(values2, 3)).to.eql(cloneDeep(result2).fill(true, 1, 4));
   });
 
   it("can find best x continuous", () => {
     const values = convertedPrices.priceData.slice(0, 12).map((p) => p.value);
     const result = cloneDeep(values).fill(false);
-    expect(getBestContinuous(values, 1)).toEqual(cloneDeep(result).fill(true, 2, 3));
-    expect(getBestContinuous(values, 3)).toEqual(cloneDeep(result).fill(true, 1, 4));
+    expect(getBestContinuous(values, 1)).to.eql(cloneDeep(result).fill(true, 2, 3));
+    expect(getBestContinuous(values, 3)).to.eql(cloneDeep(result).fill(true, 1, 4));
     const values2 = convertedPrices.priceData.slice(24, 28).map((p) => p.value);
     const result2 = cloneDeep(values2).fill(false);
-    expect(getBestContinuous(values2, 1)).toEqual(cloneDeep(result2).fill(true, 3, 4));
-    expect(getBestContinuous(values2, 3)).toEqual(cloneDeep(result2).fill(true, 1, 4));
+    expect(getBestContinuous(values2, 1)).to.eql(cloneDeep(result2).fill(true, 3, 4));
+    expect(getBestContinuous(values2, 3)).to.eql(cloneDeep(result2).fill(true, 1, 4));
   });
 });
 
 function validatePeriod(period, start, end, count) {
-  expect(period.length).toEqual(count);
-  expect(period[0]).toEqual(start);
-  expect(period[count - 1]).toEqual(end);
+  expect(period.length).to.eql(count);
+  expect(period[0]).to.eql(start);
+  expect(period[count - 1]).to.eql(end);
 }