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

package/nodes/symi-485-config.html

@@ -0,0 +1,125 @@
+<script type="text/javascript">
+    RED.nodes.registerType('symi-485-config', {
+        category: 'config',
+        defaults: {
+            name: { value: '' },
+            connectionType: { value: 'serial' },
+            host: { value: '' },
+            port: { value: 502 },
+            serialPort: { value: '' },
+            baudRate: { value: 9600 },
+            parity: { value: 'none' }
+        },
+        label: function() {
+            return this.name || (this.connectionType === 'tcp'
+                ? 'RS485 (' + this.host + ':' + this.port + ')'
+                : 'RS485 (' + this.serialPort + ')');
+        },
+        oneditprepare: function() {
+            var node = this;
+            
+            // 连接类型切换
+            $('#node-config-input-connectionType').on('change', function() {
+                if ($(this).val() === 'tcp') {
+                    $('.tcp-config').show();
+                    $('.serial-config').hide();
+                } else {
+                    $('.tcp-config').hide();
+                    $('.serial-config').show();
+                }
+            }).trigger('change');
+
+            // 加载串口列表
+            function loadSerialPorts() {
+                $.getJSON('/symi-rs485-bridge/serial-ports', function(ports) {
+                    var select = $('#node-config-input-serialPort');
+                    var currentVal = select.val() || node.serialPort;
+                    select.empty();
+                    select.append('<option value="">-- 选择串口 --</option>');
+                    ports.forEach(function(p) {
+                        var label = p.path;
+                        if (p.manufacturer) label += ' (' + p.manufacturer + ')';
+                        var sel = (p.path === currentVal) ? ' selected' : '';
+                        select.append('<option value="' + p.path + '"' + sel + '>' + label + '</option>');
+                    });
+                });
+            }
+            
+            $('#btn-refresh-ports').on('click', loadSerialPorts);
+            loadSerialPorts();
+        }
+    });
+</script>
+
+<script type="text/html" data-template-name="symi-485-config">
+    <div class="form-row">
+        <label for="node-config-input-name"><i class="fa fa-tag"></i> 名称</label>
+        <input type="text" id="node-config-input-name" placeholder="如：客厅RS485">
+    </div>
+
+    <div class="form-row">
+        <label for="node-config-input-connectionType"><i class="fa fa-plug"></i> 连接方式</label>
+        <select id="node-config-input-connectionType">
+            <option value="serial">串口 (RS485)</option>
+            <option value="tcp">TCP/IP (Modbus TCP)</option>
+        </select>
+    </div>
+    
+    <div class="serial-config">
+        <div class="form-row">
+            <label for="node-config-input-serialPort"><i class="fa fa-usb"></i> 串口</label>
+            <select id="node-config-input-serialPort" style="width:60%"></select>
+            <button type="button" id="btn-refresh-ports" class="red-ui-button" style="margin-left:5px">
+                <i class="fa fa-refresh"></i>
+            </button>
+        </div>
+        
+        <div class="form-row">
+            <label for="node-config-input-baudRate"><i class="fa fa-tachometer"></i> 波特率</label>
+            <select id="node-config-input-baudRate">
+                <option value="9600">9600</option>
+                <option value="19200">19200</option>
+                <option value="38400">38400</option>
+                <option value="57600">57600</option>
+                <option value="115200">115200</option>
+            </select>
+        </div>
+        
+        <div class="form-row">
+            <label for="node-config-input-parity"><i class="fa fa-check-square"></i> 校验位</label>
+            <select id="node-config-input-parity">
+                <option value="none">无 (None)</option>
+                <option value="even">偶校验 (Even)</option>
+                <option value="odd">奇校验 (Odd)</option>
+            </select>
+        </div>
+    </div>
+    
+    <div class="tcp-config" style="display:none">
+        <div class="form-row">
+            <label for="node-config-input-host"><i class="fa fa-server"></i> 主机地址</label>
+            <input type="text" id="node-config-input-host" placeholder="192.168.1.100">
+        </div>
+        
+        <div class="form-row">
+            <label for="node-config-input-port"><i class="fa fa-random"></i> 端口</label>
+            <input type="number" id="node-config-input-port" placeholder="502">
+        </div>
+    </div>
+</script>
+
+<script type="text/html" data-help-name="symi-485-config">
+    <p>RS485/Modbus连接配置节点</p>
+    <h3>连接方式</h3>
+    <dl>
+        <dt>串口 (RS485)</dt>
+        <dd>通过USB转RS485模块连接，选择对应的串口</dd>
+        <dt>TCP/IP (Modbus TCP)</dt>
+        <dd>通过RS485转TCP网关连接，输入IP和端口</dd>
+    </dl>
+    <h3>串口参数</h3>
+    <ul>
+        <li>波特率：常用9600、19200、115200</li>
+        <li>校验位：根据设备要求选择</li>
+    </ul>
+</script>

package/nodes/symi-485-config.js

@@ -0,0 +1,275 @@
+/**
+ * Symi RS485 Config Node - RS485/Modbus连接配置节点
+ * 使用与Mesh网关相同的技术栈（SerialPort/net）
+ */
+
+const { SerialPort } = require('serialport');
+const net = require('net');
+
+module.exports = function(RED) {
+    
+    function SymiRS485ConfigNode(config) {
+        RED.nodes.createNode(this, config);
+        const node = this;
+
+        // 配置
+        node.name = config.name || '';
+        node.connectionType = config.connectionType || 'serial';
+        node.host = config.host || '';
+        node.port = parseInt(config.port) || 502;
+        node.serialPort = config.serialPort || '';
+        node.baudRate = parseInt(config.baudRate) || 9600;
+        node.parity = config.parity || 'none';
+
+        // 连接状态
+        node.client = null;
+        node.connected = false;
+        node.receiveBuffer = Buffer.alloc(0);
+        node.users = [];
+
+        // 注册使用者
+        node.register = function(userNode) {
+            if (!node.users.includes(userNode)) {
+                node.users.push(userNode);
+            }
+            if (node.users.length === 1) {
+                node.connect();
+            }
+        };
+
+        // 注销使用者
+        node.deregister = function(userNode) {
+            const idx = node.users.indexOf(userNode);
+            if (idx >= 0) {
+                node.users.splice(idx, 1);
+            }
+            if (node.users.length === 0) {
+                node.disconnect();
+            }
+        };
+
+        // 连接
+        node.connect = function() {
+            if (node.connected) return;
+
+            try {
+                if (node.connectionType === 'serial') {
+                    if (!node.serialPort) {
+                        node.error('未配置串口');
+                        return;
+                    }
+                    
+                    node.client = new SerialPort({
+                        path: node.serialPort,
+                        baudRate: node.baudRate,
+                        dataBits: 8,
+                        stopBits: 1,
+                        parity: node.parity,
+                        autoOpen: false
+                    });
+
+                    node.client.on('open', () => {
+                        node.connected = true;
+                        node.log(`RS485串口已连接: ${node.serialPort}`);
+                        node.emit('connected');
+                    });
+
+                    node.client.on('data', (data) => {
+                        // 触发原始数据事件（用于调试节点）
+                        node.emit('data', data);
+                        // 帧解析
+                        node.handleData(data);
+                    });
+
+                    node.client.on('error', (err) => {
+                        node.error(`RS485串口错误: ${err.message}`);
+                        node.emit('error', err);
+                    });
+
+                    node.client.on('close', () => {
+                        if (node.connected) {
+                            node.connected = false;
+                            node.log('RS485串口已断开');
+                            node.emit('disconnected');
+                        }
+                        // 自动重连（静默）
+                        if (node.users.length > 0 && !node._reconnecting) {
+                            node._reconnecting = true;
+                            setTimeout(() => {
+                                node._reconnecting = false;
+                                node.connect();
+                            }, 5000);
+                        }
+                    });
+
+                    node.client.open();
+
+                } else if (node.connectionType === 'tcp') {
+                    if (!node.host) {
+                        node.error('未配置TCP主机');
+                        return;
+                    }
+
+                    node.client = new net.Socket();
+
+                    node.client.on('connect', () => {
+                        node.connected = true;
+                        node.warn(`[RS485] TCP已连接: ${node.host}:${node.port}`);
+                        node.emit('connected');
+                    });
+
+                    node.client.on('data', (data) => {
+                        // 触发原始数据事件（用于调试节点）
+                        node.emit('data', data);
+                        // 帧解析
+                        node.handleData(data);
+                    });
+
+                    node.client.on('error', (err) => {
+                        node.error(`RS485 TCP错误: ${err.message}`);
+                        node.emit('error', err);
+                    });
+
+                    node.client.on('close', () => {
+                        if (node.connected) {
+                            node.connected = false;
+                            node.log('RS485 TCP已断开');
+                            node.emit('disconnected');
+                        }
+                        // 自动重连（静默）
+                        if (node.users.length > 0 && !node._reconnecting) {
+                            node._reconnecting = true;
+                            setTimeout(() => {
+                                node._reconnecting = false;
+                                node.connect();
+                            }, 5000);
+                        }
+                    });
+
+                    node.client.connect(node.port, node.host);
+                }
+            } catch (err) {
+                node.error(`RS485连接失败: ${err.message}`);
+            }
+        };
+
+        // 断开连接
+        node.disconnect = function() {
+            if (node.client) {
+                try {
+                    if (node.connectionType === 'serial') {
+                        node.client.close();
+                    } else {
+                        node.client.destroy();
+                    }
+                } catch (e) {}
+                node.client = null;
+            }
+            node.connected = false;
+        };
+
+        // 处理接收数据（仅做帧解析，原始数据已在上层emit）
+        node.handleData = function(data) {
+            node.receiveBuffer = Buffer.concat([node.receiveBuffer, data]);
+            
+            // 防止缓冲区过大（最大8KB）
+            if (node.receiveBuffer.length > 8192) {
+                node.receiveBuffer = node.receiveBuffer.subarray(-2048);
+                node.warn('接收缓冲区溢出，已截断');
+            }
+            
+            // Modbus RTU最小帧长度为4字节
+            while (node.receiveBuffer.length >= 4) {
+                const frameLen = node.getFrameLength(node.receiveBuffer);
+                if (frameLen === 0 || node.receiveBuffer.length < frameLen) break;
+                
+                const frame = node.receiveBuffer.subarray(0, frameLen);
+                node.receiveBuffer = node.receiveBuffer.subarray(frameLen);
+                
+                if (node.validateCRC(frame)) {
+                    node.emit('frame', frame);
+                }
+            }
+        };
+
+        // 获取帧长度
+        node.getFrameLength = function(buffer) {
+            if (buffer.length < 2) return 0;
+            const fc = buffer[1];
+            if (fc === 0x03 || fc === 0x04) {
+                if (buffer.length < 3) return 0;
+                return 3 + buffer[2] + 2;
+            } else if (fc === 0x05 || fc === 0x06) {
+                return 8;
+            } else if (fc >= 0x80) {
+                return 5;
+            }
+            return 8;
+        };
+
+        // 验证CRC
+        node.validateCRC = function(frame) {
+            if (frame.length < 4) return false;
+            const data = frame.subarray(0, frame.length - 2);
+            const receivedCRC = frame.readUInt16LE(frame.length - 2);
+            const calculatedCRC = node.calculateCRC16(data);
+            return receivedCRC === calculatedCRC;
+        };
+
+        // CRC16计算
+        node.calculateCRC16 = function(buffer) {
+            let crc = 0xFFFF;
+            for (let i = 0; i < buffer.length; i++) {
+                crc ^= buffer[i];
+                for (let j = 0; j < 8; j++) {
+                    if (crc & 0x0001) {
+                        crc = (crc >> 1) ^ 0xA001;
+                    } else {
+                        crc >>= 1;
+                    }
+                }
+            }
+            return crc;
+        };
+
+        // 发送数据
+        node.send = function(data) {
+            return new Promise((resolve, reject) => {
+                if (!node.connected || !node.client) {
+                    reject(new Error('RS485未连接'));
+                    return;
+                }
+                const buffer = Buffer.isBuffer(data) ? data : Buffer.from(data);
+                node.client.write(buffer, (err) => {
+                    if (err) {
+                        reject(err);
+                    } else {
+                        // 发送tx事件用于调试
+                        node.emit('tx', buffer);
+                        resolve();
+                    }
+                });
+            });
+        };
+
+        // 构建并发送Modbus帧
+        node.writeRegister = function(slaveAddr, registerAddr, value) {
+            const buffer = Buffer.alloc(8);
+            buffer.writeUInt8(slaveAddr, 0);
+            buffer.writeUInt8(0x06, 1); // 写单个寄存器
+            buffer.writeUInt16BE(registerAddr, 2);
+            buffer.writeUInt16BE(value, 4);
+            const crc = node.calculateCRC16(buffer.subarray(0, 6));
+            buffer.writeUInt16LE(crc, 6);
+            return node.send(buffer);
+        };
+
+        // 清理
+        node.on('close', (done) => {
+            node.disconnect();
+            done();
+        });
+    }
+
+    RED.nodes.registerType('symi-485-config', SymiRS485ConfigNode);
+};

package/nodes/symi-cloud-sync.html

@@ -6,8 +6,8 @@
             name: { value: '' },
             gateway: { value: '', type: 'symi-gateway', required: true },
             mqttConfig: { value: '', type: 'symi-mqtt' },
-            appId: { value: 'cee70459', required: true },
-            appSecret: { value: 'a719a4b58e2e57e50d758ee3762507e7', required: true },
+            appId: { value: '', required: false },
+            appSecret: { value: '', required: false },
             hotelId: { value: '' },
             roomNo: { value: '' },
             roomUuid: { value: '' },
@@ -314,12 +314,12 @@
 
     <div class="form-row">
         <label for="node-input-appId"><i class="fa fa-key"></i> App ID</label>
-        <input type="text" id="node-input-appId" placeholder="cee70459">
+        <input type="text" id="node-input-appId" placeholder="请输入App ID">
     </div>
 
     <div class="form-row">
         <label for="node-input-appSecret"><i class="fa fa-lock"></i> App Secret</label>
-        <input type="password" id="node-input-appSecret" placeholder="a719a4b58e2e57e50d758ee3762507e7">
+        <input type="password" id="node-input-appSecret" placeholder="请输入App Secret">
     </div>
 
     <div class="form-row">

package/nodes/symi-cloud-sync.js

@@ -154,12 +154,12 @@ module.exports = function(RED) {
                         node.log(`设备名称已更新: ${oldName} -> ${newName} (MAC: ${cloudDevice.mac})`);
                     }
 
-                    // 同步按键名称
+                    // 同步按键完整配置（名称、类型、场景ID等）
                     if (cloudDevice.sub_device && Array.isArray(cloudDevice.sub_device) && cloudDevice.sub_device.length > 0) {
                         const newSubNames = cloudDevice.sub_device.map(sub => sub.sub_name);
                         const oldSubNames = localDevice.subDeviceNames || [];
 
-                        node.log(`[按键名称] 设备: ${localDevice.name}, 云端按键数: ${cloudDevice.sub_device.length}, 按键名称: [${newSubNames.join(', ')}]`);
+                        node.log(`[按键配置] 设备: ${localDevice.name}, 云端按键数: ${cloudDevice.sub_device.length}, 按键名称: [${newSubNames.join(', ')}]`);
 
                         // 检查是否有变化
                         const hasChanged = newSubNames.length !== oldSubNames.length ||
@@ -168,12 +168,40 @@ module.exports = function(RED) {
                         if (hasChanged) {
                             localDevice.subDeviceNames = newSubNames;
                             deviceUpdated = true;
-                            node.log(`[按键名称] 设备按键名称已更新: ${localDevice.name} -> [${newSubNames.join(', ')}]`);
+                            node.log(`[按键配置] 设备按键名称已更新: ${localDevice.name} -> [${newSubNames.join(', ')}]`);
                         } else {
-                            node.log(`[按键名称] 设备按键名称无变化: ${localDevice.name}`);
+                            node.log(`[按键配置] 设备按键名称无变化: ${localDevice.name}`);
                         }
+
+                        // 存储完整的按键配置（包含场景ID等信息）
+                        localDevice.subDeviceConfigs = cloudDevice.sub_device.map(sub => ({
+                            sub_name: sub.sub_name,
+                            sub_type: sub.sub_type,        // "普通", "场景", "双控", "总控"
+                            switch_type: sub.switch_type,  // "normal", "light"
+                            scene_id: sub.scene_id,        // 场景按键的场景ID
+                            on_scene_id: sub.on_scene_id,  // 双控/总控的开场景ID
+                            off_scene_id: sub.off_scene_id // 双控/总控的关场景ID
+                        }));
+
+                        // 记录场景绑定信息
+                        const sceneBindings = cloudDevice.sub_device
+                            .map((sub, idx) => {
+                                if (sub.sub_type === '场景' && sub.scene_id) {
+                                    return `按键${idx + 1}(${sub.sub_name})→场景${sub.scene_id}`;
+                                } else if ((sub.sub_type === '双控' || sub.sub_type === '总控') && (sub.on_scene_id || sub.off_scene_id)) {
+                                    return `按键${idx + 1}(${sub.sub_name})→开:场景${sub.on_scene_id || '无'}/关:场景${sub.off_scene_id || '无'}`;
+                                }
+                                return null;
+                            })
+                            .filter(Boolean);
+
+                        if (sceneBindings.length > 0) {
+                            node.log(`[场景绑定] ${localDevice.name}: ${sceneBindings.join(', ')}`);
+                        }
+
+                        deviceUpdated = true;
                     } else {
-                        node.log(`[按键名称] 设备无sub_device数据: ${localDevice.name}`);
+                        node.log(`[按键配置] 设备无sub_device数据: ${localDevice.name}`);
                     }
 
                     if (deviceUpdated) {
@@ -201,8 +229,8 @@ module.exports = function(RED) {
 
             if (updatedCount > 0 && node.mqttConfig) {
                 setTimeout(() => {
-                    node.log('重新发布MQTT Discovery配置（名称已更新）');
-                    node.mqttConfig.publishAllDiscovery(devices);
+                    node.log('重新发布MQTT Discovery配置（名称已更新，强制更新）');
+                    node.mqttConfig.publishAllDiscovery(devices, true); // forceUpdate=true
                 }, 1000);
             }
         };
@@ -223,11 +251,14 @@ module.exports = function(RED) {
                 const config = generateSceneButtonConfig(scene, roomNo, mqttPrefix);
 
                 setTimeout(() => {
+                    node.log(`[场景按钮] 发布: ${scene.scene_name}, topic=${config.topic}`);
+                    node.debug(`[场景按钮] payload=${config.payload}`);
+
                     mqttClient.publish(config.topic, config.payload, { retain: true }, (err) => {
                         if (err) {
                             node.error(`发布场景按钮失败: ${scene.scene_name}, ${err.message}`);
                         } else {
-                            node.debug(`场景按钮已发布: ${scene.scene_name}`);
+                            node.log(`场景按钮已发布: ${scene.scene_name}`);
                         }
                     });
                 }, index * 100);
@@ -256,6 +287,8 @@ module.exports = function(RED) {
         if (node.mqttConfig) {
             node.mqttConfig.on('scene-trigger', (topic, message) => {
                 const roomNo = node.roomNo || 'unknown';
+
+                // 直接使用原始roomNo匹配topic
                 if (topic.startsWith(`symi_mesh/room_${roomNo}/scene/`) && topic.endsWith('/trigger')) {
                     const sceneIdMatch = topic.match(/scene\/(\d+)\/trigger/);
                     if (sceneIdMatch) {
@@ -272,9 +305,9 @@ module.exports = function(RED) {
                                 node.log(`[场景控制] 场景控制帧: ${frame.toString('hex').toUpperCase()}`);
 
                                 node.gateway.sendScene(sceneId).then(() => {
-                                    node.log(`[场景控制] ✓ 场景控制命令已发送: ${scene.scene_name} (ID: ${sceneId})`);
+                                    node.log(`[场景控制] 场景控制命令已发送: ${scene.scene_name} (ID: ${sceneId})`);
                                 }).catch(err => {
-                                    node.error(`[场景控制] ✗ 场景控制命令发送失败: ${err.message}`);
+                                    node.error(`[场景控制] 场景控制命令发送失败: ${err.message}`);
                                 });
                             } else {
                                 node.error('[场景控制] 网关未连接，无法执行场景');

package/nodes/symi-device.html

@@ -212,6 +212,7 @@
         <p><b>输入：</b>接收控制命令，支持多种格式</p>
         <p><b>输出：</b>设备状态变化时自动输出</p>
         <p><b>KNX同步：</b>直接与KNX节点连线即可实现双向同步</p>
+        <p><b>485同步：</b>使用"485桥接"节点配置双向同步</p>
     </div>
 </script>
 

package/nodes/symi-device.js

@@ -37,21 +37,30 @@ module.exports = function(RED) {
         }
         
         node.device = null;
-        node.status({ fill: 'yellow', shape: 'ring', text: '等待连接' });
+        
+        // 检查设备是否已配置
+        if (!node.deviceMac) {
+            node.status({ fill: 'grey', shape: 'ring', text: '请选择设备' });
+        } else {
+            node.status({ fill: 'yellow', shape: 'ring', text: '等待连接' });
+        }
         
         const updateDevice = () => {
-            if (node.deviceMac) {
-                node.device = node.gateway.getDevice(node.deviceMac);
-                if (node.device) {
-                    const channelInfo = node.device.channels > 1 ? ` 第${node.channel}路` : '';
-                    node.status({ 
-                        fill: 'green', 
-                        shape: 'dot', 
-                        text: `已连接${channelInfo}` 
-                    });
-                } else {
-                    node.status({ fill: 'yellow', shape: 'ring', text: '等待设备' });
-                }
+            if (!node.deviceMac) {
+                node.status({ fill: 'grey', shape: 'ring', text: '请选择设备' });
+                return;
+            }
+            
+            node.device = node.gateway.getDevice(node.deviceMac);
+            if (node.device) {
+                const channelInfo = node.device.channels > 1 ? ` 第${node.channel}路` : '';
+                node.status({ 
+                    fill: 'green', 
+                    shape: 'dot', 
+                    text: `已连接${channelInfo}` 
+                });
+            } else {
+                node.status({ fill: 'yellow', shape: 'ring', text: '等待设备' });
             }
         };
         
@@ -134,7 +143,7 @@ module.exports = function(RED) {
         let command = null;
         
         if (entityType === 'switch') {
-            const channel = parseInt(msg.channel) || node.channel || 1;
+            const channel = parseInt(msg.channel) || this.channel || 1;
             let value;
             
             if (typeof payload === 'boolean') {