node-red-contrib-knx-ultimate 2.2.18 → 2.2.20

package/nodes/hue-config.js

@@ -81,7 +81,7 @@ module.exports = (RED) => {
     // }
 
     // Connect to Bridge and get the resources
-    node.initHUEConnection = () => {
+    node.initHUEConnection = async () => {
       try {
         if (node.hueManager !== undefined) node.hueManager.close();
       } catch (error) { }
@@ -115,7 +115,24 @@ 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
       });
 
@@ -133,11 +150,12 @@ module.exports = (RED) => {
     };
 
     node.startWatchdogTimer = () => {
+      if (node.timerHUEConfigCheckState !== undefined) clearTimeout(node.timerHUEConfigCheckState);
       node.timerHUEConfigCheckState = setTimeout(() => {
         (async () => {
           if (node.linkStatus === "disconnected") {
             try {
-              node.initHUEConnection();
+              await node.initHUEConnection();
             } catch (error) {
               node.linkStatus = "disconnected";
             }
@@ -149,41 +167,41 @@ module.exports = (RED) => {
     node.startWatchdogTimer();
 
     // Query the HUE Bridge to return the resources
-    node.loadResourcesFromHUEBridge = () => {
+    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);
-                }
+      //(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
+        }
+      } catch (error) {
+        if (this.sysLogger !== undefined && this.sysLogger !== null) {
+          this.sysLogger.error(`KNXUltimatehueEngine: loadResourcesFromHUEBridge: ${error.message}`);
+          throw (error);
         }
-        return true;
-      })();
+      }
+
+      //})();
     };
 
     // Returns the cached devices (node.hueAllResources) by type.
@@ -304,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.html

@@ -227,7 +227,8 @@
 
 
 </script>
-<script src="resources/node-red-contrib-knx-ultimate/11f26b4500.js"></script>
+<script type="application/javascript;charset=utf-8" src="https://kit.fontawesome.com/11f26b4500.js"
+    crossorigin="anonymous"></script>
 
 <script type="text/markdown" data-help-name="knxUltimateHueBattery">
 This node lets you get the battery level from your HUE device. Here you can get the HUE battery level events, that represents a percentage 0-100% value, evetytime the

package/nodes/knxUltimateHueButton.html

@@ -404,7 +404,8 @@
 
 
 </script>
-<script src="resources/node-red-contrib-knx-ultimate/11f26b4500.js"></script>
+<script type="application/javascript;charset=utf-8" src="https://kit.fontawesome.com/11f26b4500.js"
+    crossorigin="anonymous"></script>
 
 <script type="text/markdown" data-help-name="knxUltimateHueButton">
 This node lets you get the events from your HUE button.  

package/nodes/knxUltimateHueLight.html

@@ -1,6 +1,9 @@
-<script src="resources/node-red-contrib-knx-ultimate/11f26b4500.js"></script>
-<script src="resources/node-red-contrib-knx-ultimate/iro@5"></script>
-
+<!-- <script type="application/javascript;charset=utf-8" src="https://kit.fontawesome.com/11f26b4500.js"
+  crossorigin="anonymous"></script>
+<script src="resources/node-red-contrib-knx-ultimate/iro@5"></script> -->
+<script type="application/javascript;charset=utf-8" src="https://kit.fontawesome.com/11f26b4500.js"
+  crossorigin="anonymous"></script>
+<script type="application/javascript;charset=utf-8" src="https://cdn.jsdelivr.net/npm/@jaames/iro@5"></script>
 <script type="text/javascript">
 
   RED.nodes.registerType("knxUltimateHueLight", {
@@ -568,8 +571,7 @@
 
 
 </script>
-<script src="resources/node-red-contrib-knx-ultimate/11f26b4500.js"></script>
-<script src="resources/node-red-contrib-knx-ultimate/iro@5"></script>
+
 
 <script type="text/html" data-template-name="knxUltimateHueLight">
 

package/nodes/knxUltimateHueLight.js

@@ -56,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",

package/nodes/knxUltimateHueLightSensor.html

@@ -228,7 +228,8 @@
 
 
 </script>
-<script src="resources/node-red-contrib-knx-ultimate/11f26b4500.js"></script>
+<script type="application/javascript;charset=utf-8" src="https://kit.fontawesome.com/11f26b4500.js"
+    crossorigin="anonymous"></script>
 
 <script type="text/markdown" data-help-name="knxUltimateHueLightSensor">
 This node lets you get the events from your HUE motion device.  

package/nodes/knxUltimateHueMotion.html

@@ -217,7 +217,8 @@
 
 
 </script>
-<script src="resources/node-red-contrib-knx-ultimate/11f26b4500.js"></script>
+<script type="application/javascript;charset=utf-8" src="https://kit.fontawesome.com/11f26b4500.js"
+    crossorigin="anonymous"></script>
 
 <script type="text/markdown" data-help-name="knxUltimateHueMotion">
 This node lets you get the events from your HUE motion device.  

package/nodes/knxUltimateHueScene.html

@@ -283,7 +283,8 @@
 
 
 </script>
-<script src="resources/node-red-contrib-knx-ultimate/11f26b4500.js"></script>
+<script type="application/javascript;charset=utf-8" src="https://kit.fontawesome.com/11f26b4500.js"
+    crossorigin="anonymous"></script>
 
 <script type="text/markdown" data-help-name="knxUltimateHueScene">
 This node lets you recall a HUE scene, via KNX.  

package/nodes/knxUltimateHueTapDial.html

@@ -219,7 +219,8 @@
 
 
 </script>
-<script src="resources/node-red-contrib-knx-ultimate/11f26b4500.js"></script>
+<script type="application/javascript;charset=utf-8" src="https://kit.fontawesome.com/11f26b4500.js"
+    crossorigin="anonymous"></script>
 
 <script type="text/markdown" data-help-name="knxUltimateHueTapDial">
 This node lets you get the events from your HUE rotary device, for example the Tap Dial.  

package/nodes/knxUltimateHueTemperatureSensor.html

@@ -227,7 +227,8 @@
 
 
 </script>
-<script src="resources/node-red-contrib-knx-ultimate/11f26b4500.js"></script>
+<script type="application/javascript;charset=utf-8" src="https://kit.fontawesome.com/11f26b4500.js"
+    crossorigin="anonymous"></script>
 
 <script type="text/markdown" data-help-name="knxUltimateHueTemperatureSensor" This node lets you get the events from
     your HUE temperature device. Here you can get the HUE temperature events, that represents a celsius value, evetytime

package/package.json

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