node-zserial 1.0.18 → 1.0.20

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "node-zserial",
-    "version": "1.0.18",
+    "version": "1.0.20",
     "description": "Node-RED nodes to talk to serial ports",
     "dependencies": {
         "serialport": "^12.0.0"

package/zserial.js

@@ -697,7 +697,7 @@ module.exports = function (RED) {
                     var olderr = "";
                     var setupSerial = function () {
                         obj._retryNum++;
-                        RED.log.info(obj._retryNum)
+                        // RED.log.info(obj._retryNum)
                         if (obj._retryNum > retryNum) {
                             // serialPool.zlog("已经重试" + retryNum + "次，请检查串口是否正常！", {});
                             obj._emitter.emit('retryerror', id, retryNum);
@@ -812,21 +812,61 @@ module.exports = function (RED) {
 
                         // 645：FE* 68 + 6 addr + 68 + ctrl + len + data + cs + 16
                         function tryParse645(input) {
-                            let b = stripFE(input);
+                            // 统计 FE 前导（仅用于 used，不参与 CS 计算）
+                            let feCount = 0;
+                            while (feCount < input.length && input[feCount] === 0xFE) feCount++;
+                            const b = input.slice(feCount);
                             if (b.length < 12) return { ok: false };
-                            if (b[0] !== 0x68) return { ok: false };
-                            if (b.length >= 8 && b[7] !== 0x68) return { ok: false }; // 第二个 0x68
-                            const dataLen = b[9] >>> 0;
-                            const total = 12 + dataLen;
-                            if (b.length < total) return { ok: false }; // 半包
-                            const csIdx = total - 2, endIdx = total - 1;
-                            const csExpect = sum8(b, 8, csIdx);
-                            const csGot = b[csIdx];
-                            const endFlag = b[endIdx];
-                            const frame = b.slice(0, total);
-                            if (endFlag !== 0x16) return { ok: false, used: total, frame, err: "645_END_FLAG_16_MISSING" };
-                            if (csGot !== csExpect) return { ok: false, used: total, frame, err: "645_CHECKSUM_MISMATCH" };
-                            return { ok: true, used: total, frame };
+
+                            // 形态：68 + addr(6) + 68 + CTRL + LEN + DATA + CS + 16
+                            if (b[0] !== 0x68) {
+                                const n = b.indexOf(0x68, 1);
+                                if (n > 0) return { ok: false, used: feCount + n, frame: input.slice(0, feCount + n), err: "645_NO_68_AT_START" };
+                                return { ok: false };
+                            }
+                            if (b.length >= 8 && b[7] !== 0x68) {
+                                const n = b.indexOf(0x68, 1);
+                                if (n > 0) return { ok: false, used: feCount + n, frame: input.slice(0, feCount + n), err: "645_SECOND_68_NOT_FOUND" };
+                                return { ok: false };
+                            }
+                            if (b.length < 10) return { ok: false }; // 还缺 CTRL/LEN
+
+                            const len = b[9] >>> 0;
+                            const total = 12 + len;                    // 帧总长（含 CS 与 0x16）
+                            const endIdx = total - 1;                  // 末尾 0x16 索引
+                            const csIdx = total - 2;                  // ★ CS 在倒数第2个字节
+
+                            // CS = 从第一个 0x68 起累加到 CS 之前（不含 CS）
+                            const csOK = (end) => {
+                                const e = end;              // e == total
+                                const cs = b[e - 2];         // csIdx
+                                const s = sum8(b, 0, e - 2);
+                                return cs === s;
+                            };
+
+                            // 1) 优先按 LEN 快速命中
+                            if (b.length >= total && b[endIdx] === 0x16 && csOK(total)) {
+                                return { ok: true, used: feCount + total, frame: input.slice(0, feCount + total) };
+                            }
+
+                            // 2) 回溯：向后找 0x16 做候选结尾，再校验 CS（兼容异常 LEN/粘包）
+                            for (let end = 12; end <= b.length; end++) {
+                                if (b[end - 1] !== 0x16) continue;
+                                // 候选帧至少要有 …… + CS + 16，因此 end >= 13 且 csIdx=end-2 >= 0
+                                if (end >= 13) {
+                                    const cs = b[end - 2];
+                                    const s = sum8(b, 0, end - 2);
+                                    if (cs === s) {
+                                        return { ok: true, used: feCount + end, frame: input.slice(0, feCount + end) };
+                                    }
+                                }
+                            }
+
+                            // 3) 起始形态确定不对则丢 1 字节；否则继续等
+                            if (b.length >= 8 && b[7] !== 0x68) {
+                                return { ok: false, used: feCount + 1, frame: input.slice(0, feCount + 1), err: "645_BAD_SHAPE_DROP1" };
+                            }
+                            return { ok: false };
                         }
 
                         // 698（68-LEN 变体）：68 LL LH C ... DATA ... CS 16 ；兼容 FE* 前导