node-red-contrib-symi-mesh 1.8.3 → 1.8.5

package/nodes/symi-knx-bridge.html

@@ -17,6 +17,14 @@
         label: function() { return this.name || 'KNX桥接'; },
         oneditprepare: function() {
             const node = this;
+
+            // 设置编辑面板更宽更高
+            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 mappings = [], devices = [], knxEntities = [];
             const typeLabels = {switch:'开关',light_mono:'单调',light_cct:'双调',light_rgb:'RGB',light_rgbcw:'RGBCW',cover:'窗帘',climate:'空调',fresh_air:'新风',floor_heating:'地暖'};
 

package/nodes/symi-knx-bridge.js

@@ -3,10 +3,15 @@
  * 支持开关、窗帘等设备的双向状态同步
  * 事件驱动架构，命令队列顺序处理，防死循环机制
  * 
- * 版本: 1.6.8
+ * 版本: 1.8.5
+ * 
+ * v1.8.5 更新:
+ * - 使用通用 SyncUtils 类统一防环路逻辑
+ * - 移除本地 LOOP_PREVENTION_MS 常量，使用 SyncUtils.getTimeoutForDevice()
  */
 
 module.exports = function(RED) {
+    const { SyncUtils, COVER_TIMEOUT, BRIGHTNESS_TIMEOUT, DEFAULT_TIMEOUT } = require('../lib/sync-utils');
     
     // 设备类型配置
     const DEVICE_TYPES = {
@@ -147,12 +152,16 @@ module.exports = function(RED) {
         node.lastSyncTime = 0;
         node.stateCache = {};           // Mesh设备状态缓存
         node.knxStateCache = {};        // KNX设备状态缓存
-        node.lastMeshToKnx = {};        // 记录Mesh->KNX发送时间，防止回环
-        node.lastKnxToMesh = {};        // 记录KNX->Mesh发送时间，防止回环
         node.lastKnxAddrSent = {};      // 记录发送到KNX地址的时间，防止自己发的命令又被处理
         
-        // 防死循环参数
-        const LOOP_PREVENTION_MS = 800;   // 800ms内不处理反向同步，防止回环
+        // 初始化通用同步工具类
+        node.syncUtils = new SyncUtils({
+            defaultTimeout: DEFAULT_TIMEOUT,
+            coverTimeout: COVER_TIMEOUT,
+            brightnessTimeout: BRIGHTNESS_TIMEOUT
+        });
+        
+        // 防死循环参数（使用 SyncUtils 的超时配置）
         const DEBOUNCE_MS = 100;          // 100ms防抖
         const MAX_QUEUE_SIZE = 100;       // 最大队列大小
         const COVER_CONTROL_LOCK_MS = 3000;  // 窗帘/调光控制锁定3秒（只忽略过程反馈，不长期锁定）
@@ -226,26 +235,17 @@ module.exports = function(RED) {
             return str;
         };
 
-        // 检查是否应该阻止同步（防死循环）
+        // 检查是否应该阻止同步（防死循环）- 使用通用 SyncUtils
         node.shouldPreventSync = function(direction, key) {
-            const now = Date.now();
-            if (direction === 'mesh-to-knx') {
-                const lastKnxTime = node.lastKnxToMesh[key] || 0;
-                return (now - lastKnxTime) < LOOP_PREVENTION_MS;
-            } else {
-                const lastMeshTime = node.lastMeshToKnx[key] || 0;
-                return (now - lastMeshTime) < LOOP_PREVENTION_MS;
-            }
+            // 转换方向名称以匹配 SyncUtils 的格式
+            const syncDirection = direction === 'mesh-to-knx' ? 'mesh-to-target' : 'target-to-mesh';
+            return node.syncUtils.shouldPreventSync(syncDirection, key);
         };
 
-        // 记录同步时间（用于防死循环）
+        // 记录同步时间（用于防死循环）- 使用通用 SyncUtils
         node.recordSyncTime = function(direction, key) {
-            const now = Date.now();
-            if (direction === 'mesh-to-knx') {
-                node.lastMeshToKnx[key] = now;
-            } else {
-                node.lastKnxToMesh[key] = now;
-            }
+            const syncDirection = direction === 'mesh-to-knx' ? 'mesh-to-target' : 'target-to-mesh';
+            node.syncUtils.recordSyncTime(syncDirection, key);
         };
 
         // 延时函数
@@ -953,7 +953,7 @@ module.exports = function(RED) {
             
             // 检查是否是我们自己发出去的命令（防止自己发的命令被监听后又处理）
             const lastSentTime = node.lastKnxAddrSent[groupAddr] || 0;
-            if (Date.now() - lastSentTime < LOOP_PREVENTION_MS) {
+            if (Date.now() - lastSentTime < DEFAULT_TIMEOUT) {
                 node.debug(`[KNX输入] 跳过(自己发的): ${groupAddr}`);
                 done && done();
                 return;
@@ -1157,12 +1157,15 @@ module.exports = function(RED) {
                 node.gateway.removeListener('scene-executed', handleSceneExecuted);
             }
             
+            // 销毁 SyncUtils 实例，清理资源
+            if (node.syncUtils) {
+                node.syncUtils.destroy();
+            }
+            
             // 清空队列和缓存
             node.commandQueue = [];
             node.stateCache = {};
             node.knxStateCache = {};
-            node.lastMeshToKnx = {};
-            node.lastKnxToMesh = {};
             
             node.status({});
             done();

package/nodes/symi-mqtt-brand.html

@@ -20,6 +20,13 @@
         oneditprepare: function() {
             var node = this;
             
+            // 设置编辑面板更宽更高
+            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');
+            }
+            
             // 品牌切换
             function updateBrandUI() {
                 var brand = $('#node-config-input-brand').val();

package/nodes/symi-mqtt-sync.html

@@ -36,8 +36,8 @@
             // 设置编辑面板更宽更高
             var panel = $('#dialog-form').parent();
             if (panel.length) {
-                if (panel.width() < 920) panel.css('width', '900px');
-                if (panel.height() < 700) panel.css('min-height', '700px');
+                if (panel.width() < 1000) panel.css('width', '1000px');
+                if (panel.height() < 1000) panel.css('min-height', '1000px');
             }
 
             var deviceTypes = {

package/nodes/symi-mqtt-sync.js

@@ -1,5 +1,11 @@
 /**
  * MQTT同步节点 - 实现第三方MQTT品牌设备与Mesh设备的双向同步
+ * 版本: 1.8.5
+ * 
+ * v1.8.5 更新:
+ * - 使用通用 SyncUtils 类统一防环路逻辑
+ * - 添加三合一面板子实体同步支持 (空调/新风/地暖)
+ * - 支持 meshSubEntity 映射字段
  * 
  * 架构设计:
  * - 使用symi-mqtt配置节点共享MQTT连接（与Mesh网关MQTT一致）
@@ -11,6 +17,7 @@
 
 module.exports = function(RED) {
     const mqtt = require('mqtt');
+    const { SyncUtils, THREE_IN_ONE_SUB_ENTITIES, getSubEntityByHyqwType } = require('../lib/sync-utils');
 
     // ===== 常量定义 =====
     const SYNC_DEBOUNCE_MS = 2000;
@@ -110,6 +117,11 @@ module.exports = function(RED) {
         node._cleanupTimer = null;
         node._closing = false;
         node._lastErrorLog = 0;  // 错误日志限流
+        
+        // 初始化通用同步工具
+        node._syncUtils = new SyncUtils({
+            defaultTimeout: SYNC_DEBOUNCE_MS
+        });
 
         if (!node._mqttConfig) {
             node.status({ fill: 'red', shape: 'ring', text: '未选择Mesh MQTT' });
@@ -263,36 +275,41 @@ module.exports = function(RED) {
         function syncToMesh(deviceType, deviceId, fn, fv) {
             if (!node._gateway?.deviceManager) return;
 
-            const mapping = node.mappings.find(m => 
-                parseInt(m.brandDeviceType) === deviceType && parseInt(m.brandDeviceId) === deviceId
-            );
+            // 查找映射 - 支持三合一子实体
+            const mapping = node.mappings.find(m => {
+                const typeMatch = parseInt(m.brandDeviceType) === deviceType;
+                const idMatch = parseInt(m.brandDeviceId) === deviceId;
+                return typeMatch && idMatch;
+            });
             if (!mapping || !mapping.meshMac) return;
 
             const meshMac = mapping.meshMac;
             const meshChannel = parseInt(mapping.meshChannel) || 1;
+            const meshSubEntity = mapping.meshSubEntity; // 三合一子实体类型
 
-            // 防死循环 - 检查两个方向的时间戳
-            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;
+            // 使用 SyncUtils 防环路
+            const syncKey = `${meshMac}_${meshChannel}_${meshSubEntity || 'default'}_${fn}`;
+            if (node._syncUtils.shouldPreventSync('target-to-mesh', syncKey)) {
+                return;
+            }
 
             const device = node._gateway.deviceManager.getDeviceByMac(meshMac);
             if (!device) return;
 
-            // 记录时间戳 - 同时标记两个方向
-            node._syncTimestamps.set(mqttSyncKey, now);
-            node._syncTimestamps.set(meshSyncKey, now);
+            // 记录同步时间
+            node._syncUtils.recordSyncTime('target-to-mesh', syncKey);
 
             const typeInfo = node._brandProtocol.deviceTypes[deviceType];
             if (!typeInfo) return;
 
             let property = '', value = null;
             try {
+                // 三合一子实体特殊处理
+                if (meshSubEntity && THREE_IN_ONE_SUB_ENTITIES[meshSubEntity]) {
+                    syncThreeInOneToMesh(device, meshMac, meshSubEntity, fn, fv);
+                    return;
+                }
+                
                 // 窗帘设备特殊处理 (typeId=14)
                 if (deviceType === 14) {
                     if (fn === 1) {
@@ -392,11 +409,88 @@ module.exports = function(RED) {
                 node.warn(`[Brand→Mesh] 同步失败: ${e.message}`);
             }
         }
+        
+        // ===== 三合一子实体同步到Mesh =====
+        function syncThreeInOneToMesh(device, meshMac, subEntity, fn, fv) {
+            const subConfig = THREE_IN_ONE_SUB_ENTITIES[subEntity];
+            if (!subConfig) return;
+            
+            let property = '', value = null;
+            
+            // 根据子实体类型和功能码处理
+            if (subEntity === 'aircon') {
+                // 空调子实体
+                if (fn === 1) {
+                    property = 'climateSwitch'; value = fv === 1;
+                } else if (fn === 2) {
+                    property = 'targetTemp'; value = fv;
+                } else if (fn === 3) {
+                    property = 'climateMode'; value = AC_MODE_MAP[fv] || 'cool';
+                } else if (fn === 4) {
+                    property = 'fanMode'; value = FAN_SPEED_MAP[fv] || 'auto';
+                }
+            } else if (subEntity === 'fresh_air') {
+                // 新风子实体
+                if (fn === 1) {
+                    property = 'freshAirSwitch'; value = fv === 1;
+                } else if (fn === 3) {
+                    property = 'freshAirSpeed'; value = FAN_SPEED_MAP[fv] || 'auto';
+                }
+            } else if (subEntity === 'floor_heating') {
+                // 地暖子实体
+                if (fn === 1) {
+                    property = 'floorHeatingSwitch'; value = fv === 1;
+                } else if (fn === 2) {
+                    property = 'floorHeatingTemp'; value = fv;
+                }
+            }
+            
+            if (property && node._gateway) {
+                // 使用网关发送三合一控制命令
+                const attrMap = {
+                    'climateSwitch': 0x02,
+                    'targetTemp': 0x1B,
+                    'climateMode': 0x1D,
+                    'fanMode': 0x1C,
+                    'freshAirSwitch': 0x68,
+                    'freshAirSpeed': 0x6A,
+                    'floorHeatingSwitch': 0x6B,
+                    'floorHeatingTemp': 0x6C
+                };
+                
+                const attrType = attrMap[property];
+                if (attrType && device.networkAddress) {
+                    let param;
+                    if (property.includes('Switch')) {
+                        param = [value ? 0x02 : 0x01];
+                    } else if (property.includes('Temp')) {
+                        param = [value];
+                    } else if (property.includes('Mode') || property.includes('Speed')) {
+                        const reverseMap = { auto: 4, low: 3, medium: 2, high: 1, cool: 1, heat: 2, fan_only: 3, dry: 4 };
+                        param = [reverseMap[value] || 1];
+                    }
+                    
+                    if (param) {
+                        node._gateway.sendControl(device.networkAddress, attrType, param);
+                        node.send({
+                            topic: 'mqtt-sync/brand-to-mesh',
+                            payload: {
+                                direction: 'Brand→Mesh(三合一)',
+                                subEntity, property, value,
+                                meshMac, attrType: `0x${attrType.toString(16)}`,
+                                timestamp: Date.now()
+                            }
+                        });
+                    }
+                }
+            }
+        }
 
         // ===== 同步到MQTT =====
         function syncToMqtt(meshMac, channel, property, value) {
             if (!node._connected || !node._mqttClient) return;
 
+            // 查找映射 - 支持三合一子实体
             const mapping = node.mappings.find(m => 
                 m.meshMac?.toLowerCase() === meshMac?.toLowerCase() && 
                 parseInt(m.meshChannel) === channel
@@ -405,14 +499,28 @@ module.exports = function(RED) {
 
             const deviceType = parseInt(mapping.brandDeviceType);
             const deviceId = parseInt(mapping.brandDeviceId);
+            const meshSubEntity = mapping.meshSubEntity; // 三合一子实体类型
             const typeInfo = node._brandProtocol.deviceTypes[deviceType];
             if (!typeInfo) return;
 
+            // 使用 SyncUtils 防环路
+            const syncKey = `${meshMac}_${channel}_${meshSubEntity || 'default'}_${property}`;
+            if (node._syncUtils.shouldPreventSync('mesh-to-target', syncKey)) {
+                return;
+            }
+
             // 根据设备类型和属性确定功能码
             let fn, fv;
             
+            // 三合一子实体特殊处理
+            if (meshSubEntity && THREE_IN_ONE_SUB_ENTITIES[meshSubEntity]) {
+                const result = getThreeInOneFnFv(meshSubEntity, property, value);
+                if (!result) return;
+                fn = result.fn;
+                fv = result.fv;
+            }
             // 窗帘设备特殊处理 (typeId=14)
-            if (deviceType === 14) {
+            else if (deviceType === 14) {
                 if (property === 'curtainAction' || property === 'action') {
                     fn = 1;
                     if (value === 'open' || value === 1) fv = 1;
@@ -440,7 +548,7 @@ module.exports = function(RED) {
             }
             // 空调设备 (typeId=12)
             else if (deviceType === 12) {
-                if (property === 'switch' || property === 'on' || property === 'isOn') {
+                if (property === 'switch' || property === 'on' || property === 'isOn' || property === 'climateSwitch') {
                     fn = 1;
                     fv = value ? 1 : 0;
                 } else if (property === 'temperature' || property === 'targetTemp') {
@@ -458,10 +566,10 @@ module.exports = function(RED) {
             }
             // 地暖设备 (typeId=16)
             else if (deviceType === 16) {
-                if (property === 'switch' || property === 'on' || property === 'isOn') {
+                if (property === 'switch' || property === 'on' || property === 'isOn' || property === 'floorHeatingSwitch') {
                     fn = 1;
                     fv = value ? 1 : 0;
-                } else if (property === 'temperature' || property === 'targetTemp') {
+                } else if (property === 'temperature' || property === 'targetTemp' || property === 'floorHeatingTemp') {
                     fn = 2;
                     fv = parseInt(value) || 20;
                 } else {
@@ -470,10 +578,10 @@ module.exports = function(RED) {
             }
             // 新风设备 (typeId=36)
             else if (deviceType === 36) {
-                if (property === 'switch' || property === 'on' || property === 'isOn') {
+                if (property === 'switch' || property === 'on' || property === 'isOn' || property === 'freshAirSwitch') {
                     fn = 1;
                     fv = value ? 1 : 0;
-                } else if (property === 'fanSpeed' || property === 'fanMode') {
+                } else if (property === 'fanSpeed' || property === 'fanMode' || property === 'freshAirSpeed') {
                     fn = 3;
                     fv = FAN_SPEED_REVERSE[value] ?? 0;
                 } else {
@@ -490,19 +598,8 @@ module.exports = function(RED) {
                 }
             }
 
-            // 防死循环 - 检查两个方向的时间戳
-            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);
+            // 记录同步时间
+            node._syncUtils.recordSyncTime('mesh-to-target', syncKey);
 
             const topic = node._brandProtocol.getDownTopic(node);
             const payload = node._brandProtocol.buildMessage(deviceType, deviceId, fn, fv);
@@ -516,6 +613,7 @@ module.exports = function(RED) {
                     payload: {
                         direction: 'Mesh→Brand',
                         meshMac, channel, property, value,
+                        meshSubEntity: meshSubEntity || null,
                         brandType: deviceType, brandId: deviceId, fn, fv,
                         timestamp: Date.now()
                     }
@@ -524,6 +622,34 @@ module.exports = function(RED) {
                 node.warn(`[Mesh→Brand] 同步失败: ${e.message}`);
             }
         }
+        
+        // ===== 获取三合一子实体的功能码和值 =====
+        function getThreeInOneFnFv(subEntity, property, value) {
+            if (subEntity === 'aircon') {
+                if (property === 'climateSwitch' || property === 'switch') {
+                    return { fn: 1, fv: value ? 1 : 0 };
+                } else if (property === 'targetTemp' || property === 'temperature') {
+                    return { fn: 2, fv: parseInt(value) || 24 };
+                } else if (property === 'climateMode' || property === 'mode') {
+                    return { fn: 3, fv: AC_MODE_REVERSE[value] ?? 0 };
+                } else if (property === 'fanMode' || property === 'fanSpeed') {
+                    return { fn: 4, fv: FAN_SPEED_REVERSE[value] ?? 0 };
+                }
+            } else if (subEntity === 'fresh_air') {
+                if (property === 'freshAirSwitch' || property === 'switch') {
+                    return { fn: 1, fv: value ? 1 : 0 };
+                } else if (property === 'freshAirSpeed' || property === 'fanSpeed') {
+                    return { fn: 3, fv: FAN_SPEED_REVERSE[value] ?? 0 };
+                }
+            } else if (subEntity === 'floor_heating') {
+                if (property === 'floorHeatingSwitch' || property === 'switch') {
+                    return { fn: 1, fv: value ? 1 : 0 };
+                } else if (property === 'floorHeatingTemp' || property === 'temperature') {
+                    return { fn: 2, fv: parseInt(value) || 20 };
+                }
+            }
+            return null;
+        }
 
         // ===== 网关事件监听 =====
         function setupGatewayListeners() {
@@ -584,6 +710,10 @@ module.exports = function(RED) {
                 node._gateway.deviceManager.removeListener('device-state-changed', node._stateChangeHandler);
             }
             if (node._mqttClient) { try { node._mqttClient.end(true); } catch (e) {} node._mqttClient = null; }
+            // 清理 SyncUtils
+            if (node._syncUtils) {
+                node._syncUtils.destroy();
+            }
             node._syncTimestamps.clear();
             node._deviceStates.clear();
             node._discoveredDevices.clear();

package/nodes/symi-mqtt.html

@@ -13,6 +13,13 @@
             return this.name || 'MQTT配置';
         },
         oneditprepare: function() {
+            // 设置编辑面板更宽更高
+            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');
+            }
+            
             // 自动填充默认值到输入框
             if (!this.mqttBroker || this.mqttBroker === '') {
                 $('#node-config-input-mqttBroker').val('mqtt://localhost:1883');

package/nodes/symi-rs485-sync.html

@@ -24,10 +24,11 @@
             return 'RS485同步';
         },
         oneditprepare: function() {
-            // 设置编辑面板更宽
+            // 设置编辑面板更宽更高
             var panel = $('#dialog-form').parent();
             if (panel.length) {
-                panel.css('min-width', '700px');
+                if (panel.width() < 1000) panel.css('width', '1000px');
+                if (panel.height() < 1000) panel.css('min-height', '1000px');
             }
             
             var node = this;