@haydendonald/node-red-contrib-hass-stuff 1.2.0 → 1.2.1

package/README.md

@@ -502,12 +502,12 @@ A node that controls lights with general scenes that adjust throughout the day w
 
 ### Features
 * Adaptive scenes depending on what time of the day it is
-* Adaptive scenes depending on luminance sensor *TODO*
+* Adaptive scenes depending on luminance sensor
 * Night mode entity to force the adaptive scene to be in "night mode"
 * Ability to turn off entities in night mode
 
 ### Dependencies
-1. [Adaptive Lighting](https://github.com/basnijholt/adaptive-lighting)
+1. [Hue Scene Presets](https://github.com/Hypfer/hass-scene_presets)
 2. [HASS Sun](https://www.home-assistant.io/integrations/sun/)
 
 ## PIR

package/dist/LightControl/lightControlConfigNode.html

@@ -53,7 +53,7 @@
         <p>
             The following settings define what the scenes should do. They follow the syntax of [scene] [brightnessPercent] 
             where scene is the scene name, if the same as below values will use the 
-            <a style="font-weight: bold;" href="https://github.com/basnijholt/adaptive-lighting">Adaptive Lighting HACS plugin</a>
+            <a style="font-weight: bold;" href="https://github.com/Hypfer/hass-scene_presets">Hue Scene Presets HACS plugin</a>
             otherwise will send to scene.apply. The brightnessPercent is the brightness percentage to set
         </p>
         <ul>
@@ -106,4 +106,19 @@
 </script>
 
 <script type="text/html" data-help-name="light-control-config-node">
+<p>A node that controls lights with general scenes that adjust throughout the day with sleep mode and other features.</p>
+
+<h2>Features</h2>
+<ul>
+    <li>Adaptive scenes depending on what time of the day it is</li>
+    <li>Adaptive scenes depending on luminance sensor</li>
+    <li>Night mode entity to force the adaptive scene to be in "night mode"</li>
+    <li>Ability to turn off entities in night mode</li>
+</ul>
+
+<h2>Dependencies</h2>
+<ul>
+    <li><a href="https://github.com/Hypfer/hass-scene_presets" target="_blank">Hue Scene Presets</a></li>
+    <li><a href="https://www.home-assistant.io/integrations/sun/" target="_blank">Sun Integration</a></li>
+</ul>
 </script>

package/dist/LightControl/lightControlConfigNode.js

@@ -10,6 +10,7 @@ module.exports = function LightControlConfigNode(RED) {
         let nightModeState;
         let currentSceneState;
         let sunState;
+        let lastSentScene;
         let entitiesOnDuringNight = [];
         let entitiesOffDuringNight = [];
         let adaptiveInterval;
@@ -229,11 +230,16 @@ module.exports = function LightControlConfigNode(RED) {
         };
         //When we get a message from a node on the NodeRED flows
         this.msgReceived = function (msg, senderIds) { };
-        const activateScene = (scene, transitionSec, turnLightsOn, entitiesOn, entitiesOff) => {
+        const activateScene = (scene, transitionSec, turnLightsOn, entitiesOn, entitiesOff, forceSend) => {
             //If the lights are off and we are not to turn the lights on don't do anything
             if (turnLightsOn == false && currentState.state == "off") {
                 return;
             }
+            //Don't send the same scene again
+            if (forceSend != true && scene.sceneName == lastSentScene) {
+                return;
+            }
+            lastSentScene = scene.sceneName;
             //Is not a scene preset scene if we have a entity id
             if (scene.sceneName.includes(".")) {
                 //Run via hass scene.turn_on
@@ -242,6 +248,14 @@ module.exports = function LightControlConfigNode(RED) {
                 }, {
                     transition: transitionSec
                 });
+                //Send to the node output
+                self.sendMsg({
+                    topic: "sceneSent",
+                    payload: {
+                        scene,
+                        transitionSec
+                    }
+                });
             }
             //Is a scene preset
             else {
@@ -250,8 +264,7 @@ module.exports = function LightControlConfigNode(RED) {
                     self.error(`Scene preset not found for ${scene.sceneName}. Please use scene.<presetname> if this is not a scene i know about`);
                     return;
                 }
-                //Run via adaptive lights
-                connectionsConfigNode.sendHASSAction("scene_presets.apply_preset", undefined, {
+                const msg = {
                     brightness: (scene.brightnessPct / 100.0) * 255,
                     transition: transitionSec,
                     preset_id: sceneId,
@@ -260,7 +273,9 @@ module.exports = function LightControlConfigNode(RED) {
                     targets: {
                         entity_id: entitiesOn ? entitiesOn : [config.groupEntityId]
                     }
-                }, undefined);
+                };
+                //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) {
                     connectionsConfigNode.sendHASSAction("light.turn_off", {
@@ -269,6 +284,14 @@ module.exports = function LightControlConfigNode(RED) {
                         transition: transitionSec
                     });
                 }
+                //Send to the node output
+                self.sendMsg({
+                    topic: "sceneSent",
+                    payload: {
+                        scene,
+                        transitionSec
+                    }
+                });
             }
         };
         const runLights = (transitionSec, turnLightsOn) => {
@@ -284,7 +307,7 @@ module.exports = function LightControlConfigNode(RED) {
                 activateScene(scene, transitionSec, turnLightsOn);
             }
         };
-        const runAdaptive = (transitionSec, turnLightsOn) => {
+        const runAdaptive = (transitionSec, turnLightsOn, forceSend) => {
             let entitiesOn;
             let entitiesOff;
             //Decide what scene to send
@@ -327,12 +350,12 @@ module.exports = function LightControlConfigNode(RED) {
                 }
             }
             //Send it
-            activateScene(scene, transitionSec, turnLightsOn, entitiesOn, entitiesOff);
+            activateScene(scene, transitionSec, turnLightsOn, entitiesOn, entitiesOff, forceSend);
             //Start our interval to update the adaptive scene every minute
             clearTimeout(adaptiveInterval);
             adaptiveInterval = setTimeout(() => {
-                runAdaptive(300, false);
-            }, 60000);
+                runAdaptive(300, false, true);
+            }, 300000);
         };
     };
     RED.nodes.registerType("light-control-config-node", register);

package/dist/LightControl/lightControlNode.html

@@ -2,7 +2,7 @@
     RED.nodes.registerType("light-control-node", {
         category: "HASS Stuff",
         color: "#ffcc00",
-        inputs: 1,
+        inputs: 0,
         outputs: 1,
         icon: "bulb.svg",
         paletteLabel: "Light Control",
@@ -28,4 +28,36 @@
     </div>
 </script>
 <script type="text/html" data-help-name="light-control-node">
+<p>A node that controls lights with general scenes that adjust throughout the day with sleep mode and other features.</p>
+
+<h2>Features</h2>
+<ul>
+    <li>Adaptive scenes depending on what time of the day it is</li>
+    <li>Adaptive scenes depending on luminance sensor</li>
+    <li>Night mode entity to force the adaptive scene to be in "night mode"</li>
+    <li>Ability to turn off entities in night mode</li>
+</ul>
+
+<h2>Dependencies</h2>
+<ul>
+    <li><a href="https://github.com/Hypfer/hass-scene_presets" target="_blank">Hue Scene Presets</a></li>
+    <li><a href="https://www.home-assistant.io/integrations/sun/" target="_blank">Sun Integration</a></li>
+</ul>
+
+<h2>Output</h2>
+<p>This node can output the following messages</p>
+<ul>
+    <li>Scene Sent - A scene has been sent to the lights</li>
+    <pre><code>
+        {
+            topic: "sceneSent",
+            payload: {
+                friendlyName: "Concentrate",
+                sceneName: "sunFlare",
+                brightnessPct: 100
+            }
+        }
+    </code></pre>
+</ul>
+
 </script>

package/dist/LightControl/lightControlNode.js

@@ -9,10 +9,6 @@ module.exports = function LightControlNode(RED) {
         lightControlConfigNode.addMsgCallback(this.id, (msg) => {
             this.send(msg);
         });
-        //When an input message is received
-        this.on("input", (msg, send, done) => {
-            lightControlConfigNode.msgReceived(msg, [this.id]);
-        });
     }
     RED.nodes.registerType("light-control-node", register);
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@haydendonald/node-red-contrib-hass-stuff",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "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",