node-red-contrib-symi-mesh 1.6.6 → 1.6.7

package/nodes/symi-mqtt.js

@@ -4,8 +4,25 @@
  */
 
 const mqtt = require('mqtt');
+const net = require('net');
 const { generateDiscoveryConfig, generateStateTopics, convertStateValue } = require('../lib/mqtt-helper');
 
+// 检查TCP端口是否可用
+function checkPort(host, port, timeout = 2000) {
+    return new Promise((resolve) => {
+        const socket = new net.Socket();
+        socket.setTimeout(timeout);
+        socket.on('connect', () => { socket.destroy(); resolve(true); });
+        socket.on('timeout', () => { socket.destroy(); resolve(false); });
+        socket.on('error', () => { socket.destroy(); resolve(false); });
+        try {
+            socket.connect({ port, host, family: 4 });
+        } catch (e) {
+            resolve(false);
+        }
+    });
+}
+
 module.exports = function(RED) {
     function SymiMQTTNode(config) {
         RED.nodes.createNode(this, config);
@@ -193,10 +210,34 @@ module.exports = function(RED) {
         });
     }
 
-    SymiMQTTNode.prototype.connectMQTT = function() {
+    SymiMQTTNode.prototype.connectMQTT = async function() {
         const node = this;
         
         try {
+            // 解析broker地址
+            let host = 'localhost', port = 1883;
+            try {
+                const url = new URL(node.mqttBroker);
+                host = url.hostname || 'localhost';
+                port = parseInt(url.port) || 1883;
+            } catch (e) {
+                // 使用默认值
+            }
+            
+            // 先检查端口是否可用，避免连接失败导致崩溃
+            const isAvailable = await checkPort(host, port, 3000);
+            if (!isAvailable) {
+                // 只在首次或每分钟记录一次警告，避免日志刷屏
+                if (!node._lastMqttWarn || Date.now() - node._lastMqttWarn > 60000) {
+                    node.warn(`MQTT broker ${host}:${port} 不可用，每30秒重试`);
+                    node._lastMqttWarn = Date.now();
+                }
+                node.status({ fill: 'yellow', shape: 'ring', text: `Broker不可用 ${host}:${port}` });
+                // 30秒后重试
+                setTimeout(() => node.connectMQTT(), 30000);
+                return;
+            }
+            
             const options = {
                 clientId: `symi-mesh-${Math.random().toString(16).substring(2, 10)}`,
                 clean: true,
@@ -210,6 +251,14 @@ module.exports = function(RED) {
             
             node.mqttClient = mqtt.connect(node.mqttBroker, options);
             
+            // 立即绑定错误处理
+            node.mqttClient.on('error', (error) => {
+                if (error.code !== 'ECONNREFUSED' && error.code !== 'ENOTFOUND') {
+                    node.error(`MQTT错误: ${error.message}`);
+                }
+                node.status({ fill: 'red', shape: 'ring', text: '连接失败' });
+            });
+            
             node.mqttClient.on('message', (topic, message) => {
                 node.log(`[MQTT消息] topic=${topic}, message=${message.toString()}`);
                 node.handleMQTTMessage(topic, message);
@@ -236,14 +285,6 @@ module.exports = function(RED) {
                 node.debug('MQTT正在重连...');
                 node.status({ fill: 'yellow', shape: 'ring', text: '重连中' });
             });
-            
-            node.mqttClient.on('error', (error) => {
-                // 只记录非连接错误，避免重连时大量日志
-                if (error.code !== 'ECONNREFUSED' && error.code !== 'ENOTFOUND') {
-                    node.error(`MQTT错误: ${error.message}`);
-                }
-                node.status({ fill: 'red', shape: 'ring', text: '错误' });
-            });
 
             node.mqttClient.on('offline', () => {
                 node.status({ fill: 'yellow', shape: 'ring', text: '离线' });
@@ -552,7 +593,8 @@ module.exports = function(RED) {
                             });
                             node.debug(`[状态发布] ${device.name} 第${i}路: ${switchState} (value=${value})`);
                         } else {
-                            node.warn(`[状态发布] ${device.name} 第${i}路状态未定义`);
+                            // 部分路未使用是正常情况，不需要警告
+                            node.debug(`[状态发布] ${device.name} 第${i}路状态未定义`);
                         }
                     }
                 }

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "node-red-contrib-symi-mesh",
-  "version": "1.6.6",
+  "version": "1.6.7",
   "description": "Node-RED节点集合，用于通过TCP/串口连接Symi蓝牙Mesh网关，支持Home Assistant MQTT Discovery自动发现和云端数据同步",
-  "main": "index.js",
+  "main": "nodes/symi-gateway.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
   },
@@ -34,7 +34,8 @@
       "symi-cloud-sync": "nodes/symi-cloud-sync.js",
       "symi-485-config": "nodes/symi-485-config.js",
       "symi-rs485-bridge": "nodes/symi-485-bridge.js",
-      "rs485-debug": "nodes/rs485-debug.js"
+      "rs485-debug": "nodes/rs485-debug.js",
+      "symi-knx-bridge": "nodes/symi-knx-bridge.js"
     }
   },
   "dependencies": {