@haydendonald/node-red-contrib-hass-stuff 1.2.6 → 1.2.8

package/dist/LightControl/lightControlConfigNode.js

@@ -122,7 +122,7 @@ module.exports = function LightControlConfigNode(RED) {
                 groupEntities = data.data.attributes.entity_id;
                 currentState = data.data;
                 entitiesOffDuringNight = config.entitiesOffAtNight.split(",").filter((entity) => entity != "");
-                entitiesOnDuringNight = groupEntities.filter((entity) => !entitiesOffDuringNight.includes(entity));
+                entitiesOnDuringNight = entitiesOffDuringNight.length > 0 ? groupEntities.filter((entity) => !entitiesOffDuringNight.includes(entity)) : [config.groupEntityId];
             });
             //Get the state of the night mode switch and store it
             if (config.nightModeEntityId && config.nightModeEntityId != "") {
@@ -292,13 +292,13 @@ module.exports = function LightControlConfigNode(RED) {
                     shuffle: true,
                     smart_shuffle: true,
                     targets: {
-                        entity_id: entitiesOn ? entitiesOn : [config.groupEntityId]
+                        entity_id: (entitiesOn || []).length > 0 ? entitiesOn : [config.groupEntityId]
                     }
                 };
                 //Run via adaptive lights
                 connectionsConfigNode.sendHASSAction("scene_presets.apply_preset", undefined, msg, undefined);
                 //Run any lights off that need to be off
-                if (entitiesOff && entitiesOff.length > 0) {
+                if ((entitiesOff || []).length > 0) {
                     connectionsConfigNode.sendHASSAction("light.turn_off", {
                         entity_id: entitiesOff
                     }, {

package/dist/PIRControl/PIRControlConfigNode.js

@@ -9,8 +9,15 @@ module.exports = function PIRControlConfigNode(RED) {
         let enabledState;
         let detectedTimeout;
         let notDetectedTimeout;
+        let sentOnState = false;
         RED.nodes.createNode(this, config);
         (0, baseConfigNode_1.assignBaseConfigNode)(this);
+        //When NodeRED redeploys
+        self.on("close", function (done) {
+            clearTimeout(detectedTimeout);
+            clearTimeout(notDetectedTimeout);
+            done();
+        });
         const connectionsConfigNode = RED.nodes.getNode(config.connectionsConfigNode);
         let errored = false;
         if (!config.connectionsConfigNode || !connectionsConfigNode) {
@@ -73,11 +80,11 @@ module.exports = function PIRControlConfigNode(RED) {
                 return;
             }
             //Don't do anything if the luminance is not enough
-            if (config.minBrightnessLevel && parseInt(luminanceState.state) < parseInt(config.minBrightnessLevel)) {
+            if (sentOnState == false && config.minBrightnessLevel && parseInt(luminanceState.state) < parseInt(config.minBrightnessLevel)) {
                 return;
             }
             //Don't do anything if the luminance is too much
-            if (config.maxBrightnessLevel && parseInt(luminanceState.state) > parseInt(config.maxBrightnessLevel)) {
+            if (sentOnState == false && config.maxBrightnessLevel && parseInt(luminanceState.state) > parseInt(config.maxBrightnessLevel)) {
                 return;
             }
             const msg = {
@@ -113,9 +120,11 @@ module.exports = function PIRControlConfigNode(RED) {
             }
         }
         function sendDetectedMsg(msg) {
+            sentOnState = true;
             self.sendMsg([msg]);
         }
         function sendNotDetectedMsg(msg) {
+            sentOnState = false;
             self.sendMsg([undefined, msg]);
         }
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@haydendonald/node-red-contrib-hass-stuff",
-  "version": "1.2.6",
+  "version": "1.2.8",
   "description": "A collection of stuff I use on my Node Red + Home Assistant server. This could be of use for others, i don't know..",
   "devDependencies": {
     "@types/node": "^18.14.0",