node-red-contrib-knx-ultimate 2.1.4 → 2.1.5

package/CHANGELOG.md

@@ -7,7 +7,7 @@
 # CHANGELOG
 
 <p>
-<b>Version 2.1.4</b> - June 2023<br/>
+<b>Version 2.1.5</b> - June 2023<br/>
 - NEW: Hue light node: added random color cycle effect group address.<br/>
 - Fixed destroying KNX nodes.<br/>
 - Fixed destroying HUE nodes.<br/>

package/nodes/hue-config.js

@@ -28,14 +28,6 @@ const convertSubtype = (baseType) => (kv) => {
   }
 }
 
-// 06/02/2020 To be tested
-// convertSubtype = (baseType) => (kv) => {
-//     let value = `${baseType.base}.${kv[0]}`
-//     return {
-//         value: value
-//         , text: value + ` (${kv[1].name}${kv[1].unit !== undefined?" - " + kv[1].unit:""})`
-//     }
-// }
 
 const toConcattedSubtypes = (acc, baseType) => {
   const subtypes =

package/nodes/knxUltimateHueLight.js

@@ -96,23 +96,37 @@ module.exports = function (RED) {
           case config.GALightColorCycle:
             const gaValColorCycle = dptlib.fromBuffer(msg.knx.rawValue, dptlib.resolve(config.dptLightSwitch))
             if (gaValColorCycle) {
+
               node.serverHue.hueManager.writeHueQueueAdd(config.hueDevice, { on: { on: true } })
               node.timerColorCycle = setInterval(() => {
-                function getRandomIntInclusive(min, max) {
-                  min = Math.ceil(min);
-                  max = Math.floor(max);
-                  return Math.floor(Math.random() * (max - min + 1) + min); // The maximum is inclusive and the minimum is inclusive
+                try {
+                  function getRandomIntInclusive(min, max) {
+                    min = Math.ceil(min);
+                    max = Math.floor(max);
+                    return Math.floor(Math.random() * (max - min + 1) + min); // The maximum is inclusive and the minimum is inclusive
+                  }
+                  const red = getRandomIntInclusive(0, 255)
+                  const green = getRandomIntInclusive(0, 255)
+                  const blue = getRandomIntInclusive(0, 255)
+                  const gamut = node.currentHUEDevice.color.gamut_type || null
+                  const retXY = hueColorConverter.ColorConverter.rgbToXy(red, green, blue, gamut)
+                  const bright = hueColorConverter.ColorConverter.getBrightnessFromRGB(red, green, blue)
+                  state = bright > 0 ? { on: { on: true }, dimming: { brightness: bright }, color: { xy: retXY } } : { on: { on: false } }
+                  node.serverHue.hueManager.writeHueQueueAdd(config.hueDevice, state)
+                } catch (error) {
+                  (async () => {
+                    try {
+                      const retLight = await node.serverHue.hueManager.getLight(config.hueDevice)
+                      node.currentHUEDevice = retLight[0]
+                      RED.log.error('Errore knxUltimateHueLight node.currentHUEDevice Samba ' + error.message)
+                    } catch (err) {
+                      RED.log.error('Errore knxUltimateHueLight node.currentHUEDevice Banana ' + err.message)
+                    }
+                  })()
                 }
-                const red = getRandomIntInclusive(0, 255)
-                const green = getRandomIntInclusive(0, 255)
-                const blue = getRandomIntInclusive(0, 255)
-                const gamut = node.currentHUEDevice.color.gamut_type || null
-                const retXY = hueColorConverter.ColorConverter.rgbToXy(red, green, blue, gamut)
-                const bright = hueColorConverter.ColorConverter.getBrightnessFromRGB(red, green, blue)
-                state = bright > 0 ? { on: { on: true }, dimming: { brightness: bright }, color: { xy: retXY } } : { on: { on: false } }
-                node.serverHue.hueManager.writeHueQueueAdd(config.hueDevice, state)
               }, 10000);
-            } else {
+
+            } else {              
               if (node.timerColorCycle !== undefined) clearInterval(node.timerColorCycle)
               node.serverHue.hueManager.writeHueQueueAdd(config.hueDevice, { on: { on: false } })
             }
@@ -203,23 +217,17 @@ module.exports = function (RED) {
     }
     if (node.serverHue) {
       node.serverHue.removeClient(node)
-      node.serverHue.addClient(node)
-      setTimeout(() => {
-        try {
-          if (node !== null && node.serverHue !== null && node.serverHue.hueManager !== null) {
-            node.serverHue.hueManager.getLight(config.hueDevice).then(ret => {
-              try {
-                if (ret !== undefined && ret.length > 0) node.currentHUEDevice = ret[0]
-              } catch (error) {
-              }
-              //console.log("retrieving node.currentHUEDevice" + node.currentHUEDevice.metadata.name)
-            })
+      if (node !== null && node.serverHue !== null && node.serverHue.hueManager !== null) {
+        (async () => {
+          try {
+            const retLight = await node.serverHue.hueManager.getLight(config.hueDevice)
+            node.currentHUEDevice = retLight[0]
+            node.serverHue.addClient(node)
+          } catch (err) {
+            RED.log.error('Errore knxUltimateHueLight node.currentHUEDevice ' + err.message)
           }
-        } catch (error) {
-          console.log('Error: knxUltimateHueLight: node.serverHue.hueManager.getLight: ' + error.message)
-        }
-      }, 5000);
-
+        })()
+      }
     }
 
 

package/package.json

@@ -3,7 +3,7 @@
   "engines": {
     "node": ">=14.0.0"
   },
-  "version": "2.1.4",
+  "version": "2.1.5",
   "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 handling.",
   "dependencies": {
     "mkdirp": "1.0.4",