node-red-contrib-power-saver 3.6.1 → 4.0.0

package/src/schedule-merger.html

@@ -0,0 +1,135 @@
+<script type="text/javascript">
+  RED.nodes.registerType("ps-schedule-merger", {
+    category: "Power Saver",
+    color: "#a6bbcf",
+    defaults: {
+      name: { value: "Schedule Merger" },
+      outputIfNoSchedule: {
+        value: true,
+        required: true,
+        align: "left",
+      },
+      logicFunction: { value: "OR", required: true, align: "left" },
+      schedulingDelay: {
+        value: 2000,
+        required: true,
+        validate: RED.validators.number(),
+      },
+      sendCurrentValueWhenRescheduling: {
+        value: true,
+        required: true,
+        align: "left",
+      },
+      outputValueForOn: {
+        value: true,
+        required: true,
+        validate: RED.validators.typedInput("outputValueForOntype", false),
+      },
+      outputValueForOff: {
+        value: false,
+        required: true,
+        validate: RED.validators.typedInput("outputValueForOfftype", false),
+      },
+      outputValueForOntype: {
+        value: "bool",
+        required: true,
+      },
+      outputValueForOfftype: {
+        value: "bool",
+        required: true,
+      },
+    },
+    inputs: 1,
+    outputs: 3,
+    icon: "font-awesome/fa-compress",
+    color: "#FFCC66",
+    label: function () {
+      return this.name || "Best Save";
+    },
+    outputLabels: ["on", "off", "schedule"],
+    oneditprepare: function () {
+      $("#node-input-outputIfNoSchedule").typedInput({
+        types: [
+          {
+            value: "onoff",
+            options: [
+              { value: "true", label: "On" },
+              { value: "false", label: "Off" },
+            ],
+          },
+        ],
+      });
+      $("#node-input-logicFunction").typedInput({
+        types: [
+          {
+            value: "logic",
+            options: ["OR", "AND"],
+          },
+        ],
+      });
+      $("#node-input-outputValueForOn").typedInput({
+        default: "bool",
+        typeField: $("#node-input-outputValueForOntype"),
+        types: ["bool", "num", "str"],
+      });
+      $("#node-input-outputValueForOff").typedInput({
+        default: "bool",
+        typeField: $("#node-input-outputValueForOfftype"),
+        types: ["bool", "num", "str"],
+      });
+    },
+  });
+</script>
+
+<script type="text/html" data-template-name="ps-schedule-merger">
+    <div class="form-row">
+        <label for="node-input-name"><i class="fa fa-tag"></i> Name</label>
+        <input type="text" id="node-input-name" placeholder="Name" style="width: 240px">
+    </div>
+    <div class="form-row">
+        <label for="node-input-logicFunction">Function</label>
+        <input type="text" id="node-input-logicFunction" style="width: 80px">
+        </label>
+    </div>
+    <div class="form-row">
+      <label for="node-input-schedulingDelay"><i class="fa fa-clock-o"></i> Delay</label>
+      <input type="text" id="node-input-schedulingDelay" placeholder="milliseconds" style="width: 80px">
+      milliseconds
+    </div>
+    <div class="form-row">
+        <label for="node-input-outputValueForOn">Output value for on</label>
+        <input type="text" id="node-input-outputValueForOn" style="text-align: left; width: 120px">
+        <input type="hidden" id="node-input-outputValueForOntype">
+    </div>
+    <div class="form-row">
+        <label for="node-input-outputValueForOff">Output value for off</label>
+        <input type="text" id="node-input-outputValueForOff" style="text-align: left; width: 120px">
+        <input type="hidden" id="node-input-outputValueForOfftype">
+    </div>
+  </div>
+  <label for="node-input-sendCurrentValueWhenRescheduling" style="width:240px">
+  <input type="checkbox"
+         id="node-input-sendCurrentValueWhenRescheduling"
+         style="display:inline-block; width:22px; vertical-align:top;"
+         autocomplete="off"><span>Send when rescheduling</span>
+  </label>
+  </div>
+  <div class="form-row">
+        <label for="node-input-outputIfNoSchedule">If no schedule, send</label>
+        <input type="text" id="node-input-outputIfNoSchedule" style="width: 80px">
+        </label>
+    </div>
+</script>
+
+<script type="text/markdown" data-help-name="ps-schedule-merger">
+  A node you can use to merge multiple schedules to one.
+
+  Function OR will turn on if any of the input schedules are on.
+
+  Function AND will turn on only when all input schedules are on.
+
+  Delay is milliseconds before the merged schedule is sent. It is useful to wait for all schedules
+  to arrive before they are merged.
+
+  Please read more in the [node documentation](https://powersaver.no/nodes/schedule-merger)
+</script>

package/src/schedule-merger.js

@@ -0,0 +1,108 @@
+const {
+  msgHasSchedule,
+  mergeSchedules,
+  saveSchedule,
+  validateSchedule,
+  mergerShallSendOutput,
+  mergerShallSendSchedule,
+} = require("./schedule-merger-functions.js");
+const {
+  booleanConfig,
+  fixOutputValues,
+  getEffectiveConfig,
+  getOutputForTime,
+  makeScheduleFromHours,
+  saveOriginalConfig,
+} = require("./utils.js");
+const { DateTime } = require("luxon");
+const nanoTime = require("nano-time");
+const { handleOutput } = require("./handle-output");
+const { addLastSwitchIfNoSchedule, getCommands } = require("./handle-input");
+
+module.exports = function (RED) {
+  function ScheduleMerger(config) {
+    RED.nodes.createNode(this, config);
+    const node = this;
+    node.status({});
+
+    const validConfig = {
+      logicFunction: config.logicFunction,
+      schedulingDelay: config.schedulingDelay || 2000,
+      sendCurrentValueWhenRescheduling: config.sendCurrentValueWhenRescheduling,
+      outputIfNoSchedule: booleanConfig(config.outputIfNoSchedule),
+      outputValueForOn: config.outputValueForOn || true,
+      outputValueForOff: config.outputValueForOff || false,
+      outputValueForOntype: config.outputValueForOntype || "bool",
+      outputValueForOfftype: config.outputValueForOfftype || "bool",
+      override: "auto",
+    };
+
+    fixOutputValues(validConfig);
+    saveOriginalConfig(node, validConfig);
+
+    node.on("close", function () {
+      clearTimeout(node.schedulingTimeout);
+    });
+
+    node.on("input", function (msg) {
+      if (msg.payload.hours) {
+        // Delete config from strategy nodes so it does not merge
+        // with config for this node.
+        delete msg.payload.config;
+      }
+      const config = getEffectiveConfig(node, msg);
+      const commands = getCommands(msg);
+      const myTime = nanoTime();
+      if (msgHasSchedule(msg)) {
+        const validationError = validateSchedule(msg);
+        if (validationError) {
+          node.warn(validationError);
+          node.status({ fill: "red", shape: "dot", text: validationError });
+          return;
+        }
+        saveSchedule(node, msg);
+        // Wait for more schedules to arrive before proceeding
+        node.lastSavedScheduleTime = myTime;
+      }
+
+      setTimeout(
+        () => {
+          if (node.lastSavedScheduleTime !== myTime && msgHasSchedule(msg) && !commands.replan) {
+            // Another schedule has arrived later
+            return;
+          }
+
+          const hours = mergeSchedules(node, node.logicFunction);
+          const schedule = makeScheduleFromHours(hours);
+          addLastSwitchIfNoSchedule(schedule, hours, node);
+
+          const plan = {
+            hours,
+            schedule,
+            source: node.name,
+          };
+
+          const planFromTime = msg.payload.time ? DateTime.fromISO(msg.payload.time) : DateTime.now();
+          const currentOutput = node.context().get("currentOutput");
+          const plannedOutputNow = getOutputForTime(plan.schedule, planFromTime, node.outputIfNoSchedule);
+
+          const outputCommands = {
+            sendOutput: mergerShallSendOutput(
+              msg,
+              commands,
+              currentOutput,
+              plannedOutputNow,
+              node.sendCurrentValueWhenRescheduling
+            ),
+            sendSchedule: mergerShallSendSchedule(msg, commands),
+            runSchedule: commands.runSchedule || (commands.runSchedule !== false && msgHasSchedule(msg)),
+          };
+
+          handleOutput(node, config, plan, outputCommands, planFromTime);
+        },
+        commands.replan ? 0 : node.schedulingDelay
+      );
+    });
+  }
+  RED.nodes.registerType("ps-schedule-merger", ScheduleMerger);
+};

package/src/strategy-best-save.html

@@ -22,9 +22,26 @@
       sendCurrentValueWhenRescheduling: {
         value: true,
         required: true,
-        // validate: RED.validators.number(),
         align: "left",
       },
+      outputValueForOn: {
+        value: true,
+        required: true,
+        validate: RED.validators.typedInput("outputValueForOntype", false),
+      },
+      outputValueForOff: {
+        value: false,
+        required: true,
+        validate: RED.validators.typedInput("outputValueForOfftype", false),
+      },
+      outputValueForOntype: {
+        value: "bool",
+        required: true,
+      },
+      outputValueForOfftype: {
+        value: "bool",
+        required: true,
+      },
       outputIfNoSchedule: { value: "true", required: true, align: "left" },
       contextStorage: { value: "default", required: false, align: "left" },
     },
@@ -56,6 +73,16 @@
           },
         ],
       });
+      $("#node-input-outputValueForOn").typedInput({
+        default: "bool",
+        typeField: $("#node-input-outputValueForOntype"),
+        types: ["bool", "num", "str"],
+      });
+      $("#node-input-outputValueForOff").typedInput({
+        default: "bool",
+        typeField: $("#node-input-outputValueForOfftype"),
+        types: ["bool", "num", "str"],
+      });
     },
   });
 </script>
@@ -83,6 +110,16 @@
     </div>
   <h3>Output</h3>
     <div class="form-row">
+      <div class="form-row">
+        <label for="node-input-outputValueForOn">Output value for on</label>
+        <input type="text" id="node-input-outputValueForOn" style="text-align: left; width: 120px">
+        <input type="hidden" id="node-input-outputValueForOntype">
+    </div>
+    <div class="form-row">
+        <label for="node-input-outputValueForOff">Output value for off</label>
+        <input type="text" id="node-input-outputValueForOff" style="text-align: left; width: 120px">
+        <input type="hidden" id="node-input-outputValueForOfftype">
+    </div>
         <label for="node-input-sendCurrentValueWhenRescheduling" style="width:240px">
         <input type="checkbox"
                id="node-input-sendCurrentValueWhenRescheduling"

package/src/strategy-best-save.js

@@ -1,7 +1,6 @@
-const { countAtEnd, makeSchedule, getSavings, getDiff } = require("./utils");
-const { handleStrategyInput } = require("./handle-input");
-const { loadDayData } = require("./utils");
+const { booleanConfig, fixOutputValues, getSavings, saveOriginalConfig } = require("./utils");
 const mostSavedStrategy = require("./strategy-best-save-functions");
+const { strategyOnInput } = require("./strategy-functions");
 
 module.exports = function (RED) {
   function StrategyBestSaveNode(config) {
@@ -9,86 +8,41 @@ module.exports = function (RED) {
     const node = this;
     node.status({});
 
-    const originalConfig = {
+    const validConfig = {
+      contextStorage: config.contextStorage || "default",
       maxHoursToSaveInSequence: config.maxHoursToSaveInSequence,
       minHoursOnAfterMaxSequenceSaved: config.minHoursOnAfterMaxSequenceSaved,
       minSaving: parseFloat(config.minSaving),
+      outputIfNoSchedule: booleanConfig(config.outputIfNoSchedule),
+      outputValueForOn: config.outputValueForOn || true,
+      outputValueForOff: config.outputValueForOff || false,
+      outputValueForOntype: config.outputValueForOntype || "bool",
+      outputValueForOfftype: config.outputValueForOfftype || "bool",
+      override: "auto",
       sendCurrentValueWhenRescheduling: config.sendCurrentValueWhenRescheduling,
-      outputIfNoSchedule: config.outputIfNoSchedule === "true",
-      contextStorage: config.contextStorage || "default",
     };
-    node.context().set("config", originalConfig);
-    node.contextStorage = originalConfig.contextStorage;
+
+    fixOutputValues(validConfig);
+    saveOriginalConfig(node, validConfig);
 
     node.on("close", function () {
       clearTimeout(node.schedulingTimeout);
     });
 
     node.on("input", function (msg) {
-      handleStrategyInput(node, msg, doPlanning);
+      strategyOnInput(node, msg, doPlanning, getSavings);
     });
   }
   RED.nodes.registerType("ps-strategy-best-save", StrategyBestSaveNode);
 };
 
-function adjustSavingsPassedHours(plan, includeFromLastPlanHours) {
-  const firstOnIndex = plan.hours.findIndex((h) => h.onOff);
-  if (firstOnIndex < 0) {
-    return;
-  }
-  const nextOnValue = plan.hours[firstOnIndex].price;
-  let adjustIndex = includeFromLastPlanHours.length - 1;
-  while (adjustIndex >= 0 && !includeFromLastPlanHours[adjustIndex].onOff) {
-    includeFromLastPlanHours[adjustIndex].saving = getDiff(includeFromLastPlanHours[adjustIndex].price, nextOnValue);
-    adjustIndex--;
-  }
-}
-
-function loadDataJustBefore(node, dateDayBefore) {
-  const dataDayBefore = loadDayData(node, dateDayBefore);
-  return {
-    schedule: [...dataDayBefore.schedule],
-    hours: [...dataDayBefore.hours],
-  };
-}
-
-function doPlanning(node, _, priceData, _, dateDayBefore, _) {
-  const dataJustBefore = loadDataJustBefore(node, dateDayBefore);
+function doPlanning(node, priceData) {
   const values = priceData.map((d) => d.value);
-  const startTimes = priceData.map((d) => d.start);
-  const onOffBefore = dataJustBefore.hours.map((h) => h.onOff);
-  const lastPlanHours = node.context().get("lastPlan", node.contextStorage)?.hours ?? [];
-  const plan = makePlan(node, values, startTimes, onOffBefore);
-  const includeFromLastPlanHours = lastPlanHours.filter(
-    (h) => h.start < plan.hours[0].start && h.start >= priceData[0].start
-  );
-  adjustSavingsPassedHours(plan, includeFromLastPlanHours);
-  plan.hours.splice(0, 0, ...includeFromLastPlanHours);
-  return plan;
-}
-
-function makePlan(node, values, startTimes, onOffBefore, firstValueNextDay) {
-  const lastValueDayBefore = onOffBefore[onOffBefore.length - 1];
-  const lastCountDayBefore = countAtEnd(onOffBefore, lastValueDayBefore);
   const onOff = mostSavedStrategy.calculate(
     values,
     node.maxHoursToSaveInSequence,
     node.minHoursOnAfterMaxSequenceSaved,
-    node.minSaving,
-    lastValueDayBefore,
-    lastCountDayBefore
+    node.minSaving
   );
-
-  const schedule = makeSchedule(onOff, startTimes, lastValueDayBefore);
-  const savings = getSavings(values, onOff, firstValueNextDay);
-  const hours = values.map((v, i) => ({
-    price: v,
-    onOff: onOff[i],
-    start: startTimes[i],
-    saving: savings[i],
-  }));
-  return {
-    hours,
-    schedule,
-  };
+  return onOff;
 }