node-red-contrib-symi-mesh 1.6.5 → 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: '离线' });
@@ -258,7 +299,7 @@ module.exports = function(RED) {
     SymiMQTTNode.prototype.publishAllDiscovery = function(devices, forceUpdate = false) {
         const node = this;
 
-        const supportedTypes = [1, 2, 3, 4, 5, 8, 9, 10, 0x18, 39];
+        const supportedTypes = [1, 2, 3, 4, 5, 8, 9, 10, 11, 0x18, 39];
 
         devices.forEach(device => {
             const macClean = device.macAddress.replace(/:/g, '').toLowerCase();
@@ -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}路状态未定义`);
                         }
                     }
                 }
@@ -641,23 +683,24 @@ module.exports = function(RED) {
                 
             case 0x05:
                 // 窗帘运行状态反馈 (CURT_RUN_STATUS)
-                // 协议：0=空闲/到头, 1=打开中, 2=关闭中, 3=停止
-                if (state.curtainStatus !== undefined) {
-                    const curtainStates = { 0: 'stopped', 1: 'opening', 2: 'closing', 3: 'stopped' };
-                    const curtainState = curtainStates[state.curtainStatus] || 'stopped';
+                // 【兼容两种协议】：
+                // 米家协议: 0=打开中, 1=关闭中, 2=停止
+                // 小程序协议: 1=打开, 2=关闭, 3=停止
+                // 使用curtainAction（由device-manager解析）来发布状态
+                if (state.curtainAction !== undefined) {
                     publishes.push({
                         topic: `symi_mesh/${macClean}/cover/state`,
-                        payload: curtainState
+                        payload: state.curtainAction
                     });
-                    node.debug(`发布窗帘运行状态: ${curtainState} (原始值=${state.curtainStatus})`);
+                    node.debug(`发布窗帘运行状态: ${state.curtainAction} (原始值=${state.curtainStatus}, 协议=${state.curtainProtocol || 'unknown'})`);
                     
-                    // 到头(status=0)时也发布position，确保HA显示正确位置
-                    if (state.curtainStatus === 0 && state.curtainPosition !== undefined) {
+                    // 停止时也发布position，确保HA显示正确位置
+                    if (state.curtainAction === 'stopped' && state.curtainPosition !== undefined) {
                         publishes.push({
                             topic: `symi_mesh/${macClean}/cover/position`,
                             payload: state.curtainPosition.toString()
                         });
-                        node.debug(`窗帘到头，同时发布位置: ${state.curtainPosition}%`);
+                        node.debug(`窗帘停止，同时发布位置: ${state.curtainPosition}%`);
                     }
                 }
                 break;
@@ -672,14 +715,13 @@ module.exports = function(RED) {
                     node.debug(`发布窗帘位置: ${state.curtainPosition}%`);
                     
                     // 同时发布运行状态（确保HA正确显示）
-                    if (state.curtainStatus !== undefined) {
-                        const curtainStates = { 0: 'stopped', 1: 'opening', 2: 'closing', 3: 'stopped' };
-                        const curtainState = curtainStates[state.curtainStatus] || 'stopped';
+                    // 使用curtainAction（由device-manager解析，兼容米家和小程序协议）
+                    if (state.curtainAction !== undefined) {
                         publishes.push({
                             topic: `symi_mesh/${macClean}/cover/state`,
-                            payload: curtainState
+                            payload: state.curtainAction
                         });
-                        node.debug(`同时发布窗帘状态: ${curtainState}`);
+                        node.debug(`同时发布窗帘状态: ${state.curtainAction}`);
                     }
                 }
                 break;
@@ -1312,6 +1354,13 @@ module.exports = function(RED) {
             const action = actions[payload];
             if (action) {
                 commands.push({ attrType: 0x05, param: Buffer.from([action]) });
+                
+                // 发出窗帘控制事件，通知485桥用户的真实意图
+                this.emit('curtain-control', {
+                    mac: device.macAddress,
+                    action: payload  // 'OPEN', 'CLOSE', 'STOP'
+                });
+                this.debug(`[MQTT] 窗帘控制命令: ${payload}, MAC=${device.macAddress}`);
             }
             
         } else if (topic.includes('/position/set')) {

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "node-red-contrib-symi-mesh",
-  "version": "1.6.5",
+  "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,12 +34,13 @@
       "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": {
     "axios": "^1.7.9",
-    "mqtt": "^5.3.0",
+    "mqtt": "^5.10.0",
     "serialport": "^12.0.0"
   },
   "engines": {