node-red-contrib-power-saver 5.2.0 → 5.2.2

package/eslint.config.cjs

@@ -0,0 +1,16 @@
+const js = require("@eslint/js");
+const globals = require("globals");
+
+module.exports = [
+  js.configs.recommended,
+  {
+    languageOptions: {
+      ecmaVersion: "latest",
+      globals: {
+        ...globals.browser,
+        ...globals.commonjs,
+        ...globals.es2021,
+      },
+    },
+  },
+];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-red-contrib-power-saver",
-  "version": "5.2.0",
+  "version": "5.2.2",
   "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": {
@@ -48,6 +48,7 @@
     "url": "https://github.com/ottopaulsen/node-red-contrib-power-saver.git"
   },
   "devDependencies": {
+    "@eslint/js": "^10.0.1",
     "@vuepress/bundler-vite": "2.0.0-rc.26",
     "@vuepress/plugin-google-analytics": "2.0.0-rc.123",
     "@vuepress/plugin-register-components": "2.0.0-rc.123",
@@ -57,6 +58,7 @@
     "chai": "6.2.2",
     "eslint": "10.0.0",
     "expect": "30.2.0",
+    "globals": "^17.4.0",
     "mocha": "^11.7.5",
     "node-red": "^4.1.5",
     "node-red-node-test-helper": "0.3.6",

package/src/general-add-tariff-functions.js

@@ -1,4 +1,3 @@
-const { DateTime } = require("luxon");
 const { roundPrice } = require("./utils");
 
 // Build all periods that are different.

package/src/handle-input.js

@@ -86,7 +86,7 @@ function makePlanFromPriceData(node, msg, config, doPlanning, calcSavings) {
   const schedule = trimScheduleToStart(fullSchedule, priceData[0].start);
   addLastSwitchIfNoSchedule(schedule, minutes, config);
 
-  plan = {
+  const plan = {
     minutes,
     schedule,
     source,
@@ -174,7 +174,7 @@ function trimScheduleToStart(schedule, startTime) {
 
 function deleteSavedScheduleBefore(node, day, checkDays = 0) {
   let date = day;
-  let data = null;
+  let data;
   let count = 0;
   do {
     date = date.plus({ days: -1 });

package/src/handle-output.js

@@ -73,7 +73,6 @@ function runSchedule(node, schedule, time, currentSent = false) {
     const entry = remainingSchedule[0];
     const nextTime = DateTime.fromISO(entry.time);
     const wait = nextTime - time;
-    const onOff = entry.value ? "on" : "off";
     const statusMessage = `${remainingSchedule.length} changes - ${
       remainingSchedule[0].value ? "on" : "off"
     } at ${nextTime.toFormat("HH:mm")}`;

package/src/light-saver-functions.js

@@ -249,7 +249,6 @@ function handleStateChange(event, config, state, node, homeAssistant, clock = nu
   // Check if it's the brightness sensor
   if (config.brightnessSensor && config.brightnessSensor.entity_id === entityId) {
     const wasBrightnessAllowing = isBrightnessAllowingLights(config); // Check before update
-    const oldBrightness = config.brightnessSensor.state;
     config.brightnessSensor.lastChanged = timestamp;
     config.brightnessSensor.state = newState.state;
 
@@ -715,14 +714,16 @@ function fetchMissingStates(config, state, node, homeAssistant, clock = null) {
       `Initial timedOut set to ${state.timedOut} (all triggers actually timed out: ${allTimedOut})`,
     );
 
-    // If motion is detected at startup (timedOut is false), turn lights on
     if (!allTimedOut) {
-      debugLog(config, node, "Motion detected at startup, turning lights on");
-      const level = findCurrentLevel(config, node, clock);
-      if (level !== null && isBrightnessAllowingLights(config)) {
-        controlLights(config, config.lights, level, node, homeAssistant);
-        debugLog(config, node, `Lights turned on to ${level}% at startup (motion detected)`);
-      }
+      const levelConfig = findLevelConfig(config, clock);
+      state.lastImmediateTime = levelConfig && levelConfig.immediate === true ? levelConfig.fromTime : null;
+      debugLog(
+        config,
+        node,
+        `Startup preserved current light state while motion is still active${state.lastImmediateTime ? ` (immediate period ${state.lastImmediateTime} already active)` : ""}`,
+      );
+    } else {
+      state.lastImmediateTime = null;
     }
 
     return true; // Indicates that initial timedOut was set

package/src/light-saver.html

@@ -715,7 +715,7 @@
 
         // Limit input (without spinner arrows)
         const limitInput = $(
-          '<input type="number" id="node-input-brightnessLimit" class="brightness-limit-input" min="0" max="100000" step="1"/>',
+          '<input type="number" id="node-input-brightnessLimit" class="brightness-limit-input" max="100000" step="1"/>',
         ).css({
           width: "60px",
           padding: "3px",

package/src/light-saver.js

@@ -22,7 +22,7 @@ module.exports = function (RED) {
     let runtimeOverride = null;
     try {
       runtimeOverride = node.context().get("override", node.contextStorage);
-    } catch (err) {
+    } catch {
       // Context storage might not be available (e.g., in tests)
     }
 
@@ -89,7 +89,7 @@ module.exports = function (RED) {
       try {
         node.context().set("override", nodeConfig.override, node.contextStorage);
         debugLog(`Override saved to context storage: ${nodeConfig.override}`);
-      } catch (err) {
+      } catch {
         // Silently fail if context storage not available
       }
     };
@@ -298,7 +298,7 @@ module.exports = function (RED) {
 
     // Function to fetch current states from Home Assistant
     const fetchMissingStates = function () {
-      const initialTimedOutWasSet = funcs.fetchMissingStates(nodeConfig, state, nodeWrapper, homeAssistant);
+      funcs.fetchMissingStates(nodeConfig, state, nodeWrapper, homeAssistant);
 
       // Fetch initial light states
       try {

package/src/receive-price-functions.js

@@ -1,5 +1,4 @@
 const { addEndToLast, validationFailure } = require("./utils");
-const { DateTime } = require("luxon");
 
 function getPriceData(node, msg) {
   const isConfigMsg = !!msg?.payload?.config;
@@ -12,7 +11,7 @@ function getPriceData(node, msg) {
     return null;
   }
 
-  priceData = [...input.today, ...input.tomorrow];
+  const priceData = [...input.today, ...input.tomorrow];
 
   addEndToLast(priceData);
 

package/src/schedule-merger-functions.js

@@ -7,7 +7,7 @@ function msgHasSchedule(msg) {
   return msg.payload.minutes?.length > 0;
 }
 
-function validateSchedule(msg) {
+function validateSchedule() {
   return "";
 }
 

package/src/strategy-best-save-functions.js

@@ -119,7 +119,7 @@ function calculate(
   }
 
   savingsList.sort((b, a) => (b.saving === a.saving ? a.count - b.count : b.saving - a.saving));
-  let onOff = values.map((v) => true); // Start with all on
+  let onOff = values.map(() => true); // Start with all on
 
   // Find the best possible sequences
   while (savingsList.length > 0) {

package/src/strategy-fixed-schedule.js

@@ -3,7 +3,6 @@ const {
   calcNullSavings,
   fixOutputValues,
   fixPeriods,
-  getSavings,
   saveOriginalConfig,
 } = require("./utils");
 const { strategyOnInput } = require("./strategy-functions");

package/src/strategy-heat-capacitor-functions.js

@@ -1,6 +1,6 @@
 "use strict";
 const { DateTime } = require("luxon");
-const { roundPrice, getDiffToNextOn } = require("./utils");
+const { roundPrice } = require("./utils");
 
 function buildMinutePriceVector(priceData) {
   if (!priceData || priceData.length === 0) {

package/src/strategy-heat-capacitor.js

@@ -27,21 +27,21 @@ module.exports = function (RED) {
 
     this.on("input", function (msg) {
       if (!validateInput(node, msg)) return;
-      if (!msg.hasOwnProperty("payload")) return;
+      if (!("payload" in msg)) return;
 
-      if (msg.payload.hasOwnProperty("commands")) {
+      if ("commands" in msg.payload) {
         //Commands override input
-        if (node.hasOwnProperty("schedule")) {
+        if ("schedule" in node) {
           //Do not execute if schedule is missing
-          if (msg.payload.hasOwnProperty("time")) {
+          if ("time" in msg.payload) {
             node.dT = findTemp(msg.payload.time, node.schedule);
           } else {
             node.dT = findTemp(DateTime.now(), node.schedule);
           }
           node.T = node.setpoint + node.dT;
-          if (msg.payload.commands.hasOwnProperty("sendSchedule")) {
+          if ("sendSchedule" in msg.payload.commands) {
             // Send output if schedule exists
-            if (node.hasOwnProperty("schedule") && msg.payload.commands.sendSchedule == true) {
+            if ("schedule" in node && msg.payload.commands.sendSchedule == true) {
               node.send([
                 null,
                 null,
@@ -50,7 +50,7 @@ module.exports = function (RED) {
               ]);
             }
           }
-          if (msg.payload.commands.hasOwnProperty("sendOutput") && msg.payload.commands.sendOutput == true) {
+          if ("sendOutput" in msg.payload.commands && msg.payload.commands.sendOutput == true) {
             // Send output if schedule exists
             node.send([
               { payload: node.T, topic: "setpoint", time: node.schedule.time, version: version },
@@ -63,22 +63,22 @@ module.exports = function (RED) {
         return;
       }
       // Using msg.payload.config to change specific properties
-      if (msg.payload.hasOwnProperty("config")) {
-        if (msg.payload.config.hasOwnProperty("timeHeat1C")) node.timeHeat1C = Number(msg.payload.config.timeHeat1C);
-        if (msg.payload.config.hasOwnProperty("timeCool1C")) node.timeCool1C = Number(msg.payload.config.timeCool1C);
-        if (msg.payload.config.hasOwnProperty("setpoint")) node.setpoint = Number(msg.payload.config.setpoint);
-        if (msg.payload.config.hasOwnProperty("maxTempAdjustment"))
+      if ("config" in msg.payload) {
+        if ("timeHeat1C" in msg.payload.config) node.timeHeat1C = Number(msg.payload.config.timeHeat1C);
+        if ("timeCool1C" in msg.payload.config) node.timeCool1C = Number(msg.payload.config.timeCool1C);
+        if ("setpoint" in msg.payload.config) node.setpoint = Number(msg.payload.config.setpoint);
+        if ("maxTempAdjustment" in msg.payload.config)
           node.maxTempAdjustment = Number(msg.payload.config.maxTempAdjustment);
-        if (msg.payload.config.hasOwnProperty("boostTempHeat"))
+        if ("boostTempHeat" in msg.payload.config)
           node.boostTempHeat = Number(msg.payload.config.boostTempHeat);
-        if (msg.payload.config.hasOwnProperty("boostTempCool"))
+        if ("boostTempCool" in msg.payload.config)
           node.boostTempCool = Number(msg.payload.config.boostTempCool);
-        if (msg.payload.config.hasOwnProperty("minSavings")) node.minSavings = Number(msg.payload.config.minSavings);
+        if ("minSavings" in msg.payload.config) node.minSavings = Number(msg.payload.config.minSavings);
       }
 
       //merge pricedata to escape some midnight issues. Store max 72 hour history
-      if (msg.payload.hasOwnProperty("priceData")) {
-        if (node.hasOwnProperty("priceData")) {
+      if ("priceData" in msg.payload) {
+        if ("priceData" in node) {
           node.priceData = mergePriceData(node.priceData, msg.payload.priceData);
         } else {
           node.priceData = msg.payload.priceData;
@@ -90,7 +90,7 @@ module.exports = function (RED) {
         }
       }
 
-      if (node.hasOwnProperty("priceData")) {
+      if ("priceData" in node) {
         node.schedule = runBuySellAlgorithm(
           node.priceData,
           node.timeHeat1C,
@@ -102,7 +102,7 @@ module.exports = function (RED) {
           node.minSavings,
         );
 
-        if (msg.payload.hasOwnProperty("time")) {
+        if ("time" in msg.payload) {
           node.dT = findTemp(msg.payload.time, node.schedule);
         } else {
           node.dT = findTemp(DateTime.now(), node.schedule);

package/src/utils.js

@@ -5,7 +5,7 @@ function booleanConfig(value) {
   return value === "true" || value === true;
 }
 
-function calcNullSavings(values, _) {
+function calcNullSavings(values) {
   return values.map(() => null);
 }
 
@@ -322,7 +322,7 @@ function fillArray(value, count) {
   if (value === undefined || count <= 0) {
     return [];
   }
-  res = [];
+  let res = [];
   for (let i = 0; i < count; i++) {
     res.push(value);
   }