node-red-contrib-symi-mesh 1.7.1 → 1.7.3

package/nodes/symi-485-config.html

@@ -29,24 +29,45 @@
                 }
             }).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', function() {
+                var $btn = $(this);
+                var $select = $('#serial-port-select');
+                $btn.prop('disabled', true);
+                $select.empty().append('<option value="">搜索中...</option>').show();
+                
+                $.getJSON('/symi-gateway/serial-ports', function(ports) {
+                    $select.empty();
+                    if (ports && ports.length > 0) {
+                        $select.append('<option value="">-- 选择串口 --</option>');
+                        ports.forEach(function(p) {
+                            var label = p.path;
+                            if (p.manufacturer) label += ' (' + p.manufacturer + ')';
+                            var sel = (p.path === node.serialPort) ? ' selected' : '';
+                            $select.append('<option value="' + p.path + '"' + sel + '>' + label + '</option>');
+                        });
+                    } else {
+                        $select.append('<option value="">未发现串口</option>');
+                    }
+                    $btn.prop('disabled', false);
+                }).fail(function() {
+                    $select.empty().append('<option value="">搜索失败</option>');
+                    $btn.prop('disabled', false);
                 });
+            });
+
+            // 串口选择
+            $('#serial-port-select').on('change', function() {
+                var val = $(this).val();
+                if (val) {
+                    $('#node-config-input-serialPort').val(val);
+                }
+            });
+
+            // 初始化时如果已有串口配置，显示在下拉框
+            if (node.serialPort) {
+                $('#serial-port-select').append('<option value="' + node.serialPort + '" selected>' + node.serialPort + '</option>').show();
             }
-            
-            $('#btn-refresh-ports').on('click', loadSerialPorts);
-            loadSerialPorts();
         }
     });
 </script>
@@ -67,11 +88,13 @@
     
     <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>
+            <label for="node-config-input-serialPort"><i class="fa fa-usb"></i> 串口路径</label>
+            <input type="text" id="node-config-input-serialPort" placeholder="/dev/ttyUSB0 或 COM3" style="width:50%;">
+            <button type="button" id="btn-refresh-ports" class="red-ui-button" style="margin-left:5px">搜索串口</button>
+        </div>
+        <div class="form-row">
+            <label>&nbsp;</label>
+            <select id="serial-port-select" style="width:70%;display:none;"></select>
         </div>
         
         <div class="form-row">

package/nodes/symi-485-config.js

@@ -159,7 +159,7 @@ module.exports = function(RED) {
                     node.client.on('error', (err) => {
                         // AggregateError特殊处理（Node.js 18+的IPv4/IPv6连接失败）
                         if (err.name === 'AggregateError' || err.errors) {
-                            node.warn(`RS485 TCP连接失败: 无法连接到 ${node.host}:${node.port}`);
+                            node.debug(`RS485 TCP连接失败: 无法连接到 ${node.host}:${node.port}`);
                         } else {
                             node.error(`RS485 TCP错误: ${err.message}`);
                         }
@@ -213,18 +213,20 @@ module.exports = function(RED) {
             node.connected = false;
         };
 
-        // 处理接收数据（支持Modbus RTU和杜亚协议）
+        // 处理接收数据（支持Modbus RTU、杜亚协议和自定义码）
         node.handleData = function(data) {
+            const hexIn = data.toString('hex').toUpperCase().match(/.{1,2}/g)?.join(' ') || '';
+            node.debug(`[RS485 RX] 收到数据: ${hexIn} (${data.length}字节)`);
             node.receiveBuffer = Buffer.concat([node.receiveBuffer, data]);
             
             // 防止缓冲区过大（最大8KB）
             if (node.receiveBuffer.length > 8192) {
                 node.receiveBuffer = node.receiveBuffer.subarray(-2048);
-                node.warn('接收缓冲区溢出，已截断');
+                node.debug('接收缓冲区溢出，已截断');
             }
             
-            // 最小帧长度为4字节
-            while (node.receiveBuffer.length >= 4) {
+            // 最小帧长度为2字节
+            while (node.receiveBuffer.length >= 2) {
                 // ===== 杜亚协议检测 (55开头) =====
                 if (node.receiveBuffer[0] === 0x55 && node.receiveBuffer.length >= 7) {
                     // 杜亚窗帘协议：55 [地址高] [地址低] 03 [数据] [CRC16低] [CRC16高]
@@ -255,16 +257,52 @@ module.exports = function(RED) {
                     break;
                 }
                 
+                // ===== SYMI协议检测 (7E开头7D结尾) =====
+                if (node.receiveBuffer[0] === 0x7E) {
+                    // 查找结束符7D
+                    let endIdx = -1;
+                    for (let i = 1; i < node.receiveBuffer.length; i++) {
+                        if (node.receiveBuffer[i] === 0x7D) {
+                            endIdx = i;
+                            break;
+                        }
+                    }
+                    if (endIdx > 0) {
+                        const frame = node.receiveBuffer.subarray(0, endIdx + 1);
+                        node.receiveBuffer = node.receiveBuffer.subarray(endIdx + 1);
+                        node.emit('frame', frame);
+                        continue;
+                    }
+                    // 等待更多数据
+                    break;
+                }
+                
                 // ===== 标准Modbus RTU协议 =====
                 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 (frameLen > 0 && node.receiveBuffer.length >= frameLen) {
+                    const frame = node.receiveBuffer.subarray(0, frameLen);
+                    node.receiveBuffer = node.receiveBuffer.subarray(frameLen);
+                    
+                    if (node.validateCRC(frame)) {
+                        node.emit('frame', frame);
+                    }
+                    continue;
+                }
                 
-                if (node.validateCRC(frame)) {
-                    node.emit('frame', frame);
+                // 无法识别为标准协议，启动超时处理（用于自定义码）
+                if (!node._frameTimeout) {
+                    node._frameTimeout = setTimeout(() => {
+                        node._frameTimeout = null;
+                        if (node.receiveBuffer.length > 0) {
+                            const frame = Buffer.from(node.receiveBuffer);
+                            const hexStr = frame.toString('hex').toUpperCase().match(/.{1,2}/g)?.join(' ') || '';
+                            node.debug(`[RS485] 自定义帧超时发出: ${hexStr} (${frame.length}字节)`);
+                            node.receiveBuffer = Buffer.alloc(0);
+                            node.emit('frame', frame);
+                        }
+                    }, 50);
                 }
+                break;
             }
         };
         

package/nodes/symi-cloud-sync.html

@@ -18,6 +18,8 @@
         inputs: 1,
         outputs: 1,
         icon: 'font-awesome/fa-cloud-download',
+        align: 'left',
+        paletteLabel: '云端同步',
         label: function() {
             return this.name || '云端同步';
         },

package/nodes/symi-device.html

@@ -15,13 +15,15 @@
         },
         inputs: 1,
         outputs: 1,
-        icon: 'bridge.png',
+        icon: 'font-awesome/fa-cube',
+        align: 'left',
+        paletteLabel: '设备控制',
         label: function() {
             if (this.name) return this.name;
             if (this.deviceMac && this.channel > 1) {
-                return 'Symi设备-' + this.channel + '路';
+                return '设备控制-' + this.channel + '路';
             }
-            return 'Symi设备';
+            return '设备控制';
         },
         labelStyle: function() {
             return this.name ? 'node_label_italic' : '';

package/nodes/symi-gateway.html

@@ -15,6 +15,8 @@
                 : `Symi Gateway (${this.serialPort})`);
         },
         oneditprepare: function() {
+            var node = this;
+            
             $('#node-config-input-connectionType').on('change', function() {
                 if ($(this).val() === 'tcp') {
                     $('.tcp-config').show();
@@ -24,6 +26,47 @@
                     $('.serial-config').show();
                 }
             }).trigger('change');
+
+            // 串口自动发现
+            $('#serial-discover-btn').on('click', function() {
+                var $btn = $(this);
+                var $select = $('#serial-port-select');
+                $btn.prop('disabled', true).text('搜索中...');
+                $select.empty().append('<option value="">搜索中...</option>');
+                
+                $.getJSON('/symi-gateway/serial-ports', function(ports) {
+                    $select.empty();
+                    if (ports && ports.length > 0) {
+                        $select.append('<option value="">-- 选择串口 --</option>');
+                        ports.forEach(function(port) {
+                            var label = port.path;
+                            if (port.manufacturer) label += ' (' + port.manufacturer + ')';
+                            var selected = (node.serialPort === port.path) ? 'selected' : '';
+                            $select.append('<option value="' + port.path + '" ' + selected + '>' + label + '</option>');
+                        });
+                        $select.show();
+                    } else {
+                        $select.append('<option value="">未发现串口</option>');
+                    }
+                    $btn.prop('disabled', false).text('搜索串口');
+                }).fail(function() {
+                    $select.empty().append('<option value="">搜索失败</option>');
+                    $btn.prop('disabled', false).text('搜索串口');
+                });
+            });
+
+            // 串口选择
+            $('#serial-port-select').on('change', function() {
+                var val = $(this).val();
+                if (val) {
+                    $('#node-config-input-serialPort').val(val);
+                }
+            });
+
+            // 初始化时如果已有串口配置，显示在下拉框
+            if (node.serialPort) {
+                $('#serial-port-select').append('<option value="' + node.serialPort + '" selected>' + node.serialPort + '</option>').show();
+            }
         }
     });
 </script>
@@ -54,7 +97,12 @@
     
     <div class="form-row serial-config">
         <label for="node-config-input-serialPort"><i class="fa fa-usb"></i> 串口路径</label>
-        <input type="text" id="node-config-input-serialPort" placeholder="/dev/ttyUSB0 或 COM3">
+        <input type="text" id="node-config-input-serialPort" placeholder="/dev/ttyUSB0 或 COM3" style="width:50%;">
+        <button type="button" id="serial-discover-btn" class="red-ui-button" style="margin-left:5px;">搜索串口</button>
+    </div>
+    <div class="form-row serial-config">
+        <label>&nbsp;</label>
+        <select id="serial-port-select" style="width:70%;display:none;"></select>
     </div>
     
     <div class="form-row serial-config">

package/nodes/symi-gateway.js

@@ -53,6 +53,13 @@ module.exports = function(RED) {
         this.deviceListComplete = false;
         this.isQueryingStates = false; // 标记是否正在查询状态
 
+        // 转发deviceManager的device-state-changed事件（用于0x1C fanMode等直接触发的事件）
+        this.deviceManager.on('device-state-changed', (eventData) => {
+            if (!this.isQueryingStates) {
+                this.emit('device-state-changed', eventData);
+            }
+        });
+
         // 状态事件处理队列 - 确保场景执行后的大量状态更新能被正确处理
         this.stateEventQueue = [];
         this.maxQueueSize = 100; // 最大队列大小，防止内存泄漏
@@ -169,7 +176,7 @@ module.exports = function(RED) {
             // 规则：53 B0 后面紧跟的第一个窗帘帧就是真实用户控制
             // 注意：必须用时间戳而不是标记，因为队列中可能有旧帧等待处理
             this.lastB0Time = Date.now();
-            this.log(`[控制响应] 0xB0: ${frameHex}，记录时间戳`)
+            this.debug(`[控制响应] 0xB0: ${frameHex}，记录时间戳`)
         } else if (frame.opcode === 0xB4) {
             // 场景控制响应
             if (frame.status === 0) {
@@ -403,7 +410,7 @@ module.exports = function(RED) {
                     // 6-8路开关使用0x45，1-4路使用0x02
                     const msgType = (device.channels >= 6) ? 0x45 : 0x02;
                     queryAttrs = [msgType];
-                    this.log(`查询开关设备: ${device.name} (地址=0x${device.networkAddress.toString(16).toUpperCase()}, 路数=${device.channels}, msgType=0x${msgType.toString(16).toUpperCase()})`);
+                    this.debug(`查询开关设备: ${device.name} (地址=0x${device.networkAddress.toString(16).toUpperCase()}, 路数=${device.channels}, msgType=0x${msgType.toString(16).toUpperCase()})`);
                 } else if (device.deviceType === 9) {
                     queryAttrs = [0x02, 0x0E]; // 插卡取电：开关状态、插卡状态
                 } else if (device.deviceType === 4 || device.deviceType === 0x18) {
@@ -487,7 +494,7 @@ module.exports = function(RED) {
                 const frame = this.protocolHandler.buildDeviceControlFrame(device.networkAddress, 0x10, Buffer.from([0x01]));
                 await this.client.sendFrame(frame, 2);
                 await this.sleep(50);
-                this.log(`已启用设备${device.name}的状态上报`);
+                this.debug(`已启用设备${device.name}的状态上报`);
             } catch(e) {
                 this.error(`启用设备${device.name}状态上报失败: ${e.message}`);
             }
@@ -675,6 +682,39 @@ module.exports = function(RED) {
                 res.json([]);
             }
         });
+
+        // 串口自动发现API - 兼容不同版本serialport
+        RED.httpAdmin.get('/symi-gateway/serial-ports', async function(req, res) {
+            try {
+                let ports = [];
+                try {
+                    // 尝试新版API (serialport v10+)
+                    const { SerialPort } = require('serialport');
+                    ports = await SerialPort.list();
+                } catch (e1) {
+                    try {
+                        // 尝试旧版API (serialport v9)
+                        const SerialPort = require('serialport');
+                        if (typeof SerialPort.list === 'function') {
+                            ports = await SerialPort.list();
+                        }
+                    } catch (e2) {
+                        // 静默处理
+                    }
+                }
+                // 过滤常见串口设备
+                const filteredPorts = (ports || []).filter(function(p) {
+                    const path = (p.path || '').toLowerCase();
+                    // 排除蓝牙和内部设备
+                    if (path.includes('bluetooth') || path.includes('bt-')) return false;
+                    // 包含USB、tty、COM端口
+                    return path.includes('usb') || path.includes('tty') || path.includes('com') || path.includes('serial');
+                });
+                res.json(filteredPorts);
+            } catch (e) {
+                res.json([]);
+            }
+        });
     }
 };
 

package/nodes/symi-knx-bridge.html

@@ -11,9 +11,10 @@
         inputs: 1,
         outputs: 2,
         outputLabels: ['KNX输出', '调试信息'],
-        icon: 'bridge.svg',
-        label: function() { return this.name || 'KNX Bridge'; },
+        icon: 'font-awesome/fa-sitemap',
+        align: 'left',
         paletteLabel: 'KNX桥接',
+        label: function() { return this.name || 'KNX桥接'; },
         oneditprepare: function() {
             const node = this;
             let mappings = [], devices = [], knxEntities = [];

package/nodes/symi-knx-bridge.js

@@ -463,7 +463,7 @@ module.exports = function(RED) {
         node.queueCommand = function(cmd) {
             // 队列大小限制
             if (node.commandQueue.length >= MAX_QUEUE_SIZE) {
-                node.warn(`[KNX Bridge] 命令队列已满(${MAX_QUEUE_SIZE})，丢弃最旧命令`);
+                node.debug(`[KNX Bridge] 命令队列已满(${MAX_QUEUE_SIZE})，丢弃最旧命令`);
                 node.commandQueue.shift();
             }
             
@@ -766,7 +766,7 @@ module.exports = function(RED) {
             }
             
             if (!meshDevice) {
-                node.warn(`[KNX->Mesh] 未找到Mesh设备: ${meshMac}`);
+                node.debug(`[KNX->Mesh] 未找到Mesh设备: ${meshMac}`);
                 return;
             }
             
@@ -1032,7 +1032,7 @@ module.exports = function(RED) {
                 // 收集所有已映射的唯一设备地址
                 const mappedAddresses = new Set();
                 for (const mapping of node.mappings) {
-                    const mac = node.normalizeMac(mapping.meshMac);
+                    const mac = (mapping.meshMac || '').toLowerCase().replace(/:/g, '');
                     const device = node.gateway.deviceManager.getDeviceByMac(mac);
                     if (device && device.networkAddress) {
                         mappedAddresses.add(device.networkAddress);

package/nodes/symi-knx-ha-bridge.html

@@ -11,9 +11,10 @@
         inputs: 1,
         outputs: 2,
         outputLabels: ['KNX输出', '调试信息'],
-        icon: 'bridge.svg',
-        label: function() { return this.name || 'KNX-HA桥接'; },
-        paletteLabel: 'KNX-HA桥接',
+        icon: 'font-awesome/fa-home',
+        align: 'left',
+        paletteLabel: 'KNX HA桥接',
+        label: function() { return this.name || 'KNX HA桥接'; },
         oneditprepare: function() {
             const node = this;
             let mappings = [], haEntities = [], knxEntities = [];

package/nodes/symi-knx-ha-bridge.js

@@ -318,7 +318,7 @@ module.exports = function(RED) {
             node.recordSyncTime('knx-to-ha', key);
             
             if (!node.haServer || !node.haServer.credentials) {
-                node.warn('[KNX->HA] HA服务器未配置');
+                node.debug('[KNX->HA] HA服务器未配置');
                 return;
             }
             
@@ -328,7 +328,7 @@ module.exports = function(RED) {
                 const token = node.haServer.credentials.access_token;
                 
                 if (!token) {
-                    node.warn('[KNX->HA] HA访问令牌未配置');
+                    node.debug('[KNX->HA] HA访问令牌未配置');
                     return;
                 }
                 

package/nodes/symi-mqtt-brand.html

@@ -0,0 +1,75 @@
+<script type="text/javascript">
+    RED.nodes.registerType('symi-mqtt-brand', {
+        category: 'config',
+        defaults: {
+            name: { value: '' },
+            brand: { value: 'hyqw' },
+            mqttBroker: { value: 'mqtt://localhost:1883', required: true },
+            mqttUsername: { value: '' },
+            mqttPassword: { value: '' },
+            projectCode: { value: '', required: true },
+            deviceSn: { value: '', required: true }
+        },
+        label: function() {
+            if (this.name) return this.name;
+            if (this.projectCode && this.deviceSn) {
+                return 'HYQW: ' + this.projectCode;
+            }
+            return '品牌MQTT';
+        },
+        oneditprepare: function() {
+            var node = this;
+            
+            // 品牌切换
+            function updateBrandUI() {
+                var brand = $('#node-config-input-brand').val();
+                if (brand === 'hyqw') {
+                    $('.brand-hyqw-config').show();
+                } else {
+                    $('.brand-hyqw-config').hide();
+                }
+            }
+            $('#node-config-input-brand').on('change', updateBrandUI);
+            updateBrandUI();
+        }
+    });
+</script>
+
+<script type="text/html" data-template-name="symi-mqtt-brand">
+    <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="如：花语前湾MQTT">
+    </div>
+
+    <div class="form-row">
+        <label for="node-config-input-brand"><i class="fa fa-plug"></i> 品牌协议</label>
+        <select id="node-config-input-brand">
+            <option value="hyqw">HYQW (花语前湾)</option>
+        </select>
+    </div>
+
+    <div class="form-row">
+        <label for="node-config-input-mqttBroker"><i class="fa fa-server"></i> MQTT地址</label>
+        <input type="text" id="node-config-input-mqttBroker" placeholder="mqtt://192.168.1.100:1883">
+    </div>
+
+    <div class="form-row">
+        <label for="node-config-input-mqttUsername"><i class="fa fa-user"></i> 用户名</label>
+        <input type="text" id="node-config-input-mqttUsername" placeholder="可选">
+    </div>
+
+    <div class="form-row">
+        <label for="node-config-input-mqttPassword"><i class="fa fa-lock"></i> 密码</label>
+        <input type="password" id="node-config-input-mqttPassword" placeholder="可选">
+    </div>
+
+    <div class="form-row brand-hyqw-config">
+        <label for="node-config-input-projectCode"><i class="fa fa-folder"></i> 项目代码</label>
+        <input type="text" id="node-config-input-projectCode" placeholder="如: SH-485-V22">
+    </div>
+
+    <div class="form-row brand-hyqw-config">
+        <label for="node-config-input-deviceSn"><i class="fa fa-barcode"></i> 设备SN</label>
+        <input type="text" id="node-config-input-deviceSn" placeholder="如: FB485V222024110500000377">
+    </div>
+</script>