node-red-contrib-symi-modbus 2.5.2 → 2.5.4

package/nodes/serial-port-config.html

@@ -0,0 +1,191 @@
+<script type="text/javascript">
+    RED.nodes.registerType('serial-port-config', {
+        category: 'config',
+        defaults: {
+            name: { value: "" },
+            connectionType: { value: "serial" },
+            // TCP配置
+            tcpHost: { value: "192.168.2.110" },
+            tcpPort: { value: 1031, validate: RED.validators.number() },
+            // 串口配置
+            serialPort: { value: "/dev/ttyUSB0" },
+            baudRate: { value: 9600, validate: RED.validators.number() },
+            dataBits: { value: 8, validate: RED.validators.number() },
+            stopBits: { value: 1, validate: RED.validators.number() },
+            parity: { value: "none" }
+        },
+        label: function() {
+            if (this.name) return this.name;
+            if (this.connectionType === 'tcp') {
+                return `TCP ${this.tcpHost}:${this.tcpPort}`;
+            } else {
+                return `串口 ${this.serialPort} ${this.baudRate} ${this.dataBits}${this.parity.charAt(0).toUpperCase()}${this.stopBits}`;
+            }
+        },
+        oneditprepare: function() {
+            var node = this;
+
+            // 连接类型切换
+            function updateConnectionTypeVisibility() {
+                var connectionType = $('#node-config-input-connectionType').val();
+                if (connectionType === 'tcp') {
+                    $('.config-tcp-row').show();
+                    $('.config-serial-row').hide();
+                } else {
+                    $('.config-tcp-row').hide();
+                    $('.config-serial-row').show();
+                }
+            }
+
+            // 初始化显示
+            updateConnectionTypeVisibility();
+
+            // 监听连接类型变化
+            $('#node-config-input-connectionType').on('change', function() {
+                updateConnectionTypeVisibility();
+            });
+
+            // 串口搜索功能
+            $('#node-config-search-serial').on('click', function() {
+                var btn = $(this);
+                btn.prop('disabled', true).text('搜索中...');
+
+                $.ajax({
+                    url: 'serial-ports',
+                    type: 'GET',
+                    success: function(data) {
+                        if (data && data.length > 0) {
+                            var select = $('<select id="serial-port-select" style="width:100%; margin-top:10px;"></select>');
+                            data.forEach(function(port) {
+                                select.append(`<option value="${port.path}">${port.path}${port.manufacturer ? ' (' + port.manufacturer + ')' : ''}</option>`);
+                            });
+
+                            // 显示选择框
+                            $('#serial-port-list').html(select);
+
+                            // 监听选择
+                            select.on('change', function() {
+                                $('#node-config-input-serialPort').val($(this).val());
+                            });
+
+                            // 自动填充第一个
+                            if (data.length > 0) {
+                                $('#node-config-input-serialPort').val(data[0].path);
+                            }
+                        } else {
+                            $('#serial-port-list').html('<div style="color:#999; margin-top:10px;">未找到可用串口</div>');
+                        }
+                        btn.prop('disabled', false).text('搜索串口');
+                    },
+                    error: function() {
+                        $('#serial-port-list').html('<div style="color:#f00; margin-top:10px;">搜索失败</div>');
+                        btn.prop('disabled', false).text('搜索串口');
+                    }
+                });
+            });
+        }
+    });
+</script>
+
+<script type="text/x-red" data-template-name="serial-port-config">
+    <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="RS-485连接配置">
+    </div>
+
+    <!-- 连接类型选择 -->
+    <div class="form-row">
+        <label for="node-config-input-connectionType"><i class="fa fa-exchange"></i> 连接类型</label>
+        <select id="node-config-input-connectionType" style="width:70%">
+            <option value="tcp">TCP网关</option>
+            <option value="serial">串口</option>
+        </select>
+    </div>
+
+    <!-- TCP配置 -->
+    <div class="form-row config-tcp-row">
+        <label for="node-config-input-tcpHost"><i class="fa fa-server"></i> TCP主机</label>
+        <input type="text" id="node-config-input-tcpHost" placeholder="192.168.2.110" style="width:70%">
+    </div>
+    <div class="form-row config-tcp-row">
+        <label for="node-config-input-tcpPort"><i class="fa fa-plug"></i> TCP端口</label>
+        <input type="number" id="node-config-input-tcpPort" placeholder="1031" style="width:70%">
+    </div>
+
+    <!-- 串口配置 -->
+    <div class="form-row config-serial-row">
+        <label for="node-config-input-serialPort"><i class="fa fa-plug"></i> 串口路径</label>
+        <input type="text" id="node-config-input-serialPort" placeholder="/dev/ttyUSB0" style="width:calc(70% - 90px);">
+        <button type="button" id="node-config-search-serial" class="red-ui-button" style="width:80px; margin-left:5px;">
+            <i class="fa fa-search"></i> 搜索
+        </button>
+    </div>
+    <div class="form-row config-serial-row">
+        <div id="serial-port-list" style="margin-left:110px;"></div>
+    </div>
+    <div class="form-row config-serial-row">
+        <label for="node-config-input-baudRate"><i class="fa fa-tachometer"></i> 波特率</label>
+        <select id="node-config-input-baudRate" style="width:70%">
+            <option value="9600">9600</option>
+            <option value="19200">19200</option>
+            <option value="38400">38400</option>
+            <option value="57600">57600</option>
+            <option value="115200">115200</option>
+        </select>
+    </div>
+    <div class="form-row config-serial-row">
+        <label for="node-config-input-dataBits"><i class="fa fa-database"></i> 数据位</label>
+        <select id="node-config-input-dataBits" style="width:70%">
+            <option value="5">5</option>
+            <option value="6">6</option>
+            <option value="7">7</option>
+            <option value="8" selected>8</option>
+        </select>
+    </div>
+    <div class="form-row config-serial-row">
+        <label for="node-config-input-stopBits"><i class="fa fa-stop"></i> 停止位</label>
+        <select id="node-config-input-stopBits" style="width:70%">
+            <option value="1" selected>1</option>
+            <option value="2">2</option>
+        </select>
+    </div>
+    <div class="form-row config-serial-row">
+        <label for="node-config-input-parity"><i class="fa fa-check-square-o"></i> 校验位</label>
+        <select id="node-config-input-parity" style="width:70%">
+            <option value="none" selected>无 (N)</option>
+            <option value="even">偶校验 (E)</option>
+            <option value="odd">奇校验 (O)</option>
+        </select>
+    </div>
+</script>
+
+<script type="text/x-red" data-help-name="serial-port-config">
+    <p>RS-485连接配置节点，支持TCP网关和串口两种连接方式。</p>
+
+    <h3>配置参数</h3>
+    <dl class="message-properties">
+        <dt>名称 <span class="property-type">string</span></dt>
+        <dd>配置节点的显示名称</dd>
+
+        <dt>连接类型 <span class="property-type">string</span></dt>
+        <dd>选择TCP网关或串口连接</dd>
+
+        <dt class="optional">TCP主机 <span class="property-type">string</span></dt>
+        <dd>TCP网关的IP地址（仅TCP模式）</dd>
+
+        <dt class="optional">TCP端口 <span class="property-type">number</span></dt>
+        <dd>TCP网关的端口号（仅TCP模式）</dd>
+
+        <dt class="optional">串口路径 <span class="property-type">string</span></dt>
+        <dd>串口设备路径，支持自动搜索（仅串口模式）</dd>
+
+        <dt class="optional">波特率 <span class="property-type">number</span></dt>
+        <dd>串口通信波特率，默认9600（仅串口模式）</dd>
+    </dl>
+
+    <h3>说明</h3>
+    <p>此配置节点管理一个共享的RS-485连接，允许多个从站开关节点使用同一个连接。</p>
+    <p>连接只会被打开一次，所有使用此配置的节点共享同一个连接。</p>
+    <p>支持最多500个从站开关节点共享同一个连接。</p>
+</script>
+

package/nodes/serial-port-config.js

@@ -0,0 +1,270 @@
+/**
+ * RS-485连接配置节点
+ * 支持TCP网关和串口两种连接方式
+ * 用于多个从站开关节点共享同一个连接
+ */
+
+module.exports = function(RED) {
+    const { SerialPort } = require('serialport');
+    const net = require('net');
+
+    function SerialPortConfigNode(config) {
+        RED.nodes.createNode(this, config);
+        const node = this;
+
+        // 配置参数
+        node.connectionType = config.connectionType || 'serial';
+        node.tcpHost = config.tcpHost;
+        node.tcpPort = parseInt(config.tcpPort) || 1031;
+        node.serialPort = config.serialPort;
+        node.baudRate = parseInt(config.baudRate) || 9600;
+        node.dataBits = parseInt(config.dataBits) || 8;
+        node.stopBits = parseInt(config.stopBits) || 1;
+        node.parity = config.parity || 'none';
+
+        // 共享的连接实例
+        node.connection = null;  // TCP socket 或 SerialPort
+        node.isOpening = false;  // 标记是否正在打开连接
+
+        // 数据监听器列表（每个从站开关节点注册一个）
+        node.dataListeners = [];
+
+        // 打开TCP连接
+        node.openTcpConnection = function() {
+            if (node.connection && !node.connection.destroyed) {
+                node.log('TCP连接已打开，跳过重复打开');
+                return;
+            }
+
+            try {
+                node.connection = new net.Socket();
+
+                node.connection.connect(node.tcpPort, node.tcpHost, () => {
+                    node.log(`TCP连接已建立: ${node.tcpHost}:${node.tcpPort}`);
+                });
+
+                // 监听数据（分发给所有注册的监听器）
+                node.connection.on('data', (data) => {
+                    // 广播给所有监听器
+                    node.dataListeners.forEach(listener => {
+                        try {
+                            listener(data);
+                        } catch (err) {
+                            node.error(`数据监听器错误: ${err.message}`);
+                        }
+                    });
+                });
+
+                // 监听错误
+                node.connection.on('error', (err) => {
+                    node.error(`TCP连接错误: ${err.message}`);
+                });
+
+                // 监听关闭
+                node.connection.on('close', () => {
+                    node.log('TCP连接已关闭');
+                    // 自动重连
+                    setTimeout(() => {
+                        if (node.dataListeners.length > 0) {
+                            node.log('尝试重新连接TCP...');
+                            node.openTcpConnection();
+                        }
+                    }, 5000);
+                });
+            } catch (err) {
+                node.error(`TCP连接初始化失败: ${err.message}`);
+            }
+        };
+
+        // 打开串口连接
+        node.openSerialConnection = function() {
+            if (node.connection && node.connection.isOpen) {
+                node.log('串口已打开，跳过重复打开');
+                return;
+            }
+
+            if (node.isOpening) {
+                node.log('串口正在打开中，跳过重复打开');
+                return;
+            }
+
+            node.isOpening = true;
+
+            try {
+                node.connection = new SerialPort({
+                    path: node.serialPort,
+                    baudRate: node.baudRate,
+                    dataBits: node.dataBits,
+                    parity: node.parity,
+                    stopBits: node.stopBits,
+                    autoOpen: false
+                });
+
+                // 打开串口
+                node.connection.open((err) => {
+                    node.isOpening = false;
+
+                    if (err) {
+                        node.error(`串口打开失败: ${err.message}`);
+                        return;
+                    }
+
+                    node.log(`串口已打开: ${node.serialPort} @ ${node.baudRate}bps ${node.dataBits}${node.parity.charAt(0).toUpperCase()}${node.stopBits}`);
+
+                    // 监听数据（分发给所有注册的监听器）
+                    node.connection.on('data', (data) => {
+                        // 广播给所有监听器
+                        node.dataListeners.forEach(listener => {
+                            try {
+                                listener(data);
+                            } catch (err) {
+                                node.error(`数据监听器错误: ${err.message}`);
+                            }
+                        });
+                    });
+
+                    // 监听错误
+                    node.connection.on('error', (err) => {
+                        node.error(`串口错误: ${err.message}`);
+                    });
+
+                    // 监听关闭
+                    node.connection.on('close', () => {
+                        node.log('串口已关闭');
+                    });
+                });
+            } catch (err) {
+                node.error(`串口初始化失败: ${err.message}`);
+            }
+        };
+
+        // 注册数据监听器
+        node.registerDataListener = function(listener) {
+            if (typeof listener !== 'function') {
+                node.error('监听器必须是函数');
+                return;
+            }
+
+            node.dataListeners.push(listener);
+            node.log(`注册数据监听器，当前监听器数量: ${node.dataListeners.length}`);
+
+            // 如果连接未打开，现在打开
+            if (node.connectionType === 'tcp') {
+                if (!node.connection || node.connection.destroyed) {
+                    node.openTcpConnection();
+                }
+            } else {
+                if (!node.connection || !node.connection.isOpen) {
+                    node.openSerialConnection();
+                }
+            }
+        };
+
+        // 注销数据监听器
+        node.unregisterDataListener = function(listener) {
+            const index = node.dataListeners.indexOf(listener);
+            if (index > -1) {
+                node.dataListeners.splice(index, 1);
+                node.log(`注销数据监听器，当前监听器数量: ${node.dataListeners.length}`);
+            }
+
+            // 如果没有监听器了，关闭连接
+            if (node.dataListeners.length === 0 && node.connection) {
+                if (node.connectionType === 'tcp') {
+                    if (!node.connection.destroyed) {
+                        node.connection.destroy();
+                        node.log('所有监听器已注销，TCP连接已关闭');
+                    }
+                } else {
+                    if (node.connection.isOpen) {
+                        node.connection.close((err) => {
+                            if (err) {
+                                node.error(`串口关闭失败: ${err.message}`);
+                            } else {
+                                node.log('所有监听器已注销，串口已关闭');
+                            }
+                        });
+                    }
+                }
+            }
+        };
+
+        // 写入数据
+        node.write = function(data, callback) {
+            if (!node.connection) {
+                const err = new Error('连接未建立');
+                if (callback) callback(err);
+                return;
+            }
+
+            if (node.connectionType === 'tcp') {
+                if (node.connection.destroyed) {
+                    const err = new Error('TCP连接已断开');
+                    if (callback) callback(err);
+                    return;
+                }
+                node.connection.write(data, (err) => {
+                    if (err) {
+                        node.error(`TCP写入失败: ${err.message}`);
+                    }
+                    if (callback) callback(err);
+                });
+            } else {
+                if (!node.connection.isOpen) {
+                    const err = new Error('串口未打开');
+                    if (callback) callback(err);
+                    return;
+                }
+                node.connection.write(data, (err) => {
+                    if (err) {
+                        node.error(`串口写入失败: ${err.message}`);
+                    }
+                    if (callback) callback(err);
+                });
+            }
+        };
+
+        // 节点关闭时清理
+        node.on('close', function(done) {
+            // 清空所有监听器
+            node.dataListeners = [];
+
+            // 关闭连接
+            if (node.connection) {
+                if (node.connectionType === 'tcp') {
+                    if (!node.connection.destroyed) {
+                        node.connection.destroy();
+                    }
+                    done();
+                } else {
+                    if (node.connection.isOpen) {
+                        node.connection.close((err) => {
+                            if (err) {
+                                node.error(`串口关闭失败: ${err.message}`);
+                            }
+                            done();
+                        });
+                    } else {
+                        done();
+                    }
+                }
+            } else {
+                done();
+            }
+        });
+    }
+
+    RED.nodes.registerType('serial-port-config', SerialPortConfigNode);
+
+    // 提供串口搜索API
+    RED.httpAdmin.get('/serial-ports', async (req, res) => {
+        try {
+            const { SerialPort } = require('serialport');
+            const ports = await SerialPort.list();
+            res.json(ports);
+        } catch (err) {
+            res.status(500).json({ error: err.message });
+        }
+    });
+};
+

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "node-red-contrib-symi-modbus",
-  "version": "2.5.2",
-  "description": "Node-RED Modbus节点，支持TCP/串口通信、串口自动搜索、多设备轮询、智能MQTT连接（自动fallback HassOS/Docker环境）、Home Assistant自动发现和多品牌开关面板，生产级稳定版本",
+  "version": "2.5.4",
+  "description": "Node-RED Modbus节点，支持TCP/串口通信、串口自动搜索、多设备轮询、智能MQTT连接（自动fallback HassOS/Docker环境）、Home Assistant自动发现和物理开关面板双向同步，工控机长期稳定运行",
   "main": "nodes/modbus-master.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
@@ -34,12 +34,16 @@
     "nodes": {
       "modbus-master": "nodes/modbus-master.js",
       "modbus-slave-switch": "nodes/modbus-slave-switch.js",
-      "mqtt-server-config": "nodes/mqtt-server-config.js"
+      "modbus-server-config": "nodes/modbus-server-config.js",
+      "mqtt-server-config": "nodes/mqtt-server-config.js",
+      "serial-port-config": "nodes/serial-port-config.js"
     }
   },
   "dependencies": {
-    "modbus-serial": "^8.0.15",
-    "mqtt": "^5.3.0"
+    "modbus-serial": "^8.0.23",
+    "mqtt": "^5.14.1",
+    "node-red-contrib-symi-modbus": "file:node-red-contrib-symi-modbus-2.5.4.tgz",
+    "serialport": "^12.0.0"
   },
   "repository": {
     "type": "git",