node-red-contrib-knx-ultimate 2.1.37 → 2.1.39

package/CHANGELOG.md

@@ -6,6 +6,18 @@
 
 # CHANGELOG
 
+<p>
+<b>Version 2.1.39</b> - August 2023<br/>
+- KNX-Ultimate Node: fidex an issue with the topic, in case of update the value without writing on the KNX bus.<br/>
+- NEW: HUE Light: now you can set the color temperature, using datapoint 5.001 as well.<br/>
+- NEW: HUE Light: the node will now disable parts of the UI, based on the capabilities of the HUE lamp.<br/>
+- HUE nodes now wait 15 seconds before getting status and updating KNX devices, after node-red restart. <br/>
+</p>
+<p>
+<b>Version 2.1.38</b> - August 2023<br/>
+- Strenghten HUE eventsource resiliency.<br/>
+- Implemented standard logging on all HUE nodes (there was temporary console.log statements).<br/>
+</p>
 <p>
 <b>Version 2.1.37</b> - July 2023<br/>
 - Load control: added msg.shedding to force shed/unshed.<br/>

package/nodes/hue-config.js

@@ -64,7 +64,7 @@ module.exports = (RED) => {
     node.name = (config.name === undefined || config.name === '') ? node.host : config.name // 12/08/2021
 
     // Init HUE Utility
-    node.hueManager = new hueClass(node.host, node.credentials.username, node.credentials.clientkey, config.bridgeid)
+    node.hueManager = new hueClass(node.host, node.credentials.username, node.credentials.clientkey, config.bridgeid, node.sysLogger)
 
     // Event clip V2
     node.hueManager.on('event', _event => {

package/nodes/knxUltimate-config.js

@@ -1154,7 +1154,7 @@ return msg;`,
 
                 } else {
                   const msg = {
-                    topic: input.topic,
+                    topic: input.outputtopic,
                     payload: oKNXMessage.payload,
                     devicename: input.name ? input.name : '',
                     event: 'Update_NoWrite',

package/nodes/knxUltimate.js

@@ -13,7 +13,7 @@ module.exports = function (RED) {
       return
     }
     node.topic = config.topic
-    node.outputtopic = (typeof config.outputtopic === 'undefined' || config.outputtopic == '') ? config.topic : config.outputtopic // 07/02/2020 Importante, per retrocompatibilità
+    node.outputtopic = (config.outputtopic === undefined || config.outputtopic === '') ? config.topic : config.outputtopic // 07/02/2020 Importante, per retrocompatibilità
     node.dpt = config.dpt || '1.001'
     node.notifyreadrequest = config.notifyreadrequest || false
     node.notifyreadrequestalsorespondtobus = config.notifyreadrequestalsorespondtobus || 'false' // Auto respond if notifireadrequest is true

package/nodes/knxUltimateHueBattery.js

@@ -78,12 +78,12 @@ module.exports = function (RED) {
       if (node.serverHue !== null && node.serverHue.hueManager !== null) {
         (async () => {
           try {
+            node.serverHue.addClient(node)
             await node.serverHue.hueManager.writeHueQueueAdd(config.hueDevice, null, 'getBattery', (jLight) => {
-              node.serverHue.addClient(node)
               node.handleSendHUE(jLight)
             })
           } catch (err) {
-            RED.log.error('Errore knxUltimateHueLight node.currentHUEDevice ' + err.message)
+            RED.log.error('Errore knxUltimateHueBattery subscribe: ' + err.message)
           }
         })()
       }

package/nodes/knxUltimateHueLight.html

@@ -348,7 +348,7 @@
             // ########################
             $.getJSON('knxUltimateDpts', (data) => {
                 data.forEach(dpt => {
-                    if (dpt.value === "3.007") {
+                    if (dpt.value === "3.007" || dpt.value === "5.001") {
                         $("#node-input-dptLightHSV").append($("<option></option>")
                             .attr("value", dpt.value)
                             .text(dpt.text))
@@ -376,7 +376,7 @@
                 source: function (request, response) {
                     $.getJSON("knxUltimatecsv?nodeID=" + oNodeServer.id, (data) => {
                         response($.map(data, function (value, key) {
-                            if (value.dpt === "3.007") {
+                            if (value.dpt === "3.007" || value.dpt === "5.001") {
                                 var sSearch = (value.ga + " (" + value.devicename + ") DPT" + value.dpt);
                                 if (fullSearch(sSearch, request.term)) {
                                     return {
@@ -688,8 +688,8 @@
                             var sSearch = (value.name);
                             if (fullSearch(sSearch, request.term)) {
                                 return {
-                                    hueDevice: value.id, // Label for Display
-                                    value: value.name // Value
+                                    hueDevice: value.id,
+                                    value: value.name
                                 }
                             } else {
                                 return null;
@@ -706,6 +706,27 @@
                 }
             });
 
+            // Get the HUE capabilities to enable/disable UI parts
+            $.getJSON("KNXUltimateGetResourcesHUE?rtype=light&nodeID=" + oNodeServerHue.id, (data) => {
+                data.devices.forEach(element => {
+                    if (element.id === this.hueDevice.split('#')[0] && element.deviceObject !== undefined) {
+                        // Check dimming 
+                        if (element.deviceObject.dimming === undefined){
+                            $('#tabs').tabs("disable", "#tabs-2");
+                            $('#divColorsAtSwitchOn').hide()
+                            $('#divColorCycle').hide()
+                        } 
+                        // Check color
+                        if (element.deviceObject.color_temperature === undefined) $('#tabs').tabs("disable", "#tabs-3");
+                        if (element.deviceObject.color === undefined){
+                            $('#tabs').tabs("disable", "#tabs-4");
+                            $('#divColorsAtSwitchOn').hide()
+                            $('#divColorCycle').hide()
+                        } 
+                        return
+                    }
+                });
+            });
 
             // ########################
 
@@ -802,45 +823,47 @@
             <label for="node-input-nameLightState" style="width:50px; margin-left: 0px; text-align: right;"><span data-i18n="knxUltimateHueLight.node-input-name"></span></label>
             <input type="text" id="node-input-nameLightState" style="width:190px;margin-left: 5px; text-align: left;">
         </div>
-        <div class="form-row">
-            <label for="node-input-colorAtSwitchOnDayTime" style="width:260px">
-                <i class="fa fa-sun-o"></i> Switch On - color/brightness
-            </label>
-            <input type="text" id="node-input-colorAtSwitchOnDayTime" placeholder='Leave blank or, for example, {"red":255, "green":255, "blue":255}'
-                style="width:260px">
-        </div>
-        <div class="form-row">
-            <label style="width:170px" for="node-input-enableDayNightLighting">
-                <i class="fa fa-clone"></i> Night Lighting
-            </label>
-            <input type="checkbox" id="node-input-enableDayNightLighting" style="display:inline-block; width:auto; vertical-align:top;" />            
-        </div>        
-        <div id="DivEnableDayNightLighting">
+        <div id="divColorsAtSwitchOn">
             <div class="form-row">
-                <label for="node-input-colorAtSwitchOnNightTime" style="width:260px">
-                    <i class="fa fa-moon-o"></i> Switch On - color/brightness at Night
+                <label for="node-input-colorAtSwitchOnDayTime" style="width:260px">
+                    <i class="fa fa-sun-o"></i> Switch On - color/brightness
                 </label>
-                <input type="text" id="node-input-colorAtSwitchOnNightTime" placeholder='Example {"red":100, "green":0, "blue":50}'
+                <input type="text" id="node-input-colorAtSwitchOnDayTime" placeholder='Leave blank or, for example, {"red":255, "green":255, "blue":255}'
                     style="width:260px">
             </div>
             <div class="form-row">
-                <label for="node-input-nameDaylightSensor" style="width:110px;"><i class="fa fa-clock-o"></i> Day/Night</label>
-
-                <label for="node-input-GADaylightSensor" style="width:20px;">GA</label>
-                <input type="text" id="node-input-GADaylightSensor" placeholder="Ex: 1/1/1" style="width:70px;margin-left: 5px; text-align: left;">
-            
-                <label for="node-input-dptDaylightSensor" style="width:40px; margin-left: 0px; text-align: right;">DPT</label>
-                <select id="node-input-dptDaylightSensor" style="width:140px;"></select>
-            
-                <label for="node-input-nameDaylightSensor" style="width:50px; margin-left: 0px; text-align: right;"><span data-i18n="knxUltimateHueLight.node-input-name"></span></label>
-                <input type="text" id="node-input-nameDaylightSensor" style="width:190px;margin-left: 5px; text-align: left;">
-            </div>
-            <div  class="form-row">
-                <label style="width:170px" for="node-input-invertDayNight">
-                    <i class="fa fa-shuffle"></i> Invert day/night values
+                <label style="width:170px" for="node-input-enableDayNightLighting">
+                    <i class="fa fa-clone"></i> Night Lighting
                 </label>
-                <input type="checkbox" id="node-input-invertDayNight" style="display:inline-block; width:auto; vertical-align:top;" />
-                        
+                <input type="checkbox" id="node-input-enableDayNightLighting" style="display:inline-block; width:auto; vertical-align:top;" />            
+            </div>        
+            <div id="DivEnableDayNightLighting">
+                <div class="form-row">
+                    <label for="node-input-colorAtSwitchOnNightTime" style="width:260px">
+                        <i class="fa fa-moon-o"></i> Switch On - color/brightness at Night
+                    </label>
+                    <input type="text" id="node-input-colorAtSwitchOnNightTime" placeholder='Example {"red":100, "green":0, "blue":50}'
+                        style="width:260px">
+                </div>
+                <div class="form-row">
+                    <label for="node-input-nameDaylightSensor" style="width:110px;"><i class="fa fa-clock-o"></i> Day/Night</label>
+
+                    <label for="node-input-GADaylightSensor" style="width:20px;">GA</label>
+                    <input type="text" id="node-input-GADaylightSensor" placeholder="Ex: 1/1/1" style="width:70px;margin-left: 5px; text-align: left;">
+                
+                    <label for="node-input-dptDaylightSensor" style="width:40px; margin-left: 0px; text-align: right;">DPT</label>
+                    <select id="node-input-dptDaylightSensor" style="width:140px;"></select>
+                
+                    <label for="node-input-nameDaylightSensor" style="width:50px; margin-left: 0px; text-align: right;"><span data-i18n="knxUltimateHueLight.node-input-name"></span></label>
+                    <input type="text" id="node-input-nameDaylightSensor" style="width:190px;margin-left: 5px; text-align: left;">
+                </div>
+                <div  class="form-row">
+                    <label style="width:170px" for="node-input-invertDayNight">
+                        <i class="fa fa-shuffle"></i> Invert day/night values
+                    </label>
+                    <input type="checkbox" id="node-input-invertDayNight" style="display:inline-block; width:auto; vertical-align:top;" />
+                            
+                </div>
             </div>
         </div>
       </p>
@@ -958,17 +981,19 @@
             <input type="text" id="node-input-nameLightBlink" style="width:190px;margin-left: 5px; text-align: left;">
             </div>
         
-            <div class="form-row">
-            <label for="node-input-nameLightColorCycle" style="width:110px;"><i class="fa fa-play-circle-o"></i> Color Cycle</label>
-    
-            <label for="node-input-GALightColorCycle" style="width:20px;">GA</label>
-            <input type="text" id="node-input-GALightColorCycle" placeholder="Ex: 1/1/1" style="width:70px;margin-left: 5px; text-align: left;">
-            
-            <label for="node-input-dptLightColorCycle" style="width:40px; margin-left: 0px; text-align: right;">DPT</label>
-            <select id="node-input-dptLightColorCycle" style="width:140px;"></select>
-            
-            <label for="node-input-nameLightColorCycle" style="width:50px; margin-left: 0px; text-align: right;"><span data-i18n="knxUltimateHueLight.node-input-name"></span></label>
-            <input type="text" id="node-input-nameLightColorCycle" style="width:190px;margin-left: 5px; text-align: left;">
+            <div id="divColorCycle">
+                <div class="form-row">
+                <label for="node-input-nameLightColorCycle" style="width:110px;"><i class="fa fa-play-circle-o"></i> Color Cycle</label>
+        
+                <label for="node-input-GALightColorCycle" style="width:20px;">GA</label>
+                <input type="text" id="node-input-GALightColorCycle" placeholder="Ex: 1/1/1" style="width:70px;margin-left: 5px; text-align: left;">
+                
+                <label for="node-input-dptLightColorCycle" style="width:40px; margin-left: 0px; text-align: right;">DPT</label>
+                <select id="node-input-dptLightColorCycle" style="width:140px;"></select>
+                
+                <label for="node-input-nameLightColorCycle" style="width:50px; margin-left: 0px; text-align: right;"><span data-i18n="knxUltimateHueLight.node-input-name"></span></label>
+                <input type="text" id="node-input-nameLightColorCycle" style="width:190px;margin-left: 5px; text-align: left;">
+                </div>
             </div>
         </p>      
     </div>
@@ -1030,8 +1055,8 @@ Start typing in the GA field, the name or group address of your KNX device, the
 **Tunable white**
 |Property|Description|
 |--|--|
-| Tunable white | This command is used to change the HUE light's white temperature. Datapoint is 3.007 dimming. |
-| Tunable white Status | Link this to the light temperature status group address. Datapoint is 5.001 absolute value|
+| Tunable white | This command is used to change the HUE light's white temperature. Datapoint is 3.007 dimming or 5.001 percentage. When set to 5.001, a value of 0 is full warm, a value of 100 is full cold .|
+| Tunable white Status | Link this to the light temperature status group address. Datapoint is 5.001 absolute value. 0 is full warm, 100 is full cold.|
 
 <br/>
 

package/nodes/knxUltimateHueLight.js

@@ -90,7 +90,7 @@ module.exports = function (RED) {
               if (config.linkBrightnessToSwitchStatus === undefined || config.linkBrightnessToSwitchStatus === 'yes') {
                 state = { on: { on: false }, dimming: { brightness: 0 }, dynamics: { duration: 2000 } }
               } else {
-                state = { on: { on: false } }
+                state = { on: { on: false }, dynamics: { duration: 2000 } }
               }
             }
             node.serverHue.hueManager.writeHueQueueAdd(config.hueDevice, state, (node.isGrouped_light === false ? 'setLight' : 'setGroupedLight'))
@@ -141,6 +141,15 @@ module.exports = function (RED) {
                 node.startDimStopperTunableWhite('stop')
               }
             }
+            if (config.dptLightHSV === '5.001') {
+              // 0-100% tunable white
+              msg.payload = 100 - dptlib.fromBuffer(msg.knx.rawValue, dptlib.resolve(config.dptLightHSV))
+              const retMirek = hueColorConverter.ColorConverter.scale(msg.payload, [0, 100], [153, 500])
+              msg.payload = retMirek
+              state = { color_temperature: { mirek: msg.payload } }
+              node.serverHue.hueManager.writeHueQueueAdd(config.hueDevice, state, (node.isGrouped_light === false ? 'setLight' : 'setGroupedLight'))
+              node.setNodeStatusHue({ fill: 'green', shape: 'dot', text: 'KNX->HUE', payload: state })
+            }
             node.setNodeStatusHue({ fill: 'green', shape: 'dot', text: 'KNX->HUE', payload: msg.payload })
             break
           case config.GALightBrightness:
@@ -401,9 +410,10 @@ module.exports = function (RED) {
       if (node.serverHue !== null && node.serverHue.hueManager !== null) {
         (async () => {
           try {
+            node.serverHue.addClient(node)
             await node.serverHue.hueManager.writeHueQueueAdd(config.hueDevice, null, (node.isGrouped_light === false ? 'getLight' : 'getGroupedLight'), (jLight) => {
               node.currentHUEDevice = jLight
-              node.serverHue.addClient(node)
+              node.setNodeStatusHue({ fill: 'blue', shape: 'ring', text: 'Connected. Is on: ', payload: node.currentHUEDevice.on.on === true })
             })
           } catch (err) {
             RED.log.error('Errore knxUltimateHueLight node.currentHUEDevice ' + err.message)

package/nodes/knxUltimateHueLightSensor.js

@@ -74,17 +74,17 @@ module.exports = function (RED) {
     }
     if (node.serverHue) {
       node.serverHue.removeClient(node)
-      // I must get the object, to store read the battery status
+      // I must get the object, to store read the status
       // I queue the state request, by passing the callback to call whenever the HUE bridge send me the light status async
       if (node.serverHue !== null && node.serverHue.hueManager !== null) {
         (async () => {
+          node.serverHue.addClient(node)
           try {
-            await node.serverHue.hueManager.writeHueQueueAdd(config.hueDevice, null, 'getLightLevel', (jLight) => {
-              node.serverHue.addClient(node)
+             node.serverHue.hueManager.writeHueQueueAdd(config.hueDevice, null, 'getLightLevel', (jLight) => {              
               node.handleSendHUE(jLight)
             })
-          } catch (err) {
-            RED.log.error('Errore knxUltimateHueLight node.currentHUEDevice ' + err.message)
+          } catch (error) {
+            RED.log.error('Errore knxUltimateHueLightSensor subscribing: ' + error.message)
           }
         })()
       }

package/nodes/knxUltimateHueTemperatureSensor.js

@@ -79,8 +79,8 @@ module.exports = function (RED) {
       if (node.serverHue !== null && node.serverHue.hueManager !== null) {
         (async () => {
           try {
+            node.serverHue.addClient(node)
             await node.serverHue.hueManager.writeHueQueueAdd(config.hueDevice, null, 'getTemperature', (jLight) => {
-              node.serverHue.addClient(node)
               node.handleSendHUE(jLight)
             })
           } catch (err) {

package/nodes/knxUltimateLoadControl.js

@@ -169,7 +169,7 @@ module.exports = function (RED) {
             }
           }
         }
-      }, 10000)
+      }, 20000)
     }
 
     // Start the timer

package/nodes/utils/hueEngine.js

@@ -5,19 +5,20 @@ const http = require('./http.js')
 const EventSource = require('eventsource');
 
 class classHUE extends EventEmitter {
-  constructor(_hueBridgeIP, _username, _clientkey, _bridgeid) {
+  constructor(_hueBridgeIP, _username, _clientkey, _bridgeid, _sysLogger) {
     super()
-    this.setup(_hueBridgeIP, _username, _clientkey, _bridgeid)
+    this.setup(_hueBridgeIP, _username, _clientkey, _bridgeid, _sysLogger)
   }
 
-  setup = async (_hueBridgeIP, _username, _clientkey, _bridgeid) => {
+  setup = async (_hueBridgeIP, _username, _clientkey, _bridgeid, _sysLogger) => {
     this.hueBridgeIP = _hueBridgeIP
     this.username = _username
     this.clientkey = _clientkey
     this.bridgeid = _bridgeid
     this.commandQueue = []
     this.closePushEventStream = false
-    this.timerwriteQueueAdd = setTimeout(this.handleQueue, 3000) // First start
+    this.timerwriteQueueAdd = setTimeout(this.handleQueue, 15000) // First start. Allow the KNX to connect
+    this.sysLogger = _sysLogger
 
     // #############################################
     const options = {
@@ -25,8 +26,8 @@ class classHUE extends EventEmitter {
         'hue-application-key': this.username,
       },
       https: {
-        rejectUnauthorized: false,
-      },
+        rejectUnauthorized: false
+      }
     };
 
     // Connect
@@ -47,25 +48,21 @@ class classHUE extends EventEmitter {
             })
           }
         } catch (error) {
-          console.log('KNXUltimatehueEngine: classHUE: this.es.onmessage: ' + error.message)
+          if (this.sysLogger !== undefined && this.sysLogger !== null) this.sysLogger.error('KNXUltimatehueEngine: classHUE: this.es.onmessage: ' + error.message)
         }
 
       };
 
       this.es.onopen = () => {
-        //console.log('KNXUltimatehueEngine: classHUE: SSE-Connected')
+        //if (this.sysLogger !== undefined && this.sysLogger !== null) this.sysLogger.error('KNXUltimatehueEngine: classHUE: SSE-Connected')
         //this.emit('connected');   
       }
 
       this.es.onerror = (error) => {
         try {
-          if (this.timerReconnect !== undefined) clearTimeout(this.timerReconnect)
-          this.timerReconnect = setTimeout(() => {
-            this.connect()
-          }, 5000)
           this.es.close()
           this.es = null
-          console.log('KNXUltimatehueEngine: classHUE: request.on(error): ' + error.message)
+          if (this.sysLogger !== undefined && this.sysLogger !== null) this.sysLogger.error('KNXUltimatehueEngine: classHUE: request.on(error): ' + error.message)
         } catch (error) {
         }
         //this.emit('error', err)
@@ -83,12 +80,20 @@ class classHUE extends EventEmitter {
         this.hueAllRooms = await this.hueApiV2.get('/resource/room')
         this.hueAllDevices = await this.hueApiV2.get('/resource/device')
       } catch (error) {
-        if (this.timerReconnect !== undefined) clearTimeout(this.timerReconnect)
-        this.timerReconnect = setTimeout(() => {
-          this.connect()
-        }, 5000)
-        console.log('KNXUltimatehueEngine: classHUE: this.hueApiV2 = await http.use: ' + error.message)
+        if (this.sysLogger !== undefined && this.sysLogger !== null) this.sysLogger.error('KNXUltimatehueEngine: classHUE: this.hueApiV2 = await http.use: ' + error.message)
       }
+
+      // 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) {
+        }
+        this.connect()
+      }, 300000)
+
     }
     // First connection
     this.connect()
@@ -101,6 +106,7 @@ class classHUE extends EventEmitter {
   // ######################################
   handleQueue = async () => {
     if (this.commandQueue.length > 0) {
+      //const jRet = { ...this.commandQueue.shift() } //Clone the object by value
       const jRet = this.commandQueue.shift()
       switch (jRet._operation) {
         case 'setLight':
@@ -108,14 +114,14 @@ class classHUE extends EventEmitter {
           try {
             const ok = await this.hueApiV2.put('/resource/light/' + jRet._lightID, jRet._state)
           } catch (error) {
-            console.log('KNXUltimatehueEngine: classHUE: handleQueue: setLight light: ' + error.message)
+            if (this.sysLogger !== undefined && this.sysLogger !== null) this.sysLogger.info('KNXUltimatehueEngine: classHUE: handleQueue: setLight light: ' + error.message)
           }
           break
         case 'setGroupedLight':
           try {
             const ok = await this.hueApiV2.put('/resource/grouped_light/' + jRet._lightID, jRet._state)
           } catch (error) {
-            console.log('KNXUltimatehueEngine: classHUE: handleQueue: setLight grouped_light: ' + error.message)
+            if (this.sysLogger !== undefined && this.sysLogger !== null) this.sysLogger.info('KNXUltimatehueEngine: classHUE: handleQueue: setLight grouped_light: ' + error.message)
           }
           break
         case 'getLight':
@@ -123,7 +129,7 @@ class classHUE extends EventEmitter {
             const jReturn = await this.hueApiV2.get('/resource/light/' + jRet._lightID)
             jRet._callback(jReturn[0]) // Need to call the callback, because the event is absolutely async
           } catch (error) {
-            console.log('KNXUltimatehueEngine: classHUE: handleQueue: getLight light: ' + error.message)
+            if (this.sysLogger !== undefined && this.sysLogger !== null) this.sysLogger.info('KNXUltimatehueEngine: classHUE: handleQueue: getLight light: ' + error.message)
           }
           break
         case 'getGroupedLight':
@@ -131,7 +137,7 @@ class classHUE extends EventEmitter {
             const jReturn = await this.hueApiV2.get('/resource/grouped_light/' + jRet._lightID)
             jRet._callback(jReturn[0]) // Need to call the callback, because the event is absolutely async
           } catch (error) {
-            console.log('KNXUltimatehueEngine: classHUE: handleQueue: getLight grouped_light: ' + error.message)
+            if (this.sysLogger !== undefined && this.sysLogger !== null) this.sysLogger.info('KNXUltimatehueEngine: classHUE: handleQueue: getLight grouped_light: ' + error.message)
           }
           break
         case 'setScene':
@@ -139,7 +145,7 @@ class classHUE extends EventEmitter {
             const sceneID = jRet._lightID
             const ok = await this.hueApiV2.put('/resource/scene/' + sceneID, jRet._state)
           } catch (error) {
-            console.log('KNXUltimatehueEngine: classHUE: handleQueue: setScene: ' + error.message)
+            if (this.sysLogger !== undefined && this.sysLogger !== null) this.sysLogger.info('KNXUltimatehueEngine: classHUE: handleQueue: setScene: ' + error.message)
           }
           break
         case 'stopScene':
@@ -152,7 +158,7 @@ class classHUE extends EventEmitter {
               this.writeHueQueueAdd(light.rid, jRet._state, 'setLight')
             });
           } catch (error) {
-            console.log('KNXUltimatehueEngine: classHUE: handleQueue: stopScene: ' + error.message)
+            if (this.sysLogger !== undefined && this.sysLogger !== null) this.sysLogger.error('KNXUltimatehueEngine: classHUE: handleQueue: stopScene: ' + error.message)
           }
           break
         case 'getBattery':
@@ -160,14 +166,14 @@ class classHUE extends EventEmitter {
             const jReturn = await this.hueApiV2.get('/resource/device_power/' + jRet._lightID)
             jRet._callback(jReturn[0]) // Need to call the callback, because the event is absolutely async
           } catch (error) {
-            console.log('KNXUltimatehueEngine: classHUE: handleQueue: getBattery: ' + error.message)
+            if (this.sysLogger !== undefined && this.sysLogger !== null) this.sysLogger.error('KNXUltimatehueEngine: classHUE: handleQueue: getBattery: ' + error.message)
           }
         case 'getLightLevel':
           try {
             const jReturn = await this.hueApiV2.get('/resource/light_level/' + jRet._lightID)
             jRet._callback(jReturn[0]) // Need to call the callback, because the event is absolutely async
           } catch (error) {
-            console.log('KNXUltimatehueEngine: classHUE: handleQueue: getLightLevel: ' + error.message)
+            if (this.sysLogger !== undefined && this.sysLogger !== null) this.sysLogger.error('KNXUltimatehueEngine: classHUE: handleQueue: getLightLevel: ' + error.message)
           }
           break
         case 'getTemperature':
@@ -175,123 +181,127 @@ class classHUE extends EventEmitter {
             const jReturn = await this.hueApiV2.get('/resource/temperature/' + jRet._lightID)
             jRet._callback(jReturn[0]) // Need to call the callback, because the event is absolutely async
           } catch (error) {
-            console.log('KNXUltimatehueEngine: classHUE: handleQueue: getTemperature: ' + error.message)
+            if (this.sysLogger !== undefined && this.sysLogger !== null) this.sysLogger.error('KNXUltimatehueEngine: classHUE: handleQueue: getTemperature: ' + error.message)
           }
           break
         default:
           break
       }
     }
-    // The Hue bridge allows about 10 telegram per second, so i need to make a queue manager
-    setTimeout(this.handleQueue, 100)
+     // The Hue bridge allows about 10 telegram per second, so i need to make a queue manager
+    this.timerwriteQueueAdd = setTimeout(this.handleQueue, 100)
   }
 
-  writeHueQueueAdd = async (_lightID, _state, _operation, _callback) => {
-    // Add the new item
-    this.commandQueue.push({ _lightID, _state, _operation, _callback })
-  }
-  // ######################################
 
 
 
-  // Get all devices and join it with relative rooms, by adding the room name to the device name
-  getResources = async (_rtype, _host, _username) => {
-    try {
-      // Api V2
+writeHueQueueAdd = async (_lightID, _state, _operation, _callback) => {
+  // Add the new item
+  this.commandQueue.push({ _lightID, _state, _operation, _callback })
+}
+// ######################################
 
-      // Returns capitalized string
-      function capStr(s) {
-        if (typeof s !== 'string') return ''
-        return s.charAt(0).toUpperCase() + s.slice(1)
-      }
 
-      const retArray = []
-      let allResources = undefined
-      if (_rtype === 'light' || _rtype === 'grouped_light')
-        allResources = await this.hueAllResources.filter(a => a.type === 'light' || a.type === 'grouped_light')
-      else {
-        allResources = await this.hueAllResources.filter(a => a.type === _rtype)
-      }
-      for (let index = 0; index < allResources.length; index++) {
-        const resource = allResources[index];
-        // Get the owner
-        try {
-          let resourceName = ''
-          let sRoom = ''
-          if (_rtype === 'light' || _rtype === 'grouped_light') {
-            // It's a service, having a owner
-            const owners = await this.hueAllResources.filter(a => a.id === resource.owner.rid)
-            for (let index = 0; index < owners.length; index++) {
-              const owner = owners[index];
-              //resourceName += (owner.metadata !== undefined && owner.metadata.name !== undefined) ? owner.metadata.name + ' and ' : ' and '
-              resourceName += owner.metadata.name + ' and '
-              const room = await this.hueAllRooms.find(child => child.children.find(a => a.rid === owner.id))
-              sRoom += room !== undefined ? room.metadata.name + ' + ' : ' + '
-            }
-            sRoom = sRoom.slice(0, -(' + '.length))
-            resourceName = resourceName.slice(0, -(' and '.length))
-            resourceName += sRoom !== '' ? ' - Room: ' + sRoom : ''
-            retArray.push({ name: capStr(resource.type) + ': ' + resourceName, id: resource.id })
-          }
-          if (_rtype === 'scene') {
-            resourceName = resource.metadata.name || '**Name Not Found**'
-            // Get the linked zone
-            const zone = await this.hueAllResources.find(res => res.id === resource.group.rid)
-            resourceName += ' - ' + capStr(resource.group.rtype) + ': ' + zone.metadata.name
-            retArray.push({ name: capStr(_rtype) + ': ' + resourceName, id: resource.id })
-          }
-          if (_rtype === 'button') {
-            let linkedDevName = await this.hueAllResources.find(dev => dev.type === 'device' && dev.services.find(serv => serv.rid === resource.id)).metadata.name || ''
-            const controlID = resource.metadata !== undefined ? (resource.metadata.control_id || '') : ''
-            retArray.push({ name: capStr(_rtype) + ': ' + linkedDevName + ', button ' + controlID, id: resource.id })
-          }
-          if (_rtype === 'motion') {
-            let linkedDevName = await this.hueAllResources.find(dev => dev.type === 'device' && dev.services.find(serv => serv.rid === resource.id)).metadata.name || ''
-            retArray.push({ name: capStr(_rtype) + ': ' + linkedDevName, id: resource.id })
-          }
-          if (_rtype === 'relative_rotary') {
-            let linkedDevName = await this.hueAllResources.find(dev => dev.type === 'device' && dev.services.find(serv => serv.rid === resource.id)).metadata.name || ''
-            retArray.push({ name: 'Rotary: ' + linkedDevName, id: resource.id })
-          }
-          if (_rtype === 'light_level') {
-            let Room = await this.hueAllRooms.find(room => room.children.find(child => child.rid === resource.owner.rid))
-            let linkedDevName = await this.hueAllResources.find(dev => dev.type === 'device' && dev.services.find(serv => serv.rid === resource.id)).metadata.name || ''
-            retArray.push({ name: 'Light Level: ' + linkedDevName + (Room !== undefined ? ', room ' + Room.metadata.name : ''), id: resource.id })
-          }
-          if (_rtype === 'temperature') {
-            let Room = await this.hueAllRooms.find(room => room.children.find(child => child.rid === resource.owner.rid))
-            let linkedDevName = await this.hueAllResources.find(dev => dev.type === 'device' && dev.services.find(serv => serv.rid === resource.id)).metadata.name || ''
-            retArray.push({ name: 'Temperature: ' + linkedDevName + (Room !== undefined ? ', room ' + Room.metadata.name : ''), id: resource.id })
-          }
-          if (_rtype === 'device_power') {
-            let Room = await this.hueAllRooms.find(room => room.children.find(child => child.rid === resource.owner.rid))
-            let linkedDevName = await this.hueAllResources.find(dev => dev.type === 'device' && dev.services.find(serv => serv.rid === resource.id)).metadata.name || ''
-            retArray.push({ name: 'Battery: ' + linkedDevName + (Room !== undefined ? ', room ' + Room.metadata.name : ''), id: resource.id })
-          }
-        } catch (error) {
-          //retArray.push({ name: _rtype + ': ERROR ' + error.message, id: resource.id })
-        }
-      }
-      return { devices: retArray }
-    } catch (error) {
-      console.log('KNXUltimateHue: hueEngine: classHUE: getDevices: error ' + error.message)
-      return ({ devices: error.message })
+
+// Get all devices and join it with relative rooms, by adding the room name to the device name
+getResources = async (_rtype, _host, _username) => {
+  try {
+    // Api V2
+
+    // Returns capitalized string
+    function capStr(s) {
+      if (typeof s !== 'string') return ''
+      return s.charAt(0).toUpperCase() + s.slice(1)
     }
-  }
 
-  close = async () => {
-    return new Promise((resolve, reject) => {
+    const retArray = []
+    let allResources = undefined
+    if (_rtype === 'light' || _rtype === 'grouped_light')
+      allResources = await this.hueAllResources.filter(a => a.type === 'light' || a.type === 'grouped_light')
+    else {
+      allResources = await this.hueAllResources.filter(a => a.type === _rtype)
+    }
+    for (let index = 0; index < allResources.length; index++) {
+      const resource = allResources[index];
+      // Get the owner
       try {
-        this.closePushEventStream = true
-        if (this.es !== null) this.es.close();
-        this.es = null;
-        setTimeout(() => {
-          resolve(true)
-        }, 500)
+        let resourceName = ''
+        let sRoom = ''
+        if (_rtype === 'light' || _rtype === 'grouped_light') {
+          // It's a service, having a owner
+          const owners = await this.hueAllResources.filter(a => a.id === resource.owner.rid)
+          for (let index = 0; index < owners.length; index++) {
+            const owner = owners[index];
+            //resourceName += (owner.metadata !== undefined && owner.metadata.name !== undefined) ? owner.metadata.name + ' and ' : ' and '
+            resourceName += owner.metadata.name + ' and '
+            const room = await this.hueAllRooms.find(child => child.children.find(a => a.rid === owner.id))
+            sRoom += room !== undefined ? room.metadata.name + ' + ' : ' + '
+          }
+          sRoom = sRoom.slice(0, -(' + '.length))
+          resourceName = resourceName.slice(0, -(' and '.length))
+          resourceName += sRoom !== '' ? ' - Room: ' + sRoom : ''
+          retArray.push({ name: capStr(resource.type) + ': ' + resourceName, id: resource.id, deviceObject:resource })
+        }
+        if (_rtype === 'scene') {
+          resourceName = resource.metadata.name || '**Name Not Found**'
+          // Get the linked zone
+          const zone = await this.hueAllResources.find(res => res.id === resource.group.rid)
+          resourceName += ' - ' + capStr(resource.group.rtype) + ': ' + zone.metadata.name
+          retArray.push({ name: capStr(_rtype) + ': ' + resourceName, id: resource.id })
+        }
+        if (_rtype === 'button') {
+          let linkedDevName = await this.hueAllResources.find(dev => dev.type === 'device' && dev.services.find(serv => serv.rid === resource.id)).metadata.name || ''
+          const controlID = resource.metadata !== undefined ? (resource.metadata.control_id || '') : ''
+          retArray.push({ name: capStr(_rtype) + ': ' + linkedDevName + ', button ' + controlID, id: resource.id })
+        }
+        if (_rtype === 'motion') {
+          let linkedDevName = await this.hueAllResources.find(dev => dev.type === 'device' && dev.services.find(serv => serv.rid === resource.id)).metadata.name || ''
+          retArray.push({ name: capStr(_rtype) + ': ' + linkedDevName, id: resource.id })
+        }
+        if (_rtype === 'relative_rotary') {
+          let linkedDevName = await this.hueAllResources.find(dev => dev.type === 'device' && dev.services.find(serv => serv.rid === resource.id)).metadata.name || ''
+          retArray.push({ name: 'Rotary: ' + linkedDevName, id: resource.id })
+        }
+        if (_rtype === 'light_level') {
+          let Room = await this.hueAllRooms.find(room => room.children.find(child => child.rid === resource.owner.rid))
+          let linkedDevName = await this.hueAllResources.find(dev => dev.type === 'device' && dev.services.find(serv => serv.rid === resource.id)).metadata.name || ''
+          retArray.push({ name: 'Light Level: ' + linkedDevName + (Room !== undefined ? ', room ' + Room.metadata.name : ''), id: resource.id })
+        }
+        if (_rtype === 'temperature') {
+          let Room = await this.hueAllRooms.find(room => room.children.find(child => child.rid === resource.owner.rid))
+          let linkedDevName = await this.hueAllResources.find(dev => dev.type === 'device' && dev.services.find(serv => serv.rid === resource.id)).metadata.name || ''
+          retArray.push({ name: 'Temperature: ' + linkedDevName + (Room !== undefined ? ', room ' + Room.metadata.name : ''), id: resource.id })
+        }
+        if (_rtype === 'device_power') {
+          let Room = await this.hueAllRooms.find(room => room.children.find(child => child.rid === resource.owner.rid))
+          let linkedDevName = await this.hueAllResources.find(dev => dev.type === 'device' && dev.services.find(serv => serv.rid === resource.id)).metadata.name || ''
+          retArray.push({ name: 'Battery: ' + linkedDevName + (Room !== undefined ? ', room ' + Room.metadata.name : ''), id: resource.id })
+        }
       } catch (error) {
-        reject(error)
+        //retArray.push({ name: _rtype + ': ERROR ' + error.message, id: resource.id })
       }
-    })
+    }
+    return { devices: retArray }
+  } catch (error) {
+    if (this.sysLogger !== undefined && this.sysLogger !== null) this.sysLogger.error('KNXUltimateHue: hueEngine: classHUE: getDevices: error ' + error.message)
+    return ({ devices: error.message })
   }
 }
+
+close = async () => {
+  return new Promise((resolve, reject) => {
+    try {
+      if (this.timerReconnect !== undefined) clearInterval(this.timerReconnect)
+      this.closePushEventStream = true
+      if (this.es !== null) this.es.close();
+      this.es = null;
+      setTimeout(() => {
+        resolve(true)
+      }, 500)
+    } catch (error) {
+      reject(error)
+    }
+  })
+}
+}
 module.exports.classHUE = classHUE

package/package.json

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