node-red-contrib-power-saver 3.0.0 → 3.0.4

package/src/elvia/elvia-tariff.js

@@ -5,17 +5,13 @@ module.exports = function (RED) {
   function PsElviaTariffNode(config) {
     RED.nodes.createNode(this, config);
     this.elviaConfig = RED.nodes.getNode(config.elviaConfig);
+    const key = this.elviaConfig.credentials.elviaSubscriptionKey;
     this.tariffKey = config.tariffKey;
     this.range = config.range;
     const node = this;
-
-    const configList = node.context().global.get("elviaConfigList") || [];
-    const key = configList.find((c) => c.id == node.elviaConfig.id)?.elviaSubscriptionKey;
     ping(node, key);
 
     node.on("input", function () {
-      const configList = node.context().global.get("elviaConfigList") || [];
-      const key = configList.find((c) => c.id == node.elviaConfig.id)?.elviaSubscriptionKey;
       getTariff(node, key, node.tariffKey, node.range).then((json) => {
         node.send([{ payload: json }]);
       });

package/src/handle-input.js

@@ -37,7 +37,7 @@ function handleStrategyInput(node, msg, doPlanning) {
     payload: {
       schedule: plan.schedule,
       hours: plan.hours,
-      source: priceData.source,
+      source: msg.payload.source,
       config: effectiveConfig,
     },
   };
@@ -45,7 +45,8 @@ function handleStrategyInput(node, msg, doPlanning) {
   // Find current output, and set output (if configured to do)
   const pastSchedule = plan.schedule.filter((entry) => DateTime.fromISO(entry.time) <= planFromTime);
 
-  if (node.sendCurrentValueWhenRescheduling && pastSchedule.length > 0) {
+  const sendNow = node.sendCurrentValueWhenRescheduling && pastSchedule.length > 0;
+  if (sendNow) {
     const currentValue = pastSchedule[pastSchedule.length - 1].value;
     output1 = currentValue ? { payload: true } : null;
     output2 = currentValue ? null : { payload: false };
@@ -58,7 +59,7 @@ function handleStrategyInput(node, msg, doPlanning) {
   node.send([output1, output2, output3]);
 
   // Run schedule
-  node.schedulingTimeout = runSchedule(node, plan.schedule, planFromTime);
+  node.schedulingTimeout = runSchedule(node, plan.schedule, planFromTime, sendNow);
 }
 
 function getPriceData(node, msg) {
@@ -71,7 +72,7 @@ function getPriceData(node, msg) {
   return priceData;
 }
 
-function runSchedule(node, schedule, time) {
+function runSchedule(node, schedule, time, currentSent = false) {
   let currentTime = time;
   let remainingSchedule = schedule.filter((entry) => {
     return DateTime.fromISO(entry.time) > DateTime.fromISO(time);
@@ -94,7 +95,9 @@ function runSchedule(node, schedule, time) {
     const message = "No schedule";
     node.warn(message);
     node.status({ fill: "red", shape: "dot", text: message });
-    sendSwitch(node, node.outputIfNoSchedule);
+    if (!currentSent) {
+      sendSwitch(node, node.outputIfNoSchedule);
+    }
   }
 }
 

package/src/power-saver.html

@@ -25,9 +25,9 @@
         // validate: RED.validators.number(),
         align: "left",
       },
-      outputIfNoSchedule: { value: true, required: true, align: "left" },
+      outputIfNoSchedule: { value: "true", required: true, align: "left" },
       scheduleOnlyFromCurrentTime: {
-        value: true,
+        value: "true",
         required: true,
         align: "left",
       },
@@ -46,8 +46,8 @@
           {
             value: "onoff",
             options: [
-              { value: true, label: "On" },
-              { value: false, label: "Off" },
+              { value: "true", label: "On" },
+              { value: "false", label: "Off" },
             ],
           },
         ],
@@ -57,8 +57,8 @@
           {
             value: "nowOrStart",
             options: [
-              { value: false, label: "Whole data set" },
-              { value: true, label: "From current hour" },
+              { value: "false", label: "Whole data set" },
+              { value: "true", label: "From current hour" },
             ],
           },
         ],
@@ -90,7 +90,7 @@
     </div>
     <div class="form-row">
       <label for="node-input-scheduleOnlyFromCurrentTime">Schedule for</label>
-      <input type="boolean" id="node-input-scheduleOnlyFromCurrentTime" style="width: 160px">
+      <input type="text" id="node-input-scheduleOnlyFromCurrentTime" style="width: 160px">
       </label>
   </div>
   <h3>Output</h3>
@@ -104,7 +104,7 @@
     </div>
     <div class="form-row">
         <label for="node-input-outputIfNoSchedule">If no schedule, send</label>
-        <input type="boolean" id="node-input-outputIfNoSchedule" style="width: 80px">
+        <input type="text" id="node-input-outputIfNoSchedule" style="width: 80px">
         </label>
     </div>
 </script>

package/src/receive-price-functions.js

@@ -15,9 +15,9 @@ function getPriceData(node, msg) {
   }
 
   priceData = [...input.today, ...input.tomorrow];
-  priceData.source = input.source;
+  const source = input.source;
   node.context().set("lastPriceData", priceData);
-  return priceData;
+  return { priceData, source };
 }
 
 function validateMsg(node, msg) {
@@ -74,16 +74,20 @@ function convertMsg(msg) {
       }));
     } else if (msg.data?.new_state?.attributes["raw_" + day]) {
       result.source = "Nordpool";
-      result[day] = msg.data.new_state.attributes["raw_" + day].map((v) => ({
-        value: v.value,
-        start: v.start,
-      }));
+      result[day] = msg.data.new_state.attributes["raw_" + day]
+        .filter((v) => v.value)
+        .map((v) => ({
+          value: v.value,
+          start: v.start,
+        }));
     } else if (msg.payload?.attributes && msg.payload?.attributes["raw_" + day]) {
       result.source = "Nordpool";
-      result[day] = msg.payload.attributes["raw_" + day].map((v) => ({
-        value: v.value,
-        start: v.start,
-      }));
+      result[day] = msg.payload.attributes["raw_" + day]
+        .filter((v) => v.value)
+        .map((v) => ({
+          value: v.value,
+          start: v.start,
+        }));
     } else {
       result.source = "Other";
       result[day] = msg.payload[day] || [];

package/src/receive-price.js

@@ -6,14 +6,14 @@ module.exports = function (RED) {
     const node = this;
 
     node.on("input", function (msg) {
-      const priceData = getPriceData(node, msg);
+      const { priceData, source } = getPriceData(node, msg);
       if (!priceData) {
         // Set status failed
         return;
       }
 
       // Send output
-      node.send({ payload: { priceData } });
+      node.send({ payload: { priceData, source } });
     });
   }
 

package/src/strategy-best-save.html

@@ -25,9 +25,9 @@
         // validate: RED.validators.number(),
         align: "left",
       },
-      outputIfNoSchedule: { value: true, required: true, align: "left" },
+      outputIfNoSchedule: { value: "true", required: true, align: "left" },
       scheduleOnlyFromCurrentTime: {
-        value: true,
+        value: "true",
         required: true,
         align: "left",
       },
@@ -46,8 +46,8 @@
           {
             value: "onoff",
             options: [
-              { value: true, label: "On" },
-              { value: false, label: "Off" },
+              { value: "true", label: "On" },
+              { value: "false", label: "Off" },
             ],
           },
         ],
@@ -57,8 +57,8 @@
           {
             value: "nowOrStart",
             options: [
-              { value: false, label: "Whole data set" },
-              { value: true, label: "From current hour" },
+              { value: "false", label: "Whole data set" },
+              { value: "true", label: "From current hour" },
             ],
           },
         ],
@@ -90,7 +90,7 @@
     </div>
     <div class="form-row">
       <label for="node-input-scheduleOnlyFromCurrentTime">Schedule for</label>
-      <input type="boolean" id="node-input-scheduleOnlyFromCurrentTime" style="width: 160px">
+      <input type="text" id="node-input-scheduleOnlyFromCurrentTime" style="width: 160px">
       </label>
   </div>
   <h3>Output</h3>
@@ -104,7 +104,7 @@
     </div>
     <div class="form-row">
         <label for="node-input-outputIfNoSchedule">If no schedule, send</label>
-        <input type="boolean" id="node-input-outputIfNoSchedule" style="width: 80px">
+        <input type="text" id="node-input-outputIfNoSchedule" style="width: 80px">
         </label>
     </div>
 </script>

package/src/strategy-lowest-price.html

@@ -44,17 +44,17 @@
         required: true,
       },
       doNotSplit: {
-        value: false,
+        value: "false",
         required: true,
         align: "left",
       },
       sendCurrentValueWhenRescheduling: {
-        value: true,
+        value: "true",
         required: true,
         align: "left",
       },
-      outputIfNoSchedule: { value: true, required: true, align: "left" },
-      outputOutsidePeriod: { value: false, required: true, align: "left" },
+      outputIfNoSchedule: { value: "true", required: true, align: "left" },
+      outputOutsidePeriod: { value: "false", required: true, align: "left" },
     },
     inputs: 1,
     outputs: 3,
@@ -70,8 +70,8 @@
           {
             value: "onoff",
             options: [
-              { value: true, label: "On" },
-              { value: false, label: "Off" },
+              { value: "true", label: "On" },
+              { value: "false", label: "Off" },
             ],
           },
         ],
@@ -81,8 +81,8 @@
           {
             value: "onoff",
             options: [
-              { value: true, label: "On" },
-              { value: false, label: "Off" },
+              { value: "true", label: "On" },
+              { value: "false", label: "Off" },
             ],
           },
         ],
@@ -108,7 +108,7 @@
           {
             value: "hourson",
             options: (() => {
-              const res = hours.map((h) => ({ value: h, label: h }));
+              const res = hours.map((h) => ({ value: "" + parseInt(h), label: "" + parseInt(h) }));
               res.push({ value: "24", label: "24" });
               return res;
             })(),
@@ -151,12 +151,12 @@
     </div>
     <div class="form-row">
         <label for="node-input-outputIfNoSchedule">If no schedule, send</label>
-        <input type="boolean" id="node-input-outputIfNoSchedule" style="width: 80px">
+        <input type="text" id="node-input-outputIfNoSchedule" style="width: 80px">
         </label>
     </div>
     <div class="form-row">
         <label for="node-input-outputIfNoSchedule">Outside period, send</label>
-        <input type="boolean" id="node-input-outputOutsidePeriod" style="width: 80px">
+        <input type="text" id="node-input-outputOutsidePeriod" style="width: 80px">
         </label>
     </div>
 </script>

package/src/strategy-lowest-price.js

@@ -11,7 +11,7 @@ module.exports = function (RED) {
     const originalConfig = {
       fromTime: config.fromTime,
       toTime: config.toTime,
-      hoursOn: config.hoursOn,
+      hoursOn: parseInt(config.hoursOn),
       doNotSplit: booleanConfig(config.doNotSplit),
       sendCurrentValueWhenRescheduling: booleanConfig(config.sendCurrentValueWhenRescheduling),
       outputIfNoSchedule: booleanConfig(config.outputIfNoSchedule),
@@ -41,14 +41,14 @@ function doPlanning(node, _, priceData, _, dateDayBefore, _) {
   const periodStatus = [];
   const startIndexes = [];
   const endIndexes = [];
-  let currentStatus = from < to ? "Outside" : "StartMissing";
+  let currentStatus = from < (to === 0 && to !== from ? 24 : to) ? "Outside" : "StartMissing";
   let hour;
   priceData.forEach((pd, i) => {
     hour = DateTime.fromISO(pd.start).hour;
     if (hour === to && to === from && currentStatus === "Inside") {
       endIndexes.push(i - 1);
     }
-    if (hour === to && to !== from) {
+    if (hour === to && to !== from && i > 0) {
       currentStatus = "Outside";
       endIndexes.push(i - 1);
     }

package/test/data/converted-prices.json

@@ -1,4 +1,5 @@
 {
+  "source": "Tibber",
   "priceData": [
     {
       "value": 0.2494,

package/test/data/tibber-data-end-0-24h.json

@@ -0,0 +1,197 @@
+{
+  "source": "Tibber",
+  "priceData": [
+    {
+      "value": 0.4675,
+      "start": "2021-12-14T00:00:00.000+01:00"
+    },
+    {
+      "value": 0.4488,
+      "start": "2021-12-14T01:00:00.000+01:00"
+    },
+    {
+      "value": 0.4344,
+      "start": "2021-12-14T02:00:00.000+01:00"
+    },
+    {
+      "value": 0.4124,
+      "start": "2021-12-14T03:00:00.000+01:00"
+    },
+    {
+      "value": 0.413,
+      "start": "2021-12-14T04:00:00.000+01:00"
+    },
+    {
+      "value": 0.4232,
+      "start": "2021-12-14T05:00:00.000+01:00"
+    },
+    {
+      "value": 0.4,
+      "start": "2021-12-14T06:00:00.000+01:00"
+    },
+    {
+      "value": 0.4067,
+      "start": "2021-12-14T07:00:00.000+01:00"
+    },
+    {
+      "value": 0.504,
+      "start": "2021-12-14T08:00:00.000+01:00"
+    },
+    {
+      "value": 0.5341,
+      "start": "2021-12-14T09:00:00.000+01:00"
+    },
+    {
+      "value": 0.5179,
+      "start": "2021-12-14T10:00:00.000+01:00"
+    },
+    {
+      "value": 0.5375,
+      "start": "2021-12-14T11:00:00.000+01:00"
+    },
+    {
+      "value": 0.535,
+      "start": "2021-12-14T12:00:00.000+01:00"
+    },
+    {
+      "value": 0.5403,
+      "start": "2021-12-14T13:00:00.000+01:00"
+    },
+    {
+      "value": 0.5291,
+      "start": "2021-12-14T14:00:00.000+01:00"
+    },
+    {
+      "value": 0.5175,
+      "start": "2021-12-14T15:00:00.000+01:00"
+    },
+    {
+      "value": 0.4914,
+      "start": "2021-12-14T16:00:00.000+01:00"
+    },
+    {
+      "value": 0.4698,
+      "start": "2021-12-14T17:00:00.000+01:00"
+    },
+    {
+      "value": 0.4609,
+      "start": "2021-12-14T18:00:00.000+01:00"
+    },
+    {
+      "value": 0.4408,
+      "start": "2021-12-14T19:00:00.000+01:00"
+    },
+    {
+      "value": 0.4263,
+      "start": "2021-12-14T20:00:00.000+01:00"
+    },
+    {
+      "value": 0.3946,
+      "start": "2021-12-14T21:00:00.000+01:00"
+    },
+    {
+      "value": 0.3852,
+      "start": "2021-12-14T22:00:00.000+01:00"
+    },
+    {
+      "value": 0.373,
+      "start": "2021-12-14T23:00:00.000+01:00"
+    },
+    {
+      "value": 0.4675,
+      "start": "2021-12-15T00:00:00.000+01:00"
+    },
+    {
+      "value": 0.4488,
+      "start": "2021-12-15T01:00:00.000+01:00"
+    },
+    {
+      "value": 0.4344,
+      "start": "2021-12-15T02:00:00.000+01:00"
+    },
+    {
+      "value": 0.4124,
+      "start": "2021-12-15T03:00:00.000+01:00"
+    },
+    {
+      "value": 0.413,
+      "start": "2021-12-15T04:00:00.000+01:00"
+    },
+    {
+      "value": 0.4232,
+      "start": "2021-12-15T05:00:00.000+01:00"
+    },
+    {
+      "value": 0.4,
+      "start": "2021-12-15T06:00:00.000+01:00"
+    },
+    {
+      "value": 0.4067,
+      "start": "2021-12-15T07:00:00.000+01:00"
+    },
+    {
+      "value": 0.504,
+      "start": "2021-12-15T08:00:00.000+01:00"
+    },
+    {
+      "value": 0.5341,
+      "start": "2021-12-15T09:00:00.000+01:00"
+    },
+    {
+      "value": 0.5179,
+      "start": "2021-12-15T10:00:00.000+01:00"
+    },
+    {
+      "value": 0.5375,
+      "start": "2021-12-15T11:00:00.000+01:00"
+    },
+    {
+      "value": 0.535,
+      "start": "2021-12-15T12:00:00.000+01:00"
+    },
+    {
+      "value": 0.5403,
+      "start": "2021-12-15T13:00:00.000+01:00"
+    },
+    {
+      "value": 0.5291,
+      "start": "2021-12-15T14:00:00.000+01:00"
+    },
+    {
+      "value": 0.5175,
+      "start": "2021-12-15T15:00:00.000+01:00"
+    },
+    {
+      "value": 0.4914,
+      "start": "2021-12-15T16:00:00.000+01:00"
+    },
+    {
+      "value": 0.4698,
+      "start": "2021-12-15T17:00:00.000+01:00"
+    },
+    {
+      "value": 0.4609,
+      "start": "2021-12-15T18:00:00.000+01:00"
+    },
+    {
+      "value": 0.4408,
+      "start": "2021-12-15T19:00:00.000+01:00"
+    },
+    {
+      "value": 0.4263,
+      "start": "2021-12-15T20:00:00.000+01:00"
+    },
+    {
+      "value": 0.3946,
+      "start": "2021-12-15T21:00:00.000+01:00"
+    },
+    {
+      "value": 0.3852,
+      "start": "2021-12-15T22:00:00.000+01:00"
+    },
+    {
+      "value": 0.373,
+      "start": "2021-12-15T23:00:00.000+01:00"
+    }
+  ]
+}

package/test/data/tibber-data-end-0.json

@@ -0,0 +1,101 @@
+{
+  "source": "Tibber",
+  "priceData": [
+    {
+      "value": 0.4675,
+      "start": "2021-12-14T00:00:00.000+01:00"
+    },
+    {
+      "value": 0.4488,
+      "start": "2021-12-14T01:00:00.000+01:00"
+    },
+    {
+      "value": 0.4344,
+      "start": "2021-12-14T02:00:00.000+01:00"
+    },
+    {
+      "value": 0.4124,
+      "start": "2021-12-14T03:00:00.000+01:00"
+    },
+    {
+      "value": 0.413,
+      "start": "2021-12-14T04:00:00.000+01:00"
+    },
+    {
+      "value": 0.4232,
+      "start": "2021-12-14T05:00:00.000+01:00"
+    },
+    {
+      "value": 0.4,
+      "start": "2021-12-14T06:00:00.000+01:00"
+    },
+    {
+      "value": 0.4067,
+      "start": "2021-12-14T07:00:00.000+01:00"
+    },
+    {
+      "value": 0.504,
+      "start": "2021-12-14T08:00:00.000+01:00"
+    },
+    {
+      "value": 0.5341,
+      "start": "2021-12-14T09:00:00.000+01:00"
+    },
+    {
+      "value": 0.5179,
+      "start": "2021-12-14T10:00:00.000+01:00"
+    },
+    {
+      "value": 0.5375,
+      "start": "2021-12-14T11:00:00.000+01:00"
+    },
+    {
+      "value": 0.535,
+      "start": "2021-12-14T12:00:00.000+01:00"
+    },
+    {
+      "value": 0.5403,
+      "start": "2021-12-14T13:00:00.000+01:00"
+    },
+    {
+      "value": 0.5291,
+      "start": "2021-12-14T14:00:00.000+01:00"
+    },
+    {
+      "value": 0.5175,
+      "start": "2021-12-14T15:00:00.000+01:00"
+    },
+    {
+      "value": 0.4914,
+      "start": "2021-12-14T16:00:00.000+01:00"
+    },
+    {
+      "value": 0.4698,
+      "start": "2021-12-14T17:00:00.000+01:00"
+    },
+    {
+      "value": 0.4609,
+      "start": "2021-12-14T18:00:00.000+01:00"
+    },
+    {
+      "value": 0.4408,
+      "start": "2021-12-14T19:00:00.000+01:00"
+    },
+    {
+      "value": 0.4263,
+      "start": "2021-12-14T20:00:00.000+01:00"
+    },
+    {
+      "value": 0.3946,
+      "start": "2021-12-14T21:00:00.000+01:00"
+    },
+    {
+      "value": 0.3852,
+      "start": "2021-12-14T22:00:00.000+01:00"
+    },
+    {
+      "value": 0.373,
+      "start": "2021-12-14T23:00:00.000+01:00"
+    }
+  ]
+}