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

package/nodes/symi-rs485-sync.js

@@ -1,6 +1,8 @@
 module.exports = function(RED) {
     'use strict';
 
+    const { SyncUtils, StateCache, DEFAULT_TIMEOUT } = require('../lib/sync-utils');
+
     function SymiRS485SyncNode(config) {
         RED.nodes.createNode(this, config);
         const node = this;
@@ -22,13 +24,13 @@ module.exports = function(RED) {
         node._pollTimer = null;
         node._pollIndex = 0;
 
-        // 防抖时间戳，防止循环同步
-        node._lastSyncA = {};
-        node._lastSyncB = {};
-        const DEBOUNCE_MS = 2000;
+        // 初始化通用同步工具类
+        node.syncUtils = new SyncUtils({
+            defaultTimeout: DEFAULT_TIMEOUT
+        });
 
         // 状态缓存
-        node._stateCache = {};
+        node.stateCache = new StateCache(node.context(), 'rs485_sync_state_cache');
 
         if (!node.rs485ConfigA || !node.rs485ConfigB) {
             node.status({ fill: 'red', shape: 'ring', text: '未配置RS485连接' });
@@ -42,6 +44,19 @@ module.exports = function(RED) {
 
         node.status({ fill: 'yellow', shape: 'dot', text: '初始化...' });
 
+        // 检查是否应该阻止同步（防死循环）
+        node.shouldPreventSync = function(direction, key) {
+            // A->B 对应 mesh-to-target, B->A 对应 target-to-mesh
+            const syncDirection = direction === 'a-to-b' ? 'mesh-to-target' : 'target-to-mesh';
+            return node.syncUtils.shouldPreventSync(syncDirection, key);
+        };
+
+        // 记录同步时间（用于防死循环）
+        node.recordSyncTime = function(direction, key) {
+            const syncDirection = direction === 'a-to-b' ? 'mesh-to-target' : 'target-to-mesh';
+            node.syncUtils.recordSyncTime(syncDirection, key);
+        };
+
         // 计算校验和（中弘协议）
         function checksum(data) {
             let sum = 0;
@@ -229,7 +244,7 @@ module.exports = function(RED) {
             const addr = cfg.address || 1;
             // 获取当前缓存的状态
             const cacheKey = `symi_${addr}`;
-            const cached = node._stateCache[cacheKey] || { power: 0, temp: 24, mode: 0x01, fan: 0x01 };
+            const cached = node.stateCache.get(cacheKey) || { power: 0, temp: 24, mode: 0x01, fan: 0x01 };
             
             let power = cached.power;
             let temp = cached.temp;
@@ -293,15 +308,24 @@ module.exports = function(RED) {
 
         // 同步状态：从A到B
         function syncAtoB(mapping, state) {
-            const key = JSON.stringify({ a: mapping.configA, b: mapping.configB });
-            const now = Date.now();
+            const loopKey = JSON.stringify({ a: mapping.configA, b: mapping.configB });
+            
+            // 使用通用工具检查防环路
+            if (node.shouldPreventSync('a-to-b', loopKey)) {
+                node.debug(`[A->B] 防环路跳过: ${loopKey}`);
+                return;
+            }
             
-            if (node._lastSyncB[key] && (now - node._lastSyncB[key]) < DEBOUNCE_MS) {
-                node.debug(`[A->B] 防抖跳过`);
+            // 使用状态缓存检查是否有实际变化
+            const cacheKey = `mapping_${loopKey}`;
+            if (!node.stateCache.hasChanged(cacheKey, state)) {
+                node.debug(`[A->B] 状态未变化跳过: ${JSON.stringify(state)}`);
                 return;
             }
+            node.stateCache.update(cacheKey, state);
             
-            node._lastSyncA[key] = now;
+            // 记录同步时间
+            node.recordSyncTime('a-to-b', loopKey);
             
             node.log(`[A->B] 同步状态: ${JSON.stringify(state)}`);
             
@@ -349,15 +373,24 @@ module.exports = function(RED) {
 
         // 同步状态：从B到A
         function syncBtoA(mapping, state) {
-            const key = JSON.stringify({ a: mapping.configA, b: mapping.configB });
-            const now = Date.now();
+            const loopKey = JSON.stringify({ a: mapping.configA, b: mapping.configB });
             
-            if (node._lastSyncA[key] && (now - node._lastSyncA[key]) < DEBOUNCE_MS) {
-                node.debug(`[B->A] 防抖跳过`);
+            // 使用通用工具检查防环路
+            if (node.shouldPreventSync('b-to-a', loopKey)) {
+                node.debug(`[B->A] 防环路跳过: ${loopKey}`);
                 return;
             }
             
-            node._lastSyncB[key] = now;
+            // 使用状态缓存检查是否有实际变化
+            const cacheKey = `mapping_${loopKey}`;
+            if (!node.stateCache.hasChanged(cacheKey, state)) {
+                node.debug(`[B->A] 状态未变化跳过: ${JSON.stringify(state)}`);
+                return;
+            }
+            node.stateCache.update(cacheKey, state);
+            
+            // 记录同步时间
+            node.recordSyncTime('b-to-a', loopKey);
             
             node.log(`[B->A] 同步状态: ${JSON.stringify(state)}`);
             
@@ -451,6 +484,11 @@ module.exports = function(RED) {
                                             mode: climate.mode,
                                             fanMode: climate.fanMode
                                         };
+                                        
+                                        // 更新本地状态缓存，供B侧同步参考
+                                        const addrKey = `zhonghong_${climate.outdoorAddr}_${climate.indoorAddr}`;
+                                        node.stateCache.update(addrKey, state);
+                                        
                                         node.log(`[A->B] 内机${climate.outdoorAddr}-${climate.indoorAddr}: 开=${state.power}, 温=${state.targetTemp}, 模式=${state.mode}`);
                                         syncAtoB(mapping, state);
                                     }
@@ -471,13 +509,13 @@ module.exports = function(RED) {
                 } else if (mapping.protocolA === 'symi_climate') {
                     state = parseSymiClimateFrame(frame, mapping.configA);
                     if (state) {
-                        const cacheKey = `symi_${mapping.configA.address || 1}`;
-                        node._stateCache[cacheKey] = {
+                        const addrKey = `symi_${mapping.configA.address || 1}`;
+                        node.stateCache.update(addrKey, {
                             power: state.power ? 1 : 0,
                             temp: state.targetTemp,
                             mode: state.mode,
                             fan: state.fanMode
-                        };
+                        });
                         state.mode = SYMI_TO_ZH_MODE[state.mode] || state.mode;
                         state.fanMode = SYMI_TO_ZH_FAN[state.fanMode] || state.fanMode;
                     }
@@ -495,6 +533,10 @@ module.exports = function(RED) {
                 }
                 
                 if (state && state.type === 'status') {
+                    // 处理三合一子实体同步（空调、新风、地暖）
+                    if (state.meshSubEntity) {
+                        node.log(`[A->B] 三合一子实体同步: ${state.meshSubEntity}`);
+                    }
                     syncAtoB(mapping, state);
                 }
             }
@@ -545,6 +587,12 @@ module.exports = function(RED) {
                                             mode: climate.mode,
                                             fanMode: climate.fanMode
                                         };
+                                        
+                                        // 更新本地状态缓存，供A侧同步参考
+                                        const addrKey = `zhonghong_${climate.outdoorAddr}_${climate.indoorAddr}`;
+                                        node.stateCache.update(addrKey, state);
+                                        
+                                        node.log(`[B->A] 内机${climate.outdoorAddr}-${climate.indoorAddr}: 开=${state.power}, 温=${state.targetTemp}, 模式=${state.mode}`);
                                         syncBtoA(mapping, state);
                                     }
                                 }
@@ -564,13 +612,13 @@ module.exports = function(RED) {
                 } else if (mapping.protocolB === 'symi_climate') {
                     state = parseSymiClimateFrame(frame, mapping.configB);
                     if (state) {
-                        const cacheKey = `symi_${mapping.configB.address || 1}`;
-                        node._stateCache[cacheKey] = {
+                        const addrKey = `symi_${mapping.configB.address || 1}`;
+                        node.stateCache.update(addrKey, {
                             power: state.power ? 1 : 0,
                             temp: state.targetTemp,
                             mode: state.mode,
                             fan: state.fanMode
-                        };
+                        });
                         state.mode = SYMI_TO_ZH_MODE[state.mode] || state.mode;
                         state.fanMode = SYMI_TO_ZH_FAN[state.fanMode] || state.fanMode;
                     }
@@ -588,6 +636,10 @@ module.exports = function(RED) {
                 }
                 
                 if (state && state.type === 'status') {
+                    // 处理三合一子实体同步
+                    if (state.meshSubEntity) {
+                        node.log(`[B->A] 三合一子实体同步: ${state.meshSubEntity}`);
+                    }
                     syncBtoA(mapping, state);
                 }
             }
@@ -756,6 +808,10 @@ module.exports = function(RED) {
             
             node.rs485ConfigA.deregister(node);
             node.rs485ConfigB.deregister(node);
+
+            if (node.syncUtils) {
+                node.syncUtils.destroy();
+            }
             
             done();
         });

package/package.json

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