node-red-contrib-mitsubishi 1.0.1 → 1.0.3

package/{node-red-contrib-mitsubishi/.gitattributes → .gitattributes}

@@ -1,2 +1,2 @@
-# Auto detect text files and perform LF normalization
-* text=auto
+# Auto detect text files and perform LF normalization
+* text=auto

package/CHANGELOG.md

@@ -0,0 +1,28 @@
+# Changelog
+
+## 1.0.2 (2026-06-30)
+
+### Fixed
+- 输出添加 `regType` 字段，适配 `edgelink-pg-store` 直写 `register_type` 列
+- `rawValue` 保留 PLC 原始 int16，`engValue` 使用解码值 × 斜率 + 偏移
+- 4E 帧 `serialNo` 首帧不再跳号（先赋值再递增）
+- 输出添加 `deviceId` 字段，适配 pg-store 动态分表
+
+## 1.0.1 (2026-06-29)
+
+### Added
+- 14 个运行时 BUG 修复（锁重入、异步异常、serialNo 自增、批量超限、脏帧拦截等）
+- `close` 处理器：节点关闭时释放全局锁
+- `_destroyedByUs` 标志：区分主动关闭与异常断开
+
+## 1.0.0 (2026-06-29)
+
+### Initial Release
+- 三菱 MC Protocol 3E/4E 以太网采集
+- 表格编辑器：一个节点读写 N 个点位
+- 6 种数据类型：INT16 / UINT16 / INT32 / UINT32 / FLOAT32 / BOOL
+- 8 种软元件：D / W / R / X / Y / M / L / B
+- 斜率偏移变换：`engValue = rawValue × slope + offset`
+- 19 个 MC 错误码中文映射
+- 全局模拟模式
+- 零外部依赖（纯 Node.js `net` + `Buffer`）

package/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2026 chunhailiu
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/README.md

@@ -1,10 +1,14 @@
 # node-red-contrib-mitsubishi
 
-三菱 MC Protocol 3E/4E 以太网采集节点，零依赖纯 TCP 实现。
+[![npm version](https://img.shields.io/npm/v/node-red-contrib-mitsubishi.svg)](https://www.npmjs.com/package/node-red-contrib-mitsubishi)
+[![license](https://img.shields.io/npm/l/node-red-contrib-mitsubishi.svg)](LICENSE)
+[![Node-RED](https://img.shields.io/badge/Node--RED-%E2%89%A53.0.0-red.svg)](https://nodered.org)
 
-## 截图
+三菱 MC Protocol 3E/4E 以太网采集节点。**一个节点读 N 个点位，零外部依赖，纯 TCP 实现。**
+
+---
 
-> 替换 `Qq225083` 为你的 GitHub 用户名
+## 截图
 
 ![节点面板](https://raw.githubusercontent.com/Qq225083/node-red-contrib-mitsubishi/main/images/palette.png)
 
@@ -12,17 +16,51 @@
 
 ![采集输出](https://raw.githubusercontent.com/Qq225083/node-red-contrib-mitsubishi/main/images/output.png)
 
+---
+
+## 为什么选这个节点？
+
+| 痛点 | 其他 MC 节点 | 本节点 |
+|------|-------------|--------|
+| 读 50 个点位 | 拖 50 个节点 | **拖 1 个节点，填表格** |
+| 读 D200 是 FLOAT32 | 自己写 function 解码 | **表格选 FLOAT32，自动解码** |
+| 原始值 2530 → 实际 253.0℃ | 自己写 function 换算 | **填斜率 0.1，自动变换** |
+| PLC 返回错误码 0xC052 | 只会说 "timeout" | **"Address out of range"** |
+| serialNo 不递增 | 4E 帧可能串包 | **每帧自增 + 响应校验** |
+
+---
+
 ## 特性
 
-- **独立可用** — 脱离任何后端，拖拽配置即可采集 PLC 数据
-- **表格编辑器** — 一个节点读 N 个点位，自动聚类合并批量读取
+- **独立可用** — 纯 Node.js `net` + `Buffer`，不依赖任何第三方库或后端服务
+- **表格编辑器** — 一个节点配置 N 个点位，自动按寄存器类型和地址聚类，合并为批量读取
 - **6 种数据类型** — INT16 / UINT16 / INT32 / UINT32 / FLOAT32 / BOOL
-- **8 种软元件** — D / W / R / X / Y / M / L / B，位元件自动逐位拆包
-- **斜率偏移变换** — `engValue = rawValue × slope + offset`，节点直接输出最终值
-- **错误诊断** — 19 个 MC 错误码映射为中文可读信息
-- **模拟模式** — 全局 `mcSimulationMode=true` 不连 PLC 直接返回仿真数据
+- **8 种软元件** — D / W / R / X / Y / M / L / B，位元件（X/Y/M/L/B）自动逐位拆包
+- **斜率偏移变换** — `engValue = rawValue × slope + offset`，节点直接输出工程值
+- **4E serialNo 完整支持** — 每帧自增，响应校验，防止串包
+- **批量保护** — 单次读取字数超 960 自动拆包，防 PLC 报 `0xC059`
+- **错误诊断** — 19 个 MC 错误码映射为中文/英文可读信息
+- **模拟模式** — `RED.settings.mcSimulationMode = true` 不连 PLC 即可测试
 - **零依赖** — 仅使用 Node.js 内置 `net` + `Buffer`
-- **14 个运行时 BUG 已修复** — 含锁重入、异步异常、serialNo 自增、批量超限等
+- **15+ 运行时 BUG 已修复** — 锁重入、异步异常、serialNo 首帧跳号、脏帧拦截、批量超限等
+
+---
+
+## 安装
+
+```bash
+cd ~/.node-red
+npm install node-red-contrib-mitsubishi
+```
+
+重启 Node-RED，左侧节点栏出现 **"三菱 PLC"** 分类，包含两个节点：
+
+| 节点 | 类型 | 说明 |
+|------|------|------|
+| `PLC 连接配置` | config | 存储 PLC IP、端口、帧格式等连接参数 |
+| `MC 读取` | input/output | 配置点位表格，触发采集，输出数据 |
+
+---
 
 ## 支持的 PLC
 
@@ -32,49 +70,91 @@
 | L 系列 | 3E / 4E | ✅ |
 | iQ-R | 4E | ✅ |
 | iQ-F（FX5U） | 4E | ✅ |
-| FX3U + 以太网模块 | 3E | ✅ |
-| A 系列 | 1E / 2E | ❌ |
+| FX3U + 以太网模块（FX3U-ENET） | 3E | ✅ |
+| A 系列 | 1E / 2E | ❌ （仅支持 3E/4E） |
 
-## 安装
-
-```bash
-cd ~/.node-red
-npm install node-red-contrib-mitsubishi
-```
-
-重启 Node-RED，左侧节点栏出现 **"三菱 PLC"** 分类。
+---
 
 ## 使用方法
 
-**1. 添加 PLC 连接配置**
+### 1. 添加 PLC 连接配置
 
-拖入 `PLC 连接配置` 节点，填写 IP、端口、帧格式（3E/4E）、超时等参数。
+拖入 **`PLC 连接配置`** 节点，双击配置：
 
-**2. 配置点位表格**
+| 参数 | 默认值 | 说明 |
+|------|--------|------|
+| 名称 | `PLC-1` | 显示名称 |
+| IP 地址 | `192.168.1.10` | PLC 以太网模块 IP |
+| 端口 | `5007` | 3E 默认 5007 / 4E 默认 5008 |
+| 帧格式 | `3E` | 3E（Q/L/FX3U）或 4E（iQ-R/iQ-F/FX5U） |
+| 网络号 | `0` | 多跳网络用，直连填 0 |
+| 站号 | `0` | 目标站号，直连 CPU 填 0 |
+| 超时 (ms) | `3000` | TCP 读写超时 |
+| 重试次数 | `2` | 失败重试次数（不含首次） |
+| 重试间隔 (ms) | `300` | 重试等待时间 |
+
+### 2. 配置点位表格
 
-拖入 `MC 读取` 节点，关联 PLC 配置，在表格中添加点位：
+拖入 **`MC 读取`** 节点，关联 PLC 配置，在表格中添加点位：
 
 | 寄存器 | 地址 | 数据类型 | 斜率 | 偏移 | 名称 |
 |--------|------|----------|------|------|------|
 | D | 100 | INT16 | 0.1 | 0 | 温度 |
 | D | 200 | FLOAT32 | 1 | 0 | 压力 |
-| X | 0 | BOOL | - | - | 开关 |
+| X | 0 | BOOL | — | — | 开关 |
+| D | 300 | UINT16 | 1 | 0 | 计数器 |
+
+> **斜率/偏移公式**：`engValue = rawValue × slope + offset`
+>
+> 例如 PLC 存温度原始值 2530（实际 253.0℃），设斜率 = 0.1，偏移 = 0，输出 engValue = 253.0
 
-**3. 触发采集**
+### 3. 触发采集
 
-inject 节点连到 MC 读取节点，部署后自动采集。
+inject 节点 → MC 读取节点，部署后点击 inject 按钮即可采集。
 
-**动态点位**：上游节点传入 `msg.tags` 会覆盖表格配置，兼容 EdgeLink 采集管线。
+### 4. 动态点位（高级）
+
+上游节点传入 `msg.tags` 会覆盖表格配置，适配 EdgeLink 采集管线：
+
+```javascript
+msg.tags = [
+  { id: "温度", regType: "D", addr: 100, dataType: "INT16", slope: 0.1, offset: 0 },
+  { id: "压力", regType: "D", addr: 200, dataType: "FLOAT32" }
+];
+```
+
+---
 
 ## 输出格式
 
+### 正常采集
+
 ```javascript
 msg.payload = {
   success: true,
+  deviceId: "PLC-1",          // 适配 edgelink-pg-store 动态分表
   data: {
-    "温度": { rawValue: 2530, engValue: 253.0, quality: 0, ts: "2026-..." },
-    "压力": { rawValue: 4123, engValue: 41.23, quality: 0, ts: "2026-..." },
-    "开关": { rawValue: 1,    engValue: 1,      quality: 0, ts: "2026-..." }
+    "温度": {
+      rawValue: 2530,         // PLC 原始 int16
+      engValue: 253.0,        // 解码后 × 斜率 + 偏移
+      quality: 0,             // 0=正常 2=异常
+      ts: "2026-06-30T08:00:00.000Z",
+      regType: "D"            // 寄存器类型
+    },
+    "压力": {
+      rawValue: 4123,
+      engValue: 41.23,
+      quality: 0,
+      ts: "2026-06-30T08:00:00.000Z",
+      regType: "D"
+    },
+    "开关": {
+      rawValue: 1,
+      engValue: 1,
+      quality: 0,
+      ts: "2026-06-30T08:00:00.000Z",
+      regType: "X"
+    }
   },
   error: null,
   driverType: "driver-mc-protocol",
@@ -84,6 +164,56 @@ msg.payload = {
 }
 ```
 
+### PLC 读取失败
+
+```javascript
+msg.payload = {
+  success: false,
+  deviceId: "PLC-1",
+  data: {},
+  error: "[PLC 0xC052] Address out of range",
+  driverType: "driver-mc-protocol",
+  plcIp: "192.168.1.10",
+  plcPort: 5007,
+  roundTimeMs: 3012
+}
+```
+
+### 网络故障
+
+```javascript
+msg.payload = {
+  success: false,
+  deviceId: "PLC-1",
+  data: {},
+  error: "[NETWORK] TCP closed (no data)",
+  ...
+}
+```
+
+---
+
+## 架构
+
+```
+┌──────────┐     ┌─────────────────────────────┐     ┌──────────┐
+│ inject / │     │     mitsubishi-read          │     │ 三菱 PLC │
+│ 动态tags │────→│                              │────→│          │
+└──────────┘     │  1. 校验 + 清洗点位          │     │ Q / L /  │
+                 │  2. 去重 + 聚类分组          │     │ iQ-R /   │
+                 │  3. 逐组 3E/4E 帧请求        │     │ FX5U     │
+                 │  4. 解码 + 斜率变换          │     └──────────┘
+                 │  5. 输出 {raw,eng,quality}   │
+                 └─────────────────────────────┘
+
+ 帧构造: build3EFrame / build4EFrame
+ 响应解析: parseMCResponse (subheader + endCode + serialNo + dataLen 校验)
+ 错误分类: 19 个 MC 错误码 + 网络错误 + 脏帧拦截
+ 锁机制: 按 host:port 维度全局锁，串行采集，60s 过期自释放
+```
+
+---
+
 ## 与 node-red-contrib-mcprotocol 对比
 
 | 维度 | 本节点 | mcprotocol |
@@ -92,12 +222,62 @@ msg.payload = {
 | 批量优化 | **智能聚类合并** | 逐地址独立请求 |
 | 数据类型 | **6 种** (INT16/UINT16/INT32/UINT32/FLOAT32/BOOL) | 仅 INT16 |
 | 位元件 | **自动拆包** | 不支持 |
-| 斜率偏移变换 | **内置** (raw → eng) | 无 |
-| 错误诊断 | **[PLC 0xC052] Address out of range** | "timeout" |
+| 斜率偏移变换 | **内置** `rawValue × slope + offset` | 无 |
+| 32位/浮点 | **自动读相邻寄存器 + 拼接** | 无 |
 | serialNo | **每帧自增 + 回显校验** | 固定不变 |
+| 错误诊断 | 19 个 MC 错误码可读 | "timeout" |
 | 模拟模式 | ✅ `mcSimulationMode=true` | ❌ |
-| 连接稳定性 | 短连接, 无状态泄漏 | pool bug, 长期运行必断 |
-| 运行时 BUG | **14 个全部修复** | issue 长期未维护 |
+| deviceId 输出 | ✅ 适配 pg-store 分表 | ❌ |
+| regType 输出 | ✅ 适配 pg-store 列映射 | ❌ |
+| 依赖 | **0** (纯 Node.js) | mcprotocol 依赖 |
+| 维护状态 | ✅ 活跃 | ⚠️ issue 长期未处理 |
+
+---
+
+## 模拟模式
+
+在 Node-RED `settings.js` 中添加：
+
+```javascript
+mcSimulationMode: true
+```
+
+重启后所有 `MC 读取` 节点不连 PLC，直接返回随机仿真数据。用于离线开发、CI 测试、Demo 演示。
+
+---
+
+## 与 EdgeLink 生态集成
+
+```
+┌──────────────────┐     ┌──────────────────────┐     ┌──────────────────┐
+│ node-red-contrib │     │ node-red-contrib     │     │ PostgreSQL /     │
+│ -mitsubishi      │────→│ -edgelink-pg         │────→│ TimescaleDB      │
+│ (本节点)         │     │ (PG 批量写入)        │     │                  │
+└──────────────────┘     └──────────────────────┘     └──────────────────┘
+```
+
+本节点输出的 `deviceId`、`regType`、`rawValue`、`engValue`、`quality`、`ts` 字段可由 `edgelink-pg-store` 自动识别为 MC 驱动格式，零配置写入数据库。
+
+---
+
+## FAQ
+
+**Q: 为什么不用连接池？**  
+MC 协议是无状态短连接。每次采集建立 TCP → 发送帧 → 接收响应 → 关闭。用连接池不会带来性能提升（TCP 握手开销远小于 PLC 扫描周期），反而有状态泄漏风险。
+
+**Q: 能同时读多个 PLC 吗？**  
+可以。每个 `PLC 连接配置` 配置一个 PLC。多个 `MC 读取` 节点关联不同配置即可。全局锁按 `host:port` 隔离，不同 PLC 并行执行。
+
+**Q: 点位地址能写成 "D100" 格式吗？**  
+可以。地址字段兼容 `"D100"` 格式（自动提取数字部分），也支持纯数字 `100`。
+
+**Q: switch 元素一次最多读多少个点位？**  
+字元件单次最多 960 字，位元件单次最多 15360 点。超出自动拆组，无需手动干预。
+
+**Q: 支持 FX3U 吗？**  
+带以太网模块（FX3U-ENET）支持 3E 帧。不带以太网模块的 FX3U 不支持（需要 1E 帧或串口）。
+
+---
 
 ## 许可证
 

package/nodes/mitsubishi-config.html

@@ -1,62 +1,62 @@
-<script type="text/x-red" data-template-name="mitsubishi-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="PLC-1">
-  </div>
-  <div class="form-row">
-    <label for="node-config-input-host"><i class="fa fa-globe"></i> IP 地址</label>
-    <input type="text" id="node-config-input-host" placeholder="192.168.1.10">
-  </div>
-  <div class="form-row">
-    <label for="node-config-input-port"><i class="fa fa-plug"></i> 端口</label>
-    <input type="number" id="node-config-input-port" placeholder="5007" min="1" max="65535">
-  </div>
-  <div class="form-row">
-    <label for="node-config-input-frame"><i class="fa fa-exchange"></i> 帧格式</label>
-    <select id="node-config-input-frame">
-      <option value="3E">3E (Q/L/FX3U)</option>
-      <option value="4E">4E (iQ-R/iQ-F/FX5U)</option>
-    </select>
-  </div>
-  <div class="form-row">
-    <label for="node-config-input-networkNo"><i class="fa fa-sitemap"></i> 网络号</label>
-    <input type="number" id="node-config-input-networkNo" value="0" min="0" max="255">
-  </div>
-  <div class="form-row">
-    <label for="node-config-input-stationNo"><i class="fa fa-server"></i> 站号</label>
-    <input type="number" id="node-config-input-stationNo" value="0" min="0" max="255">
-  </div>
-  <div class="form-row">
-    <label for="node-config-input-timeout"><i class="fa fa-clock-o"></i> 超时 (ms)</label>
-    <input type="number" id="node-config-input-timeout" value="3000" min="500" max="30000">
-  </div>
-  <div class="form-row">
-    <label for="node-config-input-maxRetries"><i class="fa fa-repeat"></i> 重试次数</label>
-    <input type="number" id="node-config-input-maxRetries" value="2" min="0" max="10">
-  </div>
-  <div class="form-row">
-    <label for="node-config-input-retryInterval"><i class="fa fa-hourglass-half"></i> 重试间隔 (ms)</label>
-    <input type="number" id="node-config-input-retryInterval" value="300" min="50" max="10000">
-  </div>
-</script>
-
-<script type="text/javascript">
-  RED.nodes.registerType('mitsubishi-config', {
-    category: 'config',
-    defaults: {
-      name: { value: 'PLC-1' },
-      host: { value: '192.168.1.10', required: true },
-      port: { value: 5007, required: true, validate: RED.validators.number() },
-      frame: { value: '3E', required: true },
-      networkNo: { value: 0, validate: RED.validators.number() },
-      stationNo: { value: 0, validate: RED.validators.number() },
-      timeout: { value: 3000, validate: RED.validators.number() },
-      maxRetries: { value: 2, validate: RED.validators.number() },
-      retryInterval: { value: 300, validate: RED.validators.number() }
-    },
-    label: function () {
-      return this.name || 'PLC-1';
-    },
-    paletteLabel: 'PLC 连接配置'
-  });
-</script>
+<script type="text/x-red" data-template-name="mitsubishi-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="PLC-1">
+  </div>
+  <div class="form-row">
+    <label for="node-config-input-host"><i class="fa fa-globe"></i> IP 地址</label>
+    <input type="text" id="node-config-input-host" placeholder="192.168.1.10">
+  </div>
+  <div class="form-row">
+    <label for="node-config-input-port"><i class="fa fa-plug"></i> 端口</label>
+    <input type="number" id="node-config-input-port" placeholder="5007" min="1" max="65535">
+  </div>
+  <div class="form-row">
+    <label for="node-config-input-frame"><i class="fa fa-exchange"></i> 帧格式</label>
+    <select id="node-config-input-frame">
+      <option value="3E">3E (Q/L/FX3U)</option>
+      <option value="4E">4E (iQ-R/iQ-F/FX5U)</option>
+    </select>
+  </div>
+  <div class="form-row">
+    <label for="node-config-input-networkNo"><i class="fa fa-sitemap"></i> 网络号</label>
+    <input type="number" id="node-config-input-networkNo" value="0" min="0" max="255">
+  </div>
+  <div class="form-row">
+    <label for="node-config-input-stationNo"><i class="fa fa-server"></i> 站号</label>
+    <input type="number" id="node-config-input-stationNo" value="0" min="0" max="255">
+  </div>
+  <div class="form-row">
+    <label for="node-config-input-timeout"><i class="fa fa-clock-o"></i> 超时 (ms)</label>
+    <input type="number" id="node-config-input-timeout" value="3000" min="500" max="30000">
+  </div>
+  <div class="form-row">
+    <label for="node-config-input-maxRetries"><i class="fa fa-repeat"></i> 重试次数</label>
+    <input type="number" id="node-config-input-maxRetries" value="2" min="0" max="10">
+  </div>
+  <div class="form-row">
+    <label for="node-config-input-retryInterval"><i class="fa fa-hourglass-half"></i> 重试间隔 (ms)</label>
+    <input type="number" id="node-config-input-retryInterval" value="300" min="50" max="10000">
+  </div>
+</script>
+
+<script type="text/javascript">
+  RED.nodes.registerType('mitsubishi-config', {
+    category: 'config',
+    defaults: {
+      name: { value: 'PLC-1' },
+      host: { value: '192.168.1.10', required: true },
+      port: { value: 5007, required: true, validate: RED.validators.number() },
+      frame: { value: '3E', required: true },
+      networkNo: { value: 0, validate: RED.validators.number() },
+      stationNo: { value: 0, validate: RED.validators.number() },
+      timeout: { value: 3000, validate: RED.validators.number() },
+      maxRetries: { value: 2, validate: RED.validators.number() },
+      retryInterval: { value: 300, validate: RED.validators.number() }
+    },
+    label: function () {
+      return this.name || 'PLC-1';
+    },
+    paletteLabel: 'PLC 连接配置'
+  });
+</script>

package/nodes/mitsubishi-config.js

@@ -1,21 +1,21 @@
-/**
- * mitsubishi-config — 三菱 PLC 连接配置节点
- * 保存 IP、端口、帧格式等连接参数，供 mitsubishi-read 节点引用
- */
-module.exports = function (RED) {
-  function MitsubishiConfigNode(config) {
-    RED.nodes.createNode(this, config);
-    this.name = config.name || 'PLC-1';
-    this.host = config.host || '192.168.1.10';
-    this.port = parseInt(config.port, 10) || 5007;
-    this.frame = config.frame || '3E';
-    this.networkNo = parseInt(config.networkNo, 10) || 0;
-    this.stationNo = parseInt(config.stationNo, 10) || 0;
-    this.timeout = parseInt(config.timeout, 10) || 3000;
-    this.maxRetries = parseInt(config.maxRetries, 10);
-    if (isNaN(this.maxRetries)) this.maxRetries = 2;
-    this.retryInterval = parseInt(config.retryInterval, 10);
-    if (isNaN(this.retryInterval)) this.retryInterval = 300;
-  }
-  RED.nodes.registerType('mitsubishi-config', MitsubishiConfigNode);
-};
+/**
+ * mitsubishi-config — 三菱 PLC 连接配置节点
+ * 保存 IP、端口、帧格式等连接参数，供 mitsubishi-read 节点引用
+ */
+module.exports = function (RED) {
+  function MitsubishiConfigNode(config) {
+    RED.nodes.createNode(this, config);
+    this.name = config.name || 'PLC-1';
+    this.host = config.host || '192.168.1.10';
+    this.port = parseInt(config.port, 10) || 5007;
+    this.frame = config.frame || '3E';
+    this.networkNo = parseInt(config.networkNo, 10) || 0;
+    this.stationNo = parseInt(config.stationNo, 10) || 0;
+    this.timeout = parseInt(config.timeout, 10) || 3000;
+    this.maxRetries = parseInt(config.maxRetries, 10);
+    if (isNaN(this.maxRetries)) this.maxRetries = 2;
+    this.retryInterval = parseInt(config.retryInterval, 10);
+    if (isNaN(this.retryInterval)) this.retryInterval = 300;
+  }
+  RED.nodes.registerType('mitsubishi-config', MitsubishiConfigNode);
+};

package/nodes/mitsubishi-read.html

@@ -1,152 +1,152 @@
-<script type="text/x-red" data-template-name="mitsubishi-read">
-  <div class="form-row">
-    <label for="node-input-name"><i class="fa fa-tag"></i> 名称</label>
-    <input type="text" id="node-input-name" placeholder="三菱MC读取">
-  </div>
-  <div class="form-row">
-    <label for="node-input-plc"><i class="fa fa-microchip"></i> PLC 配置</label>
-    <input type="text" id="node-input-plc" placeholder="选择 mitsubishi-config 节点">
-  </div>
-  <div class="form-row">
-    <label for="node-input-serialNo"><i class="fa fa-hashtag"></i> 序列号 (4E帧, 0=不启用)</label>
-    <input type="number" id="node-input-serialNo" value="0" min="0" max="65535" style="width:100px">
-  </div>
-
-  <!-- 点位编辑表格 -->
-  <div class="form-row" style="margin-top:8px">
-    <label><i class="fa fa-list"></i> 默认点位 (msg.tags 传入时覆盖)</label>
-  </div>
-  <div style="margin-bottom:4px">
-    <table style="width:100%;font-size:12px;border-collapse:collapse">
-      <thead>
-        <tr style="color:#888">
-          <th style="width:11%;text-align:left">寄存器</th>
-          <th style="width:10%;text-align:left">地址</th>
-          <th style="width:16%;text-align:left">数据类型</th>
-          <th style="width:11%;text-align:left">斜率</th>
-          <th style="width:11%;text-align:left">偏移</th>
-          <th style="width:24%;text-align:left">名称</th>
-          <th style="width:6%"></th>
-          <th style="width:11%;text-align:left">ID</th>
-        </tr>
-      </thead>
-      <tbody id="tags-tbody"></tbody>
-    </table>
-    <button class="red-ui-button" onclick="addTagRow()" style="margin-top:4px;font-size:11px">
-      <i class="fa fa-plus"></i> 添加点位
-    </button>
-  </div>
-  <input type="hidden" id="node-input-tags">
-
-  <hr>
-  <div style="color:#888;font-size:11px;margin-bottom:4px">
-    <i class="fa fa-info-circle"></i> 静态: 表格配置 | 动态: msg.tags 传入覆盖<br>
-    输出: msg.payload.data[点位ID] = {rawValue, engValue, quality, ts}<br>
-    变换: engValue = rawValue × slope + offset
-  </div>
-</script>
-
-<script type="text/javascript">
-  var tagEditor = {
-    rows: [],
-    init: function () {
-      try { this.rows = JSON.parse($('#node-input-tags').val() || '[]'); } catch (e) { this.rows = []; }
-      this.render();
-    },
-    add: function () {
-      this.rows.push({ id: '', regType: 'D', addr: '', dataType: 'INT16', slope: '1', offset: '0', name: '' });
-      this.render();
-      this.save();
-    },
-    remove: function (idx) {
-      this.rows.splice(idx, 1);
-      this.render();
-      this.save();
-    },
-    update: function (idx, field, val) {
-      this.rows[idx][field] = val;
-      this.save();
-    },
-    save: function () {
-      $('#node-input-tags').val(JSON.stringify(this.rows));
-    },
-    render: function () {
-      var self = this;
-      var tbody = $('#tags-tbody');
-      tbody.empty();
-      this.rows.forEach(function (row, idx) {
-        var tr = $('<tr>');
-        var mkOpt = function (vals, cur) {
-          var s = '';
-          vals.forEach(function (v) { s += '<option' + (cur === v ? ' selected' : '') + '>' + v + '</option>'; });
-          return s;
-        };
-        var mkSel = function (vals, cur) { return $('<select style="width:95%">' + mkOpt(vals, cur) + '</select>'); };
-
-        // 寄存器
-        var reg = mkSel(['D','W','R','X','Y','M','L','B'], row.regType || 'D');
-        reg.on('change', function () { self.update(idx, 'regType', $(this).val()); });
-        tr.append($('<td>').append(reg));
-
-        // 地址
-        var addr = $('<input type="text" style="width:90%" placeholder="100">').val(row.addr || '');
-        addr.on('change', function () { self.update(idx, 'addr', $(this).val()); });
-        tr.append($('<td>').append(addr));
-
-        // 数据类型
-        var dt = mkSel(['INT16','UINT16','INT32','UINT32','FLOAT32','BOOL'], row.dataType || 'INT16');
-        dt.on('change', function () { self.update(idx, 'dataType', $(this).val()); });
-        tr.append($('<td>').append(dt));
-
-        // 斜率
-        var slope = $('<input type="number" style="width:90%" step="any" placeholder="1">').val(row.slope || '1');
-        slope.on('change', function () { self.update(idx, 'slope', $(this).val()); });
-        tr.append($('<td>').append(slope));
-
-        // 偏移
-        var off = $('<input type="number" style="width:90%" step="any" placeholder="0">').val(row.offset || '0');
-        off.on('change', function () { self.update(idx, 'offset', $(this).val()); });
-        tr.append($('<td>').append(off));
-
-        // 名称
-        var nm = $('<input type="text" style="width:95%" placeholder="温度">').val(row.name || '');
-        nm.on('change', function () { self.update(idx, 'name', $(this).val()); });
-        tr.append($('<td>').append(nm));
-
-        // 删除
-        var del = $('<button class="red-ui-button" style="font-size:10px;padding:1px 5px">✕</button>');
-        del.on('click', function (e) { e.preventDefault(); self.remove(idx); });
-        tr.append($('<td>').append(del));
-
-        // ID (自动生成或手动填)
-        var id = $('<input type="text" style="width:95%" placeholder="auto">').val(row.id || '');
-        id.on('change', function () { self.update(idx, 'id', $(this).val()); });
-        tr.append($('<td>').append(id));
-
-        tbody.append(tr);
-      });
-    }
-  };
-
-  RED.nodes.registerType('mitsubishi-read', {
-    category: '三菱 PLC',
-    color: '#C7E9C0',
-    defaults: {
-      name: { value: '三菱MC读取' },
-      plc: { type: 'mitsubishi-config', required: true },
-      serialNo: { value: 0 },
-      tags: { value: '[]' }
-    },
-    inputs: 1,
-    outputs: 1,
-    paletteLabel: 'MC 读取',
-    label: function () { return this.name || '三菱MC读取'; },
-    oneditprepare: function () {
-      tagEditor.init();
-      window.addTagRow = function () { tagEditor.add(); };
-    },
-    oneditsave: function () {
-      delete window.addTagRow;
-    }
-  });
-</script>
+<script type="text/x-red" data-template-name="mitsubishi-read">
+  <div class="form-row">
+    <label for="node-input-name"><i class="fa fa-tag"></i> 名称</label>
+    <input type="text" id="node-input-name" placeholder="三菱MC读取">
+  </div>
+  <div class="form-row">
+    <label for="node-input-plc"><i class="fa fa-microchip"></i> PLC 配置</label>
+    <input type="text" id="node-input-plc" placeholder="选择 mitsubishi-config 节点">
+  </div>
+  <div class="form-row">
+    <label for="node-input-serialNo"><i class="fa fa-hashtag"></i> 序列号 (4E帧, 0=不启用)</label>
+    <input type="number" id="node-input-serialNo" value="0" min="0" max="65535" style="width:100px">
+  </div>
+
+  <!-- 点位编辑表格 -->
+  <div class="form-row" style="margin-top:8px">
+    <label><i class="fa fa-list"></i> 默认点位 (msg.tags 传入时覆盖)</label>
+  </div>
+  <div style="margin-bottom:4px">
+    <table style="width:100%;font-size:12px;border-collapse:collapse">
+      <thead>
+        <tr style="color:#888">
+          <th style="width:11%;text-align:left">寄存器</th>
+          <th style="width:10%;text-align:left">地址</th>
+          <th style="width:16%;text-align:left">数据类型</th>
+          <th style="width:11%;text-align:left">斜率</th>
+          <th style="width:11%;text-align:left">偏移</th>
+          <th style="width:24%;text-align:left">名称</th>
+          <th style="width:6%"></th>
+          <th style="width:11%;text-align:left">ID</th>
+        </tr>
+      </thead>
+      <tbody id="tags-tbody"></tbody>
+    </table>
+    <button class="red-ui-button" onclick="addTagRow()" style="margin-top:4px;font-size:11px">
+      <i class="fa fa-plus"></i> 添加点位
+    </button>
+  </div>
+  <input type="hidden" id="node-input-tags">
+
+  <hr>
+  <div style="color:#888;font-size:11px;margin-bottom:4px">
+    <i class="fa fa-info-circle"></i> 静态: 表格配置 | 动态: msg.tags 传入覆盖<br>
+    输出: msg.payload.data[点位ID] = {rawValue, engValue, quality, ts}<br>
+    变换: engValue = rawValue × slope + offset
+  </div>
+</script>
+
+<script type="text/javascript">
+  var tagEditor = {
+    rows: [],
+    init: function () {
+      try { this.rows = JSON.parse($('#node-input-tags').val() || '[]'); } catch (e) { this.rows = []; }
+      this.render();
+    },
+    add: function () {
+      this.rows.push({ id: '', regType: 'D', addr: '', dataType: 'INT16', slope: '1', offset: '0', name: '' });
+      this.render();
+      this.save();
+    },
+    remove: function (idx) {
+      this.rows.splice(idx, 1);
+      this.render();
+      this.save();
+    },
+    update: function (idx, field, val) {
+      this.rows[idx][field] = val;
+      this.save();
+    },
+    save: function () {
+      $('#node-input-tags').val(JSON.stringify(this.rows));
+    },
+    render: function () {
+      var self = this;
+      var tbody = $('#tags-tbody');
+      tbody.empty();
+      this.rows.forEach(function (row, idx) {
+        var tr = $('<tr>');
+        var mkOpt = function (vals, cur) {
+          var s = '';
+          vals.forEach(function (v) { s += '<option' + (cur === v ? ' selected' : '') + '>' + v + '</option>'; });
+          return s;
+        };
+        var mkSel = function (vals, cur) { return $('<select style="width:95%">' + mkOpt(vals, cur) + '</select>'); };
+
+        // 寄存器
+        var reg = mkSel(['D','W','R','X','Y','M','L','B'], row.regType || 'D');
+        reg.on('change', function () { self.update(idx, 'regType', $(this).val()); });
+        tr.append($('<td>').append(reg));
+
+        // 地址
+        var addr = $('<input type="text" style="width:90%" placeholder="100">').val(row.addr || '');
+        addr.on('change', function () { self.update(idx, 'addr', $(this).val()); });
+        tr.append($('<td>').append(addr));
+
+        // 数据类型
+        var dt = mkSel(['INT16','UINT16','INT32','UINT32','FLOAT32','BOOL'], row.dataType || 'INT16');
+        dt.on('change', function () { self.update(idx, 'dataType', $(this).val()); });
+        tr.append($('<td>').append(dt));
+
+        // 斜率
+        var slope = $('<input type="number" style="width:90%" step="any" placeholder="1">').val(row.slope || '1');
+        slope.on('change', function () { self.update(idx, 'slope', $(this).val()); });
+        tr.append($('<td>').append(slope));
+
+        // 偏移
+        var off = $('<input type="number" style="width:90%" step="any" placeholder="0">').val(row.offset || '0');
+        off.on('change', function () { self.update(idx, 'offset', $(this).val()); });
+        tr.append($('<td>').append(off));
+
+        // 名称
+        var nm = $('<input type="text" style="width:95%" placeholder="温度">').val(row.name || '');
+        nm.on('change', function () { self.update(idx, 'name', $(this).val()); });
+        tr.append($('<td>').append(nm));
+
+        // 删除
+        var del = $('<button class="red-ui-button" style="font-size:10px;padding:1px 5px">✕</button>');
+        del.on('click', function (e) { e.preventDefault(); self.remove(idx); });
+        tr.append($('<td>').append(del));
+
+        // ID (自动生成或手动填)
+        var id = $('<input type="text" style="width:95%" placeholder="auto">').val(row.id || '');
+        id.on('change', function () { self.update(idx, 'id', $(this).val()); });
+        tr.append($('<td>').append(id));
+
+        tbody.append(tr);
+      });
+    }
+  };
+
+  RED.nodes.registerType('mitsubishi-read', {
+    category: '三菱 PLC',
+    color: '#C7E9C0',
+    defaults: {
+      name: { value: '三菱MC读取' },
+      plc: { type: 'mitsubishi-config', required: true },
+      serialNo: { value: 0 },
+      tags: { value: '[]' }
+    },
+    inputs: 1,
+    outputs: 1,
+    paletteLabel: 'MC 读取',
+    label: function () { return this.name || '三菱MC读取'; },
+    oneditprepare: function () {
+      tagEditor.init();
+      window.addTagRow = function () { tagEditor.add(); };
+    },
+    oneditsave: function () {
+      delete window.addTagRow;
+    }
+  });
+</script>

package/nodes/mitsubishi-read.js

@@ -200,7 +200,8 @@ module.exports = function (RED) {
           var raw = BIT_DEVICES[t.regType] ? (Math.random() > 0.5 ? 1 : 0) : Math.floor(Math.random() * 1000);
           simOut[t.id] = { rawValue: raw, engValue: applyTransform(raw, t), quality: 0, ts: new Date().toISOString() };
         });
-        msg.payload = { success: true, data: simOut, error: null, roundTimeMs: Date.now() - roundStart };
+        var devId = plc.name || (plc.host + ':' + plc.port);
+        msg.payload = { success: true, deviceId: devId, data: simOut, error: null, roundTimeMs: Date.now() - roundStart };
         node.status({ fill: 'green', shape: 'dot', text: 'SIM ' + validTags.length + ' tags' });
         node.send(msg);
         return;
@@ -273,15 +274,17 @@ module.exports = function (RED) {
             var entry = allRaw[t.id];
             if (entry) {
               output[t.id] = {
-                rawValue: entry.rawValue,
-                engValue: applyTransform(entry.rawValue, t),
+                rawValue: entry.rawValue,                    // PLC 原始 int16
+                engValue: applyTransform(entry.convertedValue, t), // 解码值 × slope + offset
                 quality: entry.quality,
-                ts: entry.ts
+                ts: entry.ts,
+                regType: t.regType
               };
             }
           });
           msg.payload = {
             success: !hasFailed,
+            deviceId: plc.name || (plc.host + ':' + plc.port),
             data: output,
             error: hasFailed ? firstError : null,
             driverType: 'driver-mc-protocol',
@@ -336,8 +339,8 @@ module.exports = function (RED) {
             return;
           }
 
-          if (frameType === '4E' && currentSN > 0) currentSN = (currentSN + 1) & 0xFFFF;
           var sentSN = (frameType === '4E' && currentSN > 0) ? currentSN : 0;
+          if (frameType === '4E' && currentSN > 0) currentSN = (currentSN + 1) & 0xFFFF;
 
           var client = new net.Socket();
           var buf = Buffer.alloc(0);
@@ -380,29 +383,30 @@ module.exports = function (RED) {
                   } else if (raw && !raw.err) {
                     grp.tags.forEach(function (t) {
                       var key = grp.regType + t.addr;
-                      var rv = raw[key];
+                      var originRv = raw[key];           // PLC 原始 int16
+                      var cv = originRv;                 // 解码后的值
                       var q = 0;
-                      if (rv === undefined || rv === null) { q = 2; rv = null; }
+                      if (originRv === undefined || originRv === null) { q = 2; originRv = null; cv = null; }
                       else if (!isBit) {
                         var dt = t.dataType || 'INT16';
-                        if (dt === 'UINT16') { if (rv < 0) rv += 65536; }
+                        if (dt === 'UINT16') { if (cv < 0) cv += 65536; }
                         else if (dt === 'INT32' || dt === 'UINT32' || dt === 'FLOAT32') {
                           var adj = raw[grp.regType + (t.addr + 1)];
-                          if (adj === undefined || adj === null) { q = 2; rv = null; }
+                          if (adj === undefined || adj === null) { q = 2; originRv = null; cv = null; }
                           else {
-                            var hi = rv, lo = adj;
+                            var hi = originRv, lo = adj;
                             var combined = (hi << 16) | (lo & 0xFFFF);
-                            if (dt === 'INT32') rv = (combined > 0x7FFFFFFF) ? combined - 0x100000000 : combined;
-                            else if (dt === 'UINT32') rv = combined >>> 0;
+                            if (dt === 'INT32') cv = (combined > 0x7FFFFFFF) ? combined - 0x100000000 : combined;
+                            else if (dt === 'UINT32') cv = combined >>> 0;
                             else if (dt === 'FLOAT32') {
                               var b32 = Buffer.alloc(4);
                               b32.writeInt16LE(hi, 0); b32.writeInt16LE(lo, 2);
-                              rv = parseFloat(b32.readFloatLE(0).toFixed(4));
+                              cv = parseFloat(b32.readFloatLE(0).toFixed(4));
                             }
                           }
                         }
                       }
-                      allRaw[t.id] = { rawValue: rv, quality: q, ts: new Date().toISOString() };
+                      allRaw[t.id] = { rawValue: originRv, convertedValue: cv, quality: q, ts: new Date().toISOString() };
                     });
                     _destroyedByUs = true; try { client.destroy(); } catch (e) {}
                     setTimeout(function () { processGroup(gi + 1); }, 0);
@@ -462,6 +466,20 @@ module.exports = function (RED) {
         node.send(msg);
       }
     });
+
+    // ===== close: 释放锁防止死锁漂移 =====
+    node.on('close', function (done) {
+      try {
+        var p2 = node.plcConfig;
+        if (p2 && p2.host) {
+          var lk = 'edge_mc_lock_' + p2.host + '_' + p2.port;
+          delete global._mcLocks[lk];
+        }
+      } catch (e) {}
+      node.status({ fill: 'grey', shape: 'dot', text: 'closed' });
+      if (typeof done === 'function') done();
+    });
+
   }
 
   RED.nodes.registerType('mitsubishi-read', MitsubishiReadNode);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-red-contrib-mitsubishi",
-  "version": "1.0.1",
+  "version": "1.0.3",
   "description": "三菱 MC Protocol 3E/4E 采集节点 — 纯TCP零依赖, 支持Q/L/iQ-R/iQ-F/FX5U",
   "main": "nodes/mitsubishi-read.js",
   "node-red": {