node-red-contrib-symi-mesh 1.3.1 → 1.6.1

package/lib/device-manager.js

@@ -37,7 +37,7 @@ class DeviceInfo {
     }
 
     getChannelCount() {
-        if ([1, 2, 3, 9, 12].includes(this.deviceType)) {
+        if ([1, 2, 3, 9, 12, 39].includes(this.deviceType)) {
             return this.deviceSubType;
         }
         return 1;
@@ -48,12 +48,12 @@ class DeviceInfo {
         if (this.isThreeInOne) {
             return 'three_in_one';
         }
-        
+
         const typeMap = {
             1: 'switch', 2: 'switch', 3: 'switch', 4: 'light',
             5: 'cover', 6: 'scene', 7: 'binary_sensor', 8: 'binary_sensor',
             9: 'switch', 10: 'climate', 11: 'sensor', 12: 'switch',
-            0x14: 'scene', 0x18: 'light'
+            0x14: 'scene', 0x18: 'light', 39: 'switch'
         };
         return typeMap[this.deviceType] || 'switch';
     }
@@ -83,9 +83,9 @@ class DeviceInfo {
                 }
                 break;
             case 0x45:
-                // 6键开关状态上报（2字节，小端序）
+                // 6-8路开关状态上报（2字节，小端序）
                 // 用于场景执行后的状态同步
-                if (this.channels === 6) {
+                if (this.channels >= 6) {
                     this.handleSwitchState(parameters);
                 }
                 break;
@@ -349,11 +349,17 @@ class DeviceInfo {
 
     handleSwitchState(parameters) {
         if (parameters.length === 0) return;
-        
+
         // 根据协议：TYPE_ON_OFF，每2位表示1路开关，b01=关，b10=开
         // 1-4路开关：1字节
         // 5-6路开关：2字节，小端序
-        
+
+        // 保存旧状态用于检测变化
+        const oldStates = {};
+        for (let i = 1; i <= this.channels; i++) {
+            oldStates[i] = this.state[`switch_${i}`];
+        }
+
         if (this.channels === 1) {
             // 单路开关
             const value = parameters[0];
@@ -372,8 +378,8 @@ class DeviceInfo {
                     this.state[`switch_${i + 1}`] = true;
                 }
             }
-        } else if (this.channels === 6) {
-            // 6路开关：2字节，小端序
+        } else if (this.channels === 6 || this.channels === 8) {
+            // 6路或8路开关：2字节，小端序
             let value;
             if (parameters.length >= 2) {
                 // 小端序：低字节在前
@@ -382,12 +388,12 @@ class DeviceInfo {
                 // 兼容1字节情况，只处理前4路
                 value = parameters[0];
             }
-            
+
             // 保存原始状态值供控制时使用
             this.state.switchState = value;
-            
-            // 处理所有6路
-            for (let i = 0; i < 6; i++) {
+
+            // 处理所有路数
+            for (let i = 0; i < this.channels; i++) {
                 const bitPos = i * 2;
                 const bitValue = (value >> bitPos) & 0x03;
                 if (bitValue === 0x01) {
@@ -397,6 +403,60 @@ class DeviceInfo {
                 }
             }
         }
+
+        // 检测哪些按键状态发生了变化
+        const changedButtons = [];
+        for (let i = 1; i <= this.channels; i++) {
+            const oldState = oldStates[i];
+            const newState = this.state[`switch_${i}`];
+            if (oldState !== undefined && oldState !== newState) {
+                changedButtons.push({
+                    button: i,
+                    oldState: oldState,
+                    newState: newState
+                });
+            }
+        }
+
+        // 存储变化的按键信息，供外部使用
+        this.lastChangedButtons = changedButtons;
+
+        return changedButtons;
+    }
+
+    // 获取按键绑定的场景ID
+    getButtonSceneId(buttonIndex) {
+        if (!this.subDeviceConfigs || buttonIndex < 1 || buttonIndex > this.subDeviceConfigs.length) {
+            return null;
+        }
+
+        const config = this.subDeviceConfigs[buttonIndex - 1];
+        if (!config) return null;
+
+        // 场景按键：直接返回scene_id
+        if (config.sub_type === '场景' && config.scene_id) {
+            return {
+                type: 'scene',
+                sceneId: config.scene_id,
+                name: config.sub_name
+            };
+        }
+
+        // 双控/总控按键：根据当前状态返回对应的场景ID
+        if ((config.sub_type === '双控' || config.sub_type === '总控')) {
+            const currentState = this.state[`switch_${buttonIndex}`];
+            const sceneId = currentState ? config.on_scene_id : config.off_scene_id;
+            if (sceneId) {
+                return {
+                    type: config.sub_type === '双控' ? 'dual_control' : 'master_control',
+                    sceneId: sceneId,
+                    name: config.sub_name,
+                    state: currentState ? 'on' : 'off'
+                };
+            }
+        }
+
+        return null;
     }
     
     // 获取当前开关状态值（用于控制时组合状态）
@@ -412,9 +472,9 @@ class DeviceInfo {
                 stateValue |= (bitValue << bitPos);
             }
             return stateValue;
-        } else if (this.channels === 6) {
+        } else if (this.channels === 6 || this.channels === 8) {
             let stateValue = 0;
-            for (let i = 0; i < 6; i++) {
+            for (let i = 0; i < this.channels; i++) {
                 const bitPos = i * 2;
                 const channelState = this.state[`switch_${i + 1}`];
                 const bitValue = (channelState === true) ? 0x02 : 0x01;
@@ -427,10 +487,11 @@ class DeviceInfo {
 }
 
 class DeviceManager extends EventEmitter {
-    constructor(context, logger = console) {
+    constructor(context, logger = console, gatewayId = 'default') {
         super();
         this.context = context;
         this.logger = logger;
+        this.gatewayId = gatewayId;
         this.devices = new Map();
         this.macToAddress = new Map();
         this.addressToMac = new Map();
@@ -439,9 +500,9 @@ class DeviceManager extends EventEmitter {
 
     loadDevices() {
         try {
-            const saved = this.context.get('symi_devices') || {};
-            const macMap = this.context.get('symi_mac_map') || {};
-            const addrMap = this.context.get('symi_addr_map') || {};
+            const saved = this.context.get(`symi_devices_${this.gatewayId}`) || {};
+            const macMap = this.context.get(`symi_mac_map_${this.gatewayId}`) || {};
+            const addrMap = this.context.get(`symi_addr_map_${this.gatewayId}`) || {};
             
             Object.entries(saved).forEach(([mac, data]) => {
                 const device = new DeviceInfo(data);
@@ -449,6 +510,17 @@ class DeviceManager extends EventEmitter {
                 if (data.isThreeInOne) {
                     device.isThreeInOne = true;
                 }
+                // 恢复温控器确认标记
+                if (data.thermostatConfirmed) {
+                    device.thermostatConfirmed = true;
+                }
+                // 恢复按键名称和配置
+                if (data.subDeviceNames) {
+                    device.subDeviceNames = data.subDeviceNames;
+                }
+                if (data.subDeviceConfigs) {
+                    device.subDeviceConfigs = data.subDeviceConfigs;
+                }
                 this.devices.set(mac, device);
             });
             
@@ -474,7 +546,8 @@ class DeviceManager extends EventEmitter {
                     name: device.name,
                     channels: device.channels,
                     online: device.online,
-                    isThreeInOne: device.isThreeInOne || false
+                    isThreeInOne: device.isThreeInOne || false,
+                    thermostatConfirmed: device.thermostatConfirmed || false
                 };
             });
             
@@ -483,9 +556,9 @@ class DeviceManager extends EventEmitter {
                 Array.from(this.addressToMac.entries()).map(([k, v]) => [k.toString(), v])
             );
             
-            this.context.set('symi_devices', devicesObj);
-            this.context.set('symi_mac_map', macMapObj);
-            this.context.set('symi_addr_map', addrMapObj);
+            this.context.set(`symi_devices_${this.gatewayId}`, devicesObj);
+            this.context.set(`symi_mac_map_${this.gatewayId}`, macMapObj);
+            this.context.set(`symi_addr_map_${this.gatewayId}`, addrMapObj);
         } catch (error) {
             this.logger.error('Error saving devices:', error);
         }
@@ -576,6 +649,19 @@ class DeviceManager extends EventEmitter {
         this.context.set('symi_mac_map', {});
         this.context.set('symi_addr_map', {});
     }
+
+    // 清理资源，防止内存泄漏
+    cleanup() {
+        // 移除所有事件监听器
+        this.removeAllListeners();
+
+        // 清理设备对象中的定时器和监听器
+        for (const device of this.devices.values()) {
+            if (device.removeAllListeners) {
+                device.removeAllListeners();
+            }
+        }
+    }
 }
 
 module.exports = { DeviceManager, DeviceInfo, DEVICE_TYPE_NAMES };

package/lib/mqtt-helper.js

@@ -29,7 +29,7 @@ const DEVICE_CLASSES = {
     11: 'temperature'           // 温湿度传感器（主要传感器）
 };
 
-function generateDiscoveryConfig(device, mqttPrefix = 'homeassistant') {
+function generateDiscoveryConfig(device, mqttPrefix = 'homeassistant', logger = console) {
     const macClean = device.macAddress.replace(/:/g, '').toLowerCase();
     const entityType = device.getEntityType();
     const configs = [];
@@ -94,17 +94,22 @@ function generateDiscoveryConfig(device, mqttPrefix = 'homeassistant') {
                 let channelName = '';
                 if (device.subDeviceNames && device.subDeviceNames[i - 1]) {
                     channelName = ` ${device.subDeviceNames[i - 1]}`;
+                    logger.debug(`[Discovery] ${device.name} 第${i}路使用云端名称: ${device.subDeviceNames[i - 1]}`);
                 } else if (device.channels > 1) {
                     channelName = ` 第${i}路`;
+                    logger.debug(`[Discovery] ${device.name} 第${i}路使用默认名称`);
                 }
 
                 const stateTopic = device.channels === 1 ? `symi_mesh/${macClean}/switch/state` : `symi_mesh/${macClean}/switch_${i}/state`;
                 const commandTopic = device.channels === 1 ? `symi_mesh/${macClean}/switch/set` : `symi_mesh/${macClean}/switch_${i}/set`;
 
+                const entityName = `${device.name}${channelName}`;
+                logger.debug(`[Discovery配置] ${device.name} 第${i}路: name="${entityName}", state_topic="${stateTopic}"`);
+
                 configs.push({
                     topic: `${mqttPrefix}/switch/${objectId}/config`,
                     payload: JSON.stringify({
-                        name: `${device.name}${channelName}`,
+                        name: entityName,
                         unique_id: objectId,
                         state_topic: stateTopic,
                         command_topic: commandTopic,
@@ -657,9 +662,25 @@ function convertStateValue(entityType, attrType, value, deviceType = null) {
     }
 }
 
+/**
+ * 将字符串转换为安全的MQTT topic ID（仅保留ASCII字母、数字、下划线、连字符）
+ * 中文字符会被转换为URL编码格式
+ */
+function sanitizeTopicId(str) {
+    if (!str) return 'unknown';
+
+    // 将字符串转换为URL编码，然后替换%为_，确保只包含安全字符
+    return encodeURIComponent(String(str))
+        .replace(/%/g, '_')
+        .replace(/[^a-zA-Z0-9_-]/g, '_')
+        .toLowerCase();
+}
+
 function generateSceneButtonConfig(scene, roomNo, mqttPrefix = 'homeassistant') {
     const sceneId = `scene_${scene.scene_id}`;
-    const objectId = `symi_room_${roomNo}_${sceneId}`;
+    // 将roomNo转换为合法的MQTT Discovery object_id（只允许字母、数字、下划线、连字符）
+    const sanitizedRoomNo = sanitizeTopicId(roomNo);
+    const objectId = `symi_room_${sanitizedRoomNo}_${sceneId}`;
 
     return {
         topic: `${mqttPrefix}/button/${objectId}/config`,
@@ -670,7 +691,7 @@ function generateSceneButtonConfig(scene, roomNo, mqttPrefix = 'homeassistant')
             payload_press: 'PRESS',
             icon: 'mdi:play-circle',
             device: {
-                identifiers: [`symi_room_${roomNo}`],
+                identifiers: [`symi_room_${sanitizedRoomNo}`],
                 name: `房间${roomNo}场景控制`,
                 model: 'Symi 场景控制器',
                 manufacturer: 'SYMI 亖米'

package/lib/protocol.js

@@ -56,16 +56,16 @@ class ProtocolHandler {
 
     /**
      * 构建开关状态值
-     * @param {number} channels - 开关路数 (1-6)
-     * @param {number} targetChannel - 目标路数 (1-6)
+     * @param {number} channels - 开关路数 (1-8)
+     * @param {number} targetChannel - 目标路数 (1-8)
      * @param {boolean} targetState - 目标状态 (true=开, false=关)
      * @param {number|null} currentState - 当前状态值，null时使用默认全关状态
-     * @returns {number|Buffer} - 1-4路返回number，6路返回Buffer(2字节)
+     * @returns {number|Buffer} - 1-4路返回number，6-8路返回Buffer(2字节)
      */
     buildSwitchState(channels, targetChannel, targetState, currentState = null) {
         // 验证参数
-        if (channels < 1 || channels > 6) {
-            throw new Error(`Invalid channels count: ${channels}, must be 1-6`);
+        if (channels < 1 || channels > 8) {
+            throw new Error(`Invalid channels count: ${channels}, must be 1-8`);
         }
         if (targetChannel < 1 || targetChannel > channels) {
             throw new Error(`Invalid target channel: ${targetChannel}, must be 1-${channels}`);
@@ -95,19 +95,27 @@ class ProtocolHandler {
             
             stateValue = (stateValue & mask) | newBits;
             return stateValue;
-        } else if (channels === 6) {
-            // 6路开关，2字节状态，小端序
+        } else if (channels === 6 || channels === 8) {
+            // 6-8路开关，2字节状态，小端序
+            // 协议说明：低2位开始表示第一路开关（与1-4路一致）
+            // 第1路=bits0-1, 第2路=bits2-3, ..., 第8路=bits14-15
             const defaultState = 0x5555; // 全关状态
             stateValue = currentState !== null ? currentState : defaultState;
-            
-            // 6路开关状态组合
+
+            // 确保currentState是16位值
+            if (typeof stateValue === 'number' && stateValue < 0x100) {
+                // 如果只有低8位，补充高8位为0x55（全关）
+                stateValue = stateValue | 0x5500;
+            }
+
+            // 6-8路开关状态组合（从低位开始）
             const bitPos = (targetChannel - 1) * 2;
             const mask = ~(0x03 << bitPos);
             const newBits = (targetState ? 0x02 : 0x01) << bitPos;
-            
+
             stateValue = (stateValue & mask) | newBits;
-            
-            // 返回小端序Buffer
+
+            // 返回小端序Buffer（低字节在前）
             return Buffer.from([stateValue & 0xFF, (stateValue >> 8) & 0xFF]);
         }
     }
@@ -445,8 +453,8 @@ class ProtocolHandler {
     /**
      * 构建开关控制帧（便捷方法）
      * @param {number} networkAddr - 网络地址
-     * @param {number} channels - 开关路数 (1-6)
-     * @param {number} targetChannel - 目标路数 (1-6)
+     * @param {number} channels - 开关路数 (1-8)
+     * @param {number} targetChannel - 目标路数 (1-8)
      * @param {boolean} targetState - 目标状态 (true=开, false=关)
      * @param {number|null} currentState - 当前状态值，null时需要先查询
      * @returns {Buffer} - 控制帧数据

package/lib/tcp-client.js

@@ -75,12 +75,7 @@ class TCPClient extends EventEmitter {
 
             this.client.on('data', (data) => {
                 try {
-                    // 添加原始数据日志
-                    // const dataHex = data.toString('hex').toUpperCase();
-                    // this.logger.log(`[TCP Raw Data] 收到${data.length}字节: ${dataHex}`);
-                    
                     const frames = this.protocolHandler.addData(data);
-                    // this.logger.log(`[TCP Parse] 解析出${frames.length}个帧`);
                     
                     frames.forEach(frame => {
                         this.emit('frame', frame);
@@ -93,11 +88,15 @@ class TCPClient extends EventEmitter {
 
             this.client.on('error', (error) => {
                 clearTimeout(timeout);
-                this.logger.error('TCP client error:', error.message);
-                
+                // 只在首次连接或重要错误时记录，避免大量重复日志
+                // ECONNRESET通常是网络波动，不记录错误
+                if (!this.connected && error.code !== 'ECONNREFUSED' && error.code !== 'ECONNRESET') {
+                    this.logger.error('TCP client error:', error.message);
+                }
+
                 // 确保错误不会导致uncaught exception
                 this.emit('error', error);
-                
+
                 if (!resolved && !rejected) {
                     rejected = true;
                     this.handleDisconnect();
@@ -107,13 +106,16 @@ class TCPClient extends EventEmitter {
 
             this.client.on('close', () => {
                 clearTimeout(timeout);
-                this.logger.log('Connection closed');
-                
+                // 只在正常连接后断开时记录，避免重连时大量日志
+                if (this.connected) {
+                    this.logger.log('Connection closed');
+                }
+
                 if (!resolved && !rejected) {
                     rejected = true;
                     reject(new Error('Connection closed during connect'));
                 }
-                
+
                 this.handleDisconnect();
             });
         });
@@ -143,13 +145,13 @@ class TCPClient extends EventEmitter {
         if (this.autoReconnect && !this.reconnectTimer) {
             this.reconnectTimer = setTimeout(() => {
                 this.reconnectTimer = null;
-                this.logger.log('Attempting to reconnect...');
+                // 减少重连日志，只在成功时记录
                 this.connect()
                     .then(() => {
                         this.logger.log('Reconnected successfully');
                     })
                     .catch((error) => {
-                        this.logger.error(`Reconnect failed: ${error.message}`);
+                        // 静默失败，避免大量重连失败日志
                         // 失败后会自动继续尝试重连（通过handleDisconnect）
                     });
             }, this.reconnectDelay);