node-red-contrib-symi-modbus 1.6.2 → 1.6.5

package/nodes/modbus-master.js

@@ -102,8 +102,8 @@ module.exports = function(RED) {
         
         // 更新节点状态显示
         node.updateNodeStatus = function() {
-            const modbusStatus = node.isConnected ? "Modbus✓" : "Modbus✗";
-            const mqttStatus = node.mqttConnected ? "MQTT✓" : "MQTT✗";
+            const modbusStatus = node.isConnected ? "Modbus-OK" : "Modbus-ERR";
+            const mqttStatus = node.mqttConnected ? "MQTT-OK" : "MQTT-ERR";
             
             if (node.isConnected && node.mqttConnected) {
                 node.status({fill: "green", shape: "dot", text: `${modbusStatus} ${mqttStatus}`});
@@ -525,11 +525,15 @@ module.exports = function(RED) {
             const minInterval = Math.min(...node.config.slaves.map(s => s.pollInterval));
             
             node.pollTimer = setInterval(() => {
-                node.pollNextSlave();
+                node.pollNextSlave().catch(err => {
+                    node.error(`轮询错误: ${err.message}`);
+                });
             }, minInterval);
             
             // 立即执行一次
-            node.pollNextSlave();
+            node.pollNextSlave().catch(err => {
+                node.error(`轮询错误: ${err.message}`);
+            });
         };
         
         // 停止轮询
@@ -629,15 +633,16 @@ module.exports = function(RED) {
                 // 更新状态显示
                 node.updateNodeStatus();
                 
-                // 仅当全部从站都失败时，检测连接是否断开
-                if (failedCount === totalCount && err.message && 
+                // 检测是否是连接断开错误
+                if (err.message && 
                     (err.message.includes('ECONNRESET') || 
                      err.message.includes('ETIMEDOUT') || 
-                     err.message.includes('ENOTCONN'))) {
+                     err.message.includes('ENOTCONN') ||
+                     err.message.includes('Port Not Open'))) {
                     
-                    // 连接断开也使用限流日志
+                    // 连接断开，尝试重连
                     if (shouldLog) {
-                        node.warn('所有从站都失败，检测到连接断开，尝试重连...');
+                        node.warn('检测到连接断开，尝试重连...');
                     }
                     
                     node.isConnected = false;
@@ -667,62 +672,70 @@ module.exports = function(RED) {
         };
         
         // 写单个线圈
-        node.writeSingleCoil = async function(slaveId, coil, value) {
+        node.writeSingleCoil = function(slaveId, coil, value) {
             if (!node.isConnected) {
                 node.warn('Modbus未连接');
-                return;
+                return Promise.resolve();
             }
             
-            try {
-                node.client.setID(slaveId);
-                await node.client.writeCoil(coil, value);
-                
-                // 更新本地状态
-                node.deviceStates[slaveId].coils[coil] = value;
-                
-                node.log(`写入成功: 从站${slaveId} 线圈${coil} = ${value}`);
-                
-                // 发布到MQTT和触发事件
-                node.publishMqttState(slaveId, coil, value);
-                node.emit('stateUpdate', {
-                    slave: slaveId,
-                    coil: coil,
-                    value: value
-                });
-                
-            } catch (err) {
-                node.error(`写入线圈失败: ${err.message}`);
-            }
+            return (async () => {
+                try {
+                    node.client.setID(slaveId);
+                    await node.client.writeCoil(coil, value);
+                    
+                    // 更新本地状态
+                    node.deviceStates[slaveId].coils[coil] = value;
+                    
+                    node.log(`写入成功: 从站${slaveId} 线圈${coil} = ${value}`);
+                    
+                    // 发布到MQTT和触发事件
+                    node.publishMqttState(slaveId, coil, value);
+                    node.emit('stateUpdate', {
+                        slave: slaveId,
+                        coil: coil,
+                        value: value
+                    });
+                    
+                } catch (err) {
+                    node.error(`写入线圈失败: ${err.message}`);
+                }
+            })().catch(err => {
+                node.error(`写入线圈异常: ${err.message}`);
+            });
         };
         
         // 写多个线圈
-        node.writeMultipleCoils = async function(slaveId, startCoil, values) {
+        node.writeMultipleCoils = function(slaveId, startCoil, values) {
             if (!node.isConnected) {
                 node.warn('Modbus未连接');
-                return;
+                return Promise.resolve();
             }
             
-            try {
-                node.client.setID(slaveId);
-                await node.client.writeCoils(startCoil, values);
-                
-                // 更新本地状态
-                for (let i = 0; i < values.length; i++) {
-                    node.deviceStates[slaveId].coils[startCoil + i] = values[i];
-                    // 发布到MQTT和触发事件
-                    node.publishMqttState(slaveId, startCoil + i, values[i]);
-                    node.emit('stateUpdate', {
-                        slave: slaveId,
-                        coil: startCoil + i,
-                        value: values[i]
-                    });
+            return (async () => {
+                try {
+                    node.client.setID(slaveId);
+                    await node.client.writeCoils(startCoil, values);
+                    
+                    // 更新本地状态
+                    for (let i = 0; i < values.length; i++) {
+                        node.deviceStates[slaveId].coils[startCoil + i] = values[i];
+                        // 发布到MQTT和触发事件
+                        node.publishMqttState(slaveId, startCoil + i, values[i]);
+                        node.emit('stateUpdate', {
+                            slave: slaveId,
+                            coil: startCoil + i,
+                            value: values[i]
+                        });
+                    }
+                    
+                    node.log(`批量写入成功: 从站${slaveId} 起始线圈${startCoil}`);
+                    
+                } catch (err) {
+                    node.error(`批量写入线圈失败: ${err.message}`);
                 }
-                
-                node.log(`批量写入成功: 从站${slaveId} 起始线圈${startCoil}`);
-                
-            } catch (err) {
-                node.error(`批量写入线圈失败: ${err.message}`);
-            }
+            })().catch(err => {
+                node.error(`批量写入线圈异常: ${err.message}`);
+            });
         };
         
         // 处理输入消息

package/nodes/modbus-slave-switch.js

@@ -331,21 +331,21 @@ module.exports = function(RED) {
         
         // 更新节点状态显示
         node.updateStatus = function() {
-            const rs485Status = node.isRs485Connected ? '✓' : '✗';
-            const mqttStatus = node.mqttClient && node.mqttClient.connected ? '✓' : '✗';
+            const rs485Status = node.isRs485Connected ? 'OK' : 'ERR';
+            const mqttStatus = node.mqttClient && node.mqttClient.connected ? 'OK' : 'ERR';
             const state = node.currentState ? 'ON' : 'OFF';
             
             if (node.isRs485Connected && node.mqttClient && node.mqttClient.connected) {
                 node.status({
                     fill: node.currentState ? "green" : "grey",
                     shape: "dot",
-                    text: `RS485${rs485Status} MQTT${mqttStatus} ${state}`
+                    text: `RS485-${rs485Status} MQTT-${mqttStatus} ${state}`
                 });
             } else {
                 node.status({
                     fill: "red",
                     shape: "ring",
-                    text: `RS485${rs485Status} MQTT${mqttStatus}`
+                    text: `RS485-${rs485Status} MQTT-${mqttStatus}`
                 });
             }
         };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-red-contrib-symi-modbus",
-  "version": "1.6.2",
+  "version": "1.6.5",
   "description": "Node-RED Modbus节点，支持TCP/串口通信、串口自动搜索、多设备轮询、智能MQTT连接（自动fallback）、Home Assistant自动发现和多品牌开关面板，稳定版本",
   "main": "nodes/modbus-master.js",
   "scripts": {