ts-communication 1.0.0 → 1.1.0

package/dist/modbus/ModbusRtuOverTcp.js

@@ -1,8 +1,73 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ModbusRtuOverTcp = void 0;
-const ModbusTcpNet_1 = require("./ModbusTcpNet");
-/** Modbus RTU frame carried over TCP. */
-class ModbusRtuOverTcp extends ModbusTcpNet_1.ModbusTcpNet {
+const Core_1 = require("../core/Core");
+const Core_2 = require("../core/Core");
+const INetMessage_1 = require("../core/INetMessage");
+const ModbusRtu_1 = require("./ModbusRtu");
+/**
+ * Modbus RTU over TCP 客户端
+ * TCP 传输 RTU 帧（无 MBAP 头）
+ */
+class ModbusRtuOverTcp extends Core_1.DeviceClient {
+    Station = 1;
+    AddressStartWithZero = true;
+    StationCheckMatch = true;
+    Crc16CheckEnable = true;
+    BroadcastStation = -1;
+    get DataFormat() {
+        return this.ByteTransform.DataFormat;
+    }
+    set DataFormat(value) {
+        this.ByteTransform.DataFormat = value;
+    }
+    constructor(ipAddress, port = 502, station = 1) {
+        super(ipAddress, port);
+        this.Station = station;
+        this.ByteTransform.DataFormat = Core_1.DataFormat.CDAB;
+    }
+    GetNewNetMessage() {
+        return new INetMessage_1.ModbusRtuMessage(this.StationCheckMatch);
+    }
+    packCommand(command) {
+        const frame = Buffer.concat([Buffer.from([this.Station]), command]);
+        const crc = ModbusRtu_1.ModbusRtu.crc16(frame);
+        return Buffer.concat([frame, crc]);
+    }
+    unpackResponse(send, response) {
+        return ModbusRtu_1.ModbusRtu.ExtraRtuResponseContent(send, response, this.Crc16CheckEnable, this.BroadcastStation);
+    }
+    async sendRequest(command) {
+        const packed = this.packCommand(command);
+        const result = await this.request(packed);
+        if (!result.IsSuccess)
+            return result;
+        return this.unpackResponse(packed, result.Content);
+    }
+    async Read(address, length) {
+        const cmd = Buffer.alloc(5);
+        cmd[0] = 3;
+        cmd.writeUInt16BE(parseInt(address), 1);
+        cmd.writeUInt16BE(length, 3);
+        return this.sendRequest(cmd);
+    }
+    async ReadInt16(address, length = 1) {
+        const result = await this.Read(address, length);
+        if (!result.IsSuccess)
+            return Core_2.OperateResult.CreateFailedResult(result);
+        const values = [];
+        for (let i = 0; i < length; i++)
+            values.push(this.ByteTransform.TransInt16(result.Content, i * 2));
+        return Core_2.OperateResult.CreateSuccessResult(length === 1 ? values[0] : values);
+    }
+    async ReadFloat(address, length = 1) {
+        const result = await this.Read(address, length * 2);
+        if (!result.IsSuccess)
+            return Core_2.OperateResult.CreateFailedResult(result);
+        const values = [];
+        for (let i = 0; i < length; i++)
+            values.push(this.ByteTransform.TransSingle(result.Content, i * 4));
+        return Core_2.OperateResult.CreateSuccessResult(length === 1 ? values[0] : values);
+    }
 }
 exports.ModbusRtuOverTcp = ModbusRtuOverTcp;

package/dist/modbus/ModbusTcpNet.d.ts

@@ -11,19 +11,27 @@ export declare function parseModbusAddress(input: string, defaultStation?: numbe
 export declare class ModbusTcpNet extends DeviceClient {
     Station: number;
     AddressStartWithZero: boolean;
-    IsStringReverse: boolean;
+    /** 字符串是否按 16 位 Modbus 字进行字节反转。 */
+    get IsStringReverse(): boolean;
+    set IsStringReverse(value: boolean);
     StationCheckMatch: boolean;
     BroadcastStation: number;
     WordReadBatchLength: number;
     DisableFunctionCode06: boolean;
     EnableWriteMaskCode: boolean;
-    DataFormat: DataFormat;
+    get DataFormat(): DataFormat;
+    set DataFormat(value: DataFormat);
     MessageId: number;
     constructor(ipAddress?: string, port?: number, station?: number);
     private nextId;
     private frame;
     private transact;
-    private addr;
+    protected addr(input: string, code: number): OperateResult<ModbusAddress>;
+    /**
+     * 读取寄存器原始数据，不再分派到被子类重写的读取方法。
+     * 地址映射子类在调用类型读取前已经完成转换，避免地址被重复转换。
+     */
+    private readRaw;
     Read(address: string, length: number): Promise<OperateResult<Buffer>>;
     ReadBool(address: string, length?: number): Promise<OperateResult<boolean | boolean[]>>;
     ReadCoil(address: string, length?: number): Promise<OperateResult<boolean | boolean[]>>;
@@ -39,6 +47,11 @@ export declare class ModbusTcpNet extends DeviceClient {
     ReadUInt64(address: string, length?: number): Promise<OperateResult<any>>;
     ReadByte(address: string): Promise<OperateResult<number>>;
     ReadString(address: string, length: number, encoding?: BufferEncoding): Promise<OperateResult<string>>;
+    /**
+     * 写入原始数据，不再分派到被子类重写的写入方法。
+     * 类型写入可能已经完成了设备专用地址转换。
+     */
+    private writeRaw;
     Write(address: string, value: number | boolean | string | Buffer | number[] | boolean[]): Promise<OperateResult<any>>;
     WriteMask(address: string, andMask: number, orMask: number): Promise<OperateResult<any>>;
     WriteByte(a: string, v: number): Promise<OperateResult<any>>;

package/dist/modbus/ModbusTcpNet.js

@@ -36,25 +36,58 @@ function parseModbusAddress(input, defaultStation = 1, defaultCode = 3) {
         return new Core_1.OperateResult(e.message);
     }
 }
-function crc16(data) { let crc = 0xffff; for (const b of data) {
-    crc ^= b;
-    for (let i = 0; i < 8; i++)
-        crc = (crc & 1) ? (crc >>> 1) ^ 0xa001 : crc >>> 1;
-} return Buffer.from([crc & 0xff, crc >>> 8]); }
+function crc16(data) {
+    let crc = 0xffff;
+    for (const b of data) {
+        crc ^= b;
+        for (let i = 0; i < 8; i++)
+            crc = (crc & 1) ? (crc >>> 1) ^ 0xa001 : crc >>> 1;
+    }
+    return Buffer.from([crc & 0xff, crc >>> 8]);
+}
 class ModbusTcpNet extends Core_1.DeviceClient {
     Station = 1;
     AddressStartWithZero = true;
-    IsStringReverse = false;
+    /** 字符串是否按 16 位 Modbus 字进行字节反转。 */
+    get IsStringReverse() {
+        return this.ByteTransform.IsStringReverseByteWord;
+    }
+    set IsStringReverse(value) {
+        this.ByteTransform.IsStringReverseByteWord = value;
+    }
     StationCheckMatch = true;
     BroadcastStation = -1;
     WordReadBatchLength = 120;
     DisableFunctionCode06 = false;
     EnableWriteMaskCode = true;
-    DataFormat = Core_1.DataFormat.CDAB;
+    get DataFormat() {
+        return this.ByteTransform.DataFormat;
+    }
+    set DataFormat(value) {
+        this.ByteTransform.DataFormat = value;
+    }
     MessageId = 0;
-    constructor(ipAddress, port = 502, station = 1) { super(ipAddress, ipAddress === undefined ? undefined : port); this.Port = ipAddress === undefined ? 5000 : port; this.Station = station; this.ByteTransform = new Core_1.ByteTransform(this.DataFormat); }
-    nextId() { const id = this.MessageId; this.MessageId = (this.MessageId + 1) & 0xffff; return id; }
-    frame(pdu, station) { const id = this.nextId(); const out = Buffer.alloc(7 + pdu.length); out.writeUInt16BE(id, 0); out.writeUInt16BE(0, 2); out.writeUInt16BE(pdu.length + 1, 4); out[6] = station; pdu.copy(out, 7); return out; }
+    constructor(ipAddress, port = 502, station = 1) {
+        super(ipAddress, ipAddress === undefined ? undefined : port);
+        this.Port = ipAddress === undefined ? 5000 : port;
+        this.Station = station;
+        this.ByteTransform = new Core_1.ByteTransform(this.DataFormat);
+    }
+    nextId() {
+        const id = this.MessageId;
+        this.MessageId = (this.MessageId + 1) & 0xffff;
+        return id;
+    }
+    frame(pdu, station) {
+        const id = this.nextId();
+        const out = Buffer.alloc(7 + pdu.length);
+        out.writeUInt16BE(id, 0);
+        out.writeUInt16BE(0, 2);
+        out.writeUInt16BE(pdu.length + 1, 4);
+        out[6] = station;
+        pdu.copy(out, 7);
+        return out;
+    }
     async transact(pdu, station) {
         const id = this.MessageId;
         const result = await this.request(this.frame(pdu, station), data => {
@@ -76,28 +109,51 @@ class ModbusTcpNet extends Core_1.DeviceClient {
             return new Core_1.OperateResult(`Modbus exception ${body[2]}`, body[2]);
         return Core_1.OperateResult.CreateSuccessResult(body);
     }
-    addr(input, code) { const p = parseModbusAddress(input, this.Station, code); if (p.IsSuccess && !this.AddressStartWithZero)
-        p.Content.address--; return p; }
-    async Read(address, length) {
+    addr(input, code) {
+        const p = parseModbusAddress(input, this.Station, code);
+        if (p.IsSuccess && !this.AddressStartWithZero)
+            p.Content.address--;
+        return p;
+    }
+    /**
+     * 读取寄存器原始数据，不再分派到被子类重写的读取方法。
+     * 地址映射子类在调用类型读取前已经完成转换，避免地址被重复转换。
+     */
+    async readRaw(address, length) {
         const a = this.addr(address, 3);
         if (!a.IsSuccess)
             return Core_1.OperateResult.CreateFailedResult(a);
         const p = a.Content;
         const fn = p.code === 1 || p.code === 2 || p.code === 4 ? p.code : 3;
-        const req = Buffer.alloc(5);
-        req[0] = fn;
-        req.writeUInt16BE(p.address, 1);
-        req.writeUInt16BE(length, 3);
-        const result = await this.transact(req, p.station);
-        if (!result.IsSuccess)
-            return result;
-        const body = result.Content;
-        if (body.length < 3 || body[1] !== fn)
-            return new Core_1.OperateResult('Invalid Modbus read response');
-        const byteCount = body[2];
-        if (body.length < 3 + byteCount)
-            return new Core_1.OperateResult('Invalid Modbus read response');
-        return Core_1.OperateResult.CreateSuccessResult(body.subarray(3, 3 + byteCount));
+        if (!Number.isInteger(length) || length < 0)
+            return new Core_1.OperateResult('Invalid Modbus read length');
+        if (length === 0)
+            return Core_1.OperateResult.CreateSuccessResult(Buffer.alloc(0));
+        // 长寄存器读取按设备允许的批量大小拆分，再按原顺序合并字节。
+        const maxBatch = fn === 1 || fn === 2 ? 2000 : this.WordReadBatchLength;
+        const chunks = [];
+        for (let offset = 0; offset < length;) {
+            const count = Math.min(maxBatch, length - offset);
+            const req = Buffer.alloc(5);
+            req[0] = fn;
+            req.writeUInt16BE(p.address + offset, 1);
+            req.writeUInt16BE(count, 3);
+            const result = await this.transact(req, p.station);
+            if (!result.IsSuccess)
+                return result;
+            const body = result.Content;
+            if (body.length < 3 || body[1] !== fn)
+                return new Core_1.OperateResult('Invalid Modbus read response');
+            const byteCount = body[2];
+            if (body.length < 3 + byteCount)
+                return new Core_1.OperateResult('Invalid Modbus read response');
+            chunks.push(body.subarray(3, 3 + byteCount));
+            offset += count;
+        }
+        return Core_1.OperateResult.CreateSuccessResult(Buffer.concat(chunks));
+    }
+    async Read(address, length) {
+        return this.readRaw(address, length);
     }
     async ReadBool(address, length) {
         const p = this.addr(address, 1);
@@ -117,23 +173,62 @@ class ModbusTcpNet extends Core_1.DeviceClient {
             out.push((r.Content[3 + (i >> 3)] & (1 << (i & 7))) !== 0);
         return Core_1.OperateResult.CreateSuccessResult(length === undefined ? out[0] : out);
     }
-    async ReadCoil(address, length) { return this.ReadBool(address, length); }
-    async ReadDiscrete(address, length) { const p = this.addr(address, 2); if (!p.IsSuccess)
-        return Core_1.OperateResult.CreateFailedResult(p); return this.ReadBool(address.replace(/^((?:s=\d+;)?)/, '$1x=2;'), length); }
-    async readTyped(address, length, width, fn) { const r = await this.Read(address, (0, Core_1.wordsFor)('x', length) * width / 2); if (!r.IsSuccess)
-        return Core_1.OperateResult.CreateFailedResult(r); const transform = this.ByteTransform; const values = Array.from({ length }, (_, i) => fn(r.Content, i * width)); return Core_1.OperateResult.CreateSuccessResult(length === 1 ? values[0] : values); }
-    async ReadInt16(address, length) { return this.readTyped(address, length ?? 1, 2, (b, o) => this.ByteTransform.TransInt16(b, o)); }
-    async ReadUInt16(address, length) { return this.readTyped(address, length ?? 1, 2, (b, o) => this.ByteTransform.TransUInt16(b, o)); }
-    async ReadInt32(address, length) { return this.readTyped(address, length ?? 1, 4, (b, o) => this.ByteTransform.TransInt32(b, o)); }
-    async ReadUInt32(address, length) { return this.readTyped(address, length ?? 1, 4, (b, o) => this.ByteTransform.TransUInt32(b, o)); }
-    async ReadFloat(address, length) { return this.readTyped(address, length ?? 1, 4, (b, o) => this.ByteTransform.TransSingle(b, o)); }
-    async ReadDouble(address, length) { return this.readTyped(address, length ?? 1, 8, (b, o) => this.ByteTransform.TransDouble(b, o)); }
-    async ReadInt64(address, length) { return this.readTyped(address, length ?? 1, 8, (b, o) => this.ByteTransform.TransInt64(b, o)); }
-    async ReadUInt64(address, length) { return this.readTyped(address, length ?? 1, 8, (b, o) => this.ByteTransform.TransUInt64(b, o)); }
-    async ReadByte(address) { const r = await this.Read(address, 1); return r.IsSuccess ? Core_1.OperateResult.CreateSuccessResult(r.Content[0]) : Core_1.OperateResult.CreateFailedResult(r); }
-    async ReadString(address, length, encoding = 'utf8') { const r = await this.Read(address, length); return r.IsSuccess ? Core_1.OperateResult.CreateSuccessResult(this.ByteTransform.TransString(r.Content, encoding)) : Core_1.OperateResult.CreateFailedResult(r); }
-    async Write(address, value) {
-        const p = this.addr(address, Array.isArray(value) && typeof value[0] === 'boolean' ? 15 : typeof value === 'boolean' ? 5 : 16);
+    async ReadCoil(address, length) {
+        return this.ReadBool(address, length);
+    }
+    async ReadDiscrete(address, length) {
+        const p = this.addr(address, 2);
+        if (!p.IsSuccess)
+            return Core_1.OperateResult.CreateFailedResult(p);
+        return this.ReadBool(address.replace(/^((?:s=\d+;)?)/, '$1x=2;'), length);
+    }
+    async readTyped(address, length, width, fn) {
+        const r = await this.readRaw(address, (0, Core_1.wordsFor)('x', length) * width / 2);
+        if (!r.IsSuccess)
+            return Core_1.OperateResult.CreateFailedResult(r);
+        const transform = this.ByteTransform;
+        const values = Array.from({ length }, (_, i) => fn(r.Content, i * width));
+        return Core_1.OperateResult.CreateSuccessResult(length === 1 ? values[0] : values);
+    }
+    async ReadInt16(address, length) {
+        return this.readTyped(address, length ?? 1, 2, (b, o) => this.ByteTransform.TransInt16(b, o));
+    }
+    async ReadUInt16(address, length) {
+        return this.readTyped(address, length ?? 1, 2, (b, o) => this.ByteTransform.TransUInt16(b, o));
+    }
+    async ReadInt32(address, length) {
+        return this.readTyped(address, length ?? 1, 4, (b, o) => this.ByteTransform.TransInt32(b, o));
+    }
+    async ReadUInt32(address, length) {
+        return this.readTyped(address, length ?? 1, 4, (b, o) => this.ByteTransform.TransUInt32(b, o));
+    }
+    async ReadFloat(address, length) {
+        return this.readTyped(address, length ?? 1, 4, (b, o) => this.ByteTransform.TransSingle(b, o));
+    }
+    async ReadDouble(address, length) {
+        return this.readTyped(address, length ?? 1, 8, (b, o) => this.ByteTransform.TransDouble(b, o));
+    }
+    async ReadInt64(address, length) {
+        return this.readTyped(address, length ?? 1, 8, (b, o) => this.ByteTransform.TransInt64(b, o));
+    }
+    async ReadUInt64(address, length) {
+        return this.readTyped(address, length ?? 1, 8, (b, o) => this.ByteTransform.TransUInt64(b, o));
+    }
+    async ReadByte(address) {
+        const r = await this.Read(address, 1);
+        return r.IsSuccess ? Core_1.OperateResult.CreateSuccessResult(r.Content[0]) : Core_1.OperateResult.CreateFailedResult(r);
+    }
+    async ReadString(address, length, encoding = 'ascii') {
+        const r = await this.Read(address, length);
+        return r.IsSuccess ? Core_1.OperateResult.CreateSuccessResult(this.ByteTransform.TransString(r.Content, encoding)) : Core_1.OperateResult.CreateFailedResult(r);
+    }
+    /**
+     * 写入原始数据，不再分派到被子类重写的写入方法。
+     * 类型写入可能已经完成了设备专用地址转换。
+     */
+    async writeRaw(address, value, functionCode) {
+        const defaultFunction = Array.isArray(value) && typeof value[0] === 'boolean' ? 15 : typeof value === 'boolean' ? 5 : 16;
+        const p = this.addr(address, functionCode ?? defaultFunction);
         if (!p.IsSuccess)
             return p;
         const a = p.Content;
@@ -148,13 +243,15 @@ class ModbusTcpNet extends Core_1.DeviceClient {
             return r.IsSuccess ? Core_1.OperateResult.CreateSuccessResult() : r;
         }
         if (typeof value === 'string')
-            data = Buffer.from(value, 'utf8');
+            data = Buffer.from(value, 'ascii');
         else if (Buffer.isBuffer(value))
             data = value;
         else if (Array.isArray(value) && typeof value[0] === 'boolean') {
             data = Buffer.alloc(Math.ceil(value.length / 8));
-            value.forEach((v, i) => { if (v)
-                data[i >> 3] |= 1 << (i & 7); });
+            value.forEach((v, i) => {
+                if (v)
+                    data[i >> 3] |= 1 << (i & 7);
+            });
         }
         else if (Array.isArray(value))
             data = this.ByteTransform.TransByte(value, 2);
@@ -175,18 +272,53 @@ class ModbusTcpNet extends Core_1.DeviceClient {
         const r = await this.transact(req, a.station);
         return r.IsSuccess ? Core_1.OperateResult.CreateSuccessResult() : r;
     }
-    async WriteMask(address, andMask, orMask) { const p = this.addr(address, 22); if (!p.IsSuccess)
-        return p; const req = Buffer.alloc(7); req[0] = 22; req.writeUInt16BE(p.Content.address, 1); req.writeUInt16BE(andMask, 3); req.writeUInt16BE(orMask, 5); const r = await this.transact(req, p.Content.station); return r.IsSuccess ? Core_1.OperateResult.CreateSuccessResult() : r; }
-    WriteByte(a, v) { return this.Write(a, this.ByteTransform.TransByte(new Core_1.Byte(v))); }
-    WriteInt16(a, v) { return this.Write(a, this.ByteTransform.TransByte(new Core_1.Int16(v))); }
-    WriteUInt16(a, v) { return this.Write(a, this.ByteTransform.TransByte(new Core_1.UInt16(v))); }
-    WriteInt32(a, v) { return this.Write(a, this.ByteTransform.TransByte(new Core_1.Int32(v))); }
-    WriteUInt32(a, v) { return this.Write(a, this.ByteTransform.TransByte(new Core_1.UInt32(v))); }
-    WriteFloat(a, v) { return this.Write(a, this.ByteTransform.TransByte(new Core_1.Float(v))); }
-    WriteDouble(a, v) { return this.Write(a, this.ByteTransform.TransByte(new Core_1.Double(v))); }
-    WriteInt64(a, v) { return this.Write(a, this.ByteTransform.TransByte(new Core_1.Int64(v))); }
-    WriteUInt64(a, v) { return this.Write(a, this.ByteTransform.TransByte(new Core_1.UInt64(v))); }
-    async ConnectServerAsync() { return this.ConnectServer(); }
-    async ConnectCloseAsync() { return this.ConnectClose(); }
+    async Write(address, value) {
+        return this.writeRaw(address, value);
+    }
+    async WriteMask(address, andMask, orMask) {
+        const p = this.addr(address, 22);
+        if (!p.IsSuccess)
+            return p;
+        const req = Buffer.alloc(7);
+        req[0] = 22;
+        req.writeUInt16BE(p.Content.address, 1);
+        req.writeUInt16BE(andMask, 3);
+        req.writeUInt16BE(orMask, 5);
+        const r = await this.transact(req, p.Content.station);
+        return r.IsSuccess ? Core_1.OperateResult.CreateSuccessResult() : r;
+    }
+    WriteByte(a, v) {
+        return this.Write(a, this.ByteTransform.TransByte(new Core_1.Byte(v)));
+    }
+    WriteInt16(a, v) {
+        return this.writeRaw(a, this.ByteTransform.TransByte(new Core_1.Int16(v)), 6);
+    }
+    WriteUInt16(a, v) {
+        return this.writeRaw(a, this.ByteTransform.TransByte(new Core_1.UInt16(v)), 6);
+    }
+    WriteInt32(a, v) {
+        return this.writeRaw(a, this.ByteTransform.TransByte(new Core_1.Int32(v)));
+    }
+    WriteUInt32(a, v) {
+        return this.writeRaw(a, this.ByteTransform.TransByte(new Core_1.UInt32(v)));
+    }
+    WriteFloat(a, v) {
+        return this.writeRaw(a, this.ByteTransform.TransByte(new Core_1.Float(v)));
+    }
+    WriteDouble(a, v) {
+        return this.writeRaw(a, this.ByteTransform.TransByte(new Core_1.Double(v)));
+    }
+    WriteInt64(a, v) {
+        return this.writeRaw(a, this.ByteTransform.TransByte(new Core_1.Int64(v)));
+    }
+    WriteUInt64(a, v) {
+        return this.writeRaw(a, this.ByteTransform.TransByte(new Core_1.UInt64(v)));
+    }
+    async ConnectServerAsync() {
+        return this.ConnectServer();
+    }
+    async ConnectCloseAsync() {
+        return this.ConnectClose();
+    }
 }
 exports.ModbusTcpNet = ModbusTcpNet;

package/dist/modbus/ModbusUdpNet.d.ts

@@ -1,4 +1,27 @@
-import { ModbusTcpNet } from './ModbusTcpNet';
-/** Modbus UDP client. */
-export declare class ModbusUdpNet extends ModbusTcpNet {
+import { DeviceUdpNet } from '../core/DeviceUdpNet';
+import { OperateResult, DataFormat } from '../core/Core';
+import { INetMessage } from '../core/INetMessage';
+/**
+ * Modbus UDP 客户端
+ * UDP 传输 Modbus TCP 帧
+ */
+export declare class ModbusUdpNet extends DeviceUdpNet {
+    Station: number;
+    AddressStartWithZero: boolean;
+    get IsStringReverse(): boolean;
+    set IsStringReverse(value: boolean);
+    MessageId: number;
+    get DataFormat(): DataFormat;
+    set DataFormat(value: DataFormat);
+    constructor(ipAddress?: string, port?: number, station?: number);
+    protected GetNewNetMessage(): INetMessage;
+    private nextId;
+    private frame;
+    private addr;
+    Read(address: string, length: number): Promise<OperateResult<Buffer>>;
+    ReadInt16(address: string, length?: number): Promise<OperateResult<number | number[]>>;
+    ReadUInt16(address: string, length?: number): Promise<OperateResult<number | number[]>>;
+    ReadInt32(address: string, length?: number): Promise<OperateResult<number | number[]>>;
+    ReadFloat(address: string, length?: number): Promise<OperateResult<number | number[]>>;
+    WriteRegister(address: string, value: number): Promise<OperateResult<void>>;
 }

package/dist/modbus/ModbusUdpNet.js

@@ -1,8 +1,131 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ModbusUdpNet = void 0;
+const DeviceUdpNet_1 = require("../core/DeviceUdpNet");
+const Core_1 = require("../core/Core");
+const INetMessage_1 = require("../core/INetMessage");
 const ModbusTcpNet_1 = require("./ModbusTcpNet");
-/** Modbus UDP client. */
-class ModbusUdpNet extends ModbusTcpNet_1.ModbusTcpNet {
+/**
+ * Modbus UDP 客户端
+ * UDP 传输 Modbus TCP 帧
+ */
+class ModbusUdpNet extends DeviceUdpNet_1.DeviceUdpNet {
+    Station = 1;
+    AddressStartWithZero = true;
+    get IsStringReverse() {
+        return this.ByteTransform.IsStringReverseByteWord;
+    }
+    set IsStringReverse(value) {
+        this.ByteTransform.IsStringReverseByteWord = value;
+    }
+    MessageId = 0;
+    get DataFormat() {
+        return this.ByteTransform.DataFormat;
+    }
+    set DataFormat(value) {
+        this.ByteTransform.DataFormat = value;
+    }
+    constructor(ipAddress, port = 502, station = 1) {
+        super(ipAddress, port);
+        this.Station = station;
+        this.ByteTransform.DataFormat = Core_1.DataFormat.CDAB;
+    }
+    GetNewNetMessage() {
+        return new INetMessage_1.ModbusTcpMessage(true);
+    }
+    nextId() {
+        const id = this.MessageId;
+        this.MessageId = (this.MessageId + 1) & 0xFFFF;
+        return id;
+    }
+    frame(pdu, station) {
+        const id = this.nextId();
+        const out = Buffer.alloc(7 + pdu.length);
+        out.writeUInt16BE(id, 0);
+        out.writeUInt16BE(0, 2);
+        out.writeUInt16BE(pdu.length + 1, 4);
+        out[6] = station;
+        pdu.copy(out, 7);
+        return out;
+    }
+    addr(input, code) {
+        const p = (0, ModbusTcpNet_1.parseModbusAddress)(input, this.Station, code);
+        if (p.IsSuccess && !this.AddressStartWithZero) {
+            p.Content.address--;
+        }
+        return p;
+    }
+    async Read(address, length) {
+        const a = this.addr(address, 3);
+        if (!a.IsSuccess)
+            return Core_1.OperateResult.CreateFailedResult(a);
+        const pdu = Buffer.alloc(5);
+        pdu[0] = a.Content.code;
+        pdu.writeUInt16BE(a.Content.address, 1);
+        pdu.writeUInt16BE(length, 3);
+        const result = await this.request(this.frame(pdu, a.Content.station));
+        if (!result.IsSuccess)
+            return result;
+        const body = result.Content;
+        if (body.length < 2)
+            return new Core_1.OperateResult('Invalid Modbus UDP response', -1);
+        if ((body[0] & 0x80) !== 0)
+            return new Core_1.OperateResult(`Modbus exception ${body[1]}`, body[1]);
+        if (body.length < 3)
+            return new Core_1.OperateResult('Invalid response length', -2);
+        const byteCount = body[1];
+        return Core_1.OperateResult.CreateSuccessResult(body.subarray(2, 2 + byteCount));
+    }
+    async ReadInt16(address, length = 1) {
+        const result = await this.Read(address, length);
+        if (!result.IsSuccess)
+            return Core_1.OperateResult.CreateFailedResult(result);
+        const values = [];
+        for (let i = 0; i < length; i++) {
+            values.push(this.ByteTransform.TransInt16(result.Content, i * 2));
+        }
+        return Core_1.OperateResult.CreateSuccessResult(length === 1 ? values[0] : values);
+    }
+    async ReadUInt16(address, length = 1) {
+        const result = await this.Read(address, length);
+        if (!result.IsSuccess)
+            return Core_1.OperateResult.CreateFailedResult(result);
+        const values = [];
+        for (let i = 0; i < length; i++) {
+            values.push(this.ByteTransform.TransUInt16(result.Content, i * 2));
+        }
+        return Core_1.OperateResult.CreateSuccessResult(length === 1 ? values[0] : values);
+    }
+    async ReadInt32(address, length = 1) {
+        const result = await this.Read(address, length * 2);
+        if (!result.IsSuccess)
+            return Core_1.OperateResult.CreateFailedResult(result);
+        const values = [];
+        for (let i = 0; i < length; i++) {
+            values.push(this.ByteTransform.TransInt32(result.Content, i * 4));
+        }
+        return Core_1.OperateResult.CreateSuccessResult(length === 1 ? values[0] : values);
+    }
+    async ReadFloat(address, length = 1) {
+        const result = await this.Read(address, length * 2);
+        if (!result.IsSuccess)
+            return Core_1.OperateResult.CreateFailedResult(result);
+        const values = [];
+        for (let i = 0; i < length; i++) {
+            values.push(this.ByteTransform.TransSingle(result.Content, i * 4));
+        }
+        return Core_1.OperateResult.CreateSuccessResult(length === 1 ? values[0] : values);
+    }
+    async WriteRegister(address, value) {
+        const a = this.addr(address, 6);
+        if (!a.IsSuccess)
+            return Core_1.OperateResult.CreateFailedResult(a);
+        const pdu = Buffer.alloc(5);
+        pdu[0] = 6;
+        pdu.writeUInt16BE(a.Content.address, 1);
+        pdu.writeUInt16BE(value & 0xFFFF, 3);
+        const result = await this.request(this.frame(pdu, a.Content.station));
+        return result.IsSuccess ? Core_1.OperateResult.CreateSuccessResult() : Core_1.OperateResult.CreateFailedResult(result);
+    }
 }
 exports.ModbusUdpNet = ModbusUdpNet;

package/dist/omron/OmronFinsNet.d.ts

@@ -28,6 +28,7 @@ export declare class OmronFinsNet extends DeviceClient {
     private transact;
     private command;
     Read(address: string, length: number): Promise<OperateResult<Buffer<ArrayBufferLike>>>;
+    ReadString(address: string, length: number, encoding?: BufferEncoding): Promise<OperateResult<string>>;
     ReadBool(address: string, length?: number): Promise<OperateResult<boolean | boolean[]>>;
     private typedRead;
     ReadInt16(a: string, l?: number): Promise<OperateResult<any>>;
@@ -53,5 +54,3 @@ export declare class OmronFinsNet extends DeviceClient {
     ConnectServerAsync(): Promise<OperateResult<any>>;
     ConnectCloseAsync(): Promise<OperateResult<any>>;
 }
-export declare class OmronFinsUdp extends OmronFinsNet {
-}