node-red-zelecproto 0.0.7 → 0.0.9

package/645.js

@@ -28,6 +28,10 @@ function build645Frame(i, reverseAddr, csMode) {
         return buildEncrypted645Frame(i, addrBytes, reverseAddr, csMode);
     }
 
+    if (oad === '04040300') {
+        return buildSwitchScreen645Frame(i, addrBytes, csMode);
+    }
+
 
     // OAD 加密：倒序 + 每字节 +0x33
     const cmdEx = encryptOAD(oad); // "xx xx xx xx"
@@ -50,6 +54,38 @@ function build645Frame(i, reverseAddr, csMode) {
     });
 }
 
+function buildSwitchScreen645Frame(i, addrBytes, csMode) {
+    const payload = i.payload || {};
+    const screenRaw = payload.screenContent || payload.switchScreenContent || payload.switchScreen || payload.itemContent || payload.dataHex;
+    let screenHex = String(screenRaw || '').replace(/\s+/g, '').toUpperCase();
+    if (!screenHex) throw new Error('04040300 屏显切换需要提供 screenContent/itemContent');
+    if (screenHex.length === 8) screenHex += '00';
+    if (!/^[0-9A-F]{10}$/.test(screenHex)) throw new Error('04040300 切屏内容必须是 10 位 HEX，例如 0001000000');
+
+    const screenBody = screenHex.slice(0, 8);
+    const optionByte = screenHex.slice(8, 10);
+    const oadBytes = hexToBytes(encryptOAD('04040300').replace(/\s+/g, ''));
+    const dataBytes = [
+        ...oadBytes,
+        ...hexToBytes(reverseHexBytes(screenBody)).map(b => (b + 0x33) & 0xFF),
+        ...hexToBytes(optionByte).map(b => (b + 0x33) & 0xFF)
+    ];
+
+    const C = 0x11;
+    const L = dataBytes.length;
+    const frameNoCS = [0x68, ...addrBytes, 0x68, C, L, ...dataBytes];
+    const cs = calc645CSForBytes(frameNoCS, csMode);
+    const csHex = cs.toString(16).toUpperCase().padStart(2, '0');
+    const fullHex = (`FE FE FE FE ${bytesToHex(frameNoCS)} ${csHex} 16`).replace(/\s+/g, '');
+    let _payload = i.payload || {};
+    return Object.assign(i, _payload, {
+        com_exec_addr: bytesToHex(addrBytes).replace(/\s+/g, ''),
+        cmdEx: bytesToHex(oadBytes).replace(/\s+/g, ''),
+        switchScreenContent: screenHex,
+        payload: fullHex
+    });
+}
+
 /**
  * 读取地址
  */
@@ -220,7 +256,16 @@ function reverseHexBytes(hex) {
 
 /******************** 解码：batchMsg（返回统一对象，含 exec_addr/di/value 等） ********************/
 function decode645(_msg) {
-    let _reslt = {};
+    // 创建一个全新的对象，不依赖于传入的 _msg 对象
+    const result = {};
+    
+    // 复制原始消息的非 payload 属性
+    for (const key in _msg) {
+        if (_msg.hasOwnProperty(key) && key !== 'payload') {
+            result[key] = _msg[key];
+        }
+    }
+    
     // ===== 工具 =====
     function calc645Checksum(u8) {
         let s = 0;
@@ -238,23 +283,23 @@ function decode645(_msg) {
     // ===== 取入参并清洗 =====
     // 允许传 {put:'...'} 或 {payload:'...'}，优先 put
     let put = ((_msg.payload && _msg.payload.put) || _msg.put || _msg.payload || '').toString();
-    if (!put) return { ok: false, reason: 'empty' };
+    if (!put) return Object.assign(result, { ok: false, reason: 'empty' });
 
     // 去前导 FE…FE（最多4个），并去空格
     put = f_stripLeadingFE(put.replace(/\s+/g, '')).toUpperCase();
 
     const buf = hexStringToBuffer(put);
-    if (!buf || buf.length < 12) return { ok: false, reason: 'too_short', raw: put };
+    if (!buf || buf.length < 12) return Object.assign(result, { ok: false, reason: 'too_short', raw: put });
 
     // ===== 基本结构：68 AA(6) 68 CTRL LEN DATA(n) CS 16 =====
     // 容错：定位到第一个 0x68
     let p0 = 0;
     while (p0 < buf.length && buf[p0] !== 0x68) p0++;
-    if (p0 + 12 > buf.length) return { ok: false, reason: 'no_head68', raw: put };
+    if (p0 + 12 > buf.length) return Object.assign(result, { ok: false, reason: 'no_head68', raw: put });
 
     // 第二个 0x68 在地址后
     const p68_2 = p0 + 7;
-    if (buf[p0] !== 0x68 || buf[p68_2] !== 0x68) return { ok: false, reason: 'bad_68_pair', raw: put };
+    if (buf[p0] !== 0x68 || buf[p68_2] !== 0x68) return Object.assign(result, { ok: false, reason: 'bad_68_pair', raw: put });
 
     // 读出地址区（A0..A5）
     const addrBytes = buf.subarray(p0 + 1, p0 + 7);
@@ -269,8 +314,8 @@ function decode645(_msg) {
     const pCS = pDataEnd;
     const pEnd = pDataEnd + 1;
 
-    if (len < 0 || pEnd >= buf.length) return { ok: false, reason: 'len_oob', exec_addr, raw: put };
-    if (buf[pEnd] !== 0x16) return { ok: false, reason: 'no_end16', exec_addr, raw: put };
+    if (len < 0 || pEnd >= buf.length) return Object.assign(result, { ok: false, reason: 'len_oob', exec_addr, raw: put });
+    if (buf[pEnd] !== 0x16) return Object.assign(result, { ok: false, reason: 'no_end16', exec_addr, raw: put });
 
     // —— CS 双模校验：std（第二个68后）与 full（第一个68起）任一通过即可 ——
     const cs_frame = buf[pCS];
@@ -278,19 +323,19 @@ function decode645(_msg) {
     const cs_full = calc645Checksum(buf.subarray(p0, pCS));
     const cs_ok = (cs_std === cs_frame) || (cs_full === cs_frame);
     if (!cs_ok) {
-        return {
+        return Object.assign(result, {
             success: false, reason: 'cs_fail',
             cs_frame: cs_frame.toString(16).toUpperCase().padStart(2, '0'),
             cs_std: cs_std.toString(16).toUpperCase().padStart(2, '0'),
             cs_full: cs_full.toString(16).toUpperCase().padStart(2, '0'),
             exec_addr, raw: put
-        };
+        });
     }
 
     const dataRaw = Array.from(buf.subarray(pDataStart, pDataEnd));
     // ===== 控制确认/错误帧 =====
     if (len === 0 && ctrl === 0x9C) {
-        return {
+        return Object.assign(result, {
             ok: true,
             type: "control_ack",
             exec_addr,
@@ -300,12 +345,12 @@ function decode645(_msg) {
             description: "控制命令执行成功 (0x9C)",
             success: cs_ok,
             raw: put
-        };
+        });
     }
 
     if (ctrl === 0xDC) {
         const detail = minus33(dataRaw);
-        return {
+        return Object.assign(result, {
             ok: true,
             type: "control_ack_ext",
             exec_addr,
@@ -315,12 +360,12 @@ function decode645(_msg) {
             statusBytes: bytesToHex(detail).replace(/\s+/g, ""),
             success: true,
             raw: put
-        };
+        });
     }
 
     if (ctrl === 0xDA) {
         const detail = minus33(dataRaw);
-        return {
+        return Object.assign(result, {
             ok: false,
             type: "control_error",
             exec_addr,
@@ -331,12 +376,12 @@ function decode645(_msg) {
             detail: detail.length ? detail[0].toString(16).toUpperCase().padStart(2, "0") : null,
             data: bytesToHex(detail).replace(/\s+/g, ""),
             raw: put
-        };
+        });
     }
 
     if (ctrl === 0xD1) {
         const errRaw = minus33(dataRaw);
-        return {
+        return Object.assign(result, {
             ok: false,
             type: "control_error",
             exec_addr,
@@ -347,13 +392,13 @@ function decode645(_msg) {
             detail: errRaw.length ? errRaw[0].toString(16).toUpperCase().padStart(2, "0") : null,
             data: bytesToHex(errRaw).replace(/\s+/g, ""),
             raw: put
-        };
+        });
     }
     // ===== 读地址响应：CTRL=0x93 且 LEN=0x06 =====
     if (ctrl === 0x93 && len === 0x06) {
         const addrMinus33 = minus33(dataRaw);
         const addr_from_data = bcdAddr12FromLE(Uint8Array.from(addrMinus33));
-        return {
+        return Object.assign(result, {
             ok: true,
             type: 'address_response',
             exec_addr,                 // 帧头解析出的地址
@@ -363,7 +408,7 @@ function decode645(_msg) {
             addr_bytes_hex,
             success: cs_ok,
             raw: put
-        };
+        });
     }
 
     // ===== 普通数据响应：DATA-0x33，首4字节(倒序)为 DI =====
@@ -371,7 +416,7 @@ function decode645(_msg) {
     let di = '';
     if (arrPush.length >= 4) di = Buffer.from(arrPush.slice(0, 4).reverse()).toString('hex').toUpperCase();
 
-    // 动态判定是否为 “日冻结/结算日冻结” 的 DI（不再限定 30 天，可到 62 等任意 1B 日号）
+    // 动态判定是否为 "日冻结/结算日冻结" 的 DI（不再限定 30 天，可到 62 等任意 1B 日号）
     function isDailyFreezeDI(di) {
         // 645 常见日冻结：050601dd（正向）、050602dd（反向）；dd 为 1B 日号（01~3E/3F/…，扩展都能兜住）
         return /^05060[12][0-9A-F]{2}$/i.test(di || '');
@@ -383,7 +428,7 @@ function decode645(_msg) {
 
 
     //判定为组合电量
-    function isToatalDI(di) {
+    function isTootalDI(di) {
         let arr = ['0000FF00', '0001FF00', '0002FF00']
         return arr.includes(di)
     }
@@ -403,7 +448,7 @@ function decode645(_msg) {
 
     let value = '';
     try {
-        // // —— 读数据“请求帧”：CTRL=0x11 且 LEN=0x04，仅含 DI，无数值 ——
+        // // —— 读数据"请求帧"：CTRL=0x11 且 LEN=0x04，仅含 DI，无数值 ——
         // if (ctrl === 0x11 && len === 0x04 && arrPush.length === 4) {
         //     return Object.assign(_msg, {
         //         ok: true,
@@ -663,6 +708,20 @@ function decode645(_msg) {
                     '广播认证密钥有效': !!(v & (1 << 6)), '主控密钥不可恢复': !!(v & (1 << 7))
                 }
             };
+        } else if (di === '04040300' && arrPush.length >= 5) {
+            const body = arrPush.slice(4);
+            const option = body.length > 0 ? body[body.length - 1] : null;
+            const screenContent = body.length > 1
+                ? Buffer.from(body.slice(0, -1).reverse()).toString('hex').toUpperCase()
+                : '';
+            value = {
+                type: 'switch_screen',
+                description: '屏显切换',
+                screenContent,
+                option: option == null ? null : option.toString(16).toUpperCase().padStart(2, '0'),
+                itemContent: screenContent + (option == null ? '' : option.toString(16).toUpperCase().padStart(2, '0')),
+                rawMinus33: bytesToHex(arrPush).replace(/\s+/g, '')
+            };
         } else if (di === '04000102' && arrPush.length >= 3) {
             value = Buffer.from(arrPush.slice(-3).reverse()).toString('hex').toUpperCase(); // "HHMMSS"
         } else if (di === '04000101' && arrPush.length >= 8) {
@@ -673,19 +732,18 @@ function decode645(_msg) {
         } else if (di === '03300D00' && arrPush.length >= 4) {
             value = bytesToIntBE(arrPush.slice(4).reverse());
         }
-        else if ((isDailyFreezeDI(di) || isSettlementFreezeDI(di) || isToatalDI(di)) && arrPush.length >= 8) {
+        else if ((isDailyFreezeDI(di) || isSettlementFreezeDI(di) || isTootalDI(di)) && arrPush.length >= 8) {
             // else if ((arrDays.includes(di) || arrDaysFX.includes(di) || arrDaysZX.includes(di) || arrDaysJSR.includes(di)) && arrPush.length >= 8) {
             // const energyNum = bytesToIntBE(arrPush.slice(4, 8).reverse());
             // value = Math.round(energyNum / 100 * 100) / 100;
             // DATA-0x33 后：DI(4) + 5×(4B 小端 BCD) = 24B LEN → 与 698 的日冻结 record 风格一致
-            // DATA-0x33 后:  DI(4) + N×(4B 小端BCD)；常见为 5 组（总/尖/峰/平/谷），也有只回 1 组“总”的情况
-
+            // DATA-0x33 后:  DI(4) + N×(4B 小端BCD)；常见为 5 组（总/尖/峰/平/谷），也有只回 1 组"总"的情况
             const afterDI = arrPush.slice(4);
             const labels = ['总', '尖', '峰', '平', '谷'];
 
 
             // 0000FF00 / 0001FF00 / 0002FF00：乱码模式
-            const isTotalBlock = isToatalDI(di);
+            const isTotalBlock = isTootalDI(di);
 
             // 4B 小端 BCD → 十进制（2 小数位，单位 kWh）
             function parseEnergyLE4(b4) {
@@ -724,11 +782,11 @@ function decode645(_msg) {
             // 如设备回了超过 5 组（极少见）或多余字节，挂个 extra 方便排查，不影响主结果
             const extraStart = parseCount * 4;
             if (afterDI.length > extraStart) {
-                _reslt.extraRaw = bytesToHex(afterDI.slice(extraStart)).replace(/\s+/g, '');
+                result.extraRaw = bytesToHex(afterDI.slice(extraStart)).replace(/\s+/g, '');
             }
 
             value = items.map(it => it.value);          // 与你 698 解析保持一致：value 返回纯数值数组
-            _reslt.payload = { data: items, value };             // 附带明细（含 rawBCD）
+            result.payload = { data: items, value };             // 附带明细（含 rawBCD）
         } else if (di === '04000402' && arrPush.length >= 8) {
             value = Buffer.from(arrPush.slice(4).reverse()).toString('hex').toUpperCase();
         } else if (arrPub.includes(di) && arrPush.length >= 8) {
@@ -794,10 +852,10 @@ function decode645(_msg) {
             };
         }
     } catch (e) {
-        return { ok: false, reason: 'decode_exception', exec_addr, di, ctrl, len, raw: put, err: String(e) };
+        return Object.assign(result, { ok: false, reason: 'decode_exception', exec_addr, di, ctrl, len, raw: put, err: String(e) });
     }
 
-    return Object.assign(_reslt, {
+    return Object.assign(result, {
         ok: true,
         type: 'data_response',
         exec_addr,

package/AGENTS.md

@@ -0,0 +1,133 @@
+# AGENTS.md
+
+This file contains guidelines and commands for agentic coding agents working in the node-red-zelecproto repository.
+
+## Global Settings
+- **Proxy**: Execute `proxy` command before running any network-related commands to enable proxy connection
+
+## Build/Test/Lint Commands
+
+### Current Commands
+- `npm test` - Currently shows "Error: no test specified" (placeholder)
+- No build, lint, or typecheck commands are currently configured
+
+### Testing
+- Use `node test.js` to run the manual test file
+- Test file located at: `test.js`
+- For single test execution, run `node -e "require('./test.js')"`
+
+### Development
+- No build process required (Node-RED nodes load directly)
+- Manual testing via Node-RED flow editor recommended
+
+## Code Style Guidelines
+
+### File Structure and Naming
+- Main node files: `zelecproto.js`, `zbatchproto.js`, `zeleble.js`
+- Protocol implementations: `645.js`, `698.js`, `ble.js`
+- HTML definitions: `zelecproto.html`, `zbatchproto.html`, `zeleble.html`
+- Icons in: `icons/` directory (SVG format)
+- Use kebab-case for file names
+
+### Module Pattern
+All Node-RED nodes must follow this pattern:
+```javascript
+module.exports = function (RED) {
+    "use strict";
+    
+    // Require dependencies
+    var proto645 = require("./645");
+    
+    function NodeName(n) {
+        RED.nodes.createNode(this, n);
+        var node = this;
+        
+        this.on("input", function (msg, send, done) {
+            // Process message
+            send(msg);
+            done();
+        });
+        
+        this.on('close', () => {
+            // Cleanup if needed
+        });
+    }
+    
+    RED.nodes.registerType("nodename", NodeName);
+}
+```
+
+### Import/Require Style
+- Use `var` for requires (consistent with existing codebase)
+- Local dependencies first: `var proto645 = require("./645");`
+- Group requires at top of module function
+- Use relative paths for local files
+
+### Code Formatting
+- Use strict mode: `"use strict";` at top of module function
+- Indentation: 4 spaces (consistent with existing files)
+- Semicolons required
+- String quotes: single quotes preferred
+- Object property access: dot notation for known properties, bracket notation for dynamic
+
+### Naming Conventions
+- Node functions: PascalCase (e.g., `zelecproto`, `zbatchproto`)
+- Variables: camelCase (e.g., `msg`, `node`, `addrBytes`)
+- Constants: UPPER_SNAKE_CASE (e.g., `START`, `END`, `OAD`)
+- File names: kebab-case (e.g., `zelecproto.js`, `645.js`)
+
+### Error Handling
+- Use `throw new Error()` for validation errors
+- Include descriptive error messages
+- Validate input parameters before processing
+- Example: `if (addrRaw.length !== 12) throw new Error('com_exec_addr 必须是 6 字节(12个HEX字符)');`
+
+### Message Processing
+- Always use the three-parameter input handler: `function (msg, send, done)`
+- Call `send(msg)` before `done()`
+- Clean up temporary properties: `delete msg._proto`
+- Preserve original message structure when possible
+
+### Protocol Implementation
+- 645 Protocol: Focus on DL/T 645 frame building/parsing
+- 698 Protocol: DL/T 698.45 encode/decode with CRC-16/X-25
+- BLE Protocol: 国网多芯物联表蓝牙通信协议
+- Each protocol file should export a function that takes `msg` and returns modified `msg`
+
+### HTML Node Definitions
+- Use data-template-name attribute matching node type
+- Include name field in all nodes
+- Set appropriate category, color, and icon
+- Category: 'zutils' for all nodes
+- Icons: reference SVG files in icons/ directory
+
+### Comments and Documentation
+- Use Chinese comments for protocol-specific explanations (consistent with existing code)
+- Use JSDoc-style comments for functions
+- Include protocol references and frame format descriptions
+- Example: `// 国网多芯物联表《蓝牙通信及脉冲检定说明手册(0224)》协议`
+
+### Buffer/Hex Handling
+- Use `Buffer.from()` for creating buffers
+- Hex strings should be uppercase without spaces for final output
+- Use helper functions for hex/bytes conversion
+- Maintain consistent hex formatting across protocols
+
+### Node-RED Integration
+- Register nodes in package.json under `node-red.nodes`
+- Minimum Node.js version: >=15
+- Minimum Node-RED version: >=1.3
+- No external dependencies currently required
+
+## Development Workflow
+1. Modify protocol implementation files as needed
+2. Test with `node test.js` or via Node-RED flow editor
+3. Ensure all nodes follow the standard module pattern
+4. Verify HTML definitions match JavaScript node registrations
+5. Test message processing with sample data
+
+## Protocol-Specific Notes
+- 645: Handle address reversal and OAD encryption
+- 698: Implement CRC-16/X-25 checksum validation
+- BLE: Follow frame format with Start/End markers
+- All protocols should support both encode and decode operations

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-red-zelecproto",
-  "version": "0.0.7",
+  "version": "0.0.9",
   "description": "node-red zelecproto node",
   "main": "index.js",
   "scripts": {

package/test.js

@@ -7,9 +7,11 @@ let msg = {};
 // msg.payload = 'FE FE FE FE 68 30 00 C3 05 77 59 63 00 15 19 11 59 0F 90 00 17 85 01 01 30 1B 07 00 01 01 01 02 02 00 02 02 06 00 00 00 00 00 00 00 01 00 04 B2 F3 8B 23 F2 7C 16'
 // msg.payload = 'FE FE FE FE 68 33 00 C3 05 60 80 63 00 15 19 11 8B E3 90 00 1A 85 01 01 30 13 0A 00 01 01 01 02 02 00 02 02 1C 07 E3 07 17 0B 06 1B 00 00 00 01 00 04 2C 96 C6 41 EF 15 16'
 // msg.payload = 'FE FE FE FE 68 2C 00 C3 05 16 01 00 00 00 00 11 54 84 90 00 13 85 01 01 30 13 0A 00 01 01 01 02 02 00 02 02 00 00 00 00 01 00 04 EE E6 E8 86 13 64 16'
-msg.payload = 'FEFEFEFE68983528070000689306CB685B3A33339316'
-msg.proto = 645
-msg.mode = 'decode'
+// msg.payload = '685134234200006893068467567533336F16'
+// msg.proto = 645
+// msg.mode = 'decode'
+
+
 
 
 
@@ -17,6 +19,31 @@ msg.mode = 'decode'
 // console.log(proto698(msg));
 
 
-let nmsg = proto645(msg);
-console.log(nmsg);
-console.log(JSON.stringify(nmsg));
+
+
+
+
+// msg.payload=[
+//     {
+//         barcode:'1',
+//         payload : '685134234200006893068467567533336F16',
+//         proto : 645
+//     }
+// ]
+
+// let nmsg = proto645(msg);
+// console.log(nmsg);
+// console.log(JSON.stringify(nmsg));
+
+
+
+// msg.payload=[
+//     {
+//         barcode:'1',
+//         payload : 'FE FE FE FE 68 52 00 C3 05 60 50 30 00 49 25 11 BA 8D 90 00 39 85 01 01 00 00 04 00 01 01 05 14 00 00 00 00 00 C2 91 74 14 00 00 00 00 00 10 CE 12 14 00 00 00 00 00 0A 24 C2 14 00 00 00 00 00 66 C8 DA 14 00 00 00 00 00 3B FC 54 00 00 01 00 04 8D 62 D9 49 53 D1 16',
+//         proto : 698
+//     }
+// ]
+
+// console.log(JSON.stringify(proto698(msg)));
+// // console.log(proto698(msg));