node-red-contrib-knx-ultimate 6.3.10 → 6.3.11

package/CHANGELOG.md

@@ -6,6 +6,10 @@
 
 # CHANGELOG
 
+**Version 6.3.11** - August 2026<br/>
+
+- **Matter Controller**: fixed KNX GA mapping tabs being hidden by transient empty KNX/Matter config-selector values during Node-RED 5 editor initialization; saved gateways now remain selected until the user explicitly changes them.<br/>
+
 **Version 6.3.10** - August 2026<br/>
 
 - **Watchdog**: added a default-on option to listen for error states reported by KNX-Ultimate nodes, including KNX Device, through the selected gateway; disabling it suppresses `NodeError` flow messages without affecting the Watchdog's own bus checks or control messages. Existing flows retain the previous enabled behavior.<br/>

package/nodes/knxUltimateMatterControllerDevice.html

@@ -3,6 +3,7 @@
 <script type="text/javascript" src="resources/node-red-contrib-knx-ultimate/11f26b4500.js"></script>
 
 <script type="text/javascript" src="resources/node-red-contrib-knx-ultimate/htmlUtils.js"></script>
+<script type="text/javascript" src="resources/node-red-contrib-knx-ultimate/configNodeEditorSelection.js"></script>
 
 <script type="text/javascript">
   (function () {
@@ -161,16 +162,6 @@
           });
         }
         $("#node-input-updateLocalStateFromKNXWrite").prop("checked", node.updateLocalStateFromKNXWrite === true || node.updateLocalStateFromKNXWrite === "true"); // Starting from v 4.1.31
-        const ensureConfigSelection = (selector) => {
-          if ($(selector).val() !== "_ADD_") return;
-          try {
-            $(selector).prop("selectedIndex", 0);
-          } catch (error) {
-            // Ignore UI quirks for legacy Node-RED versions
-          }
-        };
-        ["#node-input-server", "#node-input-serverMatter"].forEach(ensureConfigSelection);
-
         function ensureVerticalTabsStyle() {
           if ($('#knxUltimateMatterControllerDeviceVerticalTabs').length) return;
           const style = `
@@ -261,7 +252,7 @@
         function onEditPrepare() {
           ensureVerticalTabsStyle();
           const $knxServerInput = $("#node-input-server");
-          const KNX_EMPTY_VALUES = new Set(['', 'none', '_ADD_', '__NONE__']);
+          const KNX_EMPTY_VALUES = new Set(['', 'none', '_add_', '__none__']);
           // Historical variable names are retained for saved-flow compatibility; they point to Matter widgets.
           const $hueServerInput = $("#node-input-serverMatter");
           const $matterControllerModeInput = $("#node-input-matterControllerMode");
@@ -300,6 +291,21 @@
           let matterDevicePickerMouseDown = false;
           let showingNoHueDevicesPlaceholder = false;
           const HUE_EMPTY_SERVER_VALUES = new Set(['', 'none', '_add_', '__none__', '__null__', 'null', 'undefined']);
+          const selectionApi = window.KNXUltimateConfigNodeEditorSelection;
+          const normalizeConfigSelection = selectionApi && typeof selectionApi.normalizeSelection === 'function'
+            ? selectionApi.normalizeSelection
+            : (value, emptyValues) => {
+                const normalized = value === undefined || value === null ? '' : String(value).trim();
+                return emptyValues.has(normalized.toLowerCase()) ? '' : normalized;
+              };
+          const resolveSelectedOrStoredSelection = selectionApi && typeof selectionApi.resolveSelectedOrStoredSelection === 'function'
+            ? selectionApi.resolveSelectedOrStoredSelection
+            : (selectedValue, storedValue, emptyValues) => normalizeConfigSelection(selectedValue, emptyValues) || normalizeConfigSelection(storedValue, emptyValues);
+          const shouldPreserveSelection = selectionApi && typeof selectionApi.shouldPreserveSelection === 'function'
+            ? selectionApi.shouldPreserveSelection
+            : (event, nextValue, currentValue, emptyValues) => (!event || !event.originalEvent) && normalizeConfigSelection(nextValue, emptyValues) === '' && normalizeConfigSelection(currentValue, emptyValues) !== '';
+          let activeKnxServerId = resolveSelectedOrStoredSelection($knxServerInput.val(), node.server, KNX_EMPTY_VALUES);
+          let activeMatterServerId = resolveSelectedOrStoredSelection($hueServerInput.val(), node.serverMatter, HUE_EMPTY_SERVER_VALUES);
           let locateSessionActive = false;
           let locateAutoResetTimer = null;
           let locatePendingRequest = null;
@@ -483,14 +489,7 @@
           };
 
           const resolveKnxServerValue = () => {
-            const domValue = $knxServerInput.val();
-            if (domValue !== undefined && domValue !== null && domValue !== '') {
-              return domValue;
-            }
-            if (node.server !== undefined && node.server !== null) {
-              return node.server;
-            }
-            return '';
+            return activeKnxServerId;
           };
 
           const hasKnxServerSelected = () => {
@@ -500,17 +499,7 @@
           };
 
           const resolveHueServerValue = ({ allowStored = false } = {}) => {
-            if ($hueServerInput.length) {
-              const domValue = $hueServerInput.val();
-              if (domValue !== undefined && domValue !== null) {
-                const trimmed = String(domValue).trim();
-                if (trimmed !== '' && !HUE_EMPTY_SERVER_VALUES.has(trimmed.toLowerCase())) return trimmed;
-              }
-            }
-            if (node.serverMatter !== undefined && node.serverMatter !== null) {
-              const stored = String(node.serverMatter).trim();
-              if (stored !== '' && !HUE_EMPTY_SERVER_VALUES.has(stored.toLowerCase())) return stored;
-            }
+            if (activeMatterServerId !== '') return activeMatterServerId;
             if (allowStored && node.__locateSessionInfo && node.__locateSessionInfo.serverId) {
               return node.__locateSessionInfo.serverId;
             }
@@ -1458,8 +1447,20 @@
           $matterControllerModeInput.on('change.knxUltimateMatterControllerDevice', applyControllerMode);
           $universalServiceInput.on('change.knxUltimateMatterControllerDevice', refreshUniversalServiceVisibility);
 
-          $knxServerInput.on('change.knxUltimateMatterControllerDevice', () => {
-            refreshKnxBindings();
+          $knxServerInput.on('change.knxUltimateMatterControllerDevice', function (event) {
+            const selectedValue = $(this).val();
+            if (shouldPreserveSelection(event, selectedValue, activeKnxServerId, KNX_EMPTY_VALUES)) {
+              // Node-RED 5 can briefly emit an empty placeholder while rebuilding
+              // config-node selectors. Restore the effective saved value so an
+              // untouched save and the mapping tabs both keep the KNX gateway.
+              $knxServerInput.val(activeKnxServerId);
+              updateTabsVisibility();
+              return;
+            }
+            activeKnxServerId = normalizeConfigSelection(selectedValue, KNX_EMPTY_VALUES);
+            // Selecting none only changes visibility. Keep the mounted GA/DPT
+            // controls intact so choosing the gateway again cannot lose values.
+            if (activeKnxServerId !== '') refreshKnxBindings();
             updateTabsVisibility();
           });
 
@@ -1553,7 +1554,15 @@
           }
 
           if ($hueServerInput.length) {
-            $hueServerInput.off('.knxUltimateMatterControllerDeviceDevices').on('change.knxUltimateMatterControllerDeviceDevices', () => {
+            $hueServerInput.off('.knxUltimateMatterControllerDeviceDevices').on('change.knxUltimateMatterControllerDeviceDevices', function (event) {
+              const selectedValue = $(this).val();
+              if (shouldPreserveSelection(event, selectedValue, activeMatterServerId, HUE_EMPTY_SERVER_VALUES)) {
+                $hueServerInput.val(activeMatterServerId);
+                return;
+              }
+              const nextMatterServerId = normalizeConfigSelection(selectedValue, HUE_EMPTY_SERVER_VALUES);
+              if (nextMatterServerId === activeMatterServerId) return;
+              activeMatterServerId = nextMatterServerId;
               cachedHueDevices = [];
               node._cachedHueLightDevices = cachedHueDevices;
               showingNoHueDevicesPlaceholder = false;
@@ -1772,11 +1781,6 @@
 
         // The Matter controller needs no readiness poll here: the light list is fetched
         // on demand by the autocomplete. Start the editor immediately.
-        $("#node-input-serverMatter").change(function () {
-          try {
-            node._cachedHueLightDevices = [];
-          } catch (error) { }
-        });
         Go();
         // ################################################################
 

package/nodes/locales/de/knxUltimateMatterControllerDevice.html

@@ -11,7 +11,7 @@ Er ersetzt die unveröffentlichten getrennten Matter-Controller-Nodes und behäl
 
 |Feld|Beschreibung|
 |--|--|
-| KNX GW | KNX-Gateway zum Schreiben und Beantworten der konfigurierten Gruppenadressen. Kann leer bleiben, wenn nur der Node-RED-Ausgang benötigt wird. |
+| KNX GW | KNX-Gateway zum Schreiben und Beantworten der konfigurierten Gruppenadressen. Kann leer bleiben, wenn nur der Node-RED-Ausgang benötigt wird. Das gespeicherte Gateway bleibt während der Initialisierung des Editors ausgewählt und ändert sich erst nach einer ausdrücklichen Benutzerauswahl. |
 | Matter controller | Matter-Controller-Konfigurationsknoten, in dem das Gerät gekoppelt wurde. |
 | Matter device | Matter-Endpunkt aus den gekoppelten Geräten. Die UI wird aus den echten Fähigkeiten neu aufgebaut. |
 | Switch / Steckdose / Licht On-Off | On/Off-Befehls- und Status-Gruppenadressen, normalerweise DPT `1.001`. |

package/nodes/locales/en/knxUltimateMatterControllerDevice.html

@@ -11,7 +11,7 @@ It replaces the unpublished per-device Matter controller nodes and keeps the ful
 
 |Field|Description|
 |--|--|
-| KNX GW | KNX gateway used to write and answer the configured group addresses. It can be left empty when only Node-RED output is needed. |
+| KNX GW | KNX gateway used to write and answer the configured group addresses. It can be left empty when only Node-RED output is needed. The saved gateway remains selected while the editor initializes and changes only after an explicit user selection. |
 | Matter controller | Matter controller configuration node where the device has been commissioned. |
 | Matter device | Matter endpoint selected from commissioned devices. The UI is rebuilt from its real capabilities. |
 | Switch / Plug / Light On-Off | On/Off command and status group addresses, usually DPT `1.001`. |

package/nodes/locales/es/knxUltimateMatterControllerDevice.html

@@ -11,7 +11,7 @@ Sustituye a los nodos Matter separados no publicados y conserva toda la UI de lu
 
 |Campo|Descripción|
 |--|--|
-| KNX GW | Gateway KNX usado para escribir y responder las direcciones de grupo configuradas. Puede quedar vacío si solo se necesita la salida Node-RED. |
+| KNX GW | Gateway KNX usado para escribir y responder las direcciones de grupo configuradas. Puede quedar vacío si solo se necesita la salida Node-RED. El gateway guardado permanece seleccionado durante la inicialización del editor y solo cambia tras una selección explícita del usuario. |
 | Matter controller | Nodo de configuración Matter Controller donde el dispositivo fue emparejado. |
 | Dispositivo Matter | Endpoint Matter seleccionado entre los dispositivos emparejados. La UI se reconstruye a partir de sus capacidades reales. |
 | Switch / Enchufe / Luz On-Off | Direcciones de grupo de comando y estado On/Off, normalmente DPT `1.001`. |

package/nodes/locales/fr/knxUltimateMatterControllerDevice.html

@@ -11,7 +11,7 @@ Il remplace les nœuds Matter séparés non publiés et conserve toute l'UI lumi
 
 |Champ|Description|
 |--|--|
-| KNX GW | Passerelle KNX utilisée pour écrire et répondre sur les adresses de groupe configurées. Elle peut rester vide si seule la sortie Node-RED est utilisée. |
+| KNX GW | Passerelle KNX utilisée pour écrire et répondre sur les adresses de groupe configurées. Elle peut rester vide si seule la sortie Node-RED est utilisée. La passerelle enregistrée reste sélectionnée pendant l'initialisation de l'éditeur et ne change qu'après une sélection explicite de l'utilisateur. |
 | Matter controller | Nœud de configuration Matter Controller dans lequel le périphérique a été appairé. |
 | Appareil Matter | Endpoint Matter choisi parmi les appareils appairés. L'UI est reconstruite à partir de ses capacités réelles. |
 | Switch / Prise / Lumière On-Off | Adresses de groupe commande et état On/Off, généralement DPT `1.001`. |

package/nodes/locales/it/knxUltimateMatterControllerDevice.html

@@ -11,7 +11,7 @@ Sostituisce i nodi Matter separati non pubblicati e mantiene tutta la UI luce qu
 
 |Campo|Descrizione|
 |--|--|
-| KNX GW | Gateway KNX usato per scrivere e rispondere sugli indirizzi di gruppo configurati. Può restare vuoto se serve solo l'output Node-RED. |
+| KNX GW | Gateway KNX usato per scrivere e rispondere sugli indirizzi di gruppo configurati. Può restare vuoto se serve solo l'output Node-RED. Il gateway salvato rimane selezionato durante l'inizializzazione dell'editor e cambia soltanto dopo una selezione esplicita dell'utente. |
 | Matter controller | Nodo di configurazione Matter Controller in cui il dispositivo è stato associato. |
 | Dispositivo Matter | Endpoint Matter selezionato tra i dispositivi abbinati. La UI viene ricostruita in base alle capability reali. |
 | Switch / Presa / Luce On-Off | Indirizzi di gruppo di comando e stato On/Off, di solito DPT `1.001`. |

package/nodes/locales/zh-CN/knxUltimateMatterControllerDevice.html

@@ -11,7 +11,7 @@
 
 |字段|说明|
 |--|--|
-| KNX GW | 用于写入并响应已配置组地址的 KNX 网关。如果只需要 Node-RED 输出，可以留空。 |
+| KNX GW | 用于写入并响应已配置组地址的 KNX 网关。如果只需要 Node-RED 输出，可以留空。编辑器初始化期间会保留已保存的网关，只有用户明确选择后才会更改。 |
 | Matter controller | 设备已在其中配网的 Matter Controller 配置节点。 |
 | Matter device | 从已配对设备中选择的 Matter endpoint。UI 会根据真实能力重新构建。 |
 | Switch / 插座 / 灯 On-Off | On/Off 命令和状态组地址，通常使用 DPT `1.001`。 |

package/package.json

@@ -3,7 +3,7 @@
   "engines": {
     "node": ">=20.18.1"
   },
-  "version": "6.3.10",
+  "version": "6.3.11",
   "description": "KNX Ultimate is the most advanced KNX integration for Node-RED, providing secure KNX/IP communication, routing, ETS project import, Philips Hue, Matter Controller and Matter Bridge (control matter device via KNX and expose KNX GA via Matter), MQTT, diagnostics with AI, virtual devices, and powerful automation nodes. Build professional, reliable, and scalable smart home and building automation projects with minimal effort.",
   "files": [
     "nodes/",

package/resources/configNodeEditorSelection.js

@@ -0,0 +1,32 @@
+(function (root, factory) {
+  const api = factory()
+  if (typeof module === 'object' && module.exports) module.exports = api
+  if (root) root.KNXUltimateConfigNodeEditorSelection = api
+}(typeof window !== 'undefined' ? window : globalThis, function () {
+  const DEFAULT_EMPTY_VALUES = new Set(['', 'none', '_add_', '__none__'])
+
+  function normalizeSelection (value, emptyValues = DEFAULT_EMPTY_VALUES) {
+    const normalized = value === undefined || value === null ? '' : String(value).trim()
+    const normalizedEmptyValues = emptyValues instanceof Set
+      ? emptyValues
+      : new Set(Array.isArray(emptyValues) ? emptyValues : DEFAULT_EMPTY_VALUES)
+    return normalizedEmptyValues.has(normalized.toLowerCase()) ? '' : normalized
+  }
+
+  function shouldPreserveSelection (event, nextValue, currentValue, emptyValues = DEFAULT_EMPTY_VALUES) {
+    const programmaticChange = !event || !event.originalEvent
+    return programmaticChange &&
+      normalizeSelection(nextValue, emptyValues) === '' &&
+      normalizeSelection(currentValue, emptyValues) !== ''
+  }
+
+  function resolveSelectedOrStoredSelection (selectedValue, storedValue, emptyValues = DEFAULT_EMPTY_VALUES) {
+    return normalizeSelection(selectedValue, emptyValues) || normalizeSelection(storedValue, emptyValues)
+  }
+
+  return {
+    normalizeSelection,
+    resolveSelectedOrStoredSelection,
+    shouldPreserveSelection
+  }
+}))