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

package/README.md

@@ -1457,6 +1457,35 @@ node-red-contrib-symi-mesh/
 
 ## 更新日志
 
+### v1.7.3 (2025-12-24)
+- **MQTT同步节点**：新增`symi-mqtt-sync`节点实现第三方MQTT品牌设备与Mesh设备双向同步
+  - **双MQTT配置节点架构**：
+    - Mesh MQTT：选择`symi-mqtt`配置节点，获取Mesh设备列表
+    - 品牌MQTT：选择`symi-mqtt-brand`配置节点（支持下拉选择+编辑+添加）
+  - **品牌MQTT配置节点**：新增`symi-mqtt-brand`配置节点
+    - 支持配置MQTT服务器地址、用户名、密码
+    - 支持HYQW协议（项目代码、设备SN）
+    - 自动发现品牌MQTT设备实体
+    - 可扩展支持更多品牌协议
+  - **实体映射**：
+    - 左边选择Mesh设备+通道
+    - 右边选择品牌设备+通道（灯具支持多路）
+    - 相同类型实体一对一映射
+  - **设备类型**：灯具(8)、空调(12)、窗帘(14)、地暖(16)、新风(36)
+  - **双向同步**：MQTT↔Mesh实时状态同步，2秒防抖防死循环
+  - **输入输出端口**：支持连接debug节点调试同步数据
+  - **错误日志限流**：网络故障时每60秒最多记录一次错误
+  - **断线自动重连**：5秒重连间隔
+- **串口支持优化**：
+  - 所有串口节点支持手动输入+搜索选择
+  - 兼容serialport v9/v10+，兼容HassOS环境
+  - 串口错误日志限流，避免长时间故障时日志爆炸
+- **稳定性优化**：
+  - 错误日志频率限制，长时间网络故障不影响系统性能
+  - 静默处理非关键错误，生产级稳定性
+  - 内存安全，无调试日志，断电断网恢复后正常工作
+  - 缓存队列处理，符合MQTT协议要求
+
 ### v1.7.2 (2025-12-22)
 - **RS485双向同步节点**：新增`symi-rs485-sync`独立节点实现两种不同RS485协议之间的双向同步
   - 支持中弘VRF网关协议（功能码0x31-0x34控制，0x50查询）
@@ -1575,8 +1604,8 @@ Copyright (c) 2025 SYMI 亖米
 ## 关于
 
 **作者**: SYMI 亖米
-**版本**: 1.7.2
+**版本**: 1.7.3
 **协议**: 蓝牙MESH网关（初级版）串口协议V1.0
-**最后更新**: 2025-12-23
+**最后更新**: 2025-12-24
 **仓库**: https://github.com/symi-daguo/node-red-contrib-symi-mesh
 **npm包**: https://www.npmjs.com/package/node-red-contrib-symi-mesh

package/lib/serial-client.js

@@ -20,6 +20,23 @@ class SerialClient extends EventEmitter {
         this.reconnectDelay = 5000;
         this.reconnectTimer = null;
         this.autoReconnect = true;
+        // 错误日志限流
+        this._lastErrorLog = 0;
+        this._errorLogInterval = 60000;  // 60秒最多记录一次错误
+        this._reconnectAttempts = 0;
+    }
+
+    // 限流错误日志
+    _logErrorThrottled(msg) {
+        const now = Date.now();
+        if (now - this._lastErrorLog > this._errorLogInterval) {
+            this._lastErrorLog = now;
+            if (this._reconnectAttempts > 1) {
+                this.logger.warn(`${msg} (已尝试${this._reconnectAttempts}次)`);
+            } else {
+                this.logger.warn(msg);
+            }
+        }
     }
 
     async connect() {
@@ -98,7 +115,7 @@ class SerialClient extends EventEmitter {
 
                 this.port.on('error', (error) => {
                     clearTimeout(timeout);
-                    this.logger.error('Serial port error:', error.message);
+                    this._logErrorThrottled(`串口错误: ${error.message}`);
                     this.emit('error', error);
                     
                     if (!resolved && !rejected) {
@@ -153,13 +170,15 @@ class SerialClient extends EventEmitter {
         if (this.autoReconnect && !this.reconnectTimer) {
             this.reconnectTimer = setTimeout(() => {
                 this.reconnectTimer = null;
-                this.logger.log('Attempting to reconnect serial port...');
+                this._reconnectAttempts++;
                 this.connect()
                     .then(() => {
-                        this.logger.log('Serial port reconnected successfully');
+                        this._reconnectAttempts = 0;
+                        this._lastErrorLog = 0;  // 重置错误日志限流
+                        this.logger.log(`串口重连成功: ${this.portPath}`);
                     })
                     .catch((error) => {
-                        this.logger.error(`Serial port reconnect failed: ${error.message}`);
+                        this._logErrorThrottled(`串口重连失败: ${error.message}`);
                         // 失败后会自动继续尝试重连（通过handleDisconnect）
                     });
             }, this.reconnectDelay);

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-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

@@ -682,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-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>

package/nodes/symi-mqtt-brand.js

@@ -0,0 +1,238 @@
+'use strict';
+
+const mqtt = require('mqtt');
+
+module.exports = function(RED) {
+    // 品牌MQTT配置节点
+    function SymiMqttBrandNode(config) {
+        RED.nodes.createNode(this, config);
+        const node = this;
+
+        // 配置参数
+        node.name = config.name || '品牌MQTT';
+        node.brand = config.brand || 'hyqw';
+        node.mqttBroker = config.mqttBroker || 'mqtt://localhost:1883';
+        node.mqttUsername = config.mqttUsername || '';
+        node.mqttPassword = config.mqttPassword || '';
+        node.projectCode = config.projectCode || '';
+        node.deviceSn = config.deviceSn || '';
+
+        // 运行时状态
+        node._client = null;
+        node._connected = false;
+        node._discoveredDevices = new Map();
+        node._subscribers = new Set();
+        node._closing = false;
+        node._reconnectTimer = null;
+        node._lastErrorLog = 0;
+
+        // 设备类型定义
+        const DEVICE_TYPES = {
+            8: { name: '灯具', type: 'light' },
+            12: { name: '空调', type: 'climate' },
+            14: { name: '窗帘', type: 'cover' },
+            16: { name: '地暖', type: 'climate' },
+            36: { name: '新风', type: 'fan' }
+        };
+
+        // 获取MQTT主题
+        function getUploadTopic() {
+            if (!node.projectCode || !node.deviceSn) return null;
+            return `FMQ/${node.projectCode}/${node.deviceSn}/UPLOAD/2002`;
+        }
+
+        function getDownTopic() {
+            if (!node.projectCode || !node.deviceSn) return null;
+            return `FMQ/${node.projectCode}/${node.deviceSn}/DOWN/2001`;
+        }
+
+        // 限流错误日志
+        function logErrorThrottled(msg) {
+            const now = Date.now();
+            if (now - node._lastErrorLog > 60000) {
+                node._lastErrorLog = now;
+                node.warn(msg);
+            }
+        }
+
+        // 连接MQTT
+        function connect() {
+            if (node._closing || node._client) return;
+
+            const uploadTopic = getUploadTopic();
+            if (!uploadTopic) {
+                node.warn('品牌MQTT配置不完整：缺少项目代码或设备SN');
+                return;
+            }
+
+            const brokerUrl = node.mqttBroker || 'mqtt://localhost:1883';
+            const options = {
+                clientId: `symi_brand_${node.id}_${Date.now()}`,
+                clean: true,
+                connectTimeout: 10000,
+                reconnectPeriod: 0,
+                keepalive: 60
+            };
+
+            if (node.mqttUsername) {
+                options.username = node.mqttUsername;
+                options.password = node.mqttPassword || '';
+            }
+
+            try {
+                node._client = mqtt.connect(brokerUrl, options);
+
+                node._client.on('connect', function() {
+                    node._connected = true;
+                    node._lastErrorLog = 0;
+                    node.log(`品牌MQTT已连接: ${brokerUrl}`);
+                    
+                    // 订阅上报主题
+                    node._client.subscribe(uploadTopic, function(err) {
+                        if (!err) {
+                            node.log(`已订阅: ${uploadTopic}`);
+                        }
+                    });
+
+                    // 通知订阅者
+                    notifySubscribers('connected');
+                });
+
+                node._client.on('message', function(topic, payload) {
+                    try {
+                        const data = JSON.parse(payload.toString());
+                        if (data.payload) {
+                            const { st, si, fn, fv } = data.payload;
+                            if (st !== undefined && si !== undefined) {
+                                // 发现设备
+                                const deviceKey = `${st}_${si}`;
+                                const deviceType = DEVICE_TYPES[st] || { name: `类型${st}`, type: 'unknown' };
+                                
+                                if (!node._discoveredDevices.has(deviceKey)) {
+                                    node._discoveredDevices.set(deviceKey, {
+                                        deviceType: st,
+                                        deviceId: si,
+                                        typeName: deviceType.name,
+                                        meshType: deviceType.type,
+                                        lastSeen: Date.now(),
+                                        lastState: { fn, fv }
+                                    });
+                                    node.log(`发现品牌设备: ${deviceType.name} ID:${si}`);
+                                } else {
+                                    const dev = node._discoveredDevices.get(deviceKey);
+                                    dev.lastSeen = Date.now();
+                                    dev.lastState = { fn, fv };
+                                }
+
+                                // 通知订阅者状态更新
+                                notifySubscribers('state', { st, si, fn, fv });
+                            }
+                        }
+                    } catch (e) {
+                        // 静默处理解析错误
+                    }
+                });
+
+                node._client.on('error', function(err) {
+                    logErrorThrottled(`品牌MQTT错误: ${err.message}`);
+                });
+
+                node._client.on('close', function() {
+                    node._connected = false;
+                    notifySubscribers('disconnected');
+                    
+                    if (!node._closing && !node._reconnectTimer) {
+                        node._reconnectTimer = setTimeout(function() {
+                            node._reconnectTimer = null;
+                            if (node._client) {
+                                try { node._client.end(true); } catch(e) {}
+                                node._client = null;
+                            }
+                            connect();
+                        }, 5000);
+                    }
+                });
+
+            } catch (err) {
+                logErrorThrottled(`品牌MQTT连接失败: ${err.message}`);
+            }
+        }
+
+        // 通知订阅者
+        function notifySubscribers(event, data) {
+            node._subscribers.forEach(function(callback) {
+                try {
+                    callback(event, data);
+                } catch (e) {}
+            });
+        }
+
+        // 发布控制命令
+        node.publish = function(st, si, fn, fv) {
+            if (!node._client || !node._connected) return false;
+            
+            const downTopic = getDownTopic();
+            if (!downTopic) return false;
+
+            const payload = JSON.stringify({ payload: { st, si, fn, fv } });
+            node._client.publish(downTopic, payload);
+            return true;
+        };
+
+        // 订阅状态更新
+        node.subscribe = function(callback) {
+            node._subscribers.add(callback);
+            return function() {
+                node._subscribers.delete(callback);
+            };
+        };
+
+        // 获取已发现的设备列表
+        node.getDiscoveredDevices = function() {
+            return Array.from(node._discoveredDevices.values());
+        };
+
+        // 检查是否已连接
+        node.isConnected = function() {
+            return node._connected;
+        };
+
+        // 启动连接
+        if (node.projectCode && node.deviceSn) {
+            setTimeout(connect, 1000);
+        }
+
+        // 清理
+        node.on('close', function(done) {
+            node._closing = true;
+            
+            if (node._reconnectTimer) {
+                clearTimeout(node._reconnectTimer);
+                node._reconnectTimer = null;
+            }
+
+            if (node._client) {
+                try {
+                    node._client.end(true);
+                } catch (e) {}
+                node._client = null;
+            }
+
+            node._subscribers.clear();
+            node._discoveredDevices.clear();
+            done();
+        });
+    }
+
+    RED.nodes.registerType('symi-mqtt-brand', SymiMqttBrandNode);
+
+    // HTTP API - 获取已发现的设备
+    RED.httpAdmin.get('/symi-mqtt-brand/devices/:id', function(req, res) {
+        const node = RED.nodes.getNode(req.params.id);
+        if (node && typeof node.getDiscoveredDevices === 'function') {
+            res.json(node.getDiscoveredDevices());
+        } else {
+            res.json([]);
+        }
+    });
+};