node-red-contrib-power-saver 5.1.5 → 5.2.1

package/README.md

@@ -6,5 +6,4 @@ A Node-RED node to save money when power prices are changing by the hour.
 
 ## Please read more in the [documentation](https://powersaver.no/).
 
-
-[![Donation](./donation.png)](https://powersaver.no/contribute/#donate)
+[![Donation](./donation.png)](https://powersaver.no/contribute/#donate)

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/examples/price-filter.json

@@ -0,0 +1,139 @@
+[
+  {
+    "id": "pf01a2b3c4d5e6f7",
+    "type": "inject",
+    "z": "pf01tab01tab01t1",
+    "name": "Refresh prices (every hour)",
+    "props": [
+      {
+        "p": "payload"
+      }
+    ],
+    "repeat": "3600",
+    "crontab": "",
+    "once": true,
+    "onceDelay": "1",
+    "topic": "",
+    "payload": "{viewer{homes{currentSubscription{priceInfo(resolution:QUARTER_HOURLY){today{totalstartsAt}tomorrow{totalstartsAt}}}}}}",
+    "payloadType": "str",
+    "x": 180,
+    "y": 80,
+    "wires": [["pf02a2b3c4d5e6f7"]]
+  },
+  {
+    "id": "pf02a2b3c4d5e6f7",
+    "type": "tibber-query",
+    "z": "pf01tab01tab01t1",
+    "name": "Get Tibber prices",
+    "active": true,
+    "apiEndpointRef": "pf0btibberapi01",
+    "x": 430,
+    "y": 80,
+    "wires": [["pf03a2b3c4d5e6f7"]]
+  },
+  {
+    "id": "pf03a2b3c4d5e6f7",
+    "type": "ps-receive-price",
+    "z": "pf01tab01tab01t1",
+    "name": "Price Receiver",
+    "x": 170,
+    "y": 180,
+    "wires": [["pf04a2b3c4d5e6f7"]]
+  },
+  {
+    "id": "pf04a2b3c4d5e6f7",
+    "type": "ps-strategy-lowest-price",
+    "z": "pf01tab01tab01t1",
+    "name": "4 Cheapest Hours",
+    "fromHour": "00",
+    "fromMinute": "00",
+    "toHour": "00",
+    "toMinute": "00",
+    "minutesOn": "240",
+    "maxPrice": "",
+    "doNotSplit": false,
+    "sendCurrentValueWhenRescheduling": true,
+    "outputValueForOn": "true",
+    "outputValueForOff": "false",
+    "outputValueForOntype": "bool",
+    "outputValueForOfftype": "bool",
+    "outputIfNoSchedule": "false",
+    "outputOutsidePeriod": "false",
+    "contextStorage": "default",
+    "x": 390,
+    "y": 180,
+    "wires": [[], [], ["pf05a2b3c4d5e6f7"]]
+  },
+  {
+    "id": "pf05a2b3c4d5e6f7",
+    "type": "ps-price-filter",
+    "z": "pf01tab01tab01t1",
+    "name": "No heating above 1.00",
+    "turn": "off",
+    "condition": "over",
+    "limit": 1,
+    "x": 630,
+    "y": 180,
+    "wires": [["pf06a2b3c4d5e6f7"], ["pf07a2b3c4d5e6f7"], ["pf08a2b3c4d5e6f7"]]
+  },
+  {
+    "id": "pf06a2b3c4d5e6f7",
+    "type": "debug",
+    "z": "pf01tab01tab01t1",
+    "name": "Turn ON",
+    "active": true,
+    "tosidebar": true,
+    "console": false,
+    "tostatus": false,
+    "complete": "payload",
+    "targetType": "msg",
+    "x": 860,
+    "y": 140,
+    "wires": []
+  },
+  {
+    "id": "pf07a2b3c4d5e6f7",
+    "type": "debug",
+    "z": "pf01tab01tab01t1",
+    "name": "Turn OFF",
+    "active": true,
+    "tosidebar": true,
+    "console": false,
+    "tostatus": false,
+    "complete": "payload",
+    "targetType": "msg",
+    "x": 860,
+    "y": 180,
+    "wires": []
+  },
+  {
+    "id": "pf08a2b3c4d5e6f7",
+    "type": "debug",
+    "z": "pf01tab01tab01t1",
+    "name": "Filtered Schedule",
+    "active": true,
+    "tosidebar": true,
+    "console": false,
+    "tostatus": false,
+    "complete": "payload",
+    "targetType": "msg",
+    "x": 870,
+    "y": 220,
+    "wires": []
+  },
+  {
+    "id": "pf0btibberapi01",
+    "type": "tibber-api-endpoint",
+    "queryUrl": "https://api.tibber.com/v1-beta/gql",
+    "name": "Tibber API"
+  },
+  {
+    "id": "cd9babd81a9c291a",
+    "type": "global-config",
+    "env": [],
+    "modules": {
+      "node-red-contrib-tibber-api": "6.4.1",
+      "node-red-contrib-power-saver": "5.1.5"
+    }
+  }
+]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-red-contrib-power-saver",
-  "version": "5.1.5",
+  "version": "5.2.1",
   "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": {
@@ -32,7 +32,8 @@
       "ps-elvia-tariff-types": "src/elvia/elvia-tariff-types.js",
       "ps-elvia-tariff": "src/elvia/elvia-tariff.js",
       "ps-elvia-add-tariff": "src/elvia/elvia-add-tariff.js",
-      "ps-general-add-tariff": "src/general-add-tariff.js"
+      "ps-general-add-tariff": "src/general-add-tariff.js",
+      "ps-price-filter": "src/price-filter.js"
     },
     "version": ">=2.2.0"
   },
@@ -47,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",
@@ -56,9 +58,11 @@
     "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",
+    "prettier": "^3.8.1",
     "sass-embedded": "^1.97.3",
     "sass-loader": "^16.0.7",
     "vuepress": "2.0.0-rc.26"

package/src/elvia/elvia-add-tariff.js

@@ -15,7 +15,7 @@ module.exports = function (RED) {
       const prices = msg.payload.priceData;
       if (!prices) {
         node.warn(
-          "No price data received on input. Did you use the ps-receive-price node or convert to correct format otherwise?"
+          "No price data received on input. Did you use the ps-receive-price node or convert to correct format otherwise?",
         );
         return;
       }

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.
@@ -68,13 +67,13 @@ function addTariffToPrices(node, config, prices) {
     if (p.start.substring(0, 10) >= validFrom && p.start.substring(0, 10) <= validTo && config.days[day]) {
       p.sum = roundPrice(p.value + p.add);
     } else {
-      p.sum = p.value
+      p.sum = p.value;
     }
   });
 
-  const result = sortedPeriods.map(p => ({start: p.start, value: p.sum}))
+  const result = sortedPeriods.map((p) => ({ start: p.start, value: p.sum }));
 
-    // Set end on last period
+  // Set end on last period
   result[result.length - 1].end = lastEnd;
 
   return result;

package/src/general-add-tariff.html

@@ -80,7 +80,7 @@
             ["for", id],
             ["style", "margin-right: 10px;"],
           ],
-          []
+          [],
         );
         label.innerHTML = text;
         const inp = createElement("input", [
@@ -160,7 +160,7 @@
               ["for", id],
               ["style", " margin: 4px 10px 0px 2px;width: 30px; text-align: left;"],
             ],
-            []
+            [],
           );
           label.innerHTML = day;
           const attrs = [

package/src/handle-input.js

@@ -74,7 +74,6 @@ function makePlanFromPriceData(node, msg, config, doPlanning, calcSavings) {
   const startTimes = priceDatePerMinute.map((d) => d.start);
   const prices = priceDatePerMinute.map((d) => d.value);
 
-
   const onOff = doPlanning(node, priceDatePerMinute);
   const savings = calcSavings(prices, onOff);
   const minutes = startTimes.map((v, i) => ({
@@ -87,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,
@@ -175,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")}`;
@@ -114,9 +113,6 @@ function collapseMinutes(minutes) {
     return a.price === b.price && a.onOff === b.onOff && a.saving === b.saving;
   }
 
-
-
-
   if (!Array.isArray(minutes) || minutes.length === 0) {
     return [];
   }

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