node-red-contrib-knx-ultimate 2.2.40 → 2.3.1

package/CHANGELOG.md

@@ -6,6 +6,12 @@
 
 # CHANGELOG
 
+**Version 2.3.1** - Jan 2024<br/>
+- HUE Light: minor fixes.
+
+**Version 2.3.0** - Jan 2024<br/>
+- HUE Light: partially rewrote code to cloneDeep(oHUEDevice) not to duplicate the brightness status of a single ligh, at node-red restart. https://github.com/Supergiovane/node-red-contrib-knx-ultimate/issues/312#issue-2064480332 <br/>
+
 **Version 2.2.40** - Jan 2024<br/>
 - HUE Light: fixed an issue with initial status read from HUE Bridge (on/off status was incorrectly set).<br/>
 

package/nodes/hue-config.js

@@ -7,6 +7,7 @@ const dptlib = require("../KNXEngine/src/dptlib");
 const HueClass = require("./utils/hueEngine").classHUE;
 const loggerEngine = require("./utils/sysLogger");
 const hueColorConverter = require("./utils/hueColorConverter");
+const cloneDeep = require("lodash/cloneDeep");
 
 function getRandomIntInclusive(min, max) {
   min = Math.ceil(min);
@@ -206,7 +207,7 @@ module.exports = (RED) => {
                   shape: "ring",
                   text: "Ready :-)",
                 });
-                _node.currentHUEDevice = oHUEDevice;
+                _node.currentHUEDevice = cloneDeep(oHUEDevice);
                 if (_node.initializingAtStart === true) _node.handleSendHUE(oHUEDevice);
               }
             }
@@ -417,7 +418,7 @@ module.exports = (RED) => {
         if (node.hueAllResources !== undefined && node.hueAllResources !== null && _Node.initializingAtStart === true) {
           const oHUEDevice = node.hueAllResources.filter((a) => a.id === _Node.hueDevice)[0];
           if (oHUEDevice !== undefined) {
-            _Node.currentHUEDevice = oHUEDevice;
+            _Node.currentHUEDevice = cloneDeep(oHUEDevice);
             _Node.handleSendHUE(oHUEDevice);
             // Add _Node to the clients array
             _Node.setNodeStatusHue({
@@ -507,7 +508,7 @@ module.exports = (RED) => {
       try {
         const _lightId = req.query.id;
         const oLight = node.hueAllResources.filter((a) => a.id === _lightId)[0];
-        // Infer some useful info, so the HTML part cann avoid to query the server
+        // Infer some useful info, so the HTML part can avoid to query the server
         // Kelvin
         try {
           if (oLight.color_temperature !== undefined && oLight.color_temperature.mirek !== undefined) {

package/nodes/knxUltimate-config.html

@@ -183,11 +183,14 @@
     }
 
     .ui-tabs .ui-tabs-nav .ui-state-default a {
-        color: #c0c0c0;
+        color: #878787;
+        outline: none;
     }
 
     .ui-tabs .ui-tabs-nav .ui-state-active a {
-        color: #459e00;
+        color: #377e00;
+        border-bottom: 1px solid#377e00;
+        outline: none;
     }
 </style>
 

package/nodes/knxUltimateHueLight.html

@@ -172,137 +172,140 @@
 
 
       // Get the HUE capabilities to enable/disable UI parts
-      $.getJSON("knxUltimateGetLightObject?id=" + $("#node-input-hueDevice").val().split("#")[0], (data) => {
-        let oLight = data;
-        // Check if grouped, to hide/show the "Get current" buttons
-        if (oLight.type === "grouped_light") {
-          $("#tabs").tabs("enable", "#tabs-4");
-          $("#tabs").tabs("enable", "#tabs-3");
-          $("#tabs").tabs("enable", "#tabs-2");
-          $("#getColorAtSwitchOnDayTimeButton").show();
-          $("#getColorAtSwitchOnNightTimeButton").show();
-          $("#node-input-specifySwitchOnBrightness").empty().append(
-            $("<option>")
-              .val("no")
-              .text("None")
-          ).append(
-            $("<option>")
-              .val("yes")
-              .text("Select color")
-          ).append(
-            $("<option>")
-              .val("temperature")
-              .text("Select temperature and brightness")
-          );
-          $("#node-input-enableDayNightLighting").empty().append(
-            $("<option>")
-              .val("no")
-              .text("No")
-          ).append(
-            $("<option>")
-              .val("yes")
-              .text("Select color")
-          ).append(
-            $("<option>")
-              .val("temperature")
-              .text("Select temperature and brightness")
-          );
-          $("#node-input-specifySwitchOnBrightness").val(node.specifySwitchOnBrightness).trigger('change');
-          $("#node-input-enableDayNightLighting").val(node.enableDayNightLighting).trigger('change');
-          return;
-        } else {
-
-          $("#getColorAtSwitchOnDayTimeButton").show();
-          $("#getColorAtSwitchOnNightTimeButton").show();
-          $("#node-input-specifySwitchOnBrightness").empty().append(
-            $("<option>")
-              .val("no")
-              .text("None")
-          );
-          $("#node-input-enableDayNightLighting").empty().append(
-            $("<option>")
-              .val("no")
-              .text("No")
-          );
-        }
+      if ($("#node-input-hueDevice").val() === '') {
+        $("#tabs").hide();
+      } else {
+        $.getJSON("knxUltimateGetLightObject?id=" + $("#node-input-hueDevice").val().split("#")[0] + " &" + { _: new Date().getTime() }, (data) => {
+          let oLight = data;
+          // Check if grouped, to hide/show the "Get current" buttons
+          if (oLight.type === "grouped_light") {
+            $("#tabs").tabs("enable", "#tabs-4");
+            $("#tabs").tabs("enable", "#tabs-3");
+            $("#tabs").tabs("enable", "#tabs-2");
+            $("#getColorAtSwitchOnDayTimeButton").show();
+            $("#getColorAtSwitchOnNightTimeButton").show();
+            $("#node-input-specifySwitchOnBrightness").empty().append(
+              $("<option>")
+                .val("no")
+                .text("None")
+            ).append(
+              $("<option>")
+                .val("yes")
+                .text("Select color")
+            ).append(
+              $("<option>")
+                .val("temperature")
+                .text("Select temperature and brightness")
+            );
+            $("#node-input-enableDayNightLighting").empty().append(
+              $("<option>")
+                .val("no")
+                .text("No")
+            ).append(
+              $("<option>")
+                .val("yes")
+                .text("Select color")
+            ).append(
+              $("<option>")
+                .val("temperature")
+                .text("Select temperature and brightness")
+            );
+            $("#node-input-specifySwitchOnBrightness").val(node.specifySwitchOnBrightness).trigger('change');
+            $("#node-input-enableDayNightLighting").val(node.enableDayNightLighting).trigger('change');
+            return;
+          } else {
 
-        $("#tabs").tabs("disable", "#tabs-4");
-        $("#tabs").tabs("disable", "#tabs-3");
-        $("#tabs").tabs("disable", "#tabs-2");
-        $("#divColorsAtSwitchOn").hide();
-        $("#divColorsAtSwitchOnNightTime").hide();
-        $("#divTemperatureAtSwitchOn").hide();
-        $("#divTemperatureAtSwitchOnNightTime").hide();
-        $("#divColorCycle").hide();
-        $("#divUpdateKNXBrightnessStatusOnHUEOnOff").hide();
-        $("#divBehaviourBrightness").hide();
-        $("#comboTemperatureAtSwitchOn").hide();
-        $("#comboTemperatureAtSwitchOnNightTime").hide();
-
-        // Enable options/tabs one by one
-        if (oLight.dimming !== undefined) {
-          $("#tabs").tabs("enable", "#tabs-2");
-          $("#divBehaviourBrightness").show();
-        }
-        if (oLight.color !== undefined) {
-          $("#tabs").tabs("enable", "#tabs-4");
-          $("#divColorsAtSwitchOn").show();
-          $("#divColorsAtSwitchOnNightTime").show();
-          $("#divColorCycle").show();
-          $("#node-input-specifySwitchOnBrightness").append(
-            $("<option>")
-              .val("yes")
-              .text("Select color")
-          );
-          $("#node-input-enableDayNightLighting").append(
-            $("<option>")
-              .val("yes")
-              .text("Select color")
-          );
-        }
-        // Check temperature (if the light supports temperature, it support dimming as well)
-        if (oLight.color_temperature !== undefined) {
-          $("#tabs").tabs("enable", "#tabs-3");
-          //$("#tabs").tabs("enable", "#tabs-2");
-          $("#node-input-specifySwitchOnBrightness").append(
-            $("<option>")
-              .val("temperature")
-              .text("Select temperature and brightness")
-          );
-          $("#node-input-enableDayNightLighting").append(
-            $("<option>")
-              .val("temperature")
-              .text("Select temperature and brightness")
-          );
-          $("#divTemperatureAtSwitchOn").show();
-          $("#divTemperatureAtSwitchOnNightTime").show();
-          $("#divUpdateKNXBrightnessStatusOnHUEOnOff").show();
-          $("#divBehaviourBrightness").show();
-          $("#comboTemperatureAtSwitchOn").show();
-          $("#comboTemperatureAtSwitchOnNightTime").show();
-        } else {
-          //$("#tabs").tabs("enable", "#tabs-2");
-          $("#node-input-specifySwitchOnBrightness").append(
-            $("<option>")
-              .val("temperature")
-              .text("Select brightness")
-          );
-          $("#node-input-enableDayNightLighting").append(
-            $("<option>")
-              .val("temperature")
-              .text("Select brightness")
-          );
-          $("#comboTemperatureAtSwitchOn").val(0);
-          $("#comboTemperatureAtSwitchOnNightTime").val(0);
-          $("#divTemperatureAtSwitchOn").show();
-          $("#divTemperatureAtSwitchOnNightTime").show();
-          $("#divUpdateKNXBrightnessStatusOnHUEOnOff").show();
-          //$("#divBehaviourBrightness").show();
-        }
-        $("#node-input-specifySwitchOnBrightness").val(node.specifySwitchOnBrightness).trigger('change');
-        $("#node-input-enableDayNightLighting").val(node.enableDayNightLighting).trigger('change');
-      });
+            $("#getColorAtSwitchOnDayTimeButton").show();
+            $("#getColorAtSwitchOnNightTimeButton").show();
+            $("#node-input-specifySwitchOnBrightness").empty().append(
+              $("<option>")
+                .val("no")
+                .text("None")
+            );
+            $("#node-input-enableDayNightLighting").empty().append(
+              $("<option>")
+                .val("no")
+                .text("No")
+            );
+          }
 
+          $("#tabs").tabs("disable", "#tabs-4");
+          $("#tabs").tabs("disable", "#tabs-3");
+          $("#tabs").tabs("disable", "#tabs-2");
+          $("#divColorsAtSwitchOn").hide();
+          $("#divColorsAtSwitchOnNightTime").hide();
+          $("#divTemperatureAtSwitchOn").hide();
+          $("#divTemperatureAtSwitchOnNightTime").hide();
+          $("#divColorCycle").hide();
+          $("#divUpdateKNXBrightnessStatusOnHUEOnOff").hide();
+          $("#divBehaviourBrightness").hide();
+          $("#comboTemperatureAtSwitchOn").hide();
+          $("#comboTemperatureAtSwitchOnNightTime").hide();
+
+          // Enable options/tabs one by one
+          if (oLight.dimming !== undefined) {
+            $("#tabs").tabs("enable", "#tabs-2");
+            $("#divBehaviourBrightness").show();
+          }
+          if (oLight.color !== undefined) {
+            $("#tabs").tabs("enable", "#tabs-4");
+            $("#divColorsAtSwitchOn").show();
+            $("#divColorsAtSwitchOnNightTime").show();
+            $("#divColorCycle").show();
+            $("#node-input-specifySwitchOnBrightness").append(
+              $("<option>")
+                .val("yes")
+                .text("Select color")
+            );
+            $("#node-input-enableDayNightLighting").append(
+              $("<option>")
+                .val("yes")
+                .text("Select color")
+            );
+          }
+          // Check temperature (if the light supports temperature, it support dimming as well)
+          if (oLight.color_temperature !== undefined) {
+            $("#tabs").tabs("enable", "#tabs-3");
+            //$("#tabs").tabs("enable", "#tabs-2");
+            $("#node-input-specifySwitchOnBrightness").append(
+              $("<option>")
+                .val("temperature")
+                .text("Select temperature and brightness")
+            );
+            $("#node-input-enableDayNightLighting").append(
+              $("<option>")
+                .val("temperature")
+                .text("Select temperature and brightness")
+            );
+            $("#divTemperatureAtSwitchOn").show();
+            $("#divTemperatureAtSwitchOnNightTime").show();
+            $("#divUpdateKNXBrightnessStatusOnHUEOnOff").show();
+            $("#divBehaviourBrightness").show();
+            $("#comboTemperatureAtSwitchOn").show();
+            $("#comboTemperatureAtSwitchOnNightTime").show();
+          } else {
+            //$("#tabs").tabs("enable", "#tabs-2");
+            $("#node-input-specifySwitchOnBrightness").append(
+              $("<option>")
+                .val("temperature")
+                .text("Select brightness")
+            );
+            $("#node-input-enableDayNightLighting").append(
+              $("<option>")
+                .val("temperature")
+                .text("Select brightness")
+            );
+            $("#comboTemperatureAtSwitchOn").val(0);
+            $("#comboTemperatureAtSwitchOnNightTime").val(0);
+            $("#divTemperatureAtSwitchOn").show();
+            $("#divTemperatureAtSwitchOnNightTime").show();
+            $("#divUpdateKNXBrightnessStatusOnHUEOnOff").show();
+            //$("#divBehaviourBrightness").show();
+          }
+          $("#node-input-specifySwitchOnBrightness").val(node.specifySwitchOnBrightness).trigger('change');
+          $("#node-input-enableDayNightLighting").val(node.enableDayNightLighting).trigger('change');
+        });
+      }
       // Show/Hide the div of the color at swich on
       if (node.specifySwitchOnBrightness === "yes") {
         $("#divColorsAtSwitchOn").show();

package/nodes/knxUltimateHueLight.js

@@ -667,7 +667,7 @@ module.exports = function (RED) {
             // In case of switch off, set the dim to zero
             if (_event.on.on === false && (config.updateKNXBrightnessStatusOnHUEOnOff === undefined || config.updateKNXBrightnessStatusOnHUEOnOff === "onhueoff")) {
               node.updateKNXBrightnessState(0);
-              //node.currentHUEDevice.dimming.brightness = 0;
+              if (_event.dimming !== undefined) delete _event.dimming; // Remove event.dimming, because has beem handled by this function and i don't want the function below to take care of it.
             } else if (_event.on.on === true && node.currentHUEDevice.on.on === false) {
               // Turn on always update the dimming KNX Status value as well.
               let brightVal = 50;
@@ -715,7 +715,7 @@ module.exports = function (RED) {
           shape: "dot",
           text: `HUE->KNX error ${node.id} ${error.message}. Seee Log`,
         });
-        RED.log.error(`knxUltimateHueLight: node.handleSendHUE = (_event): ${error.message}`);
+        RED.log.error(`knxUltimateHueLight: node.handleSendHUE = (_event): ${error.stack}`);
       }
     };
 

package/package.json

@@ -3,7 +3,7 @@
   "engines": {
     "node": ">=16.0.0"
   },
-  "version": "2.2.40",
+  "version": "2.3.1",
   "description": "Control your KNX intallation via Node-Red! A bunch of KNX nodes, with integrated Philips HUE control and ETS group address importer. Easy to use and highly configurable.",
   "dependencies": {
     "binary-parser": "2.2.1",