@haydendonald/node-red-contrib-hass-stuff 1.0.1 → 1.1.1

package/dist/Connections/connectionsConfigNode.js

@@ -16,7 +16,7 @@ module.exports = function ConnectionsConfigNode(RED) {
         self.hassEventCallServiceCallbacks = {};
         self.hassEventStateChangeCallbacks = {};
         self.sendHASSAPI = function (protocol, method, path, callback, params, data, results) {
-            const callbackId = callback ? (0, utility_1.generateRandomId)(Object.keys(self.hassAPICallbacks)) : undefined;
+            const callbackId = (0, utility_1.generateRandomId)(Object.keys(self.hassAPICallbacks));
             const msg = {
                 topic: connectionsTypes_1.Topics.API,
                 callbackId,
@@ -31,12 +31,12 @@ module.exports = function ConnectionsConfigNode(RED) {
             };
             self.sendMsg(msg);
             //Add our callback for when a response comes back in
-            if (callbackId && callback) {
+            if (callback) {
                 self.hassAPICallbacks[callbackId] = callback;
             }
         };
         self.sendHASSAction = function (action, target, data, callback) {
-            const callbackId = callback ? (0, utility_1.generateRandomId)(Object.keys(self.hassActionCallbacks)) : undefined;
+            const callbackId = (0, utility_1.generateRandomId)(Object.keys(self.hassActionCallbacks));
             const msg = {
                 topic: connectionsTypes_1.Topics.ACTION,
                 callbackId,
@@ -48,12 +48,12 @@ module.exports = function ConnectionsConfigNode(RED) {
             };
             self.sendMsg(msg);
             //Add our callback for when a response comes back in
-            if (callbackId && callback) {
+            if (callback) {
                 self.hassActionCallbacks[callbackId] = callback;
             }
         };
         self.getHASSEntityState = function (entityId, callback) {
-            const callbackId = callback ? (0, utility_1.generateRandomId)(Object.keys(self.hassCurrentStateCallbacks)) : undefined;
+            const callbackId = (0, utility_1.generateRandomId)(Object.keys(self.hassCurrentStateCallbacks));
             const msg = {
                 topic: connectionsTypes_1.Topics.STATE,
                 callbackId,
@@ -63,12 +63,12 @@ module.exports = function ConnectionsConfigNode(RED) {
             };
             self.sendMsg(msg);
             //Add our callback for when a response comes back in
-            if (callbackId && callback) {
+            if (callback) {
                 self.hassCurrentStateCallbacks[callbackId] = callback;
             }
         };
         self.getHASSEntities = function (rules, callback) {
-            const callbackId = callback ? (0, utility_1.generateRandomId)(Object.keys(self.hassGetEntitiesCallbacks)) : undefined;
+            const callbackId = (0, utility_1.generateRandomId)(Object.keys(self.hassGetEntitiesCallbacks));
             const msg = {
                 topic: connectionsTypes_1.Topics.GET_ENTITIES,
                 callbackId,
@@ -78,7 +78,7 @@ module.exports = function ConnectionsConfigNode(RED) {
             };
             self.sendMsg(msg);
             //Add our callback for when a response comes back in
-            if (callbackId && callback) {
+            if (callback) {
                 self.hassGetEntitiesCallbacks[callbackId] = callback;
             }
         };
@@ -351,13 +351,16 @@ module.exports = function ConnectionsConfigNode(RED) {
             }
         };
         self.handleCallback = function (callbacks, callbackId, ...args) {
-            var _a;
             //This is a specific callback id
-            if (callbackId) {
-                (_a = callbacks[callbackId]) === null || _a === void 0 ? void 0 : _a.call(callbacks, ...args);
+            if (callbacks[callbackId]) {
+                callbacks[callbackId](...args);
                 delete callbacks[callbackId];
                 return;
             }
+            //We failed to find the callback, so it must not exist
+            if (callbackId !== undefined) {
+                return;
+            }
             //Send to everyone
             for (const id of Object.keys(callbacks)) {
                 if (callbacks[id]) {

package/dist/Connections/connectionsNode.html

@@ -5,6 +5,7 @@
         inputs: 1,
         outputs: 1,
         icon: "bulb.svg",
+        paletteLabel: "Connections",
         defaults: {
             name: { value: "" },
             connectionsConfigNode: { value: '', type: "connections-config-node", required: true }

package/dist/LightControl/lightControlConfigNode.js

@@ -171,6 +171,22 @@ module.exports = function LightControlConfigNode(RED) {
                     });
                 }
             });
+            //Add our toggle scene
+            connectionsConfigNode.addHASSScene({
+                friendlyName: `${self.name} - Toggle`,
+                id: (0, utility_1.getEntityId)("scene", `${self.name}_toggle`),
+                creationCallback: (response) => { },
+                activatedCallback: (serviceData) => {
+                    if (currentState.state == "off") {
+                        runLights(serviceData.transition || 1, true);
+                    }
+                    else {
+                        connectionsConfigNode.sendHASSAction("light.turn_off", { entity_id: [config.groupEntityId] }, {
+                            transition: serviceData.transition || 1
+                        });
+                    }
+                }
+            });
             //Add our select to keep track of what scene we are running
             connectionsConfigNode.addHASSSelect({
                 friendlyName: `${self.name} - Current Scene`,
@@ -179,6 +195,7 @@ module.exports = function LightControlConfigNode(RED) {
                     ...Object.values(scenes).map(scene => scene.friendlyName),
                     "Adaptive"
                 ],
+                defaultState: "Adaptive",
                 creationCallback: (state) => {
                     currentSceneState = state;
                     runLights(300, false);
@@ -209,7 +226,7 @@ module.exports = function LightControlConfigNode(RED) {
         this.msgReceived = function (msg, senderIds) { };
         const activateScene = (scene, transitionSec, turnLightsOn, entitiesOn, entitiesOff) => {
             //If the lights are off and we are not to turn the lights on don't do anything
-            if (turnLightsOn == false && currentState == "off") {
+            if (turnLightsOn == false && currentState.state == "off") {
                 return;
             }
             //Is not a scene preset scene if we have a entity id

package/dist/LightControl/lightControlNode.html

@@ -5,6 +5,7 @@
         inputs: 1,
         outputs: 1,
         icon: "bulb.svg",
+        paletteLabel: "Light Control",
         defaults: {
             name: { value: "" },
             lightControlConfigNode: { value: '', type: "light-control-config-node", required: true }

package/package.json

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