node-red-contrib-knx-ultimate 2.2.10 → 2.2.12

package/nodes/knxUltimateHueLight.js

@@ -35,8 +35,7 @@ module.exports = function (RED) {
     node.DayTime = true;
     node.isGrouped_light = config.hueDevice.split("#")[1] === "grouped_light";
     node.hueDevice = config.hueDevice.split("#")[0];
-    node.readStatusAtStartup = config.readStatusAtStartup;
-    if (config.readStatusAtStartup === undefined) node.readStatusAtStartup = "yes";
+    node.initializingAtStart = (config.readStatusAtStartup === undefined || config.readStatusAtStartup === "yes");
 
     // Used to call the status update from the config node.
     node.setNodeStatus = ({
@@ -60,7 +59,7 @@ module.exports = function (RED) {
     node.handleSend = (msg) => {
       if (node.currentHUEDevice === undefined) {
         node.setNodeStatusHue({
-          fill: "grey",
+          fill: "yellow",
           shape: "ring",
           text: "Initializing. Please wait.",
           payload: "",
@@ -428,7 +427,7 @@ module.exports = function (RED) {
             return;
           }
           // IMPORTANT: exit if no button last_event present.
-          if (_event.initializingAtStart === true && node.readStatusAtStartup === "no") return;
+          if (!node.initializingAtStart) return;
 
           // Output the msg to the flow
           node.send(_event);

package/nodes/knxUltimateHueLightSensor.js

@@ -23,6 +23,7 @@ module.exports = function (RED) {
     node.formatnegativevalue = 'leave';
     node.formatdecimalsvalue = 2;
     node.hueDevice = config.hueDevice;
+    node.initializingAtStart = !((config.readStatusAtStartup === undefined || config.readStatusAtStartup === "no"));
 
     // Used to call the status update from the config node.
     node.setNodeStatus = ({ fill, shape, text, payload }) => {
@@ -45,7 +46,7 @@ module.exports = function (RED) {
         if (_event.id === config.hueDevice) {
 
           // IMPORTANT: exit if no event presen.
-          if (_event.initializingAtStart === true && (config.readStatusAtStartup === undefined || config.readStatusAtStartup === "no")) return;
+          if (!node.initializingAtStart) return;
           if (!_event.hasOwnProperty('light') || _event.light.light_level === undefined) return;
 
           const knxMsgPayload = {};

package/nodes/knxUltimateHueMotion.js

@@ -23,6 +23,7 @@ module.exports = function (RED) {
     node.formatnegativevalue = "leave";
     node.formatdecimalsvalue = 2;
     node.hueDevice = config.hueDevice;
+    node.initializingAtStart = false;
 
     // Used to call the status update from the config node.
     node.setNodeStatus = ({ fill, shape, text, payload }) => { };
@@ -42,7 +43,7 @@ module.exports = function (RED) {
         if (_event.id === config.hueDevice) {
 
           // IMPORTANT: exit if no event presen.
-          if (_event.initializingAtStart === true) return;
+          if (!node.initializingAtStart) return;
           if (!_event.hasOwnProperty("motion") || _event.motion.motion === undefined) return;
 
 

package/nodes/knxUltimateHueScene.js

@@ -25,6 +25,7 @@ module.exports = function (RED) {
     node.formatnegativevalue = 'leave';
     node.formatdecimalsvalue = 2;
     node.hueDevice = config.hueDevice;
+    node.initializingAtStart = false;
 
     // Used to call the status update from the config node.
     node.setNodeStatus = ({ fill, shape, text, payload }) => {
@@ -78,13 +79,9 @@ module.exports = function (RED) {
     node.handleSendHUE = (_event) => {
       try {
         if (_event.id === config.hueDevice) {
-
-          // IMPORTANT: exit if no event presen.
-          if (_event.initializingAtStart === true) return;
-
+          if (!node.initializingAtStart) return;
           // Output the msg to the flow
           node.send(_event);
-
         }
       } catch (error) {
         node.status({ fill: 'red', shape: 'dot', text: 'HUE->KNX error ' + error.message + ' (' + new Date().getDate() + ', ' + new Date().toLocaleTimeString() + ')' });

package/nodes/knxUltimateHueTapDial.js

@@ -26,6 +26,7 @@ module.exports = function (RED) {
     node.brightnessState = 0;
     node.isTimerDimStopRunning = false;
     node.hueDevice = config.hueDevice;
+    node.initializingAtStart = false;
 
     // Used to call the status update from the config node.
     node.setNodeStatus = ({
@@ -51,7 +52,7 @@ module.exports = function (RED) {
         if (_event.id === config.hueDevice) {
 
           // IMPORTANT: exit if no event presen.
-          if (_event.initializingAtStart === true) return;
+          if (!node.initializingAtStart) return;
           if (!_event.hasOwnProperty("relative_rotary")
             || !_event.relative_rotary.hasOwnProperty("last_event")
             || _event.relative_rotary.last_event === undefined

package/nodes/utils/hueEngine.js

@@ -41,7 +41,13 @@ class classHUE extends EventEmitter {
     } catch (error) {
       /* empty */
     }
-    this.es = new EventSource(`https://${this.hueBridgeIP}/eventstream/clip/v2`, options);
+
+    try {
+      this.es = new EventSource(`https://${this.hueBridgeIP}/eventstream/clip/v2`, options);
+    } catch (error) {
+      console.log("hue-config: ew EventSource:" + error.message);
+    }
+
 
     this.es.onmessage = (event) => {
       try {
@@ -86,7 +92,9 @@ class classHUE extends EventEmitter {
       } catch (error) {
         /* empty */
       }
-      this.Connect();
+      try {
+        this.Connect();
+      } catch (error) { }
     }, 300000);
   };
 
@@ -176,12 +184,24 @@ class classHUE extends EventEmitter {
   };
   // ######################################
 
+  isConnected = async () => {
+    try {
+      await this.hueApiV2.get('/resource/bridge');
+      return true;
+    } catch (error) {
+      console.log("hueEngine: isConnected: " + error.message)
+      return false;
+    }
+  };
+
   close = async () =>
     new Promise((resolve, reject) => {
       try {
         if (this.timerReconnect !== undefined) clearInterval(this.timerReconnect);
         this.closePushEventStream = true;
-        if (this.es !== null) this.es.close();
+        try {
+          if (this.es !== null && this.es !== undefined) this.es.close();
+        } catch (error) { }
         this.es = null;
         setTimeout(() => {
           resolve(true);

package/package.json

@@ -3,7 +3,7 @@
   "engines": {
     "node": ">=16.0.0"
   },
-  "version": "2.2.10",
+  "version": "2.2.12",
   "description": "Control your KNX intallation via Node-Red! Single Node KNX IN/OUT with optional ETS group address importer. Easy to use and highly configurable. With integrated Philips HUE devices control.",
   "dependencies": {
     "binary-parser": "2.2.1",