node-red-contrib-knx-ultimate 3.2.8 → 3.2.10

package/CHANGELOG.md

@@ -6,6 +6,12 @@
 
 # CHANGELOG
 
+**Version 3.2.10** - October 2024<br/>
+- Fixed a race condition happening whenever FULL DEPLOY is pressed in the node-red interface, preventing the HUE bridge node to gracefully disconnect from the HUE Bridge.<br/>
+
+**Version 3.2.9** - October 2024<br/>
+- Maintenance release: added some log to better identify problems.<br/>
+
 **Version 3.2.8** - October 2024<br/>
 - KNX Node: fixed "read status at startup" field not showing up in very old versions.<br/>
 

package/nodes/commonFunctions.js

@@ -66,11 +66,16 @@ module.exports = (RED) => {
             try {
                 const serverId = RED.nodes.getNode(req.query.serverId); // Retrieve node.id of the config node.
                 if (serverId.hueAllResources === null || serverId.hueAllResources === undefined) {
-                    res.json({ ready: false });
+                    (async function main() {
+                        await serverId.loadResourcesFromHUEBridge();
+                        res.json({ ready: false });
+                    }()).catch();
                 } else {
                     res.json({ ready: true });
                 }
             } catch (error) {
+                RED.log.error(`Errore RED.httpAdmin.get('/knxultimateCheckHueConnected' ${error.message}`);
+
                 res.json({ ready: false });
             }
         });

package/nodes/hue-config.js

@@ -477,18 +477,17 @@ module.exports = (RED) => {
     node.on("close", (done) => {
       try {
         if (node.sysLogger !== undefined && node.sysLogger !== null) node.sysLogger = null;
-        loggerEngine.destroy();
         node.nodeClients = [];
-        node.hueManager.removeAllListeners();
+        if (node.hueManager !== undefined && node.hueManager !== null) node.hueManager.removeAllListeners();
         (async () => {
           try {
             await node.hueManager.close();
             node.hueManager = null;
             delete node.hueManager;
+            done();
           } catch (error) {
-            /* empty */
+            done();
           }
-          done();
         })();
       } catch (error) {
         done();

package/nodes/knxUltimateHueLight.html

@@ -720,11 +720,14 @@
         });
 
         // Timer connection to backend ####################################################
-        this.timerWaitBackEnd;
         let timerWaitBackEndCounter = 0;
         function checkConnection() {
-          if (this.timerBlinkBackground !== undefined) clearTimeout(this.timerBlinkBackground);
-          this.timerBlinkBackground = setTimeout(() => {
+          if (this.timerWaitBackEnd !== undefined) clearTimeout(this.timerWaitBackEnd);
+          if ($("#node-input-serverHue").val() === undefined) {
+            // Someone has FULL deployed node-red, exit.
+            return;
+          }
+          this.timerWaitBackEnd = setTimeout(() => {
             timerWaitBackEndCounter++;
             if (timerWaitBackEndCounter > 20) {
               timerWaitBackEndCounter = 0;

package/nodes/utils/http.js

@@ -121,7 +121,7 @@ module.exports.getBridgeDetails = async (_ip) => {
         simpleget.concat(opt, (err, res, data) => {
             try {
                 if (err) {
-                    reject(err);
+                    reject(new Error(err.message || 'getBridgeDetails general error'));
                 } else {
                     // log.trace('http data ' + data);
                     if (res.statusCode >= 100 && res.statusCode < 400) {

package/nodes/utils/hueEngine.js

@@ -44,8 +44,11 @@ class classHUE extends EventEmitter {
     });
 
     try {
-      this.es.close();
-      this.es = null;
+      if (this.es !== null && this.es !== undefined) {
+        this.es.removeEventListener();
+        this.es.close();
+        this.es = null;
+      }
     } catch (error) {
       /* empty */
     }
@@ -78,7 +81,7 @@ class classHUE extends EventEmitter {
     this.es.onopen = () => {
       // if (this.sysLogger !== undefined && this.sysLogger !== null) this.sysLogger.error('KNXUltimatehueEngine: classHUE: SSE-Connected')
       this.emit("connected");
-
+      if (this.sysLogger !== undefined && this.sysLogger !== null) this.sysLogger.info(`KNXUltimatehueEngine: classHUE: this.es.onopen: connected`);
       // Check wether the hue bridge is connected or not
       if (this.timerCheckConnected !== null) clearInterval(this.timerCheckConnected);
       this.timerCheckConnected = setInterval(() => {
@@ -86,7 +89,9 @@ class classHUE extends EventEmitter {
       }, 30000);
     };
 
-    // this.es.onerror = (error) => {
+    this.es.onerror = (error) => {
+      if (this.sysLogger !== undefined && this.sysLogger !== null) this.sysLogger.error(`KNXUltimatehueEngine: classHUE: this.es.onopen:  ${error.status || ''} ${error.message}`);
+    };
     // 29/08/2023 NON riattivare, perchè alla disconnessione, va in loop e consuma tutto il pool di risorse.
     //   try {
     //     this.es.close();
@@ -97,19 +102,6 @@ class classHUE extends EventEmitter {
     //   // this.emit('error', error)
     // };
 
-    // 31/07/2023 Every now and then, restart the connection to the eventsource, because it can goes down without knowing that
-    if (this.timerReconnect !== undefined) clearInterval(this.timerReconnect);
-    this.timerReconnect = setInterval(() => {
-      try {
-        this.es.close();
-        this.es = null;
-      } catch (error) {
-        /* empty */
-      }
-      try {
-        this.Connect();
-      } catch (error) { }
-    }, 10 * (60 * 1000)); // 10 minutes
   };
 
   // Process single item in the queue
@@ -222,15 +214,14 @@ class classHUE extends EventEmitter {
   close = async () =>
     new Promise((resolve, reject) => {
       try {
-        if (this.timerReconnect !== undefined) clearInterval(this.timerReconnect);
-        this.closePushEventStream = true; // Signal to exit all loops
-        try {
-          if (this.es !== null && this.es !== undefined) this.es.close();
-        } catch (error) { }
-        this.es = null;
+        this.closePushEventStream = true; // Signal to exit all loops        
         setTimeout(() => {
+          try {
+            if (this.es !== null && this.es !== undefined) this.es.close();
+          } catch (error) { }
+          this.es = null;
           resolve(true);
-        }, 500);
+        }, 2000);
       } catch (error) {
         reject(error);
       }

package/package.json

@@ -3,7 +3,7 @@
   "engines": {
     "node": ">=16.0.0"
   },
-  "version": "3.2.8",
+  "version": "3.2.10",
   "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",