node-red-contrib-knx-ultimate 5.2.1 → 5.2.2

package/nodes/knxUltimateMatterBridge.html

@@ -3,325 +3,252 @@
 
 <script type="text/javascript">
     (function () {
+        // GA fields of each virtual device type.
+        // dir 'command' = Matter -> KNX (GA written on assistant commands), 'status' = KNX -> Matter.
+        const TYPE_FIELDS = {
+            onofflight: [
+                { key: 'OnOff', labelKey: 'fn_onoff_cmd', dptPrefix: '1.', fallbackDpt: '1.001' },
+                { key: 'OnOffStatus', labelKey: 'fn_onoff_status', dptPrefix: '1.', fallbackDpt: '1.001' }
+            ],
+            onoffplug: [
+                { key: 'OnOff', labelKey: 'fn_onoff_cmd', dptPrefix: '1.', fallbackDpt: '1.001' },
+                { key: 'OnOffStatus', labelKey: 'fn_onoff_status', dptPrefix: '1.', fallbackDpt: '1.001' }
+            ],
+            dimmablelight: [
+                { key: 'OnOff', labelKey: 'fn_onoff_cmd', dptPrefix: '1.', fallbackDpt: '1.001' },
+                { key: 'OnOffStatus', labelKey: 'fn_onoff_status', dptPrefix: '1.', fallbackDpt: '1.001' },
+                { key: 'Level', labelKey: 'fn_level_cmd', dptPrefix: '5.', fallbackDpt: '5.001' },
+                { key: 'LevelStatus', labelKey: 'fn_level_status', dptPrefix: '5.', fallbackDpt: '5.001' }
+            ],
+            rgblight: [
+                { key: 'OnOff', labelKey: 'fn_onoff_cmd', dptPrefix: '1.', fallbackDpt: '1.001' },
+                { key: 'OnOffStatus', labelKey: 'fn_onoff_status', dptPrefix: '1.', fallbackDpt: '1.001' },
+                { key: 'Level', labelKey: 'fn_level_cmd', dptPrefix: '5.', fallbackDpt: '5.001' },
+                { key: 'LevelStatus', labelKey: 'fn_level_status', dptPrefix: '5.', fallbackDpt: '5.001' },
+                { key: 'RGB', labelKey: 'fn_rgb_cmd', dptPrefix: '232.', fallbackDpt: '232.600' },
+                { key: 'RGBStatus', labelKey: 'fn_rgb_status', dptPrefix: '232.', fallbackDpt: '232.600' }
+            ],
+            colortemperaturelight: [
+                { key: 'OnOff', labelKey: 'fn_onoff_cmd', dptPrefix: '1.', fallbackDpt: '1.001' },
+                { key: 'OnOffStatus', labelKey: 'fn_onoff_status', dptPrefix: '1.', fallbackDpt: '1.001' },
+                { key: 'Level', labelKey: 'fn_level_cmd', dptPrefix: '5.', fallbackDpt: '5.001' },
+                { key: 'LevelStatus', labelKey: 'fn_level_status', dptPrefix: '5.', fallbackDpt: '5.001' },
+                { key: 'CT', labelKey: 'fn_ct_cmd', dptPrefix: '7.', fallbackDpt: '7.600' },
+                { key: 'CTStatus', labelKey: 'fn_ct_status', dptPrefix: '7.', fallbackDpt: '7.600' }
+            ],
+            temperaturesensor: [{ key: 'Status', labelKey: 'fn_sensor_ga', dptPrefix: '9.', fallbackDpt: '9.001' }],
+            humiditysensor: [{ key: 'Status', labelKey: 'fn_sensor_ga', dptPrefix: '9.', fallbackDpt: '9.007' }],
+            lightsensor: [{ key: 'Status', labelKey: 'fn_sensor_ga', dptPrefix: '9.', fallbackDpt: '9.004' }],
+            occupancysensor: [{ key: 'Status', labelKey: 'fn_sensor_ga', dptPrefix: '1.', fallbackDpt: '1.011' }],
+            contactsensor: [{ key: 'Status', labelKey: 'fn_sensor_ga', dptPrefix: '1.', fallbackDpt: '1.002' }],
+            windowcovering: [
+                { key: 'UpDown', labelKey: 'fn_updown', dptPrefix: '1.', fallbackDpt: '1.008' },
+                { key: 'Stop', labelKey: 'fn_stop', dptPrefix: '1.', fallbackDpt: '1.017' },
+                { key: 'Position', labelKey: 'fn_position_cmd', dptPrefix: '5.', fallbackDpt: '5.001' },
+                { key: 'PositionStatus', labelKey: 'fn_position_status', dptPrefix: '5.', fallbackDpt: '5.001' }
+            ],
+            thermostat: [
+                { key: 'CurrentTemp', labelKey: 'fn_currenttemp', dptPrefix: '9.', fallbackDpt: '9.001' },
+                { key: 'Setpoint', labelKey: 'fn_setpoint_cmd', dptPrefix: '9.', fallbackDpt: '9.001' },
+                { key: 'SetpointStatus', labelKey: 'fn_setpoint_status', dptPrefix: '9.', fallbackDpt: '9.001' }
+            ],
+            smokecoalarm: [
+                { key: 'Smoke', labelKey: 'fn_smoke_ga', dptPrefix: '1.', fallbackDpt: '1.005' },
+                { key: 'CO', labelKey: 'fn_co_ga', dptPrefix: '1.', fallbackDpt: '1.005' }
+            ],
+            waterleakdetector: [{ key: 'Status', labelKey: 'fn_leak_ga', dptPrefix: '1.', fallbackDpt: '1.005' }],
+            airqualitysensor: [{ key: 'Status', labelKey: 'fn_co2_ga', dptPrefix: '9.', fallbackDpt: '9.008' }],
+            fan: [
+                { key: 'FanSpeed', labelKey: 'fn_fanspeed_cmd', dptPrefix: '5.', fallbackDpt: '5.001' },
+                { key: 'FanSpeedStatus', labelKey: 'fn_fanspeed_status', dptPrefix: '5.', fallbackDpt: '5.001' }
+            ],
+            robotvacuum: [] // Flow-only: no GA fields, controlled via the node PINs
+        };
+        const TYPE_ORDER = ['onofflight', 'dimmablelight', 'rgblight', 'colortemperaturelight', 'onoffplug', 'windowcovering', 'thermostat', 'fan', 'temperaturesensor', 'humiditysensor', 'lightsensor', 'occupancysensor', 'contactsensor', 'smokecoalarm', 'waterleakdetector', 'airqualitysensor', 'robotvacuum'];
+
+        // Every GA/DPT key across all types, used to declare the node defaults.
+        const ALL_KEYS = [];
+        Object.keys(TYPE_FIELDS).forEach((t) => TYPE_FIELDS[t].forEach((f) => { if (ALL_KEYS.indexOf(f.key) === -1) ALL_KEYS.push(f.key); }));
+        const gaDefaults = {
+            server: { type: 'knxUltimate-config', required: false },
+            serverMatterBridge: { type: 'matterbridge-config', required: true },
+            name: { value: '' },
+            deviceType: { value: 'onofflight' },
+            invertPosition: { value: false },
+            readStatusAtStartup: { value: 'yes' },
+            enableNodePINS: { value: 'no' },
+            outputs: { value: 0 },
+            inputs: { value: 0 }
+        };
+        ALL_KEYS.forEach((key) => {
+            gaDefaults['ga' + key] = { value: '' };
+            gaDefaults['dpt' + key] = { value: '' };
+        });
+
         RED.nodes.registerType('knxUltimateMatterBridge', {
             category: 'KNX Ultimate Matter',
             color: '#D7C7E9',
-            defaults: {
-                server: { type: 'knxUltimate-config', required: false },
-                name: { value: '' },
-                bridgeDeviceName: { value: 'KNX-Ultimate Bridge' },
-                bridgePort: { value: 5540, validate: RED.validators.number() },
-                readStatusAtStartup: { value: 'yes' },
-                enableNodePINS: { value: 'no' },
-                devices: { value: [] },
-                outputs: { value: 0 },
-                inputs: { value: 0 }
-            },
+            defaults: gaDefaults,
             inputs: 0,
             outputs: 0,
             icon: 'node-matter-icon.svg',
             label() {
-                return this.name || 'Matter Bridge (BETA)';
+                return this.name || 'Matter Bridge device (BETA)';
             },
-            paletteLabel: 'Matter Bridge (BETA)',
+            paletteLabel: 'Matter Bridge device (BETA)',
             oneditprepare() {
                 try { RED.sidebar.show('help'); } catch (error) { /* empty */ }
                 const node = this;
 
-                let oNodeServer = RED.nodes.node($('#node-input-server').val());
-                $('#node-input-server').on('change.knxUltimateMatterBridge', function () {
-                    try { oNodeServer = RED.nodes.node($(this).val()); } catch (error) { /* empty */ }
+                // Resolves the KNX gateway at query time: the selected one, or - as a
+                // fallback - the first knxUltimate-config available, so the GA list works
+                // even before the user picks the gateway on this device node.
+                const findKnxGateway = () => {
+                    let srv = null;
+                    try {
+                        const val = $('#node-input-server').val();
+                        if (val && val !== '_ADD_') srv = RED.nodes.node(val);
+                    } catch (error) { /* empty */ }
+                    if (!srv) {
+                        try {
+                            RED.nodes.eachConfig((c) => { if (!srv && c.type === 'knxUltimate-config') srv = c; });
+                        } catch (error) { /* empty */ }
+                    }
+                    return srv;
+                };
+
+                // Auto-select the KNX gateway when there is only one, sparing the user a click per device node
+                try {
+                    const cur = $('#node-input-server').val();
+                    if (!cur || cur === '_ADD_') {
+                        const gws = [];
+                        RED.nodes.eachConfig((c) => { if (c.type === 'knxUltimate-config') gws.push(c); });
+                        if (gws.length === 1) $('#node-input-server').val(gws[0].id).trigger('change');
+                    }
+                } catch (error) { /* empty */ }
+
+                // Device type dropdown
+                const $type = $('#node-input-deviceType');
+                TYPE_ORDER.forEach((t) => {
+                    $type.append($('<option></option>').attr('value', t).text(node._('knxUltimateMatterBridge.types.' + t)));
                 });
+                $type.val(node.deviceType || 'onofflight');
 
-                // GA fields of each virtual device type.
-                // dir 'command' = Matter -> KNX (GA written on Alexa commands), 'status' = KNX -> Matter.
-                const TYPE_FIELDS = {
-                    onofflight: [
-                        { key: 'OnOff', labelKey: 'fn_onoff_cmd', dir: 'command', dptPrefix: '1.', fallbackDpt: '1.001' },
-                        { key: 'OnOffStatus', labelKey: 'fn_onoff_status', dir: 'status', dptPrefix: '1.', fallbackDpt: '1.001' }
-                    ],
-                    onoffplug: [
-                        { key: 'OnOff', labelKey: 'fn_onoff_cmd', dir: 'command', dptPrefix: '1.', fallbackDpt: '1.001' },
-                        { key: 'OnOffStatus', labelKey: 'fn_onoff_status', dir: 'status', dptPrefix: '1.', fallbackDpt: '1.001' }
-                    ],
-                    dimmablelight: [
-                        { key: 'OnOff', labelKey: 'fn_onoff_cmd', dir: 'command', dptPrefix: '1.', fallbackDpt: '1.001' },
-                        { key: 'OnOffStatus', labelKey: 'fn_onoff_status', dir: 'status', dptPrefix: '1.', fallbackDpt: '1.001' },
-                        { key: 'Level', labelKey: 'fn_level_cmd', dir: 'command', dptPrefix: '5.', fallbackDpt: '5.001' },
-                        { key: 'LevelStatus', labelKey: 'fn_level_status', dir: 'status', dptPrefix: '5.', fallbackDpt: '5.001' }
-                    ],
-                    rgblight: [
-                        { key: 'OnOff', labelKey: 'fn_onoff_cmd', dir: 'command', dptPrefix: '1.', fallbackDpt: '1.001' },
-                        { key: 'OnOffStatus', labelKey: 'fn_onoff_status', dir: 'status', dptPrefix: '1.', fallbackDpt: '1.001' },
-                        { key: 'Level', labelKey: 'fn_level_cmd', dir: 'command', dptPrefix: '5.', fallbackDpt: '5.001' },
-                        { key: 'LevelStatus', labelKey: 'fn_level_status', dir: 'status', dptPrefix: '5.', fallbackDpt: '5.001' },
-                        { key: 'RGB', labelKey: 'fn_rgb_cmd', dir: 'command', dptPrefix: '232.', fallbackDpt: '232.600' },
-                        { key: 'RGBStatus', labelKey: 'fn_rgb_status', dir: 'status', dptPrefix: '232.', fallbackDpt: '232.600' }
-                    ],
-                    colortemperaturelight: [
-                        { key: 'OnOff', labelKey: 'fn_onoff_cmd', dir: 'command', dptPrefix: '1.', fallbackDpt: '1.001' },
-                        { key: 'OnOffStatus', labelKey: 'fn_onoff_status', dir: 'status', dptPrefix: '1.', fallbackDpt: '1.001' },
-                        { key: 'Level', labelKey: 'fn_level_cmd', dir: 'command', dptPrefix: '5.', fallbackDpt: '5.001' },
-                        { key: 'LevelStatus', labelKey: 'fn_level_status', dir: 'status', dptPrefix: '5.', fallbackDpt: '5.001' },
-                        { key: 'CT', labelKey: 'fn_ct_cmd', dir: 'command', dptPrefix: '7.', fallbackDpt: '7.600' },
-                        { key: 'CTStatus', labelKey: 'fn_ct_status', dir: 'status', dptPrefix: '7.', fallbackDpt: '7.600' }
-                    ],
-                    temperaturesensor: [{ key: 'Status', labelKey: 'fn_sensor_ga', dir: 'status', dptPrefix: '9.', fallbackDpt: '9.001' }],
-                    humiditysensor: [{ key: 'Status', labelKey: 'fn_sensor_ga', dir: 'status', dptPrefix: '9.', fallbackDpt: '9.007' }],
-                    lightsensor: [{ key: 'Status', labelKey: 'fn_sensor_ga', dir: 'status', dptPrefix: '9.', fallbackDpt: '9.004' }],
-                    occupancysensor: [{ key: 'Status', labelKey: 'fn_sensor_ga', dir: 'status', dptPrefix: '1.', fallbackDpt: '1.011' }],
-                    contactsensor: [{ key: 'Status', labelKey: 'fn_sensor_ga', dir: 'status', dptPrefix: '1.', fallbackDpt: '1.002' }],
-                    windowcovering: [
-                        { key: 'UpDown', labelKey: 'fn_updown', dir: 'command', dptPrefix: '1.', fallbackDpt: '1.008' },
-                        { key: 'Stop', labelKey: 'fn_stop', dir: 'command', dptPrefix: '1.', fallbackDpt: '1.017' },
-                        { key: 'Position', labelKey: 'fn_position_cmd', dir: 'command', dptPrefix: '5.', fallbackDpt: '5.001' },
-                        { key: 'PositionStatus', labelKey: 'fn_position_status', dir: 'status', dptPrefix: '5.', fallbackDpt: '5.001' }
-                    ],
-                    thermostat: [
-                        { key: 'CurrentTemp', labelKey: 'fn_currenttemp', dir: 'status', dptPrefix: '9.', fallbackDpt: '9.001' },
-                        { key: 'Setpoint', labelKey: 'fn_setpoint_cmd', dir: 'command', dptPrefix: '9.', fallbackDpt: '9.001' },
-                        { key: 'SetpointStatus', labelKey: 'fn_setpoint_status', dir: 'status', dptPrefix: '9.', fallbackDpt: '9.001' }
-                    ],
-                    smokecoalarm: [
-                        { key: 'Smoke', labelKey: 'fn_smoke_ga', dir: 'status', dptPrefix: '1.', fallbackDpt: '1.005' },
-                        { key: 'CO', labelKey: 'fn_co_ga', dir: 'status', dptPrefix: '1.', fallbackDpt: '1.005' }
-                    ],
-                    waterleakdetector: [{ key: 'Status', labelKey: 'fn_leak_ga', dir: 'status', dptPrefix: '1.', fallbackDpt: '1.005' }],
-                    airqualitysensor: [{ key: 'Status', labelKey: 'fn_co2_ga', dir: 'status', dptPrefix: '9.', fallbackDpt: '9.008' }],
-                    fan: [
-                        { key: 'FanSpeed', labelKey: 'fn_fanspeed_cmd', dir: 'command', dptPrefix: '5.', fallbackDpt: '5.001' },
-                        { key: 'FanSpeedStatus', labelKey: 'fn_fanspeed_status', dir: 'status', dptPrefix: '5.', fallbackDpt: '5.001' }
-                    ],
-                    robotvacuum: [] // Flow-only: no GA fields, controlled via the node PINs
-                };
-                const TYPE_ORDER = ['onofflight', 'dimmablelight', 'rgblight', 'colortemperaturelight', 'onoffplug', 'windowcovering', 'thermostat', 'fan', 'temperaturesensor', 'humiditysensor', 'lightsensor', 'occupancysensor', 'contactsensor', 'smokecoalarm', 'waterleakdetector', 'airqualitysensor', 'robotvacuum'];
+                // Compact "list" layout: a small gray caption above each input, fields wrapping
+                // on one or more rows (same pattern used across the rest of the KNX-Ultimate nodes).
+                const $fields = $('#mb-ga-fields').css({ display: 'flex', flexWrap: 'wrap', alignItems: 'flex-end', gap: '10px' });
+                const $invertRow = $('#mb-invert-row');
+                const gaInputs = {};
 
-                function createLabeledField(row, labelText, element, options = {}) {
+                function createLabeledField(row, element, options = {}) {
                     const wrapper = $('<div/>', {
-                        style: 'display:flex; flex-direction:column; margin-right:10px;'
+                        style: 'display:flex; flex-direction:column; margin-bottom:8px;'
                     }).appendTo(row);
                     if (options.width) wrapper.css('width', options.width);
-                    if (options.flex) wrapper.css('flex', options.flex);
-                    $('<span/>', {
-                        text: labelText,
-                        style: 'font-size:11px; color:#666; margin-bottom:2px;'
+                    const $labelSpan = $('<span/>', {
+                        style: 'font-size:11px; color:#666; margin-bottom:2px; white-space:nowrap;'
                     }).appendTo(wrapper);
                     element.css('width', '100%');
                     element.appendTo(wrapper);
-                    element.data('fieldWrapper', wrapper);
-                    return element;
+                    return { wrapper, $labelSpan };
                 }
 
-                function attachGaAutocomplete($ga, $dptHidden, fieldDef) {
+                function attachGaAutocomplete($ga, $dpt, fieldDef) {
                     $ga.autocomplete({
                         minLength: 0,
                         source(request, response) {
-                            if (!oNodeServer) { response([]); return; }
-                            $.getJSON(`knxUltimatecsv?nodeID=${oNodeServer.id}`, (data) => {
+                            const gw = findKnxGateway();
+                            if (!gw) { response([]); return; }
+                            $.getJSON(`knxUltimatecsv?nodeID=${gw.id}`, (data) => {
                                 response($.map(data, (value) => {
                                     const search = `${value.ga} (${value.devicename}) DPT${value.dpt}`;
                                     if (htmlUtilsfullCSVSearch(search, `${request.term} ${fieldDef.dptPrefix}`)) {
-                                        return {
-                                            label: `${value.ga} # ${value.devicename} # ${value.dpt}`,
-                                            value: value.ga,
-                                            dpt: value.dpt
-                                        };
+                                        return { label: `${value.ga} # ${value.devicename} # ${value.dpt}`, value: value.ga, dpt: value.dpt };
                                     }
                                     return null;
                                 }));
                             });
                         },
-                        select(event, ui) {
-                            $dptHidden.val(ui.item.dpt || fieldDef.fallbackDpt);
-                        }
+                        select(event, ui) { $dpt.val(ui.item.dpt || fieldDef.fallbackDpt); }
                     });
                     $ga.on('focus.knxUltimateMatterBridge click.knxUltimateMatterBridge', function () {
                         try { $(this).autocomplete('search', ''); } catch (error) { /* empty */ }
                     });
                     try {
-                        if (oNodeServer && oNodeServer.id) KNX_enableSecureFormatting($ga, oNodeServer.id);
+                        const gw = findKnxGateway();
+                        if (gw && gw.id) KNX_enableSecureFormatting($ga, gw.id);
                     } catch (error) { /* empty */ }
                 }
 
-                // ------------------------------------------------------------------
-                // Devices editable list
-                // ------------------------------------------------------------------
-                const container = $('#node-input-devices-container');
-                container.css('min-height', '260px').css('min-width', '640px').editableList({
-                    sortable: true,
-                    removable: true,
-                    addItem: function (row, index, data) {
-                        const device = $.extend(true, { id: '', type: 'onofflight', name: '' }, data.device);
-                        if (!device.id) {
-                            try { device.id = RED.util.generateId(); } catch (error) { device.id = Math.random().toString(16).slice(2); }
-                        }
-                        row.data('deviceId', device.id);
-
-                        const block = $('<div/>').appendTo(row);
-                        const topRow = $('<div/>').addClass('form-row').css({ display: 'flex', alignItems: 'flex-end', flexWrap: 'wrap', gap: '10px' }).appendTo(block);
-                        const gaRow = $('<div/>').addClass('form-row').css({ display: 'flex', alignItems: 'flex-end', flexWrap: 'wrap', gap: '10px', marginTop: '6px' }).appendTo(block);
-
-                        // Type
-                        const $type = $('<select/>', { class: 'mb-type' });
-                        TYPE_ORDER.forEach((t) => {
-                            $type.append($('<option></option>').attr('value', t).text(node._('knxUltimateMatterBridge.types.' + t)));
-                        });
-                        createLabeledField(topRow, node._('knxUltimateMatterBridge.fields.type'), $type, { width: '190px' });
-                        $type.val(device.type || 'onofflight');
-
-                        // Name (the one Alexa & Co. show and use)
-                        const $name = $('<input/>', { type: 'text', class: 'mb-name' }).attr('placeholder', node._('knxUltimateMatterBridge.fields.name_placeholder')).val(device.name);
-                        createLabeledField(topRow, node._('knxUltimateMatterBridge.fields.name'), $name, { flex: '1 1 220px' });
-
-                        // Position inversion (covers only)
-                        const $invertWrapper = $('<label/>', { style: 'display:flex; align-items:center; gap:6px; padding:4px 8px; border:1px solid #ced4da; border-radius:4px; cursor:pointer;' }).appendTo(topRow);
-                        const $invert = $('<input/>', { type: 'checkbox', class: 'mb-invert', style: 'width:auto; margin:0;' }).appendTo($invertWrapper);
-                        $('<span/>', { text: node._('knxUltimateMatterBridge.fields.invert'), style: 'font-size:12px;' }).appendTo($invertWrapper);
-                        $invert.prop('checked', device.invertPosition === true);
-
-                        // GA fields: created for every possible function; visibility follows the selected type
-                        const allFieldKeys = {};
-                        Object.keys(TYPE_FIELDS).forEach((t) => {
-                            TYPE_FIELDS[t].forEach((f) => { allFieldKeys[f.key] = f; });
-                        });
-                        const gaInputs = {};
-                        Object.keys(allFieldKeys).forEach((key) => {
-                            const fieldDef = allFieldKeys[key];
-                            // The "corrupted key" fallbacks recover values saved by versions where the
-                            // jQuery UI autocomplete class polluted the field key extraction.
-                            const gaValue = device[`ga${key}`] !== undefined ? device[`ga${key}`] : (device[`ga${key} ui-autocomplete-input`] || '');
-                            const dptValue = device[`dpt${key}`] !== undefined ? device[`dpt${key}`] : (device[`dpt${key} ui-autocomplete-input`] || '');
-                            const $ga = $('<input/>', { type: 'text', class: `mb-ga-${key}`, placeholder: '1/1/1' }).val(gaValue);
-                            const $dpt = $('<input/>', { type: 'hidden', class: `mb-dpt-${key}` }).val(dptValue);
-                            createLabeledField(gaRow, '', $ga, { width: '120px' });
-                            gaRow.append($dpt);
-                            attachGaAutocomplete($ga, $dpt, fieldDef);
-                            gaInputs[key] = { $ga, $dpt, fieldDef };
-                        });
-
-                        const updateTypePresentation = () => {
-                            const selected = $type.val();
-                            const active = TYPE_FIELDS[selected] || [];
-                            Object.keys(gaInputs).forEach((key) => {
-                                const entry = gaInputs[key];
-                                const fieldForType = active.find((f) => f.key === key);
-                                const wrapper = entry.$ga.data('fieldWrapper');
-                                if (fieldForType) {
-                                    wrapper.show();
-                                    wrapper.find('span').first().text(node._('knxUltimateMatterBridge.functions.' + fieldForType.labelKey));
-                                } else {
-                                    wrapper.hide();
-                                }
-                            });
-                            if (selected === 'windowcovering') $invertWrapper.show();
-                            else $invertWrapper.hide();
-                        };
-                        $type.on('change', updateTypePresentation);
-                        updateTypePresentation();
-                    }
-                });
-
-                (node.devices || []).forEach((d) => {
-                    container.editableList('addItem', { device: d });
+                // Build one field per possible GA key; show only the ones of the selected type.
+                ALL_KEYS.forEach((key) => {
+                    const fieldDef = {};
+                    Object.keys(TYPE_FIELDS).forEach((t) => { const f = TYPE_FIELDS[t].find((x) => x.key === key); if (f) Object.assign(fieldDef, f); });
+                    const $ga = $('<input/>', { type: 'text', placeholder: '1/1/1' }).val(node['ga' + key] || '');
+                    const $dpt = $('<input/>', { type: 'hidden' }).val(node['dpt' + key] || '');
+                    const { wrapper, $labelSpan } = createLabeledField($fields, $ga, { width: '150px' });
+                    wrapper.append($dpt); // Kept alongside the GA input; never rendered.
+                    attachGaAutocomplete($ga, $dpt, fieldDef);
+                    // Keyed by field key (not DOM position), so save is robust regardless of layout.
+                    gaInputs[key] = { wrapper, $ga, $dpt, $labelSpan };
                 });
 
-                // ------------------------------------------------------------------
-                // Pairing panel
-                // ------------------------------------------------------------------
-                const $pairingBody = $('#mb-pairing-body');
-                const $refreshPairing = $('#mb-refresh-pairing');
-                const $resetButton = $('#mb-factory-reset');
-
-                function loadPairingInfo() {
-                    $pairingBody.html('<i class="fa fa-circle-notch fa-spin"></i>');
-                    $.getJSON(`KNXUltimateMatterBridgeInfo?nodeId=${node.id}&_=${Date.now()}`, (info) => {
-                        $pairingBody.empty();
-                        if (info.error) {
-                            $pairingBody.append($('<p style="color:#999;"></p>').text(info.error));
-                            return;
-                        }
-                        if (!info.running) {
-                            $pairingBody.append($('<p style="color:#999;"></p>').text(node._('knxUltimateMatterBridge.pairing.not_running')));
-                            return;
+                function updateTypePresentation() {
+                    const selected = $type.val();
+                    const active = TYPE_FIELDS[selected] || [];
+                    ALL_KEYS.forEach((key) => {
+                        const entry = gaInputs[key];
+                        const fieldForType = active.find((f) => f.key === key);
+                        if (fieldForType) {
+                            entry.wrapper.show();
+                            entry.$labelSpan.text(node._('knxUltimateMatterBridge.functions.' + fieldForType.labelKey));
+                        } else {
+                            entry.wrapper.hide();
                         }
-                        if (info.commissioned) {
-                            $pairingBody.append($('<p style="color:#1b7d33;"></p>').text(`${node._('knxUltimateMatterBridge.pairing.commissioned')} (${info.fabrics.length})`));
-                            info.fabrics.forEach((f) => {
-                                $pairingBody.append($('<div style="margin-left:10px;"></div>').text(`• ${f.label || 'Controller'} (vendor ${f.vendorId})`));
-                            });
-                            $resetButton.show();
-                            return;
-                        }
-                        $pairingBody.append($('<p style="color:#b8860b;"></p>').text(node._('knxUltimateMatterBridge.pairing.awaiting')));
-                        if (info.manualPairingCode) {
-                            $pairingBody.append($('<p></p>').append($('<b style="font-size:18px; letter-spacing:2px;"></b>').text(info.manualPairingCode)));
-                        }
-                        if (info.qrAscii) {
-                            $pairingBody.append($('<pre style="font-family:monospace; line-height:1.05; font-size:7px; display:inline-block; padding:6px; background:#fff; color:#000;"></pre>').text(info.qrAscii));
-                        }
-                        if (info.qrPairingCode) {
-                            const url = `https://project-chip.github.io/connectedhomeip/qrcode.html?data=${encodeURIComponent(info.qrPairingCode)}`;
-                            $pairingBody.append($('<p></p>').append($('<a target="_blank"></a>').attr('href', url).text(node._('knxUltimateMatterBridge.pairing.qr_link'))));
-                        }
-                        $resetButton.hide();
-                    }).fail(() => {
-                        $pairingBody.empty();
-                        $pairingBody.append($('<p style="color:#999;"></p>').text(node._('knxUltimateMatterBridge.pairing.deploy_first')));
                     });
+                    $invertRow.toggle(selected === 'windowcovering');
                 }
+                $type.on('change', updateTypePresentation);
+                updateTypePresentation();
 
-                $refreshPairing.on('click.knxUltimateMatterBridge', () => loadPairingInfo());
-                $resetButton.on('click.knxUltimateMatterBridge', () => {
-                    if (!window.confirm(node._('knxUltimateMatterBridge.pairing.reset_confirm'))) return;
-                    $resetButton.prop('disabled', true);
-                    $.getJSON(`KNXUltimateMatterBridgeReset?nodeId=${node.id}`, (data) => {
-                        if (data && data.error) RED.notify(data.error, { type: 'error' });
-                        else RED.notify(node._('knxUltimateMatterBridge.pairing.reset_ok'), { type: 'success' });
-                        loadPairingInfo();
-                    }).always(() => $resetButton.prop('disabled', false));
-                });
-
-                loadPairingInfo();
+                // oneditsave reads the GA values straight from these references: no DOM
+                // position matching, so it cannot break if the layout changes again.
+                node._matterGaInputs = gaInputs;
 
+                $('#node-input-invertPosition').prop('checked', node.invertPosition === true);
                 $('#node-input-readStatusAtStartup').val(node.readStatusAtStartup || 'yes');
                 $('#node-input-enableNodePINS').val(node.enableNodePINS || 'no');
             },
             oneditsave() {
                 try { RED.sidebar.show('info'); } catch (error) { /* empty */ }
                 const node = this;
-                const items = $('#node-input-devices-container').editableList('items');
-                node.devices = [];
-                items.each(function () {
-                    const row = $(this);
-                    const type = row.find('.mb-type').val();
-                    const device = {
-                        id: row.data('deviceId') || '',
-                        type,
-                        name: (row.find('.mb-name').val() || '').trim()
-                    };
-                    if (!device.name) return; // Skip incomplete rows
-                    if (type === 'windowcovering') device.invertPosition = row.find('.mb-invert').is(':checked');
-                    row.find('input[class*="mb-ga-"]').each(function () {
-                        const $ga = $(this);
-                        // The class attribute may contain extra classes added by jQuery UI
-                        // (e.g. "mb-ga-OnOff ui-autocomplete-input"): extract the key safely.
-                        const match = ($ga.attr('class') || '').match(/mb-ga-([A-Za-z0-9]+)/);
-                        if (!match) return;
-                        const key = match[1];
-                        const ga = ($ga.val() || '').trim();
-                        if (ga !== '') {
-                            device[`ga${key}`] = ga;
-                            device[`dpt${key}`] = (row.find(`.mb-dpt-${key}`).val() || '').trim();
-                        }
-                    });
-                    node.devices.push(device);
+                const selected = $('#node-input-deviceType').val();
+                node.deviceType = selected;
+                node.invertPosition = $('#node-input-invertPosition').is(':checked');
+                const active = TYPE_FIELDS[selected] || [];
+                const gaInputs = node._matterGaInputs || {};
+                // Clear every GA/DPT, then write only the ones of the selected type, reading
+                // straight from the field references built in oneditprepare (not DOM position).
+                ALL_KEYS.forEach((key) => {
+                    node['ga' + key] = '';
+                    node['dpt' + key] = '';
+                    const entry = gaInputs[key];
+                    if (!entry) return;
+                    const isActive = active.some((f) => f.key === key);
+                    const ga = (entry.$ga.val() || '').trim();
+                    if (isActive && ga !== '') {
+                        node['ga' + key] = ga;
+                        node['dpt' + key] = (entry.$dpt.val() || '').trim();
+                    }
                 });
+                delete node._matterGaInputs;
                 this.enableNodePINS = $('#node-input-enableNodePINS').val() || 'no';
                 this.outputs = this.enableNodePINS === 'yes' ? 1 : 0;
                 this.inputs = this.enableNodePINS === 'yes' ? 1 : 0;
             },
             oneditcancel() {
                 try { RED.sidebar.show('info'); } catch (error) { /* empty */ }
+                delete this._matterGaInputs;
             }
         });
     }());
@@ -340,31 +267,43 @@
     <input type="text" id="node-input-server">
   </div>
 
+  <div class="form-row">
+    <label for="node-input-serverMatterBridge">
+      <i class="fa fa-share-alt"></i> <span data-i18n="knxUltimateMatterBridge.bridge"></span>
+    </label>
+    <input type="text" id="node-input-serverMatterBridge">
+  </div>
+
   <div class="form-row">
     <label for="node-input-name">
-      <i class="fa fa-tag"></i> <span data-i18n="common.name"></span>
+      <i class="fa fa-tag"></i> <span data-i18n="knxUltimateMatterBridge.device_name"></span>
     </label>
-    <input type="text" id="node-input-name">
+    <input type="text" id="node-input-name" data-i18n="[placeholder]knxUltimateMatterBridge.fields.name_placeholder">
   </div>
 
   <div class="form-row">
-    <label for="node-input-bridgeDeviceName" style="width:180px;">
-      <i class="fa fa-share-alt"></i> <span data-i18n="knxUltimateMatterBridge.bridge_name"></span>
+    <label for="node-input-deviceType">
+      <i class="fa fa-microchip"></i> <span data-i18n="knxUltimateMatterBridge.fields.type"></span>
     </label>
-    <input type="text" id="node-input-bridgeDeviceName" style="width:220px;">
-    <label for="node-input-bridgePort" style="width:60px; text-align:right;"><span data-i18n="knxUltimateMatterBridge.port"></span></label>
-    <input type="number" id="node-input-bridgePort" style="width:90px;">
+    <select id="node-input-deviceType" style="width:260px;"></select>
   </div>
 
   <div class="form-tips" style="margin-bottom:8px;">
     <i class="fa fa-circle-info"></i>
-    <span data-i18n="knxUltimateMatterBridge.devices_help"></span>
+    <span data-i18n="knxUltimateMatterBridge.device_help"></span>
   </div>
 
-  <div class="form-row node-input-devices-container-row">
-    <ol id="node-input-devices-container"></ol>
+  <div id="mb-ga-fields"></div>
+
+  <div class="form-row" id="mb-invert-row" style="display:none;">
+    <label for="node-input-invertPosition" style="width:auto;">
+      <input type="checkbox" id="node-input-invertPosition" style="width:auto; display:inline-block; vertical-align:middle;">
+      <span data-i18n="knxUltimateMatterBridge.fields.invert"></span>
+    </label>
   </div>
 
+  <hr/>
+
   <div class="form-row">
     <label for="node-input-readStatusAtStartup" style="width:260px;">
       <i class="fa fa-question-circle"></i> <span data-i18n="knxUltimateMatterBridge.read_status_startup"></span>
@@ -384,46 +323,20 @@
       <option value="yes" data-i18n="knxUltimateMatterBridge.node_pins_show"></option>
     </select>
   </div>
-
-  <hr/>
-
-  <div class="form-row">
-    <b><i class="fa fa-qrcode"></i>&nbsp;<span data-i18n="knxUltimateMatterBridge.pairing.title"></span></b>
-    <button type="button" id="mb-refresh-pairing" class="red-ui-button" style="margin-left:6px; color:#1b7d33; border-color:#1b7d33;">
-      <i class="fa fa-refresh"></i>
-    </button>
-    <button type="button" id="mb-factory-reset" class="red-ui-button" style="margin-left:6px; color:#c00; border-color:#c00; display:none;">
-      <i class="fa fa-trash"></i>&nbsp;<span data-i18n="knxUltimateMatterBridge.pairing.reset_button"></span>
-    </button>
-  </div>
-  <div class="form-row" id="mb-pairing-body" style="text-align:center;"></div>
-
-  <br/>
-  <br/>
-  <br/>
-  <br/>
-  <br/>
-  <br/>
-  <br/>
-  <br/>
-  <br/>
-  <br/>
-  <br/>
-  <br/>
 </script>
 
 <script type="text/markdown" data-help-name="knxUltimateMatterBridge">
-Exposes **KNX group addresses as Matter devices** (bridge). This node is in **BETA**.
+Exposes **one KNX device as a Matter device**. This node is in **BETA**.
 
-Add your KNX virtual devices (lights, plugs, dimmers, sensors), deploy, then open the node again: it shows the **pairing code and QR code**. Scan it with Alexa, Google Home or Apple Home: the app sees a Matter bridge with all your KNX devices inside, using the names you typed.
+Point it to a **Matter Bridge** configuration node (the actual bridge, paired once by Alexa/Google Home/Apple Home), pick the device type, give it the name the assistant will use, and fill the group addresses.
 
 - **Matter → KNX**: commands from the voice assistant write to the *command* group addresses.
-- **KNX → Matter**: telegrams on the *status* group addresses update the Matter attributes (and the app UI).
+- **KNX → Matter**: telegrams on the *status* group addresses update the Matter attribute (and the app UI).
 
-The device must be reachable over the IP network; IPv6 link-local must be enabled on the Node-RED host (standard Matter requirement).
+The **KNX gateway is optional**: without it, enable the node PINs and drive the device from the flow.
 
-If you enable the **node PINs** you can also talk to the bridge from the flow:
+If you enable the **node PINs**:
 
-- input: `msg.payload = { device: "Kitchen light", function: "onoff", value: true }` updates the Matter state without the KNX bus
+- input: `msg.payload = { function: "onoff", value: true }` updates the Matter state without the KNX bus
 - output: every command from a Matter controller is forwarded as `msg` (topic = device name, payload = value, `msg.matter` = raw command)
 </script>