node-red-contrib-knx-ultimate 2.1.50 → 2.1.52

package/CHANGELOG.md

@@ -6,18 +6,24 @@
 
 # CHANGELOG
 
+<p>
+<b>Version 2.1.52</b> - October 2023<br/>
+- HUE Light node: fixed another possible switch on brightness issue.<br/>
+</p>
+<p>
+<b>Version 2.1.51</b> - October 2023<br/>
+- HUE Light node: fixed a possible switch on brightness issue.<br/>
+</p>
 <p>
 <b>Version 2.1.50</b> - October 2023<br/>
 - KNXUltimateViewer node: fixed too large text in custom template..<br/>
-<br/>
-<p>
+</p>
 <b>Version 2.1.47</b> - September 2023<br/>
 - HUE BRIDGE: fixed multiple HUE bridge handling.<br/>
-<br/>
-<p>
+</p>
 <b>Version 2.1.46</b> - September 2023<br/>
 - HUE BRIDGE: In case of https problems (certificate expired, etc...), the node will try to connect to the HUE BRIDGE in insecure http mode.<br/>
-<br/>
+</p>
 <p>
 <b>Version 2.1.45</b> - August 2023<br/>
 - HUE Light: now it correctly sets the KNX brightness if you turn on/off the light via HUE app.<br/>

package/nodes/hue-config.js

@@ -138,7 +138,7 @@ module.exports = (RED) => {
           // Get the owner
           try {
             let resourceName = "";
-            let sRoom = "";
+            let sType = "";
             if (_rtype === "light" || _rtype === "grouped_light") {
               // It's a service, having a owner
               const owners = node.hueAllResources.filter((a) => a.id === resource.owner.rid);
@@ -148,13 +148,14 @@ module.exports = (RED) => {
                   resourceName += "ALL GROUPS and ";
                 } else {
                   resourceName += `${owner.metadata.name} and `;
-                  const room = node.hueAllRooms.find((child) => child.children.find((a) => a.rid === owner.id));
-                  sRoom += room !== undefined ? `${room.metadata.name} + ` : " + ";
+                  //const room = node.hueAllRooms.find((child) => child.children.find((a) => a.rid === owner.id));
+                  //sRoom += room !== undefined ? `${room.metadata.name} + ` : " + ";
+                  sType += capStr(owner.type) + ' + ';
                 }
               }
-              sRoom = sRoom.slice(0, -" + ".length);
+              sType = sType.slice(0, -" + ".length);
               resourceName = resourceName.slice(0, -" and ".length);
-              resourceName += sRoom !== "" ? ` - Room: ${sRoom}` : "";
+              resourceName += sType !== "" ? ' (' + sType + ')' : "";
               retArray.push({
                 name: `${capStr(resource.type)}: ${resourceName}`,
                 id: resource.id,
@@ -172,8 +173,7 @@ module.exports = (RED) => {
               });
             }
             if (_rtype === "button") {
-              const linkedDevName =
-                node.hueAllResources.find((dev) => dev.type === "device" && dev.services.find((serv) => serv.rid === resource.id)).metadata.name || "";
+              const linkedDevName = node.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}`,
@@ -181,16 +181,14 @@ module.exports = (RED) => {
               });
             }
             if (_rtype === "motion") {
-              const linkedDevName =
-                node.hueAllResources.find((dev) => dev.type === "device" && dev.services.find((serv) => serv.rid === resource.id)).metadata.name || "";
+              const linkedDevName = node.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") {
-              const linkedDevName =
-                node.hueAllResources.find((dev) => dev.type === "device" && dev.services.find((serv) => serv.rid === resource.id)).metadata.name || "";
+              const linkedDevName = node.hueAllResources.find((dev) => dev.type === "device" && dev.services.find((serv) => serv.rid === resource.id)).metadata.name || "";
               retArray.push({
                 name: `Rotary: ${linkedDevName}`,
                 id: resource.id,
@@ -198,8 +196,7 @@ module.exports = (RED) => {
             }
             if (_rtype === "light_level") {
               const Room = node.hueAllRooms.find((room) => room.children.find((child) => child.rid === resource.owner.rid));
-              const linkedDevName =
-                node.hueAllResources.find((dev) => dev.type === "device" && dev.services.find((serv) => serv.rid === resource.id)).metadata.name || "";
+              const linkedDevName = node.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,
@@ -207,8 +204,7 @@ module.exports = (RED) => {
             }
             if (_rtype === "temperature") {
               const Room = node.hueAllRooms.find((room) => room.children.find((child) => child.rid === resource.owner.rid));
-              const linkedDevName =
-                node.hueAllResources.find((dev) => dev.type === "device" && dev.services.find((serv) => serv.rid === resource.id)).metadata.name || "";
+              const linkedDevName = node.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,
@@ -216,8 +212,7 @@ module.exports = (RED) => {
             }
             if (_rtype === "device_power") {
               const Room = node.hueAllRooms.find((room) => room.children.find((child) => child.rid === resource.owner.rid));
-              const linkedDevName =
-                node.hueAllResources.find((dev) => dev.type === "device" && dev.services.find((serv) => serv.rid === resource.id)).metadata.name || "";
+              const linkedDevName = node.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,
@@ -255,7 +250,7 @@ module.exports = (RED) => {
       // Remove the client node from the clients array
       try {
         node.nodeClients = node.nodeClients.filter((x) => x.id !== _Node.id);
-      } catch (error) {}
+      } catch (error) { }
     };
 
     node.on("close", (done) => {

package/nodes/knxUltimateHueLight.html

@@ -535,7 +535,7 @@
         <p> 
             <div class="form-row">
                 <label for="node-input-linkBrightnessToSwitchStatus" style="width:260px;">
-                    <i class="fa fa-tag"></i> Link color/bright. to on/off switch
+                    <i class="fa fa-tag"></i> Specify switch on brightness
                 </label>
                 <select id="node-input-linkBrightnessToSwitchStatus">
                     <option value="yes">Yes</option>
@@ -660,8 +660,8 @@ Start typing in the GA field, the name or group address of your KNX device, the
 
 |Property|Description|
 |--|--|
-| Link color/bright. to on/off switch | If checked, updates the *brightness and color values* on each light on/off status change. If light is switched *on*, a 100% brightness is also set, otherwise, if the light is switched off, a 0%  brightness is set. If **Switch On - color/brightness** option is not empty, every time the light is swiched on, this brightness/color are set instead. Default value is **Yes**. |
-| Switch On - color/brightness | You can choose the color/brightness of your light, at switch on. Set it as JSON object, for example **{ "red": 255, "green": 255, "blue": 255 }**. Leave blank to disable the brightness change and leave the last color selected. |
+| Specify switch on brightness | It enables the brightness value to follow the on/off status of the light. If you change the HUE brightness value to 0% (from the HUE App), an "off" telegram is also sent to the KNX bus; if you set it other than 0%, an "on" telegram is also sent to the KNX bus. This is valid also vice-versa: if you change the brightness via KNX bus, the HUE on/off value is also sent to the lamp. If you set it to **No**, the previous HUE light brightness value is retained. Default value is **Yes**. |
+| Switch On - color/brightness | You can choose the color/brightness of your light, at switch on. Set it as JSON object, for example **{ "red": 255, "green": 255, "blue": 255 }** |
 | Night Lighting | It allows to set a particular light color/brightness at nighttime. If **checked**, a further set of option shows up and the light changes the behaviour based on these options, everytime you switch the light *on*. |
 | Switch On - color/brightness at Nighttime | You can choose the color/brightness of your light, at switch on, on night time. Set it as JSON object. Default value if you leave blank is **{ "red": 100, "green": 0, "blue": 0 }** |
 | Day/Night | Select the group address used to set the day/night behaviour. The group address value is *true* if daytime, *false* if nighttime. |

package/nodes/knxUltimateHueLight.js

@@ -1,8 +1,8 @@
 /* eslint-disable max-len */
 /* eslint-disable no-lonely-if */
 module.exports = function (RED) {
-  const dptlib = require('../KNXEngine/src/dptlib');
-  const hueColorConverter = require('./utils/hueColorConverter');
+  const dptlib = require("../KNXEngine/src/dptlib");
+  const hueColorConverter = require("./utils/hueColorConverter");
 
   function knxUltimateHueLight(config) {
     RED.nodes.createNode(this, config);
@@ -10,43 +10,37 @@ module.exports = function (RED) {
     node.server = RED.nodes.getNode(config.server);
     node.serverHue = RED.nodes.getNode(config.serverHue);
     node.topic = node.name;
-    node.name = config.name === undefined ? 'Hue' : config.name;
+    node.name = config.name === undefined ? "Hue" : config.name;
     node.outputtopic = node.name;
-    node.dpt = '';
+    node.dpt = "";
     node.notifyreadrequest = false;
-    node.notifyreadrequestalsorespondtobus = 'false';
-    node.notifyreadrequestalsorespondtobusdefaultvalueifnotinitialized = '';
+    node.notifyreadrequestalsorespondtobus = "false";
+    node.notifyreadrequestalsorespondtobusdefaultvalueifnotinitialized = "";
     node.notifyresponse = false;
     node.notifywrite = true;
     node.initialread = true;
     node.listenallga = true; // Don't remove
-    node.outputtype = 'write';
+    node.outputtype = "write";
     node.outputRBE = false; // Apply or not RBE to the output (Messages coming from flow)
     node.inputRBE = false; // Apply or not RBE to the input (Messages coming from BUS)
-    node.currentPayload = ''; // Current value for the RBE input and for the .previouspayload msg
-    node.passthrough = 'no';
+    node.currentPayload = ""; // Current value for the RBE input and for the .previouspayload msg
+    node.passthrough = "no";
     node.formatmultiplyvalue = 1;
-    node.formatnegativevalue = 'leave';
+    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';
-    config.hueDevice = config.hueDevice.split('#')[0];
+    node.isGrouped_light = config.hueDevice.split("#")[1] === "grouped_light";
+    config.hueDevice = config.hueDevice.split("#")[0];
 
     // Used to call the status update from the config node.
-    node.setNodeStatus = ({
-      fill, shape, text, payload,
-    }) => {
-
-    };
+    node.setNodeStatus = ({ fill, shape, text, payload }) => { };
     // Used to call the status update from the HUE config node.
-    node.setNodeStatusHue = ({
-      fill, shape, text, payload,
-    }) => {
+    node.setNodeStatusHue = ({ fill, shape, text, payload }) => {
       if (payload === undefined) return;
       const dDate = new Date();
-      payload = typeof payload === 'object' ? JSON.stringify(payload) : payload.toString();
+      payload = typeof payload === "object" ? JSON.stringify(payload) : payload.toString();
       node.status({ fill, shape, text: `${text} ${payload} (${dDate.getDate()}, ${dDate.toLocaleTimeString()})` });
     };
 
@@ -60,25 +54,39 @@ module.exports = function (RED) {
             if (msg.payload === true) {
               if (node.DayTime) {
                 // Day Time
-                if (config.colorAtSwitchOnDayTime !== undefined && config.colorAtSwitchOnDayTime.toString().trim() !== '') {
+                if (config.colorAtSwitchOnDayTime !== undefined && config.colorAtSwitchOnDayTime.toString().trim() !== "") {
                   // The user selected specific color/brightness at switch on.
                   let jColorChoosen = { red: 255, green: 255, blue: 255 };
                   jColorChoosen = JSON.parse(config.colorAtSwitchOnDayTime || '{ "red": 255, "green": 255, "blue": 255 }');
                   let gamut = null;
-                  if (node.currentHUEDevice !== undefined && node.currentHUEDevice.hasOwnProperty('color') && node.currentHUEDevice.color.hasOwnProperty('gamut_type')) {
+                  if (
+                    node.currentHUEDevice !== undefined
+                    && node.currentHUEDevice.hasOwnProperty("color")
+                    && node.currentHUEDevice.color.hasOwnProperty("gamut_type")
+                  ) {
                     gamut = node.currentHUEDevice.color.gamut_type;
                   }
                   const dretXY = hueColorConverter.ColorConverter.rgbToXy(jColorChoosen.red, jColorChoosen.green, jColorChoosen.blue, gamut);
                   const dbright = hueColorConverter.ColorConverter.getBrightnessFromRGB(jColorChoosen.red, jColorChoosen.green, jColorChoosen.blue);
-                  if (config.linkBrightnessToSwitchStatus === undefined || config.linkBrightnessToSwitchStatus === 'yes') {
+                  node.currentHUEDevice.dimming.brightness = dbright;
+                  node.updateKNXBrightnessState(node.currentHUEDevice.dimming.brightness);
+                  if (config.linkBrightnessToSwitchStatus === undefined || config.linkBrightnessToSwitchStatus === "yes") {
                     state = dbright > 0 ? { on: { on: true }, dimming: { brightness: dbright }, color: { xy: dretXY } } : { on: { on: false } };
                   } else {
                     state = dbright > 0 ? { on: { on: true }, color: { xy: dretXY } } : { on: { on: false } };
                   }
-                } else if (config.linkBrightnessToSwitchStatus === undefined || config.linkBrightnessToSwitchStatus === 'yes') {
-                  state = { on: { on: true }, dimming: { brightness: 100 } };
+                } else if (config.linkBrightnessToSwitchStatus === undefined || config.linkBrightnessToSwitchStatus === "yes") {
+                  try {
+                    node.currentHUEDevice.dimming.brightness = 100;
+                    node.updateKNXBrightnessState(node.currentHUEDevice.dimming.brightness);
+                  } catch (error) { /* empty */ }
+                  state = { on: { on: true }, dimming: { brightness: node.currentHUEDevice.dimming.brightness } };
                 } else {
-                  state = { on: { on: true } };
+                  try {
+                    state = { on: { on: true }, dimming: { brightness: node.currentHUEDevice.dimming.brightness } };
+                  } catch (error) {
+                    state = { on: { on: true } };
+                  }
                 }
               } else {
                 // Night Time
@@ -86,26 +94,39 @@ module.exports = function (RED) {
                   let jColorChoosen = { red: 23, green: 4, blue: 0 };
                   jColorChoosen = JSON.parse(config.colorAtSwitchOnNightTime || '{ "red": 23, "green": 4, "blue": 0 }');
                   let gamut = null;
-                  if (node.currentHUEDevice !== undefined && node.currentHUEDevice.hasOwnProperty('color') && node.currentHUEDevice.color.hasOwnProperty('gamut_type')) {
+                  if (
+                    node.currentHUEDevice !== undefined
+                    && node.currentHUEDevice.hasOwnProperty("color")
+                    && node.currentHUEDevice.color.hasOwnProperty("gamut_type")
+                  ) {
                     gamut = node.currentHUEDevice.color.gamut_type;
                   }
                   const dretXY = hueColorConverter.ColorConverter.rgbToXy(jColorChoosen.red, jColorChoosen.green, jColorChoosen.blue, gamut);
                   const dbright = hueColorConverter.ColorConverter.getBrightnessFromRGB(jColorChoosen.red, jColorChoosen.green, jColorChoosen.blue);
-                  if (config.linkBrightnessToSwitchStatus === undefined || config.linkBrightnessToSwitchStatus === 'yes') {
+                  if (config.linkBrightnessToSwitchStatus === undefined || config.linkBrightnessToSwitchStatus === "yes") {
+                    node.currentHUEDevice.dimming.brightness = dbright;
+                    node.updateKNXBrightnessState(node.currentHUEDevice.dimming.brightness);
                     state = dbright > 0 ? { on: { on: true }, dimming: { brightness: dbright }, color: { xy: dretXY } } : { on: { on: false } };
                   } else {
                     state = dbright > 0 ? { on: { on: true }, color: { xy: dretXY } } : { on: { on: false } };
                   }
                 }
               }
-            } else if (config.linkBrightnessToSwitchStatus === undefined || config.linkBrightnessToSwitchStatus === 'yes') {
-              state = { on: { on: false }, dimming: { brightness: 0 }, dynamics: { duration: 2000 } };
+            } else if (config.linkBrightnessToSwitchStatus === undefined || config.linkBrightnessToSwitchStatus === "yes") {
+              try {
+                node.currentHUEDevice.dimming.brightness = 0;
+                node.updateKNXBrightnessState(node.currentHUEDevice.dimming.brightness);
+                state = { on: { on: false }, dimming: { brightness: node.currentHUEDevice.dimming.brightness }, dynamics: { duration: 2000 } };
+              } catch (error) { /* empty */ }
             } else {
               state = { on: { on: false }, dynamics: { duration: 2000 } };
             }
-            node.serverHue.hueManager.writeHueQueueAdd(config.hueDevice, state, (node.isGrouped_light === false ? 'setLight' : 'setGroupedLight'));
+            node.serverHue.hueManager.writeHueQueueAdd(config.hueDevice, state, node.isGrouped_light === false ? "setLight" : "setGroupedLight");
             node.setNodeStatusHue({
-              fill: 'green', shape: 'dot', text: 'KNX->HUE', payload: state,
+              fill: "green",
+              shape: "dot",
+              text: "KNX->HUE",
+              payload: state,
             });
             break;
           case config.GALightDIM:
@@ -113,24 +134,35 @@ module.exports = function (RED) {
             // { decr_incr: 0, data: 1 } : Start decreasing until { decr_incr: 0, data: 0 } is received.
             msg.payload = dptlib.fromBuffer(msg.knx.rawValue, dptlib.resolve(config.dptLightDIM));
             if (msg.payload.data > 0) {
-              const dimDirection = msg.payload.decr_incr === 1 ? 'up' : 'down';
+              const dimDirection = msg.payload.decr_incr === 1 ? "up" : "down";
               // First, switch on the light if off
-              if (node.currentHUEDevice !== undefined && node.currentHUEDevice.on.on === false && dimDirection === 'up') {
-                if (config.linkBrightnessToSwitchStatus === undefined || config.linkBrightnessToSwitchStatus === 'yes') {
+              if (node.currentHUEDevice !== undefined && node.currentHUEDevice.on.on === false && dimDirection === "up") {
+                if (config.linkBrightnessToSwitchStatus === undefined || config.linkBrightnessToSwitchStatus === "yes") {
                   // Starts from minimum of 5
-                  node.serverHue.hueManager.writeHueQueueAdd(config.hueDevice, { on: { on: true }, dimming: { brightness: 5 } }, (node.isGrouped_light === false ? 'setLight' : 'setGroupedLight'));
+                  node.serverHue.hueManager.writeHueQueueAdd(
+                    config.hueDevice,
+                    { on: { on: true }, dimming: { brightness: 5 } },
+                    node.isGrouped_light === false ? "setLight" : "setGroupedLight"
+                  );
                 } else {
                   // Read the last HUE brightness status and starts from there
                   const lastDimVal = node.currentHUEDevice !== undefined ? node.currentHUEDevice.dimming.brightness : 5;
-                  node.serverHue.hueManager.writeHueQueueAdd(config.hueDevice, { on: { on: true }, dimming: { brightness: lastDimVal } }, (node.isGrouped_light === false ? 'setLight' : 'setGroupedLight'));
+                  node.serverHue.hueManager.writeHueQueueAdd(
+                    config.hueDevice,
+                    { on: { on: true }, dimming: { brightness: lastDimVal } },
+                    node.isGrouped_light === false ? "setLight" : "setGroupedLight"
+                  );
                 }
               }
               node.startDimStopper(dimDirection);
             } else {
-              node.startDimStopper('stop');
+              node.startDimStopper("stop");
             }
             node.setNodeStatusHue({
-              fill: 'green', shape: 'dot', text: 'KNX->HUE', payload: msg.payload,
+              fill: "green",
+              shape: "dot",
+              text: "KNX->HUE",
+              payload: msg.payload,
             });
             break;
           case config.GADaylightSensor:
@@ -138,44 +170,56 @@ module.exports = function (RED) {
               node.DayTime = Boolean(dptlib.fromBuffer(msg.knx.rawValue, dptlib.resolve(config.dptDaylightSensor)));
               if (config.invertDayNight !== undefined && config.invertDayNight === true) node.DayTime = !node.DayTime;
               node.setNodeStatusHue({
-                fill: 'green', shape: 'dot', text: 'KNX->HUE Daytime', payload: node.DayTime,
+                fill: "green",
+                shape: "dot",
+                text: "KNX->HUE Daytime",
+                payload: node.DayTime,
               });
             } else {
               node.DayTime = true;
             }
             break;
           case config.GALightHSV:
-            if (config.dptLightHSV === '3.007') {
+            if (config.dptLightHSV === "3.007") {
               // MDT smartbutton will dim the color temperature
               // { decr_incr: 1, data: 1 } : Start increasing until { decr_incr: 0, data: 0 } is received.
               // { decr_incr: 0, data: 1 } : Start decreasing until { decr_incr: 0, data: 0 } is received.
               msg.payload = dptlib.fromBuffer(msg.knx.rawValue, dptlib.resolve(config.dptLightHSV));
               if (msg.payload.data > 0) {
-                const dimDirectionTunableWhite = msg.payload.decr_incr === 1 ? 'up' : 'down';
+                const dimDirectionTunableWhite = msg.payload.decr_incr === 1 ? "up" : "down";
                 node.startDimStopperTunableWhite(dimDirectionTunableWhite);
               } else {
-                node.startDimStopperTunableWhite('stop');
+                node.startDimStopperTunableWhite("stop");
               }
             }
             node.setNodeStatusHue({
-              fill: 'green', shape: 'dot', text: 'KNX->HUE', payload: msg.payload,
+              fill: "green",
+              shape: "dot",
+              text: "KNX->HUE",
+              payload: msg.payload,
             });
             break;
           case config.GALightHSVPercentage:
-            if (config.dptLightHSVPercentage === '5.001') {
+            if (config.dptLightHSVPercentage === "5.001") {
               // 0-100% tunable white
               msg.payload = 100 - dptlib.fromBuffer(msg.knx.rawValue, dptlib.resolve(config.dptLightHSVPercentage));
               // msg.payload = msg.payload <= 0 ? 1 : msg.payload
               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.serverHue.hueManager.writeHueQueueAdd(config.hueDevice, state, node.isGrouped_light === false ? "setLight" : "setGroupedLight");
               node.setNodeStatusHue({
-                fill: 'green', shape: 'dot', text: 'KNX->HUE', payload: state,
+                fill: "green",
+                shape: "dot",
+                text: "KNX->HUE",
+                payload: state,
               });
             }
             node.setNodeStatusHue({
-              fill: 'green', shape: 'dot', text: 'KNX->HUE', payload: msg.payload,
+              fill: "green",
+              shape: "dot",
+              text: "KNX->HUE",
+              payload: msg.payload,
             });
             break;
           case config.GALightBrightness:
@@ -189,15 +233,22 @@ module.exports = function (RED) {
               if (node.currentHUEDevice.on.on === false && msg.payload > 0) state.on = { on: true };
               if (node.currentHUEDevice.on.on === true && msg.payload === 0) state.on = { on: false };
             }
-            node.serverHue.hueManager.writeHueQueueAdd(config.hueDevice, state, (node.isGrouped_light === false ? 'setLight' : 'setGroupedLight'));
+            node.serverHue.hueManager.writeHueQueueAdd(config.hueDevice, state, node.isGrouped_light === false ? "setLight" : "setGroupedLight");
             node.setNodeStatusHue({
-              fill: 'green', shape: 'dot', text: 'KNX->HUE', payload: state,
+              fill: "green",
+              shape: "dot",
+              text: "KNX->HUE",
+              payload: state,
             });
             break;
           case config.GALightColor:
             msg.payload = dptlib.fromBuffer(msg.knx.rawValue, dptlib.resolve(config.dptLightColor));
             let gamut = null;
-            if (node.currentHUEDevice !== undefined && node.currentHUEDevice.hasOwnProperty('color') && node.currentHUEDevice.color.hasOwnProperty('gamut_type')) {
+            if (
+              node.currentHUEDevice !== undefined
+              && node.currentHUEDevice.hasOwnProperty("color")
+              && node.currentHUEDevice.color.hasOwnProperty("gamut_type")
+            ) {
               gamut = node.currentHUEDevice.color.gamut_type;
             }
             const retXY = hueColorConverter.ColorConverter.rgbToXy(msg.payload.red, msg.payload.green, msg.payload.blue, gamut);
@@ -212,9 +263,12 @@ module.exports = function (RED) {
               if (node.currentHUEDevice.on.on === false && bright > 0) state.on = { on: true };
               if (node.currentHUEDevice.on.on === true && bright === 0) state = { on: { on: false }, dimming: { brightness: bright } };
             }
-            node.serverHue.hueManager.writeHueQueueAdd(config.hueDevice, state, (node.isGrouped_light === false ? 'setLight' : 'setGroupedLight'));
+            node.serverHue.hueManager.writeHueQueueAdd(config.hueDevice, state, node.isGrouped_light === false ? "setLight" : "setGroupedLight");
             node.setNodeStatusHue({
-              fill: 'green', shape: 'dot', text: 'KNX->HUE', payload: state,
+              fill: "green",
+              shape: "dot",
+              text: "KNX->HUE",
+              payload: state,
             });
             break;
           case config.GALightBlink:
@@ -225,22 +279,35 @@ module.exports = function (RED) {
                 node.blinkValue = !node.blinkValue;
                 msg.payload = node.blinkValue;
                 // state = msg.payload === true ? { on: { on: true } } : { on: { on: false } }
-                state = msg.payload === true ? { on: { on: true }, dimming: { brightness: 100 }, dynamics: { duration: 0 } } : { on: { on: false }, dynamics: { duration: 0 } };
-                node.serverHue.hueManager.writeHueQueueAdd(config.hueDevice, state, (node.isGrouped_light === false ? 'setLight' : 'setGroupedLight'));
+                state = msg.payload === true
+                  ? { on: { on: true }, dimming: { brightness: 100 }, dynamics: { duration: 0 } }
+                  : { on: { on: false }, dynamics: { duration: 0 } };
+                node.serverHue.hueManager.writeHueQueueAdd(config.hueDevice, state, node.isGrouped_light === false ? "setLight" : "setGroupedLight");
               }, 1000);
             } else {
               if (node.timerBlink !== undefined) clearInterval(node.timerBlink);
-              node.serverHue.hueManager.writeHueQueueAdd(config.hueDevice, { on: { on: false } }, (node.isGrouped_light === false ? 'setLight' : 'setGroupedLight'));
+              node.serverHue.hueManager.writeHueQueueAdd(
+                config.hueDevice,
+                { on: { on: false } },
+                node.isGrouped_light === false ? "setLight" : "setGroupedLight"
+              );
             }
             node.setNodeStatusHue({
-              fill: 'green', shape: 'dot', text: 'KNX->HUE', payload: gaVal,
+              fill: "green",
+              shape: "dot",
+              text: "KNX->HUE",
+              payload: gaVal,
             });
             break;
           case config.GALightColorCycle:
             if (node.timerColorCycle !== undefined) clearInterval(node.timerColorCycle);
             const gaValColorCycle = dptlib.fromBuffer(msg.knx.rawValue, dptlib.resolve(config.dptLightColorCycle));
             if (gaValColorCycle === true) {
-              node.serverHue.hueManager.writeHueQueueAdd(config.hueDevice, { on: { on: true } }, (node.isGrouped_light === false ? 'setLight' : 'setGroupedLight'));
+              node.serverHue.hueManager.writeHueQueueAdd(
+                config.hueDevice,
+                { on: { on: true } },
+                node.isGrouped_light === false ? "setLight" : "setGroupedLight"
+              );
               node.timerColorCycle = setInterval(() => {
                 try {
                   function getRandomIntInclusive(min, max) {
@@ -252,29 +319,43 @@ module.exports = function (RED) {
                   const green = getRandomIntInclusive(0, 255);
                   const blue = getRandomIntInclusive(0, 255);
                   let gamut = null;
-                  if (node.currentHUEDevice !== undefined && node.currentHUEDevice.hasOwnProperty('color') && node.currentHUEDevice.color.hasOwnProperty('gamut_type')) {
+                  if (
+                    node.currentHUEDevice !== undefined
+                    && node.currentHUEDevice.hasOwnProperty("color")
+                    && node.currentHUEDevice.color.hasOwnProperty("gamut_type")
+                  ) {
                     gamut = node.currentHUEDevice.color.gamut_type;
                   }
                   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, (node.isGrouped_light === false ? 'setLight' : 'setGroupedLight'));
-                } catch (error) {
-                }
+                  node.serverHue.hueManager.writeHueQueueAdd(config.hueDevice, state, node.isGrouped_light === false ? "setLight" : "setGroupedLight");
+                } catch (error) { }
               }, 10000);
             } else {
               if (node.timerColorCycle !== undefined) clearInterval(node.timerColorCycle);
-              node.serverHue.hueManager.writeHueQueueAdd(config.hueDevice, { on: { on: false } }, (node.isGrouped_light === false ? 'setLight' : 'setGroupedLight'));
+              node.serverHue.hueManager.writeHueQueueAdd(
+                config.hueDevice,
+                { on: { on: false } },
+                node.isGrouped_light === false ? "setLight" : "setGroupedLight"
+              );
             }
             node.setNodeStatusHue({
-              fill: 'green', shape: 'dot', text: 'KNX->HUE', payload: gaValColorCycle,
+              fill: "green",
+              shape: "dot",
+              text: "KNX->HUE",
+              payload: gaValColorCycle,
             });
             break;
           default:
             break;
         }
       } catch (error) {
-        node.status({ fill: 'red', shape: 'dot', text: `KNX->HUE error ${error.message || error} (${new Date().getDate()}, ${new Date().toLocaleTimeString()})` });
+        node.status({
+          fill: "red",
+          shape: "dot",
+          text: `KNX->HUE error ${error.message || error} (${new Date().getDate()}, ${new Date().toLocaleTimeString()})`,
+        });
       }
     };
 
@@ -286,23 +367,26 @@ module.exports = function (RED) {
     node.startDimStopper = function (_direction) {
       node.timeoutDim = 0;
       if (node.timerDim !== undefined) clearInterval(node.timerDim);
-      if (_direction === 'stop') {
+      if (_direction === "stop") {
         return;
       }
       switch (_direction) {
-        case 'up':
-          node.dimDirection = { dimming_delta: { action: 'up', brightness_delta: 10 } };
+        case "up":
+          node.dimDirection = { dimming_delta: { action: "up", brightness_delta: 10 } };
           break;
-        case 'down':
-          node.dimDirection = { dimming_delta: { action: 'down', brightness_delta: 10 } };
+        case "down":
+          node.dimDirection = { dimming_delta: { action: "down", brightness_delta: 10 } };
           break;
         default:
           break;
       }
       node.timerDim = setInterval(() => {
         node.timeoutDim += 1;
-        if (node.timeoutDim > 150) { node.timeoutDim = 0; clearInterval(node.timerDim); }
-        node.serverHue.hueManager.writeHueQueueAdd(config.hueDevice, node.dimDirection, (node.isGrouped_light === false ? 'setLight' : 'setGroupedLight'));
+        if (node.timeoutDim > 150) {
+          node.timeoutDim = 0;
+          clearInterval(node.timerDim);
+        }
+        node.serverHue.hueManager.writeHueQueueAdd(config.hueDevice, node.dimDirection, node.isGrouped_light === false ? "setLight" : "setGroupedLight");
       }, 700);
     };
     // ***********************************************************
@@ -316,21 +400,28 @@ module.exports = function (RED) {
     node.startDimStopperTunableWhite = function (_direction) {
       node.timeoutDimTunableWhite = 0;
       if (node.timerDimTunableWhite !== undefined) clearInterval(node.timerDimTunableWhite);
-      if (_direction === 'stop') return;
+      if (_direction === "stop") return;
       switch (_direction) {
-        case 'up':
-          node.dimDirectionTunableWhite = { color_temperature_delta: { action: 'up', mirek_delta: 10 } };
+        case "up":
+          node.dimDirectionTunableWhite = { color_temperature_delta: { action: "up", mirek_delta: 10 } };
           break;
-        case 'down':
-          node.dimDirectionTunableWhite = { color_temperature_delta: { action: 'down', mirek_delta: 10 } };
+        case "down":
+          node.dimDirectionTunableWhite = { color_temperature_delta: { action: "down", mirek_delta: 10 } };
           break;
         default:
           break;
       }
       node.timerDimTunableWhite = setInterval(() => {
         node.timeoutDimTunableWhite += 1;
-        if (node.timeoutDimTunableWhite > 150) { node.timeoutDimTunableWhite = 0; clearInterval(node.timerDimTunableWhite); }
-        node.serverHue.hueManager.writeHueQueueAdd(config.hueDevice, node.dimDirectionTunableWhite, (node.isGrouped_light === false ? 'setLight' : 'setGroupedLight'));
+        if (node.timeoutDimTunableWhite > 150) {
+          node.timeoutDimTunableWhite = 0;
+          clearInterval(node.timerDimTunableWhite);
+        }
+        node.serverHue.hueManager.writeHueQueueAdd(
+          config.hueDevice,
+          node.dimDirectionTunableWhite,
+          node.isGrouped_light === false ? "setLight" : "setGroupedLight"
+        );
       }, 700);
     };
     // ***********************************************************
@@ -338,9 +429,9 @@ module.exports = function (RED) {
     node.handleSendHUE = (_event) => {
       try {
         if (_event.id === config.hueDevice) {
-          if (_event.hasOwnProperty('on')) {
+          if (_event.hasOwnProperty("on")) {
             node.updateKNXLightState(_event.on.on);
-            if (config.linkBrightnessToSwitchStatus === undefined || config.linkBrightnessToSwitchStatus === 'yes') {
+            if (config.linkBrightnessToSwitchStatus === undefined || config.linkBrightnessToSwitchStatus === "yes") {
               // In case of switch off, set the dim to zero
               if (_event.on.on === false) {
                 node.updateKNXBrightnessState(0);
@@ -348,55 +439,71 @@ module.exports = function (RED) {
                 // Restore the previous brightness value
                 try {
                   node.updateKNXBrightnessState(node.currentHUEDevice.dimming.brightness);
-                } catch (error) { /* empty */ }
+                } catch (error) {
+                  /* empty */
+                }
               }
             }
             if (node.currentHUEDevice !== undefined) node.currentHUEDevice.on = _event.on; // Update the internal object representing the current light
+            return;
           }
-          if (_event.hasOwnProperty('color')) {
+          if (_event.hasOwnProperty("color")) {
             node.updateKNXLightColorState(_event.color);
             if (node.currentHUEDevice !== undefined) node.currentHUEDevice.color = _event.color; // Update the internal object representing the current light
+            return;
           }
-          if (_event.hasOwnProperty('dimming')) {
+          if (_event.hasOwnProperty("dimming")) {
             // Every once time, the light transmit the brightness value of 0.39.
             // To avoid wrongly turn light state on, exit
-            if (_event.dimming.brightness < 1) _event.dimming.brightness = 0;
-            if (node.currentHUEDevice !== undefined && node.currentHUEDevice.hasOwnProperty('dimming') && node.currentHUEDevice.dimming.brightness === _event.dimming.brightness) return;
             if (_event.dimming.brightness === undefined) return;
-
+            if (_event.dimming.brightness < 1) _event.dimming.brightness = 0;
             node.updateKNXBrightnessState(_event.dimming.brightness);
-            // Send true/false to switch state
-            node.updateKNXLightState(_event.dimming.brightness > 0);
-
-            // If the brightness reaches zero, the hue lamp "on" property must be set to zero as well
-            if (_event.dimming.brightness === 0) node.serverHue.hueManager.writeHueQueueAdd(config.hueDevice, { on: { on: false } }, (node.isGrouped_light === false ? 'setLight' : 'setGroupedLight'));
-
             if (node.currentHUEDevice !== undefined) node.currentHUEDevice.dimming = _event.dimming; // Update the internal object representing the current light
+            if (config.linkBrightnessToSwitchStatus === undefined || config.linkBrightnessToSwitchStatus === "yes") {
+              node.updateKNXLightState(_event.dimming.brightness > 0);
+            }
+            // If the brightness reaches zero, the hue lamp "on" property must be set to zero as well
+            if (_event.dimming.brightness === 0) {
+              node.serverHue.hueManager.writeHueQueueAdd(config.hueDevice, { on: { on: false } }, node.isGrouped_light === false ? "setLight" : "setGroupedLight");
+            }
+            return;
           }
-          if (_event.hasOwnProperty('color_temperature')) {
+          if (_event.hasOwnProperty("color_temperature")) {
             node.updateKNXLightHSVState(_event.color_temperature.mirek);
             if (node.currentHUEDevice !== undefined) node.currentHUEDevice.color_temperature = _event.color_temperature; // Update the internal object representing the current light
+            return;
           }
         }
       } catch (error) {
-        node.status({ fill: 'red', shape: 'dot', text: `HUE->KNX error ${knxMsgPayload.topic} ${error.message} (${new Date().getDate()}, ${new Date().toLocaleTimeString()})` });
+        node.status({
+          fill: "red",
+          shape: "dot",
+          text: `HUE->KNX error ${knxMsgPayload.topic} ${error.message} (${new Date().getDate()}, ${new Date().toLocaleTimeString()})`,
+        });
       }
     };
 
     node.updateKNXBrightnessState = function (_value) {
-      if (config.GALightBrightnessState !== undefined && config.GALightBrightnessState !== '') {
+      if (config.GALightBrightnessState !== undefined && config.GALightBrightnessState !== "") {
         const knxMsgPayload = {};
         knxMsgPayload.topic = config.GALightBrightnessState;
         knxMsgPayload.dpt = config.dptLightBrightnessState;
         knxMsgPayload.payload = _value;
         // Send to KNX bus
-        if (knxMsgPayload.topic !== '' && knxMsgPayload.topic !== undefined) {
+        if (knxMsgPayload.topic !== "" && knxMsgPayload.topic !== undefined) {
           node.server.writeQueueAdd({
-            grpaddr: knxMsgPayload.topic, payload: knxMsgPayload.payload, dpt: knxMsgPayload.dpt, outputtype: 'write', nodecallerid: node.id,
+            grpaddr: knxMsgPayload.topic,
+            payload: knxMsgPayload.payload,
+            dpt: knxMsgPayload.dpt,
+            outputtype: "write",
+            nodecallerid: node.id,
           });
         }
         node.setNodeStatusHue({
-          fill: 'blue', shape: 'ring', text: 'HUE->KNX State', payload: knxMsgPayload.payload,
+          fill: "blue",
+          shape: "ring",
+          text: "HUE->KNX State",
+          payload: knxMsgPayload.payload,
         });
       }
     };
@@ -406,58 +513,86 @@ module.exports = function (RED) {
         knxMsgPayload.topic = config.GALightState;
         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) {
+        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,
+                grpaddr: knxMsgPayload.topic,
+                payload: knxMsgPayload.payload,
+                dpt: knxMsgPayload.dpt,
+                outputtype: "write",
+                nodecallerid: node.id,
               });
             }
             node.setNodeStatusHue({
-              fill: 'blue', shape: 'ring', text: 'HUE->KNX State', payload: knxMsgPayload.payload,
+              fill: "blue",
+              shape: "ring",
+              text: "HUE->KNX State",
+              payload: knxMsgPayload.payload,
             });
           }
         }
         node.currentKNXGALightState = knxMsgPayload.payload; // Stores the current value
-      } catch (error) { /* empty */ }
+      } catch (error) {
+        /* empty */
+      }
     };
 
     node.updateKNXLightHSVState = function (_value) {
-      if (config.GALightHSVState !== undefined && config.GALightHSVState !== '') {
+      if (config.GALightHSVState !== undefined && config.GALightHSVState !== "") {
         const knxMsgPayload = {};
         knxMsgPayload.topic = config.GALightHSVState;
         knxMsgPayload.dpt = config.dptLightHSVState;
-        if (config.dptLightHSVState === '5.001') {
+        if (config.dptLightHSVState === "5.001") {
           const retPercent = hueColorConverter.ColorConverter.scale(_value, [153, 500], [0, 100]);
           knxMsgPayload.payload = 100 - retPercent;
         }
         // Send to KNX bus
-        if (knxMsgPayload.topic !== '' && knxMsgPayload.topic !== undefined) {
+        if (knxMsgPayload.topic !== "" && knxMsgPayload.topic !== undefined) {
           node.server.writeQueueAdd({
-            grpaddr: knxMsgPayload.topic, payload: knxMsgPayload.payload, dpt: knxMsgPayload.dpt, outputtype: 'write', nodecallerid: node.id,
+            grpaddr: knxMsgPayload.topic,
+            payload: knxMsgPayload.payload,
+            dpt: knxMsgPayload.dpt,
+            outputtype: "write",
+            nodecallerid: node.id,
           });
         }
         node.setNodeStatusHue({
-          fill: 'blue', shape: 'ring', text: 'HUE->KNX State', payload: knxMsgPayload.payload,
+          fill: "blue",
+          shape: "ring",
+          text: "HUE->KNX State",
+          payload: knxMsgPayload.payload,
         });
       }
     };
 
     node.updateKNXLightColorState = function (_value) {
-      if (config.GALightColorState !== undefined && config.GALightColorState !== '') {
+      if (config.GALightColorState !== undefined && config.GALightColorState !== "") {
         const knxMsgPayload = {};
         knxMsgPayload.topic = config.GALightColorState;
         knxMsgPayload.dpt = config.dptLightColorState;
-        knxMsgPayload.payload = hueColorConverter.ColorConverter.xyBriToRgb(_value.xy.x, _value.xy.y, (node.currentHUEDevice !== undefined ? node.currentHUEDevice.dimming.brightness : 100));
+        knxMsgPayload.payload = hueColorConverter.ColorConverter.xyBriToRgb(
+          _value.xy.x,
+          _value.xy.y,
+          node.currentHUEDevice !== undefined ? node.currentHUEDevice.dimming.brightness : 100
+        );
         // Send to KNX bus
-        if (knxMsgPayload.topic !== '' && knxMsgPayload.topic !== undefined) {
+        if (knxMsgPayload.topic !== "" && knxMsgPayload.topic !== undefined) {
           node.server.writeQueueAdd({
-            grpaddr: knxMsgPayload.topic, payload: knxMsgPayload.payload, dpt: knxMsgPayload.dpt, outputtype: 'write', nodecallerid: node.id,
+            grpaddr: knxMsgPayload.topic,
+            payload: knxMsgPayload.payload,
+            dpt: knxMsgPayload.dpt,
+            outputtype: "write",
+            nodecallerid: node.id,
           });
         }
         node.setNodeStatusHue({
-          fill: 'blue', shape: 'ring', text: 'HUE->KNX State', payload: knxMsgPayload.payload,
+          fill: "blue",
+          shape: "ring",
+          text: "HUE->KNX State",
+          payload: knxMsgPayload.payload,
         });
       }
     };
@@ -475,12 +610,20 @@ module.exports = function (RED) {
         (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.setNodeStatusHue({
-                fill: 'blue', shape: 'ring', text: 'Connected. Is on: ', payload: node.currentHUEDevice.on.on === true,
-              });
-            });
+            await node.serverHue.hueManager.writeHueQueueAdd(
+              config.hueDevice,
+              null,
+              node.isGrouped_light === false ? "getLight" : "getGroupedLight",
+              (jLight) => {
+                node.currentHUEDevice = jLight;
+                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}`);
           }
@@ -488,11 +631,9 @@ module.exports = function (RED) {
       }
     }
 
-    node.on('input', (msg) => {
-
-    });
+    node.on("input", (msg) => { });
 
-    node.on('close', (done) => {
+    node.on("close", (done) => {
       if (node.server) {
         node.server.removeClient(node);
       }
@@ -502,5 +643,5 @@ module.exports = function (RED) {
       done();
     });
   }
-  RED.nodes.registerType('knxUltimateHueLight', knxUltimateHueLight);
+  RED.nodes.registerType("knxUltimateHueLight", knxUltimateHueLight);
 };

package/package.json

@@ -3,7 +3,7 @@
   "engines": {
     "node": ">=16.0.0"
   },
-  "version": "2.1.50",
+  "version": "2.1.52",
   "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": {
     "binary-parser": "2.2.1",