node-red-contrib-knx-ultimate 2.2.16 → 2.2.19

package/CHANGELOG.md

@@ -6,6 +6,15 @@
 
 # CHANGELOG
 
+<b>Version 2.2.19</b> - November 2023<br/>
+<p>
+- HUE Bugfix.<br/>
+</p>
+<b>Version 2.2.18</b> - November 2023<br/>
+<p>
+- HUE Bugfix.<br/>
+- New connection check for HUE bridge.<br/>
+</p>
 <b>Version 2.2.16</b> - November 2023<br/>
 <p>
 - NEW: Hue Light: you can now enable the input/output PINs and send/receive commands to/from the light, via the msg flow, like msg.on={"on":true}. The option is "Node Input/Output PINs".<br/>

package/nodes/hue-config.js

@@ -94,9 +94,10 @@ module.exports = (RED) => {
           // Init HUE Utility
           node.hueManager = new HueClass(node.host, node.credentials.username, node.credentials.clientkey, config.bridgeid, node.sysLogger);
         } catch (error) { }
-        await node.hueManager.Connect();
+        node.hueManager.Connect();
       } catch (error) {
-        /* empty */
+        if (node.sysLogger !== undefined && node.sysLogger !== null) node.sysLogger.error(`Errore hue-config: node.initHUEConnection: ${error.message}`);
+        node.linkStatus = "disconnected";
       }
       node.hueManager.on("event", (_event) => {
         node.nodeClients.forEach((_oClient) => {
@@ -114,12 +115,42 @@ module.exports = (RED) => {
         // Start the timer to do initial read.
         if (node.timerDoInitialRead !== null) clearTimeout(node.timerDoInitialRead);
         node.timerDoInitialRead = setTimeout(() => {
-          node.loadResourcesFromHUEBridge();
+          (async () => {
+            try {
+              await node.loadResourcesFromHUEBridge();
+            } catch (error) {
+              node.linkStatus = "disconnected";
+              node.nodeClients.forEach((_oClient) => {
+                setTimeout(() => {
+                  _oClient.setNodeStatusHue({
+                    fill: "red",
+                    shape: "ring",
+                    text: "HUE",
+                    payload: error.message,
+                  });
+                }, 1000);
+              });
+            }
+            node.startWatchdogTimer();
+          })();
         }, 6000); // 17/02/2020 Do initial read of all nodes requesting initial read
       });
+
+      node.hueManager.on("disconnected", () => {
+        node.linkStatus = "disconnected";
+        node.nodeClients.forEach((_oClient) => {
+          _oClient.setNodeStatusHue({
+            fill: "red",
+            shape: "ring",
+            text: "HUE Disconnected",
+            payload: "",
+          });
+        });
+      });
     };
 
     node.startWatchdogTimer = () => {
+      if (node.timerHUEConfigCheckState !== undefined) clearTimeout(node.timerHUEConfigCheckState);
       node.timerHUEConfigCheckState = setTimeout(() => {
         (async () => {
           if (node.linkStatus === "disconnected") {
@@ -128,12 +159,6 @@ module.exports = (RED) => {
             } catch (error) {
               node.linkStatus = "disconnected";
             }
-          } else {
-            try {
-              // Check wether the hue connection is still alive
-              const ret = await node.hueManager.isConnected();
-              if (!ret) node.linkStatus = "disconnected";
-            } catch (error) { node.linkStatus = "disconnected"; }
           }
           node.startWatchdogTimer();
         })();
@@ -142,40 +167,41 @@ module.exports = (RED) => {
     node.startWatchdogTimer();
 
     // Query the HUE Bridge to return the resources
-    node.loadResourcesFromHUEBridge = () => {
-      (async () => {
-        // °°°°°° Load ALL resources
-        try {
-          node.hueAllResources = await node.hueManager.hueApiV2.get("/resource");
-          if (node.hueAllResources !== undefined) {
-            node.hueAllRooms = node.hueAllResources.filter((a) => a.type === "room");
-            // Update all KNX State of the nodes with the new hue device values
-            node.nodeClients.forEach((_node) => {
-              if (_node.hueDevice !== undefined && node.hueAllResources !== undefined) {
-                const oHUEDevice = node.hueAllResources.filter((a) => a.id === _node.hueDevice)[0];
-                if (oHUEDevice !== undefined) {
-                  // Add _Node to the clients array
-                  _node.setNodeStatusHue({
-                    fill: "green",
-                    shape: "ring",
-                    text: "Ready :-)",
-                  });
-                  _node.currentHUEDevice = oHUEDevice;
-                  if (_node.initializingAtStart === true) _node.handleSendHUE(oHUEDevice);
-                }
+    node.loadResourcesFromHUEBridge = async () => {
+      if (node.linkStatus === "disconnected") return;
+      //(async () => {
+      // °°°°°° Load ALL resources
+      try {
+        node.hueAllResources = await node.hueManager.hueApiV2.get("/resource");
+        if (node.hueAllResources !== undefined) {
+          node.hueAllRooms = node.hueAllResources.filter((a) => a.type === "room");
+          // Update all KNX State of the nodes with the new hue device values
+          node.nodeClients.forEach((_node) => {
+            if (_node.hueDevice !== undefined && node.hueAllResources !== undefined) {
+              const oHUEDevice = node.hueAllResources.filter((a) => a.id === _node.hueDevice)[0];
+              if (oHUEDevice !== undefined) {
+                // Add _Node to the clients array
+                _node.setNodeStatusHue({
+                  fill: "green",
+                  shape: "ring",
+                  text: "Ready :-)",
+                });
+                _node.currentHUEDevice = oHUEDevice;
+                if (_node.initializingAtStart === true) _node.handleSendHUE(oHUEDevice);
               }
-            });
-          } else {
-            // The config node cannot read the resources. Signalling disconnected
-          }
-        } catch (error) {
-          if (this.sysLogger !== undefined && this.sysLogger !== null) {
-            this.sysLogger.error(`KNXUltimatehueEngine: loadResourcesFromHUEBridge: ${error.message}`);
-            return (error.message);
-          }
+            }
+          });
+        } else {
+          // The config node cannot read the resources. Signalling disconnected
         }
-        return true;
-      })();
+      } catch (error) {
+        if (this.sysLogger !== undefined && this.sysLogger !== null) {
+          this.sysLogger.error(`KNXUltimatehueEngine: loadResourcesFromHUEBridge: ${error.message}`);
+          throw (error);
+        }
+      }
+
+      //})();
     };
 
     // Returns the cached devices (node.hueAllResources) by type.
@@ -296,7 +322,6 @@ module.exports = (RED) => {
     // Query HUE Bridge and get the updated color.
     node.getColorFromHueLight = (_lightId) => {
       try {
-        // await node.loadResourcesFromHUEBridge();
         const oLight = node.hueAllResources.filter((a) => a.id === _lightId)[0];
         const ret = hueColorConverter.ColorConverter.xyBriToRgb(oLight.color.xy.x, oLight.color.xy.y, oLight.dimming.brightness);
         return JSON.stringify(ret);

package/nodes/knxUltimateHueBattery.js

@@ -49,7 +49,6 @@ module.exports = function (RED) {
         if (_event.id === config.hueDevice) {
 
           // IMPORTANT: exit if no event presen.
-          if (!node.initializingAtStart) return;
           if (!_event.hasOwnProperty("power_state") || _event.power_state.battery_level === undefined) return;
 
           const knxMsgPayload = {};

package/nodes/knxUltimateHueButton.js

@@ -79,7 +79,6 @@ module.exports = function (RED) {
         if (_event.id === config.hueDevice) {
 
           // IMPORTANT: exit if no button last_event present.
-          if (!node.initializingAtStart) return;
           if (!_event.hasOwnProperty("button") || _event.button.last_event === undefined) return;
 
           const knxMsgPayload = {};

package/nodes/knxUltimateHueLight.js

@@ -31,7 +31,6 @@ module.exports = function (RED) {
     node.formatnegativevalue = "leave";
     node.formatdecimalsvalue = 2;
     node.currentHUEDevice = undefined; // At start, this value is filled by a call to HUE api. It stores a value representing the current light status.
-    node.currentKNXGALightState = false; // Stores the current KNX value for the GA
     node.DayTime = true;
     node.isGrouped_light = config.hueDevice.split("#")[1] === "grouped_light";
     node.hueDevice = config.hueDevice.split("#")[0];
@@ -57,7 +56,7 @@ module.exports = function (RED) {
 
     // This function is called by the hue-config.js
     node.handleSend = (msg) => {
-      if (node.currentHUEDevice === undefined) {
+      if (node.currentHUEDevice === undefined && node.serverHue.linkStatus === "connected") {
         node.setNodeStatusHue({
           fill: "yellow",
           shape: "ring",
@@ -426,8 +425,6 @@ module.exports = function (RED) {
             });
             return;
           }
-          // IMPORTANT: exit if no button last_event present.
-          if (!node.initializingAtStart) return;
 
           // Output the msg to the flow
           node.send(_event);
@@ -458,7 +455,7 @@ module.exports = function (RED) {
             if (node.currentHUEDevice.hasOwnProperty("on") && node.currentHUEDevice.on.on === false && _event.dimming.brightness === 0) {
               // Do nothing, because the light is off and the dimming also is 0
             } else {
-              if (node.currentHUEDevice.on.on === false) node.updateKNXLightState(_event.dimming.brightness > 0);
+              if (node.currentHUEDevice.on.on === false && (!_event.hasOwnProperty("on") || (_event.hasOwnProperty("on") && _event.on.on === true))) node.updateKNXLightState(_event.dimming.brightness > 0);
               node.updateKNXBrightnessState(_event.dimming.brightness);
               // If the brightness reaches zero, the hue lamp "on" property must be set to zero as well
               if (_event.dimming.brightness === 0) {
@@ -520,27 +517,25 @@ module.exports = function (RED) {
         knxMsgPayload.dpt = config.dptLightState;
         knxMsgPayload.payload = _value;
         if (config.GALightState !== undefined && config.GALightState !== "") {
-          if (node.currentKNXGALightState !== knxMsgPayload.payload) {
-            // Check not to have already sent the value
-            // Send to KNX bus
-            if (knxMsgPayload.topic !== "" && knxMsgPayload.topic !== undefined) {
-              node.server.writeQueueAdd({
-                grpaddr: knxMsgPayload.topic,
-                payload: knxMsgPayload.payload,
-                dpt: knxMsgPayload.dpt,
-                outputtype: "write",
-                nodecallerid: node.id,
-              });
-            }
-            node.setNodeStatusHue({
-              fill: "blue",
-              shape: "ring",
-              text: "HUE->KNX On/Off",
+
+          // Check not to have already sent the value
+          // Send to KNX bus
+          if (knxMsgPayload.topic !== "" && knxMsgPayload.topic !== undefined) {
+            node.server.writeQueueAdd({
+              grpaddr: knxMsgPayload.topic,
               payload: knxMsgPayload.payload,
+              dpt: knxMsgPayload.dpt,
+              outputtype: "write",
+              nodecallerid: node.id,
             });
           }
+          node.setNodeStatusHue({
+            fill: "blue",
+            shape: "ring",
+            text: "HUE->KNX On/Off",
+            payload: knxMsgPayload.payload,
+          });
         }
-        node.currentKNXGALightState = knxMsgPayload.payload; // Stores the current value
       } catch (error) {
         /* empty */
       }

package/nodes/knxUltimateHueLightSensor.js

@@ -45,8 +45,6 @@ module.exports = function (RED) {
       try {
         if (_event.id === config.hueDevice) {
 
-          // IMPORTANT: exit if no event presen.
-          if (!node.initializingAtStart) return;
           if (!_event.hasOwnProperty('light') || _event.light.light_level === undefined) return;
 
           const knxMsgPayload = {};

package/nodes/knxUltimateHueMotion.js

@@ -42,8 +42,6 @@ module.exports = function (RED) {
       try {
         if (_event.id === config.hueDevice) {
 
-          // IMPORTANT: exit if no event presen.
-          if (!node.initializingAtStart) return;
           if (!_event.hasOwnProperty("motion") || _event.motion.motion === undefined) return;
 
 

package/nodes/knxUltimateHueScene.js

@@ -79,7 +79,6 @@ module.exports = function (RED) {
     node.handleSendHUE = (_event) => {
       try {
         if (_event.id === config.hueDevice) {
-          if (!node.initializingAtStart) return;
           // Output the msg to the flow
           node.send(_event);
         }

package/nodes/knxUltimateHueTapDial.js

@@ -51,8 +51,7 @@ module.exports = function (RED) {
       try {
         if (_event.id === config.hueDevice) {
 
-          // IMPORTANT: exit if no event presen.
-          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

@@ -13,11 +13,14 @@ class classHUE extends EventEmitter {
     this.commandQueue = [];
     this.closePushEventStream = false;
     // eslint-disable-next-line max-len
-    this.timerwriteQueueAdd = setTimeout(this.handleQueue, 15000); // First start. Allow the KNX to connect
+    this.timerwriteQueueAdd = setTimeout(this.handleQueue, 10000); // First start. Allow the KNX to connect
     this.sysLogger = _sysLogger;
+    this.timerCheckConnected = undefined;
+
   }
 
-  Connect = async () => {
+  Connect = () => {
+
     const options = {
       headers: {
         "hue-application-key": this.username,
@@ -70,6 +73,12 @@ class classHUE extends EventEmitter {
     this.es.onopen = () => {
       // if (this.sysLogger !== undefined && this.sysLogger !== null) this.sysLogger.error('KNXUltimatehueEngine: classHUE: SSE-Connected')
       this.emit("connected");
+
+      // Check wether the hue bridge is connected or not
+      if (this.timerCheckConnected !== undefined) clearInterval(this.timerCheckConnected);
+      this.timerCheckConnected = setInterval(() => {
+        this.writeHueQueueAdd(null, null, "Ping");
+      }, 30000);
     };
 
     // this.es.onerror = (error) => {
@@ -146,28 +155,14 @@ class classHUE extends EventEmitter {
               this.sysLogger.error(`KNXUltimatehueEngine: classHUE: handleQueue: stopScene: ${error.message}`);
           }
           break;
-        case "getBattery":
-          try {
-            const jReturn = await this.hueApiV2.get(`/resource/device_power/${jRet._lightID}`);
-          } catch (error) {
-            if (this.sysLogger !== undefined && this.sysLogger !== null)
-              this.sysLogger.error(`KNXUltimatehueEngine: classHUE: handleQueue: getBattery: ${error.message}`);
-          }
-          break;
-        case "getLightLevel":
+        case "Ping":
           try {
-            const jReturn = await this.hueApiV2.get(`/resource/light_level/${jRet._lightID}`);
+            const jReturn = await this.hueApiV2.get('/resource/bridge');
           } catch (error) {
-            if (this.sysLogger !== undefined && this.sysLogger !== null)
-              this.sysLogger.error(`KNXUltimatehueEngine: classHUE: handleQueue: getLightLevel: ${error.message}`);
-          }
-          break;
-        case "getTemperature":
-          try {
-            const jReturn = await this.hueApiV2.get(`/resource/temperature/${jRet._lightID}`);
-          } catch (error) {
-            if (this.sysLogger !== undefined && this.sysLogger !== null)
-              this.sysLogger.error(`KNXUltimatehueEngine: classHUE: handleQueue: getTemperature: ${error.message}`);
+            if (this.sysLogger !== undefined && this.sysLogger !== null) this.sysLogger.error(`KNXUltimatehueEngine: classHUE: handleQueue: Ping: ${error.message}`);
+            if (this.timerCheckConnected !== undefined) clearInterval(this.timerCheckConnected);
+            this.commandQueue.length = [];
+            this.emit("disconnected");
           }
           break;
         default:
@@ -175,6 +170,7 @@ class classHUE extends EventEmitter {
       }
     }
     // The Hue bridge allows about 10 telegram per second, so i need to make a queue manager
+    //await new Promise(resolve => setTimeout(resolve, 2000));
     this.timerwriteQueueAdd = setTimeout(this.handleQueue, 200);
   };
 
@@ -184,16 +180,6 @@ 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 {

package/package.json

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