node-red-zelecproto 0.0.8 → 0.1.0

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
+    });
+}
+
 /**
  * 读取地址
  */
@@ -672,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) {

package/698.js

@@ -859,6 +859,32 @@ function toBigEndian16(value) {
     // 将小端(低字节在前)转换为大端(高字节在前)
     return (lower << 8) | upper;
 }
+
+function parseStatusWordFromAxdrBitString(buffer) {
+    if (!Buffer.isBuffer(buffer) || buffer.length < 3 || buffer[0] !== 0x04) return null;
+    const L = readAxdrLength(buffer, 1);
+    const byteLen = Math.ceil(L.len / 8);
+    const start = 1 + L.size;
+    const end = start + byteLen;
+    if (end > buffer.length) return null;
+    const bytes = buffer.slice(start, end);
+    if (bytes.length < 2) return null;
+    const bits = [];
+    for (const byte of bytes.slice(0, 2)) {
+        for (let bit = 7; bit >= 0; bit--) {
+            bits.push((byte >> bit) & 0x01);
+        }
+    }
+    let statusWord = 0;
+    for (let i = 0; i < 16; i++) {
+        statusWord |= bits[i] << i;
+    }
+    return {
+        statusWord,
+        binary: bits.slice(0, 16).join('')
+    };
+}
+
 /**
  * 解析电表运行状态字2 - 与645协议格式保持一致
  * @param {Buffer} dataBuffer - 数据缓冲区
@@ -928,11 +954,12 @@ function parseMeterStatusWord3(dataBuffer) {
     const oad = '20140203';
     const result = createStandardResult("电表运行状态字3", oad, dataBuffer);
     try {
-        const statusWord = parseMeterStatusOptimized(dataBuffer);
+        const bitStringStatus = parseStatusWordFromAxdrBitString(dataBuffer);
+        const statusWord = bitStringStatus?.statusWord ?? parseMeterStatusOptimized(dataBuffer);
         if (statusWord === null) throw new Error('无法解析状态字');
 
         const val16 = statusWord & 0xFFFF; // 低16位
-        const bin = val16.toString(2).padStart(16, '0');
+        const bin = bitStringStatus?.binary ?? val16.toString(2).padStart(16, '0');
 
         const supplyBits = (val16 >> 1) & 0b11; // bit2-bit1
         const supplyMode = (
@@ -984,11 +1011,12 @@ function parseMeterStatusWord2(dataBuffer) {
     const oad = '20140202';
     const result = createStandardResult("电表运行状态字2", oad, dataBuffer);
     try {
-        const statusWord = parseMeterStatusOptimized(dataBuffer);
+        const bitStringStatus = parseStatusWordFromAxdrBitString(dataBuffer);
+        const statusWord = bitStringStatus?.statusWord ?? parseMeterStatusOptimized(dataBuffer);
         if (statusWord === null) throw new Error('无法解析状态字');
 
         const val16 = statusWord & 0xFFFF;
-        const bin = val16.toString(2).padStart(16, '0');
+        const bin = bitStringStatus?.binary ?? val16.toString(2).padStart(16, '0');
 
         const bit = (n) => ((val16 >> n) & 0x1);
         const dir = (b) => (b ? '反向' : '正向'); // 0=正向, 1=反向
@@ -3005,4 +3033,4 @@ function batchMsg698(msg) {
 }
 
 module.exports = batchMsg698;
-module.exports.batchMsg698 = batchMsg698;
+module.exports.batchMsg698 = batchMsg698;

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.8",
+  "version": "0.1.0",
   "description": "node-red zelecproto node",
   "main": "index.js",
   "scripts": {

package/test.js

@@ -7,9 +7,9 @@ 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 = '685134234200006893068467567533336F16'
-msg.proto = 645
-msg.mode = 'decode'
+// msg.payload = '685134234200006893068467567533336F16'
+// msg.proto = 645
+// msg.mode = 'decode'
 
 
 
@@ -23,14 +23,27 @@ msg.mode = 'decode'
 
 
 
-msg.payload=[
-    {
-        barcode:'1',
-        payload : '685134234200006893068467567533336F16',
-        proto : 645
-    }
-]
+// msg.payload=[
+//     {
+//         barcode:'1',
+//         payload : '685134234200006893068467567533336F16',
+//         proto : 645
+//     }
+// ]
 
-let nmsg = proto645(msg);
-console.log(nmsg);
-// console.log(JSON.stringify(nmsg));
+// 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));