node-red-contrib-knx-ultimate 3.3.24 → 3.3.25

package/CHANGELOG.md

@@ -6,6 +6,9 @@
 
 # CHANGELOG
 
+**Version 3.3.25** - April 2025<br/>
+- HUE: fixed a saltuary bug preventing reconnection after HUE bridge has been restarted and there is no KNX Gateway configured.<br/>
+
 **Version 3.3.24** - April 2025<br/>
 - NEW: Added Datapoint 14.1200<br/>
 

package/nodes/hue-config.js

@@ -43,13 +43,10 @@ module.exports = (RED) => {
 
     // Connect to Bridge and get the resources
     node.initHUEConnection = async () => {
+      await node.closeConnection();
       try {
-        if (node.hueManager !== undefined) node.hueManager.close();
+        if (node.hueManager !== undefined) await node.hueManager.close();
       } catch (error) { /* empty */ }
-      try {
-        if (node.hueManager !== undefined) node.hueManager.removeAllListeners();
-      } catch (error) { /* empty */ }
-      // Handle events
       try {
         // Init HUE Utility
         node.hueManager = new HueClass(node.host, node.credentials.username, node.credentials.clientkey, config.bridgeid, node.sysLogger);
@@ -87,11 +84,11 @@ module.exports = (RED) => {
                       text: "HUE",
                       payload: error.message,
                     });
-                  }, 1000);
+                  }, 200);
                 });
               }
             })();
-          }, 6000); // 17/02/2020 Do initial read of all nodes requesting initial read
+          }, 10000); // 17/02/2020 Do initial read of all nodes requesting initial read
         }
       });
 
@@ -106,12 +103,12 @@ module.exports = (RED) => {
         });
       });
       try {
-        node.hueManager.Connect();
+        await node.hueManager.Connect();
       } catch (error) { }
 
     };
 
-    node.startWatchdogTimer = () => {
+    node.startWatchdogTimer = async () => {
       if (node.timerHUEConfigCheckState !== null) clearTimeout(node.timerHUEConfigCheckState);
       node.timerHUEConfigCheckState = setTimeout(() => {
         (async () => {
@@ -123,12 +120,14 @@ module.exports = (RED) => {
               node.sysLogger?.error(`Errore hue-config: node.startWatchdogTimer: ${error.message}`);
             }
           }
-          node.startWatchdogTimer();
+          await node.startWatchdogTimer();
         })();
-      }, 10000);
+      }, 20000);
     };
-    node.startWatchdogTimer();
 
+    (async () => {
+      await node.startWatchdogTimer();
+    })();
 
     // Functions called from the nodes ----------------------------------------------------------------
     // Query the HUE Bridge to return the resources
@@ -480,11 +479,16 @@ module.exports = (RED) => {
       }
     };
 
+    node.closeConnection = async () => {
+      node.hueManager?.removeAllListeners();
+      node.linkStatus === "disconnected";
+    }
+
     node.on("close", (done) => {
       try {
-        if (node.sysLogger !== undefined && node.sysLogger !== null) node.sysLogger = null;
+        node.sysLogger = null;
         node.nodeClients = [];
-        if (node.hueManager !== undefined && node.hueManager !== null) node.hueManager.removeAllListeners();
+        node.closeConnection();
         (async () => {
           try {
             await node.hueManager.close();

package/nodes/utils/hueEngine.js

@@ -19,9 +19,9 @@ class classHUE extends EventEmitter {
     this.bridgeid = _bridgeid;
     this.commandQueue = [];
     // eslint-disable-next-line max-len
-    setTimeout(this.handleQueue, 10000); // First start. Allow the KNX to connect
     this.sysLogger = _sysLogger;
     this.timerCheckConnected = null;
+    this.handleQueue();
   }
 
   Connect = () => {
@@ -59,7 +59,7 @@ class classHUE extends EventEmitter {
     try {
       this.es = new EventSource(`https://${this.hueBridgeIP}/eventstream/clip/v2`, options);
     } catch (error) {
-      console.log("hue-config: ew EventSource:" + error.message);
+      if (this.sysLogger !== undefined && this.sysLogger !== null) this.sysLogger.error(`hueEngine: ew EventSource: ${error.message}`);
     }
 
 
@@ -91,37 +91,41 @@ class classHUE extends EventEmitter {
       this.timerCheckConnected = setInterval(() => {
         (async () => {
           try {
-            if (this.sysLogger !== undefined && this.sysLogger !== null) this.sysLogger.debug(`KNXUltimatehueEngine: classHUE: processQueueItem: Pinging...`);
+            if (this.sysLogger !== undefined && this.sysLogger !== null) this.sysLogger.debug(`KNXUltimatehueEngine: classHUE: Pinging...`);
             const jReturn = await this.hueApiV2.get('/resource/bridge');
             if (!Array.isArray(jReturn) || jReturn.length < 1) throw new Error("jReturn: not an array or array empty")
             this.HUEBridgeConnectionStatus = "connected";
-            if (this.sysLogger !== undefined && this.sysLogger !== null) this.sysLogger.debug(`KNXUltimatehueEngine: classHUE: processQueueItem: Ping OK`);
+            if (this.sysLogger !== undefined && this.sysLogger !== null) this.sysLogger.debug(`KNXUltimatehueEngine: classHUE: Ping OK`);
           } catch (error) {
-            if (this.sysLogger !== undefined && this.sysLogger !== null) this.sysLogger.error(`KNXUltimatehueEngine: classHUE: processQueueItem: Ping ERROR: ${error.message}`);
+            if (this.sysLogger !== undefined && this.sysLogger !== null) this.sysLogger.error(`KNXUltimatehueEngine: classHUE: Ping ERROR: ${error.message}`);
             if (this.timerCheckConnected !== null) clearInterval(this.timerCheckConnected);
             this.commandQueue = [];
-            this.emit("disconnected");
             try {
-              this.close();
+              await this.close();
             } catch (error) { }
+            this.emit("disconnected");
           }
         })();
-      }, 20000);
+      }, 60000);
     };
 
     this.es.onerror = (error) => {
-      if (this.sysLogger !== undefined && this.sysLogger !== null) this.sysLogger.error(`KNXUltimatehueEngine: classHUE: this.es.onopen:  ${error.status || ''} ${error.message}`);
+      if (this.sysLogger !== undefined && this.sysLogger !== null) this.sysLogger.error(`KNXUltimatehueEngine: classHUE: this.es.onopen: ${error.message}`);
+      (async () => {
+        await this.close();
+        if (this.HUEBridgeConnectionStatus === 'connected') this.emit('disconnected');
+      })();
+
+      // 29/08/2023 NON riattivare, perchè alla disconnessione, va in loop e consuma tutto il pool di risorse.
+      //   try {
+      //     this.es.close();
+      //     this.es = null;
+      //     if (this.sysLogger !== undefined && this.sysLogger !== null) this.sysLogger.error(`KNXUltimatehueEngine: classHUE: request.on(error): ${error.message}`);
+      //   } catch (err) { /* empty */ }
+      //   this.Connect();
+      //   // this.emit('error', error)
+      // };
     };
-    // 29/08/2023 NON riattivare, perchè alla disconnessione, va in loop e consuma tutto il pool di risorse.
-    //   try {
-    //     this.es.close();
-    //     this.es = null;
-    //     if (this.sysLogger !== undefined && this.sysLogger !== null) this.sysLogger.error(`KNXUltimatehueEngine: classHUE: request.on(error): ${error.message}`);
-    //   } catch (err) { /* empty */ }
-    //   this.Connect();
-    //   // this.emit('error', error)
-    // };
-
   };
 
   // Process single item in the queue
@@ -201,6 +205,7 @@ class classHUE extends EventEmitter {
     //console.log("\x1b[42m End processing commandQueue \x1b[0m " + new Date().toTimeString(), this.commandQueue.length);
   };
 
+
   writeHueQueueAdd = async (_lightID, _state, _operation) => {
     // Add the new item
     this.commandQueue.unshift({ _lightID, _state, _operation });
@@ -226,6 +231,7 @@ class classHUE extends EventEmitter {
         setTimeout(() => {
           try {
             if (this.es !== null && this.es !== undefined) this.es.close();
+            if (this.es !== null && this.es !== undefined) this.es.removeEventListener();
           } catch (error) { }
           this.es = null;
           resolve(true);

package/package.json

@@ -3,7 +3,7 @@
   "engines": {
     "node": ">=16.0.0"
   },
-  "version": "3.3.24",
+  "version": "3.3.25",
   "description": "Control your KNX intallation via Node-Red! A bunch of KNX nodes, with integrated Philips HUE control and ETS group address importer. Easy to use and highly configurable.",
   "dependencies": {
     "binary-parser": "2.2.1",