node-red-contrib-symi-mesh 1.7.7 → 1.7.8

package/nodes/symi-mqtt-sync.html

@@ -7,7 +7,10 @@
             mqttConfig: { value: '', type: 'symi-mqtt', required: true },
             brandMqttConfig: { value: '', type: 'symi-mqtt-brand', required: true },
             autoDiscover: { value: true },
-            mappings: { value: '[]' }
+            mappings: { value: '[]' },
+            // 持久化缓存：保存设备列表，断线后仍可显示
+            cachedMeshDevices: { value: '[]' },
+            cachedBrandDevices: { value: '[]' }
         },
         inputs: 1,
         outputs: 1,
@@ -27,11 +30,14 @@
             var mappings = [];
             var meshDevices = [];
             var brandDevices = [];
+            var cachedMeshDevices = [];
+            var cachedBrandDevices = [];
 
-            // 设置编辑面板更宽
+            // 设置编辑面板更宽更高
             var panel = $('#dialog-form').parent();
-            if (panel.length && panel.width() < 920) {
-                panel.css('width', '900px');
+            if (panel.length) {
+                if (panel.width() < 920) panel.css('width', '900px');
+                if (panel.height() < 700) panel.css('min-height', '700px');
             }
 
             var deviceTypes = {
@@ -42,28 +48,70 @@
                 36: { name: '新风' }
             };
 
+            // 加载已保存的配置
             try { mappings = JSON.parse(node.mappings || '[]'); } catch(e) { mappings = []; }
+            try { cachedMeshDevices = JSON.parse(node.cachedMeshDevices || '[]'); } catch(e) { cachedMeshDevices = []; }
+            try { cachedBrandDevices = JSON.parse(node.cachedBrandDevices || '[]'); } catch(e) { cachedBrandDevices = []; }
+
+            // 合并设备列表：在线设备 + 缓存设备（去重）
+            function mergeDevices(onlineDevices, cachedDevices, keyField) {
+                var merged = [];
+                var keys = new Set();
+                
+                // 先添加在线设备
+                (onlineDevices || []).forEach(function(d) {
+                    var key = keyField === 'mac' ? (d.mac || '').toLowerCase().replace(/:/g, '') : 
+                              (d.deviceType + '_' + d.deviceId);
+                    if (!keys.has(key)) {
+                        keys.add(key);
+                        d._online = true;
+                        merged.push(d);
+                    }
+                });
+                
+                // 再添加缓存中不在线的设备
+                (cachedDevices || []).forEach(function(d) {
+                    var key = keyField === 'mac' ? (d.mac || '').toLowerCase().replace(/:/g, '') : 
+                              (d.deviceType + '_' + d.deviceId);
+                    if (!keys.has(key)) {
+                        keys.add(key);
+                        d._online = false;
+                        merged.push(d);
+                    }
+                });
+                
+                return merged;
+            }
 
             // 加载Mesh设备列表
             function loadMeshDevices(callback) {
                 var mqttConfigId = $('#node-input-mqttConfig').val();
                 if (!mqttConfigId) {
-                    meshDevices = [];
+                    // 无配置时使用缓存
+                    meshDevices = mergeDevices([], cachedMeshDevices, 'mac');
                     if (callback) callback();
                     return;
                 }
                 var mqttConfigNode = RED.nodes.node(mqttConfigId);
                 var gatewayId = mqttConfigNode ? mqttConfigNode.gateway : null;
                 if (!gatewayId) {
-                    meshDevices = [];
+                    meshDevices = mergeDevices([], cachedMeshDevices, 'mac');
                     if (callback) callback();
                     return;
                 }
                 $.getJSON('symi-gateway/devices/' + gatewayId, function(devices) {
-                    meshDevices = devices || [];
+                    // 合并在线设备和缓存设备
+                    meshDevices = mergeDevices(devices || [], cachedMeshDevices, 'mac');
+                    // 更新缓存（只保存有效设备）
+                    if (devices && devices.length > 0) {
+                        cachedMeshDevices = devices.map(function(d) {
+                            return { mac: d.mac, name: d.name, channels: d.channels };
+                        });
+                    }
                     if (callback) callback();
                 }).fail(function() {
-                    meshDevices = [];
+                    // 请求失败时使用缓存
+                    meshDevices = mergeDevices([], cachedMeshDevices, 'mac');
                     if (callback) callback();
                 });
             }
@@ -72,38 +120,56 @@
             function loadBrandDevices(callback) {
                 var brandConfigId = $('#node-input-brandMqttConfig').val();
                 if (!brandConfigId) {
-                    brandDevices = [];
+                    brandDevices = mergeDevices([], cachedBrandDevices, 'brand');
                     if (callback) callback();
                     return;
                 }
                 $.getJSON('symi-mqtt-brand/devices/' + brandConfigId, function(devices) {
-                    brandDevices = devices || [];
+                    brandDevices = mergeDevices(devices || [], cachedBrandDevices, 'brand');
+                    // 更新缓存
+                    if (devices && devices.length > 0) {
+                        cachedBrandDevices = devices.map(function(d) {
+                            return { deviceType: d.deviceType, deviceId: d.deviceId, typeName: d.typeName };
+                        });
+                    }
                     if (callback) callback();
                 }).fail(function() {
-                    brandDevices = [];
+                    brandDevices = mergeDevices([], cachedBrandDevices, 'brand');
                     if (callback) callback();
                 });
             }
 
-            // 构建Mesh设备选项
-            function getMeshOptions(selectedMac) {
+            // 构建Mesh设备选项（支持显示离线设备）
+            function getMeshOptions(selectedMac, savedName) {
                 var html = '<option value="">-- 选择Mesh设备 --</option>';
                 var selMacNorm = (selectedMac || '').toLowerCase().replace(/:/g, '');
+                var found = false;
+                
                 meshDevices.forEach(function(d) {
                     var devMacNorm = (d.mac || '').toLowerCase().replace(/:/g, '');
                     var selected = (devMacNorm === selMacNorm && selMacNorm !== '') ? ' selected' : '';
-                    html += '<option value="' + d.mac + '" data-channels="' + (d.channels || 1) + '"' + selected + '>' + d.name + '</option>';
+                    if (selected) found = true;
+                    var statusIcon = d._online === false ? ' [离线]' : '';
+                    var style = d._online === false ? ' style="color:#999;"' : '';
+                    html += '<option value="' + d.mac + '" data-channels="' + (d.channels || 1) + '" data-name="' + (d.name || '') + '"' + selected + style + '>' + (d.name || d.mac) + statusIcon + '</option>';
                 });
+                
+                // 如果已选择的设备不在列表中，添加它（使用保存的名称）
+                if (selMacNorm && !found) {
+                    var displayName = savedName || selectedMac;
+                    html += '<option value="' + selectedMac + '" selected style="color:#c00;">' + displayName + ' [未找到]</option>';
+                }
+                
                 return html;
             }
 
             // 构建Mesh按键选项
-            function getMeshChannelOptions(mac, selectedChannel) {
+            function getMeshChannelOptions(mac, selectedChannel, savedChannels) {
                 var macNorm = (mac || '').toLowerCase().replace(/:/g, '');
                 var device = meshDevices.find(function(d) { 
                     return (d.mac || '').toLowerCase().replace(/:/g, '') === macNorm; 
                 });
-                var channels = device ? (device.channels || 1) : 0;
+                var channels = device ? (device.channels || 1) : (savedChannels || 1);
                 if (channels <= 1) return '';
                 var html = '<select class="mesh-channel">';
                 for (var i = 1; i <= channels; i++) {
@@ -114,27 +180,26 @@
                 return html;
             }
 
-            // 构建品牌设备选项
-            function getBrandOptions(selectedType, selectedId) {
+            // 构建品牌设备选项（支持显示离线设备）
+            function getBrandOptions(selectedType, selectedId, savedTypeName) {
                 var html = '<option value="">-- 选择品牌设备 --</option>';
                 var selectedKey = selectedType + '_' + selectedId;
+                var found = false;
                 
-                // 从已发现设备生成选项
+                // 从设备列表生成选项
                 brandDevices.forEach(function(d) {
                     var key = d.deviceType + '_' + d.deviceId;
                     var selected = (key === selectedKey) ? ' selected' : '';
-                    html += '<option value="' + key + '"' + selected + '>' + d.typeName + ' (ID:' + d.deviceId + ')</option>';
+                    if (selected) found = true;
+                    var statusIcon = d._online === false ? ' [离线]' : '';
+                    var style = d._online === false ? ' style="color:#999;"' : '';
+                    html += '<option value="' + key + '" data-typename="' + (d.typeName || '') + '"' + selected + style + '>' + (d.typeName || '设备') + ' (ID:' + d.deviceId + ')' + statusIcon + '</option>';
                 });
                 
                 // 如果选中的设备不在列表中，添加它
-                if (selectedType && selectedId) {
-                    var exists = brandDevices.some(function(d) {
-                        return d.deviceType == selectedType && d.deviceId == selectedId;
-                    });
-                    if (!exists) {
-                        var typeName = deviceTypes[selectedType] ? deviceTypes[selectedType].name : '类型' + selectedType;
-                        html += '<option value="' + selectedKey + '" selected>' + typeName + ' (ID:' + selectedId + ')</option>';
-                    }
+                if (selectedType && selectedId && !found) {
+                    var typeName = savedTypeName || (deviceTypes[selectedType] ? deviceTypes[selectedType].name : '类型' + selectedType);
+                    html += '<option value="' + selectedKey + '" selected style="color:#c00;">' + typeName + ' (ID:' + selectedId + ') [未找到]</option>';
                 }
                 
                 return html;
@@ -142,7 +207,6 @@
 
             // 构建品牌设备通道选项（灯具支持多路）
             function getBrandChannelOptions(deviceType, selectedChannel) {
-                // 灯具(8)支持多路，其他设备单路
                 var channels = (parseInt(deviceType) === 8) ? 8 : 1;
                 if (channels <= 1) return '';
                 var html = '<select class="brand-channel">';
@@ -169,12 +233,12 @@
                     row.html(
                         '<div class="mapping-main">' +
                         '<div class="mesh-col">' +
-                        '  <select class="mesh-select">' + getMeshOptions(m.meshMac) + '</select>' +
-                        '  <span class="mesh-ch-wrap">' + getMeshChannelOptions(m.meshMac, m.meshChannel || 1) + '</span>' +
+                        '  <select class="mesh-select">' + getMeshOptions(m.meshMac, m.meshName) + '</select>' +
+                        '  <span class="mesh-ch-wrap">' + getMeshChannelOptions(m.meshMac, m.meshChannel || 1, m.meshChannels) + '</span>' +
                         '</div>' +
                         '<div class="arrow-col"><i class="fa fa-arrows-h"></i></div>' +
                         '<div class="brand-col">' +
-                        '  <select class="brand-select">' + getBrandOptions(m.brandDeviceType, m.brandDeviceId) + '</select>' +
+                        '  <select class="brand-select">' + getBrandOptions(m.brandDeviceType, m.brandDeviceId, m.brandTypeName) + '</select>' +
                         '  <span class="brand-ch-wrap">' + getBrandChannelOptions(m.brandDeviceType, m.brandChannel || 1) + '</span>' +
                         '</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>' +
@@ -194,9 +258,14 @@
                     var row = $(this).closest('.mapping-row');
                     var idx = row.data('idx');
                     var mac = $(this).val();
+                    var opt = $(this).find('option:selected');
+                    
                     mappings[idx].meshMac = mac || '';
+                    mappings[idx].meshName = opt.data('name') || opt.text().replace(' [离线]', '').replace(' [未找到]', '');
+                    mappings[idx].meshChannels = parseInt(opt.data('channels')) || 1;
                     mappings[idx].meshChannel = 1;
-                    row.find('.mesh-ch-wrap').html(getMeshChannelOptions(mac, 1));
+                    
+                    row.find('.mesh-ch-wrap').html(getMeshChannelOptions(mac, 1, mappings[idx].meshChannels));
                     bindEvents();
                 });
 
@@ -209,17 +278,20 @@
                     var row = $(this).closest('.mapping-row');
                     var idx = row.data('idx');
                     var val = $(this).val();
+                    var opt = $(this).find('option:selected');
+                    
                     if (val) {
                         var parts = val.split('_');
                         mappings[idx].brandDeviceType = parseInt(parts[0]) || 8;
                         mappings[idx].brandDeviceId = parseInt(parts[1]) || 1;
+                        mappings[idx].brandTypeName = opt.data('typename') || opt.text().split(' (ID:')[0].replace(' [离线]', '').replace(' [未找到]', '');
                         mappings[idx].brandChannel = 1;
-                        // 更新通道选择器
                         row.find('.brand-ch-wrap').html(getBrandChannelOptions(mappings[idx].brandDeviceType, 1));
                         bindEvents();
                     } else {
                         mappings[idx].brandDeviceType = null;
                         mappings[idx].brandDeviceId = null;
+                        mappings[idx].brandTypeName = null;
                         mappings[idx].brandChannel = 1;
                         row.find('.brand-ch-wrap').empty();
                     }
@@ -239,12 +311,30 @@
 
             // 刷新品牌设备
             $('#refresh-brand-btn').on('click', function() {
-                loadBrandDevices(renderMappings);
+                var btn = $(this);
+                btn.prop('disabled', true).find('i').addClass('fa-spin');
+                loadBrandDevices(function() {
+                    renderMappings();
+                    btn.prop('disabled', false).find('i').removeClass('fa-spin');
+                });
+            });
+
+            // 刷新Mesh设备
+            $('#refresh-mesh-btn').on('click', function() {
+                var btn = $(this);
+                btn.prop('disabled', true).find('i').addClass('fa-spin');
+                loadMeshDevices(function() {
+                    renderMappings();
+                    btn.prop('disabled', false).find('i').removeClass('fa-spin');
+                });
             });
 
             // 添加映射按钮
             $('#btn-add-mapping').on('click', function() {
-                mappings.push({ meshMac: '', meshChannel: 1, brandDeviceType: 8, brandDeviceId: 1, brandChannel: 1 });
+                mappings.push({ 
+                    meshMac: '', meshName: '', meshChannel: 1, meshChannels: 1,
+                    brandDeviceType: 8, brandDeviceId: 1, brandTypeName: '灯具', brandChannel: 1 
+                });
                 renderMappings();
             });
 
@@ -261,10 +351,14 @@
                 }, 100);
             });
 
-            // 保存时更新mappings
-            node._saveMappings = function() {
+            // 保存时更新所有数据
+            node._saveAll = function() {
                 node.mappings = JSON.stringify(mappings);
+                node.cachedMeshDevices = JSON.stringify(cachedMeshDevices);
+                node.cachedBrandDevices = JSON.stringify(cachedBrandDevices);
                 $('#node-input-mappings').val(node.mappings);
+                $('#node-input-cachedMeshDevices').val(node.cachedMeshDevices);
+                $('#node-input-cachedBrandDevices').val(node.cachedBrandDevices);
             };
 
             // 初始加载
@@ -282,7 +376,7 @@
             $('#mapping-list').css('max-height', Math.max(150, height) + 'px');
         },
         oneditsave: function() {
-            if (this._saveMappings) { this._saveMappings(); }
+            if (this._saveAll) { this._saveAll(); }
         }
     });
 </script>
@@ -292,8 +386,10 @@
         .bridge-section { margin: 12px 0; padding: 10px; border: 1px solid #ddd; border-radius: 5px; background: #fafafa; }
         .bridge-section h4 { margin: 0 0 10px 0; padding-bottom: 6px; border-bottom: 1px solid #eee; color: #333; font-size: 13px; }
         .bridge-section h4 i { margin-right: 6px; color: #666; }
+        .section-btns { float: right; }
+        .section-btns button { margin-left: 4px; }
         
-        #mapping-list { max-height: calc(100vh - 400px); min-height: 150px; overflow-y: auto; }
+        #mapping-list { max-height: 600px; min-height: 400px; overflow-y: auto; }
         .mapping-empty { padding: 15px; text-align: center; color: #999; font-size: 12px; }
         .mapping-row { display: flex; flex-direction: column; padding: 6px 8px; margin-bottom: 6px; background: #fff; border: 1px solid #e0e0e0; border-radius: 4px; gap: 6px; }
         .mapping-main { display: flex; align-items: center; width: 100%; gap: 6px; min-width: 0; }
@@ -331,7 +427,10 @@
 
     <div class="bridge-section">
         <h4><i class="fa fa-exchange"></i> 实体映射（Mesh ↔ 品牌MQTT）
-            <button type="button" id="refresh-brand-btn" class="red-ui-button red-ui-button-small" style="float:right;" title="刷新品牌设备"><i class="fa fa-refresh"></i></button>
+            <span class="section-btns">
+                <button type="button" id="refresh-mesh-btn" class="red-ui-button red-ui-button-small" title="刷新Mesh设备"><i class="fa fa-refresh"></i> Mesh</button>
+                <button type="button" id="refresh-brand-btn" class="red-ui-button red-ui-button-small" title="刷新品牌设备"><i class="fa fa-refresh"></i> 品牌</button>
+            </span>
         </h4>
         <div style="display:flex; padding:4px 8px; font-size:11px; color:#666; border-bottom:1px solid #eee; margin-bottom:6px; gap:6px;">
             <span style="flex:1 1 40%">Mesh设备/按键</span>
@@ -345,6 +444,8 @@
     </div>
 
     <input type="hidden" id="node-input-mappings">
+    <input type="hidden" id="node-input-cachedMeshDevices">
+    <input type="hidden" id="node-input-cachedBrandDevices">
 </script>
 
 <script type="text/html" data-help-name="symi-mqtt-sync">
@@ -354,6 +455,7 @@
     <ul>
         <li><strong>双MQTT配置节点</strong>：Mesh MQTT + 品牌MQTT独立配置</li>
         <li><strong>设备自动发现</strong>：品牌MQTT连接后自动发现设备</li>
+        <li><strong>配置持久化</strong>：设备列表和映射配置持久保存，断线后仍可显示</li>
         <li><strong>实体映射</strong>：左边选择Mesh设备，右边选择品牌设备</li>
         <li><strong>双向同步</strong>：MQTT↔Mesh双向状态实时同步</li>
         <li><strong>防死循环</strong>：内置2秒防抖机制</li>
@@ -367,9 +469,16 @@
         <dt>品牌MQTT</dt>
         <dd>选择品牌MQTT配置节点（如HYQW），用于获取品牌设备列表</dd>
         <dt>实体映射</dt>
-        <dd>配置Mesh设备与品牌设备的对应关系</dd>
+        <dd>配置Mesh设备与品牌设备的对应关系（配置会持久保存）</dd>
     </dl>
 
+    <h3>离线设备显示</h3>
+    <p>当MQTT断开时，已配置的设备仍会显示在列表中：</p>
+    <ul>
+        <li><strong>[离线]</strong>：设备在缓存中但当前不在线</li>
+        <li><strong>[未找到]</strong>：设备既不在线也不在缓存中</li>
+    </ul>
+
     <h3>支持的设备类型（HYQW）</h3>
     <ul>
         <li><strong>灯具(8)</strong>：开关、亮度</li>

package/nodes/symi-mqtt-sync.js

@@ -268,18 +268,25 @@ module.exports = function(RED) {
             );
             if (!mapping || !mapping.meshMac) return;
 
-            // 防死循环
-            const syncKey = `mqtt_${deviceType}_${deviceId}_${fn}`;
-            const lastSync = node._syncTimestamps.get(syncKey) || 0;
-            if (Date.now() - lastSync < SYNC_DEBOUNCE_MS) return;
-
             const meshMac = mapping.meshMac;
             const meshChannel = parseInt(mapping.meshChannel) || 1;
+
+            // 防死循环 - 检查两个方向的时间戳
+            const now = Date.now();
+            const mqttSyncKey = `mqtt_${deviceType}_${deviceId}_${fn}`;
+            const meshSyncKey = `mesh_${meshMac}_${meshChannel}_${fn}`;
+            const lastMqttSync = node._syncTimestamps.get(mqttSyncKey) || 0;
+            const lastMeshSync = node._syncTimestamps.get(meshSyncKey) || 0;
+            
+            // 如果任一方向在防抖时间内有同步，跳过
+            if (now - lastMqttSync < SYNC_DEBOUNCE_MS || now - lastMeshSync < SYNC_DEBOUNCE_MS) return;
+
             const device = node._gateway.deviceManager.getDeviceByMac(meshMac);
             if (!device) return;
 
-            node._syncTimestamps.set(syncKey, Date.now());
-            node._syncTimestamps.set(`mesh_${meshMac}_${meshChannel}`, Date.now());
+            // 记录时间戳 - 同时标记两个方向
+            node._syncTimestamps.set(mqttSyncKey, now);
+            node._syncTimestamps.set(meshSyncKey, now);
 
             const typeInfo = node._brandProtocol.deviceTypes[deviceType];
             if (!typeInfo) return;
@@ -346,21 +353,42 @@ module.exports = function(RED) {
             const typeInfo = node._brandProtocol.deviceTypes[deviceType];
             if (!typeInfo) return;
 
-            // 防死循环
-            const syncKey = `mesh_${meshMac}_${channel}`;
-            const lastSync = node._syncTimestamps.get(syncKey) || 0;
-            if (Date.now() - lastSync < SYNC_DEBOUNCE_MS) return;
-            node._syncTimestamps.set(syncKey, Date.now());
-
-            let fn, fv;
+            // 根据属性确定功能码
+            let fn;
             if (property === 'switch' || property === 'on' || property === 'isOn') {
-                fn = 1; fv = value ? 1 : 0;
+                fn = 1;
             } else if (property === 'brightness' || property === 'temperature' || property === 'position') {
-                fn = 2; fv = parseInt(value) || 0;
+                fn = 2;
             } else if (property === 'mode' || property === 'hvacMode') {
-                fn = 3; fv = AC_MODE_REVERSE[value] ?? 0;
+                fn = 3;
             } else if (property === 'fanSpeed' || property === 'fanMode') {
                 fn = typeInfo.meshType === 'climate' ? 4 : 3;
+            } else {
+                return;
+            }
+
+            // 防死循环 - 检查两个方向的时间戳
+            const now = Date.now();
+            const meshSyncKey = `mesh_${meshMac}_${channel}_${fn}`;
+            const mqttSyncKey = `mqtt_${deviceType}_${deviceId}_${fn}`;
+            const lastMeshSync = node._syncTimestamps.get(meshSyncKey) || 0;
+            const lastMqttSync = node._syncTimestamps.get(mqttSyncKey) || 0;
+            
+            // 如果任一方向在防抖时间内有同步，跳过
+            if (now - lastMeshSync < SYNC_DEBOUNCE_MS || now - lastMqttSync < SYNC_DEBOUNCE_MS) return;
+            
+            // 记录时间戳 - 同时标记两个方向
+            node._syncTimestamps.set(meshSyncKey, now);
+            node._syncTimestamps.set(mqttSyncKey, now);
+
+            let fv;
+            if (property === 'switch' || property === 'on' || property === 'isOn') {
+                fv = value ? 1 : 0;
+            } else if (property === 'brightness' || property === 'temperature' || property === 'position') {
+                fv = parseInt(value) || 0;
+            } else if (property === 'mode' || property === 'hvacMode') {
+                fv = AC_MODE_REVERSE[value] ?? 0;
+            } else if (property === 'fanSpeed' || property === 'fanMode') {
                 fv = FAN_SPEED_REVERSE[value] ?? 0;
             } else {
                 return;
@@ -371,7 +399,6 @@ module.exports = function(RED) {
 
             try {
                 node._mqttClient.publish(topic, payload, { qos: 0 });
-                node._syncTimestamps.set(`mqtt_${deviceType}_${deviceId}_${fn}`, Date.now());
                 
                 // 输出到debug
                 node.send({

package/package.json

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