node-red-contrib-symi-mesh 1.8.10 → 1.8.12

package/README.md

@@ -704,6 +704,24 @@ node-red-contrib-symi-mesh/
 
 ## 更新日志
 
+### v1.8.12 (2026-01-17)
+- **KNX场景同步优化**：新增“场景”设备类型支持，修复了KNX场景(DPT 17.001)触发Mesh开关的逻辑。
+    - **场景映射**：支持配置 KNX 场景号(1-64) 与 Mesh 开关状态(开/关) 的直接映射。
+    - **防死循环**：针对场景触发的单向特性，特别优化了防环路机制，确保 Mesh 状态变化后不会再次触发场景发送。
+- **UI兼容性恢复**：
+    - **字段扩展**：在经典界面中无缝集成了场景配置所需的“场景号”和“动作”字段。
+- **配置窗口优化**：保留了配置窗口的尺寸自动扩展功能，提供更宽敞的编辑视野。
+
+### v1.8.11 (2026-01-16)
+
+**核心稳定性修复**：
+- **僵尸节点彻底清除**：修复了在删除或修改 KNX 场景映射并重新部署后，旧的配置逻辑仍在后台运行的问题。
+    - **原因分析**：旧节点实例销毁时，未能完全解绑网关事件监听器，导致“僵尸节点”继续响应事件。
+    - **解决方案**：引入 `node.isClosed` 标志位，强制拦截销毁后的所有逻辑执行；同时修复了网关连接状态监听器的内存泄漏问题。
+- **内存泄漏修复**：将所有匿名事件监听器改为具名函数，确保在节点关闭时能被正确移除，防止多次部署后的内存累积。
+- **空指针异常防护**：在 `symi-gateway` 中增加了多处连接状态检查，防止网关断开后后台任务访问已销毁的客户端对象，彻底消除 `Cannot read properties of null (reading 'sendFrame')` 报错刷屏。
+- **UI 显示优化**：修复了 KNX 开关类型在配置列表中错误显示“扩展”列数据的问题，现在开关类型的扩展列将正确显示为“-”。
+
 ### v1.8.10 (2026-01-16)
 
 **新增功能**：

package/nodes/symi-gateway.js

@@ -495,6 +495,10 @@ module.exports = function(RED) {
                 }
                 
                 for (const attr of queryAttrs) {
+                    if (!this.client) {
+                        this.error(`查询设备${device.name}失败: 网关未连接 (Client is null)`);
+                        break;
+                    }
                     const frame = this.protocolHandler.buildDeviceStatusQueryFrame(device.networkAddress, attr);
                     await this.client.sendFrame(frame, 2);
                     await this.sleep(150); // 增加延迟确保设备有时间响应
@@ -522,6 +526,7 @@ module.exports = function(RED) {
                             this.log(`[三合一检测] 查询 ${device.name} 完整状态...`);
                             const threeInOneAttrs = [0x02, 0x16, 0x1B, 0x1C, 0x1D, 0x6A, 0x6C];
                             for (const attr of threeInOneAttrs) {
+                                if (!this.client) break;
                                 const frame = this.protocolHandler.buildDeviceStatusQueryFrame(device.networkAddress, attr);
                                 await this.client.sendFrame(frame, 2);
                                 await this.sleep(150);
@@ -545,6 +550,7 @@ module.exports = function(RED) {
                         // 查询温控器状态
                         const tempCtrlAttrs = [0x02, 0x16, 0x1B, 0x1C, 0x1D];
                         for (const attr of tempCtrlAttrs) {
+                            if (!this.client) break;
                             const frame = this.protocolHandler.buildDeviceStatusQueryFrame(device.networkAddress, attr);
                             await this.client.sendFrame(frame, 2);
                             await this.sleep(150);
@@ -567,6 +573,10 @@ module.exports = function(RED) {
         this.log('启用设备状态上报功能...');
         for (const device of devices) {
             try {
+                if (!this.client) {
+                    this.error('网关连接断开，停止启用状态上报');
+                    break;
+                }
                 // 启用状态上报：msg_type=0x10, param=0x01
                 const frame = this.protocolHandler.buildDeviceControlFrame(device.networkAddress, 0x10, Buffer.from([0x01]));
                 await this.client.sendFrame(frame, 2);

package/nodes/symi-ha-sync.html

@@ -250,96 +250,133 @@
             }
 
             // 渲染映射列表
-            function renderMappings() {
-                var container = $('#mapping-list');
-                container.empty();
-                
-                if (!mappings || !Array.isArray(mappings) || mappings.length === 0) {
-                    container.append('<div class="mapping-empty">暂无映射，点击下方按钮添加</div>');
-                    return;
-                }
-
-                mappings.forEach(function(m, idx) {
-                    try {
-                        var row = $('<div class="mapping-row" data-idx="' + idx + '"></div>');
-                        var symiOpts = getSymiOptions(m.symiMac, m.symiName);
-                        var keyOpts = getKeyOptions(m.symiMac, m.symiKey || 1, m.symiChannels, m.symiEntityType);
-                        var syncModeOpts = getSyncModeOptions(m.syncMode || 0);
-                        var haOpts = getHaOptions(m.haEntityId, m.haEntityName);
-                        
-                        row.html(
-                            '<div class="mapping-main">' +
-                            '<div class="symi-col">' +
-                            '  <select class="symi-select">' + symiOpts + '</select>' +
-                            '  <span class="symi-key-wrap">' + keyOpts + '</span>' +
-                            '</div>' +
-                            '<div class="arrow-col">' + syncModeOpts + '</div>' +
-                            '<div class="ha-col">' +
-                            '  <select class="ha-select">' + haOpts + '</select>' +
-                            '</div>' +
-                            '<div class="del-col"><button type="button" class="red-ui-button red-ui-button-small btn-remove" title="删除"><i class="fa fa-times"></i></button></div>' +
-                            '</div>'
-                        );
-                        container.append(row);
-                    } catch (err) {
-                        console.error("[symi-ha-sync] Render row error:", err, m);
+            $('#mapping-list').css('min-height','300px').editableList({
+                addItem: function(container, i, data) {
+                    var m = data;
+                    // 如果是新添加的项，初始化默认值
+                    if (!m.symiMac && !m.haEntityId) {
+                         m.symiMac = ''; m.symiName = ''; m.symiKey = 1; m.symiChannels = 1; m.symiDeviceType = '';
+                         m.symiEntityType = ''; m.syncMode = 0;
+                         m.haEntityId = ''; m.haEntityName = '';
                     }
-                });
 
-                bindEvents();
-            }
-
-            // 绑定事件
-            function bindEvents() {
-                var container = $('#mapping-list');
-                
-                container.find('.symi-select').off('change').on('change', function() {
-                    var row = $(this).closest('.mapping-row');
-                    var idx = row.data('idx');
-                    var mac = $(this).val();
-                    var opt = $(this).find('option:selected');
+                    var row = $('<div class="mapping-row" style="display:flex;align-items:center;gap:5px;padding:5px 0;"></div>').appendTo(container);
                     
-                    mappings[idx].symiMac = mac || '';
-                    mappings[idx].symiName = opt.data('name') || opt.text().replace(/ \[.*?\]/g, '');
-                    mappings[idx].symiChannels = parseInt(opt.data('channels')) || 1;
-                    mappings[idx].symiDeviceType = opt.data('devicetype') || '';
-                    mappings[idx].symiEntityType = opt.data('entitytype') || '';
-                    mappings[idx].symiKey = 1;
+                    var symiOpts = getSymiOptions(m.symiMac, m.symiName);
+                    var keyOpts = getKeyOptions(m.symiMac, m.symiKey || 1, m.symiChannels, m.symiEntityType);
+                    var syncModeOpts = getSyncModeOptions(m.syncMode || 0);
+                    var haOpts = getHaOptions(m.haEntityId, m.haEntityName);
                     
-                    row.find('.symi-key-wrap').html(getKeyOptions(mac, 1, mappings[idx].symiChannels, mappings[idx].symiEntityType));
-                    bindEvents();
-                });
-
-                container.find('.symi-key').off('change').on('change', function() {
-                    var idx = $(this).closest('.mapping-row').data('idx');
-                    mappings[idx].symiKey = parseInt($(this).val()) || 1;
-                });
+                    // Symi Column
+                    var symiCol = $('<div class="symi-col" style="flex:1;display:flex;gap:4px;min-width:0;"></div>').appendTo(row);
+                    var symiSelect = $('<select class="symi-select" style="flex:1;padding:4px;border:1px solid #81c784;border-radius:3px;background:#e8f5e9;font-size:12px;">' + symiOpts + '</select>').appendTo(symiCol);
+                    var symiKeyWrap = $('<span class="symi-key-wrap">' + keyOpts + '</span>').appendTo(symiCol);
+                    
+                    // Arrow Column
+                    var arrowCol = $('<div class="arrow-col" style="flex:0 0 100px;text-align:center;"></div>').appendTo(row);
+                    var syncModeSelect = $(syncModeOpts).appendTo(arrowCol).css({width:'100%',padding:'4px',border:'1px solid #ccc',borderRadius:'3px',fontSize:'11px'});
+                    
+                    // HA Column
+                    var haCol = $('<div class="ha-col" style="flex:1;min-width:0;"></div>').appendTo(row);
+                    var haSelect = $('<select class="ha-select" style="width:100%;padding:4px;border:1px solid #41BDF5;border-radius:3px;background:#e3f2fd;font-size:12px;">' + haOpts + '</select>').appendTo(haCol);
+
+                    // 绑定事件
+                    symiSelect.on('change', function() {
+                        var mac = $(this).val();
+                        var opt = $(this).find('option:selected');
+                        
+                        m.symiMac = mac || '';
+                        m.symiName = opt.data('name') || opt.text().replace(/ \[.*?\]/g, '');
+                        m.symiChannels = parseInt(opt.data('channels')) || 1;
+                        m.symiDeviceType = opt.data('devicetype') || '';
+                        m.symiEntityType = opt.data('entitytype') || '';
+                        m.symiKey = 1;
+                        
+                        symiKeyWrap.html(getKeyOptions(mac, 1, m.symiChannels, m.symiEntityType));
+                        // 重新绑定新生成的按键下拉框事件
+                        bindKeyEvents();
+                    });
 
-                container.find('.sync-mode').off('change').on('change', function() {
-                    var idx = $(this).closest('.mapping-row').data('idx');
-                    mappings[idx].syncMode = parseInt($(this).val()) || 0;
-                });
+                    function bindKeyEvents() {
+                        symiKeyWrap.find('.symi-key').on('change', function() {
+                            m.symiKey = parseInt($(this).val()) || 1;
+                        });
+                    }
+                    bindKeyEvents();
 
-                container.find('.ha-select').off('change').on('change', function() {
-                    var idx = $(this).closest('.mapping-row').data('idx');
-                    var opt = $(this).find('option:selected');
-                    mappings[idx].haEntityId = $(this).val();
-                    mappings[idx].haEntityName = opt.data('name') || opt.text().split(' (')[0].replace(/ \[.*?\]/g, '');
-                });
+                    syncModeSelect.on('change', function() {
+                        m.syncMode = parseInt($(this).val()) || 0;
+                    });
 
-                container.find('.btn-remove').off('click').on('click', function() {
-                    var idx = $(this).closest('.mapping-row').data('idx');
-                    mappings.splice(idx, 1);
-                    renderMappings();
-                });
+                    haSelect.on('change', function() {
+                        var opt = $(this).find('option:selected');
+                        m.haEntityId = $(this).val();
+                        m.haEntityName = opt.data('name') || opt.text().split(' (')[0].replace(/ \[.*?\]/g, '');
+                    });
+                    
+                    // 保存更新UI的方法供外部调用
+                    container.data('refreshUI', function() {
+                        var currentSymi = symiSelect.val();
+                        var currentKey = symiKeyWrap.find('.symi-key').val();
+                        var currentHa = haSelect.val();
+                        
+                        symiSelect.html(getSymiOptions(m.symiMac, m.symiName));
+                        // 如果之前选中的还在，保持选中；否则选中数据中的值
+                        if (symiSelect.find('option[value="'+currentSymi+'"]').length) symiSelect.val(currentSymi);
+                        
+                        // 刷新按键
+                        // 注意：如果设备列表变了，channels可能变了，所以要重新生成
+                        // 我们需要重新获取设备信息来确认channels
+                        // 但这里简单起见，我们假设 getKeyOptions 会处理
+                        // m.symiChannels 应该在 loadSymiDevices 时更新吗？
+                        // loadSymiDevices 更新了 symiDevices 数组
+                        // 我们需要从 symiDevices 中找到当前设备并更新 m.symiChannels
+                        var dev = symiDevices.find(d => d.macAddress === m.symiMac);
+                        if (dev) {
+                            m.symiChannels = dev.channels;
+                            m.symiEntityType = dev.entityType;
+                        }
+                        
+                        symiKeyWrap.html(getKeyOptions(m.symiMac, m.symiKey, m.symiChannels, m.symiEntityType));
+                        bindKeyEvents();
+                        
+                        haSelect.html(getHaOptions(m.haEntityId, m.haEntityName));
+                        if (haSelect.find('option[value="'+currentHa+'"]').length) haSelect.val(currentHa);
+                    });
+                },
+                sortable: true,
+                removable: true,
+                addButton: false,
+                height: 400
+            });
+            
+            function renderMappings() {
+                // 这个函数现在只用于初次加载
+                if (mappings && mappings.length > 0) {
+                    // 只有当列表为空时才添加，避免重复
+                    if ($('#mapping-list').editableList('items').length === 0) {
+                        mappings.forEach(function(m) {
+                            $('#mapping-list').editableList('addItem', m);
+                        });
+                    } else {
+                        // 如果列表不为空，说明是刷新操作，调用 refreshUI
+                        $('#mapping-list').editableList('items').each(function() {
+                            var refresh = $(this).data('refreshUI');
+                            if (refresh) refresh();
+                        });
+                    }
+                }
             }
 
+            // 绑定事件 (已移至 addItem 内部)
+            function bindEvents() {}
+
             // 刷新按钮
             $('#refresh-symi-btn').on('click', function() {
                 var btn = $(this);
                 btn.prop('disabled', true).find('i').addClass('fa-spin');
                 loadSymiDevices(function() {
-                    renderMappings();
+                    renderMappings(); // 这里会触发 refreshUI
                     btn.prop('disabled', false).find('i').removeClass('fa-spin');
                 });
             });
@@ -348,39 +385,48 @@
                 var btn = $(this);
                 btn.prop('disabled', true).find('i').addClass('fa-spin');
                 loadHaEntities(function() {
-                    renderMappings();
+                    renderMappings(); // 这里会触发 refreshUI
                     btn.prop('disabled', false).find('i').removeClass('fa-spin');
                 });
             });
 
             // 添加映射按钮
             $('#btn-add-mapping').on('click', function() {
-                mappings.push({ 
+                $('#mapping-list').editableList('addItem', { 
                     symiMac: '', symiName: '', symiKey: 1, symiChannels: 1, symiDeviceType: '',
                     symiEntityType: '', syncMode: 0,
                     haEntityId: '', haEntityName: ''
                 });
-                renderMappings();
-                var list = $('#mapping-list');
-                list.scrollTop(list.prop('scrollHeight'));
             });
 
             // 配置变化时重新加载
             $('#node-input-mqttConfig').on('change', function() {
                 setTimeout(function() {
-                    loadSymiDevices(renderMappings);
+                    loadSymiDevices(function() {
+                         // 清空列表并重新渲染，或者只是刷新？
+                         // 如果MQTT配置变了，设备列表完全不同，最好清空
+                         // 但如果用户已经配置了一些，清空会丢失数据
+                         // 所以我们尝试刷新，未找到的会显示红色
+                         renderMappings();
+                    });
                 }, 100);
             });
 
             $('#node-input-haServer').on('change', function() {
                 setTimeout(function() {
-                    loadHaEntities(renderMappings);
+                    loadHaEntities(function() {
+                        renderMappings();
+                    });
                 }, 100);
             });
 
             // 保存时更新所有数据
             node._saveAll = function() {
-                node.mappings = JSON.stringify(mappings);
+                var newMappings = [];
+                $('#mapping-list').editableList('items').each(function() {
+                    newMappings.push($(this).data('data'));
+                });
+                node.mappings = JSON.stringify(newMappings);
                 node.cachedSymiDevices = JSON.stringify(cachedSymiDevices);
                 node.cachedHaEntities = JSON.stringify(cachedHaEntities);
                 $('#node-input-mappings').val(node.mappings);
@@ -400,7 +446,7 @@
             var height = size.height;
             for (var i = 0; i < rows.length; i++) { height -= $(rows[i]).outerHeight(true); }
             height -= 120;
-            $('#mapping-list').css('max-height', Math.max(150, height) + 'px');
+            $('#mapping-list').editableList('height', Math.max(150, height));
         },
         oneditsave: function() {
             if (this._saveAll) { this._saveAll(); }

package/nodes/symi-knx-bridge.html

@@ -79,7 +79,7 @@
                 if (!knxEntities.length) { c.html('<div class="tips">点击"导入"或"添加"管理KNX实体</div>'); return; }
                 let h = '<table class="tbl"><tr><th>名称</th><th>类型</th><th>命令</th><th>状态</th><th>扩展</th><th style="width:60px">操作</th></tr>';
                 knxEntities.forEach((e,i) => {
-                    const ext = [e.ext1,e.ext2,e.ext3].filter(x=>x).join(',');
+                    const ext = (e.type === 'switch') ? '-' : [e.ext1,e.ext2,e.ext3].filter(x=>x).join(',');
                     const inv = e.type==='cover' ? '<input type="checkbox" class="e-inv" title="位置反转"'+(e.invert?' checked':'')+'>' : '';
                     h += '<tr data-ei="'+i+'"><td>'+e.name+'</td><td>'+(typeLabels[e.type]||e.type)+inv+'</td><td>'+e.cmdAddr+'</td><td>'+(e.statusAddr||'-')+'</td><td>'+(ext||'-')+'</td><td><button class="red-ui-button red-ui-button-small e-edit" title="编辑"><i class="fa fa-pencil"></i></button> <button class="red-ui-button red-ui-button-small e-del" title="删除"><i class="fa fa-times"></i></button></td></tr>';
                 });
@@ -112,7 +112,7 @@
                 'climate': ['开关地址*','温度地址','模式地址','风速地址','当前温度'],
                 'fresh_air': ['开关地址*','风速地址'],
                 'floor_heating': ['开关地址*','温度地址','当前温度'],
-                'scene': ['KNX组地址*', '场景号(1-64)*', '绑定Mesh开关状态(1=开/0=关)*']
+                'scene': ['KNX组地址*', '场景号(1-64)*', '触发Mesh动作(1=开/0=关)*']
             };
             
             // 统一的添加/编辑KNX实体面板

package/nodes/symi-knx-bridge.js

@@ -107,6 +107,13 @@ module.exports = function(RED) {
                         mapping.knxAddrTemp = knxEntity.statusAddr || '';
                         mapping.knxAddrCurrentTemp = knxEntity.ext1 || '';
                         break;
+                    case 'scene':
+                        // 场景: 组地址(cmd), 场景号(ext1), 动作(ext2)
+                        // ext1: 场景号 1-64
+                        // ext2: 动作 1=开, 0=关
+                        mapping.sceneNumber = parseInt(knxEntity.ext1) || 1;
+                        mapping.sceneAction = (parseInt(knxEntity.ext2) === 1);
+                        break;
                 }
                 
                 // 收集所有KNX地址用于快速查找
@@ -178,6 +185,7 @@ module.exports = function(RED) {
         
         // 初始化标记
         node.initializing = true;
+        node.isClosed = false; // 防止僵尸节点执行逻辑
         node.initTimer = setTimeout(() => {
             node.initializing = false;
             node.log('[KNX Bridge] 初始化完成，开始同步');
@@ -261,6 +269,9 @@ module.exports = function(RED) {
 
         // ========== Mesh设备状态变化处理 ==========
         const handleMeshStateChange = (eventData) => {
+            // 防止僵尸节点执行
+            if (node.isClosed) return;
+
             // 只检查initializing，不检查syncLock
             // syncLock会导致队列处理期间丢失事件，改用per-device时间戳防回环
             if (node.initializing) return;
@@ -353,20 +364,19 @@ module.exports = function(RED) {
                         
                         // 检查是否匹配配置的触发动作
                         if (switchValue === mapping.sceneAction) {
+                            // 场景命令 DPT 17.001 (1字节无符号整数)
+                            // payload = 场景号 - 1 (KNX wire format: 0-63)
+                            const scenePayload = mapping.sceneNumber - 1;
+                            
                             // 构造防死循环key
-                            // 注意：这里使用的是 knx-to-mesh 方向的记录来防止 mesh-to-knx 的发送
-                            // 即：如果最近收到了 KNX 场景命令导致 Mesh 变化，这里应该拦截
-                            const sceneLoopKey = `${loopKey}_scene_${mapping.sceneNumber}`;
+                            // 统一使用 KNX 值 (0-63) 作为 key 的一部分
+                            const sceneLoopKey = `${loopKey}_scene_${scenePayload}`;
                             
                             if (node.shouldPreventSync('mesh-to-knx', sceneLoopKey)) {
                                 node.log(`[Mesh->KNX] 跳过场景触发(防死循环): ${sceneLoopKey}`);
                                 continue;
                             }
                             
-                            // 场景命令 DPT 17.001 (1字节无符号整数)
-                            // payload = 场景号 - 1 (KNX wire format: 0-63)
-                            const scenePayload = mapping.sceneNumber - 1;
-                            
                             const knxMsg = {
                                 topic: mapping.knxAddrCmd,
                                 payload: scenePayload,
@@ -1101,6 +1111,50 @@ module.exports = function(RED) {
                     });
                 }
             }
+            // 场景触发逻辑 (新增)
+            else if (mapping.deviceType === 'scene') {
+                if (addrFunc === 'cmd') { // 场景通常只有一个组地址，这里我们用cmdAddr匹配
+                    // 场景 DPT 17.001 实际上是 0-63 的整数
+                    // 但有时也会用 DPT 5.001 (0-255)
+                    const receivedScene = parseInt(value) || 0;
+                    const targetScene = parseInt(mapping.sceneNumber) || 1; // 配置的场景号 (1-64)
+                    
+                    // KNX场景值通常是 场景号-1 (例如场景1发送0)
+                    // 但也有设备发送直接的场景号，这里我们兼容两种情况：
+                    // 如果接收值 == 配置值，或者 接收值 == 配置值-1，都认为匹配
+                    // 更严谨的做法是：DPT 17.001 规定传输值 = 场景号 - 1
+                    // 所以如果配置的是1 (UI显示1)，实际收到应该是0
+                    // 我们这里做宽容匹配：
+                    
+                    let matched = false;
+                    // 情况A: 标准 DPT 17.001, 收到值 = 场景号-1
+                    if (receivedScene === (targetScene - 1)) matched = true;
+                    // 情况B: 非标准或用户直接配置了0-63的原始值
+                    else if (receivedScene === targetScene) matched = true;
+
+                    if (matched) {
+                        const action = (mapping.sceneAction === 'on' || mapping.sceneAction === true || mapping.sceneAction === 1);
+                        const loopKey = `${mapping.meshMac}_${mapping.meshChannel}_scene_${receivedScene}`;
+                        
+                        // 防死循环
+                        if (node.shouldPreventSync('knx-to-mesh', loopKey)) {
+                            node.log(`[KNX->Mesh] 跳过场景触发(防死循环): ${loopKey}`);
+                            done && done();
+                            return;
+                        }
+
+                        node.log(`[KNX->Mesh] 场景触发: 收到场景${receivedScene+1} -> Mesh开关=${action?'ON':'OFF'}`);
+                        node.queueCommand({
+                            direction: 'knx-to-mesh',
+                            mapping: mapping,
+                            type: 'switch',
+                            value: action,
+                            key: loopKey,
+                            sourceAddr: groupAddr
+                        });
+                    }
+                }
+            }
             // 窗帘设备 - 简化逻辑：谁动谁跟，KNX可抢占控制权
             else if (mapping.deviceType === 'cover') {
                 const deviceKey = (mapping.meshMac || '').toLowerCase().replace(/:/g, '');
@@ -1198,13 +1252,17 @@ module.exports = function(RED) {
         // ========== 事件监听 ==========
         
         // 监听网关连接状态
-        node.gateway.on('gateway-connected', () => {
+        const handleGatewayConnected = () => {
+            if (node.isClosed) return;
             node.status({ fill: 'green', shape: 'ring', text: `网关已连接 ${node.mappings.length}个映射` });
-        });
+        };
+        node.gateway.on('gateway-connected', handleGatewayConnected);
         
-        node.gateway.on('gateway-disconnected', () => {
+        const handleGatewayDisconnected = () => {
+            if (node.isClosed) return;
             node.status({ fill: 'red', shape: 'ring', text: '网关断开' });
-        });
+        };
+        node.gateway.on('gateway-disconnected', handleGatewayDisconnected);
         
         // 监听Mesh设备状态变化
         node.gateway.on('device-state-changed', handleMeshStateChange);
@@ -1212,6 +1270,9 @@ module.exports = function(RED) {
         // ========== 场景执行事件处理 ==========
         // 当收到场景执行通知时，查询所有已映射设备的状态
         const handleSceneExecuted = (eventData) => {
+            // 防止僵尸节点执行
+            if (node.isClosed) return;
+
             if (node.initializing) return;
             
             node.log(`[场景执行] 检测到场景${eventData.sceneId}执行，延迟查询设备状态`);
@@ -1253,6 +1314,9 @@ module.exports = function(RED) {
         
         // ========== 清理 ==========
         node.on('close', function(done) {
+            // 标记为已关闭，阻止任何后续事件处理
+            node.isClosed = true;
+
             // 清除初始化定时器
             if (node.initTimer) {
                 clearTimeout(node.initTimer);
@@ -1262,6 +1326,8 @@ module.exports = function(RED) {
             if (node.gateway) {
                 node.gateway.removeListener('device-state-changed', handleMeshStateChange);
                 node.gateway.removeListener('scene-executed', handleSceneExecuted);
+                node.gateway.removeListener('gateway-connected', handleGatewayConnected);
+                node.gateway.removeListener('gateway-disconnected', handleGatewayDisconnected);
             }
             
             // 销毁 SyncUtils 实例，清理资源

package/nodes/symi-knx-ha-bridge.html

@@ -17,17 +17,108 @@
         label: function() { return this.name || 'KNX HA桥接'; },
         oneditprepare: function() {
             const node = this;
-            let mappings = [], haEntities = [], knxEntities = [];
+            
+            // 设置编辑面板更宽更高
+            var panel = $('#dialog-form').parent();
+            if (panel.length) {
+                if (panel.width() < 1000) panel.css('width', '1000px');
+                if (panel.height() < 1000) panel.css('min-height', '1000px');
+            }
+            
+            let haEntities = [];
             const typeLabels = {switch:'开关',light_mono:'单调',light_cct:'双调',light_rgb:'RGB',light_rgbcw:'RGBCW',cover:'窗帘',climate:'空调',fresh_air:'新风',floor_heating:'地暖'};
 
-            try { mappings = JSON.parse(node.mappings || '[]'); } catch(e) { mappings = []; }
-            try { knxEntities = JSON.parse(node.knxEntities || '[]'); } catch(e) { knxEntities = []; }
+            // 初始化列表容器
+            $('#knx-list').css('min-height','300px').css('max-height','500px').editableList({
+                addItem: function(container, i, data) {
+                    const e = data;
+                    const ext = [e.ext1,e.ext2,e.ext3].filter(x=>x).join(',');
+                    const inv = e.type==='cover' ? '<input type="checkbox" class="e-inv" title="位置反转"'+(e.invert?' checked':'')+'>' : '';
+                    
+                    const row = $('<div class="knx-row" style="display:flex;align-items:center;font-size:12px;"></div>').appendTo(container);
+                    $('<div style="flex:2;padding:0 5px;">'+e.name+'</div>').appendTo(row);
+                    $('<div style="flex:1;padding:0 5px;">'+(typeLabels[e.type]||e.type)+inv+'</div>').appendTo(row);
+                    $('<div style="flex:1;padding:0 5px;">'+e.cmdAddr+'</div>').appendTo(row);
+                    $('<div style="flex:1;padding:0 5px;">'+(e.statusAddr||'-')+'</div>').appendTo(row);
+                    $('<div style="flex:1;padding:0 5px;">'+(ext||'-')+'</div>').appendTo(row);
+                    
+                    const btns = $('<div style="width:60px;text-align:right;"></div>').appendTo(row);
+                    $('<button class="red-ui-button red-ui-button-small e-edit" title="编辑"><i class="fa fa-pencil"></i></button>')
+                        .appendTo(btns)
+                        .on('click', function() { editKnxEntity(data, container); });
+                    
+                    container.find('.e-inv').on('change', function() {
+                        e.invert = $(this).is(':checked');
+                    });
+                },
+                sortable: true,
+                removable: true,
+                addButton: false,
+                height: 350
+            });
+
+            $('#map-list').css('min-height','300px').css('max-height','500px').editableList({
+                addItem: function(container, i, data) {
+                    const m = data;
+                    const row = $('<div class="map-row" style="display:flex;align-items:center;gap:5px;"></div>').appendTo(container);
+                    
+                    // KNX实体选择
+                    const selKnx = $('<select class="m-knx" style="flex:1;font-size:11px;"><option value="">--选择KNX--</option></select>').appendTo(row);
+                    function updateKnxOpts() {
+                        const currentVal = selKnx.val() || m.knxEntityId;
+                        selKnx.empty().append('<option value="">--选择KNX--</option>');
+                        const entities = [];
+                        $('#knx-list').editableList('items').each(function() {
+                            entities.push($(this).data('data'));
+                        });
+                        entities.forEach(e => {
+                            const inv = e.invert ? '↕' : '';
+                            $('<option value="'+e.id+'">'+e.name+'['+e.cmdAddr+']('+inv+(typeLabels[e.type]||'')+')</option>').appendTo(selKnx);
+                        });
+                        selKnx.val(currentVal);
+                    }
+                    updateKnxOpts();
+                    container.data('updateKnxOpts', updateKnxOpts);
+                    
+                    // HA实体选择 (使用 datalist 实现搜索)
+                    const listId = 'ha-list-' + Math.floor(Math.random() * 1000000);
+                    $('<input type="text" class="m-ha-input" placeholder="输入实体ID或名称搜索" value="'+(m.haEntityId||'')+'" list="'+listId+'" style="flex:1;font-size:11px;">').appendTo(row);
+                    const datalist = $('<datalist id="'+listId+'"></datalist>').appendTo(row);
+                    
+                    function updateHaOpts() {
+                        datalist.empty();
+                        haEntities.forEach(e => {
+                            $('<option value="'+e.entity_id+'">'+e.name+'</option>').appendTo(datalist);
+                        });
+                    }
+                    updateHaOpts();
+                    // 暴露更新方法
+                    container.data('updateHaOpts', updateHaOpts);
+
+                    // 绑定事件
+                    selKnx.on('change', function() {
+                        m.knxEntityId = $(this).val();
+                    });
+                    row.find('.m-ha-input').on('input change', function() {
+                        m.haEntityId = $(this).val();
+                    });
+                },
+                sortable: true,
+                removable: true,
+                height: 350
+            });
+
+            // 加载初始数据
+            try { 
+                const knxEntities = JSON.parse(node.knxEntities || '[]');
+                knxEntities.forEach(e => $('#knx-list').editableList('addItem', e));
+            } catch(e) {}
 
             function loadHaEntities() {
                 const sid = $('#node-input-haServer').val();
                 if (!sid) { 
                     haEntities = []; 
-                    renderMappings(); 
+                    refreshHaLists();
                     return; 
                 }
                 
@@ -37,7 +128,7 @@
                     .done(function(data) {
                         console.log('[KNX-HA Bridge] 收到响应:', data);
                         haEntities = data || [];
-                        renderMappings();
+                        refreshHaLists();
                         if (haEntities.length > 0) {
                             RED.notify('成功加载 ' + haEntities.length + ' 个HA实体', 'success');
                         } else {
@@ -47,11 +138,28 @@
                     .fail(function(err) {
                         console.error('[KNX-HA Bridge] 加载失败:', err);
                         haEntities = [];
-                        renderMappings();
+                        refreshHaLists();
                         RED.notify('HA服务器还未就绪，请稍后重试', 'warning');
                     });
             }
 
+            function refreshHaLists() {
+                 $('#map-list').editableList('items').each(function() {
+                     const updateFunc = $(this).data('updateHaOpts');
+                     if (updateFunc) updateFunc();
+                 });
+            }
+
+            // 刷新映射列表（主要用于初次加载）
+            function refreshMappings() {
+                if ($('#map-list').editableList('items').length === 0) {
+                    try {
+                        const mappings = JSON.parse(node.mappings || '[]');
+                        mappings.forEach(m => $('#map-list').editableList('addItem', m));
+                    } catch(e) {}
+                }
+            }
+
             $('#download-tpl-btn').on('click', function() {
                 const tpl = `# KNX实体导入模板 (Tab分隔)
 # 格式: 名称	类型	命令地址	状态地址	扩展1	扩展2	扩展3
@@ -81,32 +189,6 @@
                 a.download = 'knx-template.txt'; a.click();
             });
 
-            function renderKnxEntities() {
-                const c = $('#knx-list'); c.empty(); $('#knx-cnt').text(knxEntities.length);
-                if (!knxEntities.length) { c.html('<div class="tips">点击"导入"或"添加"管理KNX实体</div>'); return; }
-                let h = '<table class="tbl"><tr><th>名称</th><th>类型</th><th>命令</th><th>状态</th><th>扩展</th><th style="width:60px">操作</th></tr>';
-                knxEntities.forEach((e,i) => {
-                    const ext = [e.ext1,e.ext2,e.ext3].filter(x=>x).join(',');
-                    const inv = e.type==='cover' ? '<input type="checkbox" class="e-inv" title="位置反转"'+(e.invert?' checked':'')+'>' : '';
-                    h += '<tr data-ei="'+i+'"><td>'+e.name+'</td><td>'+(typeLabels[e.type]||e.type)+inv+'</td><td>'+e.cmdAddr+'</td><td>'+(e.statusAddr||'-')+'</td><td>'+(ext||'-')+'</td><td><button class="red-ui-button red-ui-button-small e-edit" title="编辑"><i class="fa fa-pencil"></i></button> <button class="red-ui-button red-ui-button-small e-del" title="删除"><i class="fa fa-times"></i></button></td></tr>';
-                });
-                c.html(h+'</table>');
-                $('.e-inv').off('change').on('change', function() {
-                    const ei = $(this).closest('tr').data('ei');
-                    knxEntities[ei].invert = $(this).is(':checked');
-                    saveKnxData();
-                });
-                $('.e-edit').off('click').on('click', function() {
-                    const ei = $(this).closest('tr').data('ei');
-                    editKnxEntity(ei);
-                });
-                $('.e-del').off('click').on('click', function() {
-                    const ei = $(this).closest('tr').data('ei');
-                    knxEntities.splice(ei, 1);
-                    renderKnxEntities(); renderMappings();
-                });
-            }
-            
             const typeFields = {
                 'switch': ['命令地址*','状态地址'],
                 'light_mono': ['开关地址*','状态地址','亮度地址'],
@@ -119,11 +201,16 @@
                 'floor_heating': ['开关地址*','温度地址','当前温度']
             };
             
-            let editingIndex = -1;
-            function showEntityPanel(index) {
-                const isEdit = index >= 0;
-                const e = isEdit ? knxEntities[index] : {name:'',type:'switch',cmdAddr:'',statusAddr:'',ext1:'',ext2:'',ext3:'',invert:false};
-                editingIndex = index;
+            // 编辑KNX实体
+            let currentEditContainer = null;
+            let currentEditData = null;
+
+            function showEntityPanel(data, container) {
+                const isEdit = !!data;
+                const e = isEdit ? data : {name:'',type:'switch',cmdAddr:'',statusAddr:'',ext1:'',ext2:'',ext3:'',invert:false};
+                currentEditContainer = container;
+                currentEditData = data;
+
                 const typeOpts = Object.keys(typeLabels).map(t => '<option value="'+t+'"'+(t===e.type?' selected':'')+'>'+typeLabels[t]+'</option>').join('');
                 const title = isEdit ? '编辑: '+e.name : '添加KNX实体';
                 const btnText = isEdit ? '保存' : '添加';
@@ -163,7 +250,8 @@
                     const name = $('#edit-name').val().trim();
                     const cmd = $('#edit-cmd').val().trim();
                     if (!name || !cmd) { RED.notify('请填写名称和命令地址', 'warning'); return; }
-                    const entity = {
+                    
+                    const newData = {
                         id: isEdit ? e.id : 'k'+Date.now()+Math.random().toString(36).substr(2,4),
                         name: name,
                         type: $('#edit-type').val(),
@@ -174,60 +262,35 @@
                         ext3: $('#edit-ext3').val().trim(),
                         invert: $('#edit-inv').is(':checked')
                     };
-                    if (isEdit) { knxEntities[editingIndex] = entity; }
-                    else { knxEntities.push(entity); }
+                    
+                    if (isEdit) {
+                        Object.assign(currentEditData, newData);
+                        const items = [];
+                        $('#knx-list').editableList('items').each(function() {
+                            items.push($(this).data('data'));
+                        });
+                        $('#knx-list').editableList('empty');
+                        items.forEach(item => $('#knx-list').editableList('addItem', item));
+                    } else {
+                        $('#knx-list').editableList('addItem', newData);
+                    }
+                    
+                    $('#map-list').editableList('items').each(function() {
+                        const updateFunc = $(this).data('updateKnxOpts');
+                        if (updateFunc) updateFunc();
+                    });
+
                     $('#edit-panel').hide().empty();
-                    renderKnxEntities(); renderMappings();
                     RED.notify(isEdit?'已更新':'已添加', 'success');
                 });
                 $('#cancel-edit').on('click', function() { $('#edit-panel').hide().empty(); });
             }
-            function editKnxEntity(index) { showEntityPanel(index); }
-
-            function renderMappings() {
-                const c = $('#map-list'); c.empty();
-                if (!mappings.length) { c.html('<div class="tips">点击"添加"创建映射</div>'); return; }
-                let h = '<table class="tbl"><tr><th style="width:24px">#</th><th style="width:45%">KNX实体</th><th style="width:45%">HA实体</th><th style="width:32px">删除</th></tr>';
-                mappings.forEach((m, i) => {
-                    h += '<tr data-i="'+i+'"><td>'+(i+1)+'</td>';
-                    h += '<td><select class="m-knx"><option value="">--选择KNX--</option>';
-                    knxEntities.forEach(e => {
-                        const inv = e.invert ? '↕' : '';
-                        h += '<option value="'+e.id+'"'+(e.id===m.knxEntityId?' selected':'')+'>'+e.name+'['+e.cmdAddr+']('+inv+(typeLabels[e.type]||'')+')</option>';
-                    });
-                    h += '</select></td>';
-                    h += '<td><input type="text" class="m-ha-input" placeholder="输入实体ID或名称搜索" value="'+(m.haEntityId||'')+'" list="ha-list-'+i+'" style="width:100%; font-size:11px">';
-                    h += '<datalist id="ha-list-'+i+'">';
-                    haEntities.forEach(e => {
-                        h += '<option value="'+e.entity_id+'">'+e.name+'</option>';
-                    });
-                    h += '</datalist></td>';
-                    h += '<td><button class="red-ui-button red-ui-button-small m-del" title="删除"><i class="fa fa-times"></i></button></td></tr>';
-                });
-                c.html(h+'</table>');
-                bindEvents();
-            }
-
-            function bindEvents() {
-                $('.m-knx').off('change').on('change', function() {
-                    const i = $(this).closest('tr').data('i');
-                    mappings[i].knxEntityId = $(this).val();
-                });
-                $('.m-ha-input').off('input change').on('input change', function() {
-                    const i = $(this).closest('tr').data('i');
-                    mappings[i].haEntityId = $(this).val();
-                });
-                $('.m-del').off('click').on('click', function() {
-                    mappings.splice($(this).closest('tr').data('i'), 1);
-                    renderMappings();
-                });
-            }
+            function editKnxEntity(data, container) { showEntityPanel(data, container); }
 
             $('#add-map-btn').on('click', function() {
-                mappings.push({ knxEntityId:'', haEntityId:'' });
-                renderMappings();
+                $('#map-list').editableList('addItem', { knxEntityId:'', haEntityId:'' });
             });
-            $('#clear-map-btn').on('click', function() { if(confirm('清空映射？')) { mappings=[]; renderMappings(); } });
+            $('#clear-map-btn').on('click', function() { if(confirm('清空映射？')) { $('#map-list').editableList('empty'); } });
 
             $('#import-btn').on('click', function() { $('#import-modal').show(); });
             $('#import-cancel').on('click', function() { $('#import-modal').hide(); });
@@ -241,21 +304,32 @@
                     const p = line.split(/\t+/);
                     if (p.length >= 2 && p[1] && /\d+\/\d+\/\d+/.test(p[2]||'')) {
                         const id = 'k' + Date.now() + Math.random().toString(36).substr(2,4);
-                        knxEntities.push({ id, name:p[0].trim(), type:p[1].trim(), cmdAddr:p[2].trim(), statusAddr:(p[3]||'').trim(), ext1:(p[4]||'').trim(), ext2:(p[5]||'').trim(), ext3:(p[6]||'').trim(), invert:false });
+                        const entity = { id, name:p[0].trim(), type:p[1].trim(), cmdAddr:p[2].trim(), statusAddr:(p[3]||'').trim(), ext1:(p[4]||'').trim(), ext2:(p[5]||'').trim(), ext3:(p[6]||'').trim(), invert:false };
+                        $('#knx-list').editableList('addItem', entity);
                         cnt++;
                     }
                 });
+                // 刷新映射列表中的KNX选项
+                $('#map-list').editableList('items').each(function() {
+                    const updateFunc = $(this).data('updateKnxOpts');
+                    if (updateFunc) updateFunc();
+                });
                 $('#import-modal').hide(); $('#import-input').val('');
-                renderKnxEntities(); renderMappings();
                 RED.notify('导入 '+cnt+' 个实体'+(cnt?'':'（需要有效组地址格式如1/2/3）'), cnt?'success':'warning');
             });
-            $('#add-knx-btn').on('click', function() { showEntityPanel(-1); });
-            $('#clear-knx-btn').on('click', function() { if(confirm('清空KNX实体？')) { knxEntities=[]; renderKnxEntities(); renderMappings(); } });
+            $('#add-knx-btn').on('click', function() { showEntityPanel(null, null); });
+            $('#clear-knx-btn').on('click', function() { if(confirm('清空KNX实体？')) { $('#knx-list').editableList('empty'); } });
 
-            function saveKnxData() { $('#knx-data').val(JSON.stringify(knxEntities)); }
+            function saveKnxData() { 
+                const entities = [];
+                $('#knx-list').editableList('items').each(function() {
+                    entities.push($(this).data('data'));
+                });
+                $('#knx-data').val(JSON.stringify(entities));
+            }
             
-            const origRender = renderKnxEntities;
-            renderKnxEntities = function() { origRender(); saveKnxData(); };
+            // 渲染后保存 (Deprecated in editableList mode, but kept for compatibility logic if any)
+            // renderKnxEntities = function() { origRender(); saveKnxData(); };
 
             $('#node-input-haServer').on('change', function() {
                 setTimeout(loadHaEntities, 2000);
@@ -269,7 +343,7 @@
             });
             
             setTimeout(function() { 
-                renderKnxEntities(); 
+                refreshMappings();
                 if ($('#node-input-haServer').val()) {
                     setTimeout(loadHaEntities, 2000);
                 }
@@ -277,12 +351,18 @@
         },
         oneditsave: function() {
             const maps = [];
-            $('#map-list tr[data-i]').each(function() {
-                const m = { knxEntityId: $(this).find('.m-knx').val(), haEntityId: $(this).find('.m-ha-input').val() };
+            $('#map-list').editableList('items').each(function() {
+                const m = $(this).data('data');
                 if (m.knxEntityId && m.haEntityId) maps.push(m);
             });
             this.mappings = JSON.stringify(maps);
-            this.knxEntities = $('#knx-data').val() || '[]';
+            
+            const entities = [];
+            $('#knx-list').editableList('items').each(function() {
+                entities.push($(this).data('data'));
+            });
+            $('#knx-data').val(JSON.stringify(entities));
+            this.knxEntities = $('#knx-data').val();
         }
     });
 </script>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-red-contrib-symi-mesh",
-  "version": "1.8.10",
+  "version": "1.8.12",
   "description": "Node-RED节点集合，用于通过TCP/串口连接Symi蓝牙Mesh网关，支持Home Assistant MQTT Discovery自动发现和云端数据同步",
   "main": "nodes/symi-gateway.js",
   "scripts": {