ts-communication 1.0.0 → 1.1.0

package/dist/omron/OmronFinsNet.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.OmronFinsUdp = exports.OmronFinsNet = exports.OmronPlcType = void 0;
+exports.OmronFinsNet = exports.OmronPlcType = void 0;
 exports.parseOmronAddress = parseOmronAddress;
 const Core_1 = require("../core/Core");
 var OmronPlcType;
@@ -8,23 +8,40 @@ var OmronPlcType;
     OmronPlcType[OmronPlcType["CSCJ"] = 1] = "CSCJ";
     OmronPlcType[OmronPlcType["CV"] = 2] = "CV";
 })(OmronPlcType || (exports.OmronPlcType = OmronPlcType = {}));
-const area = { D: [0x02, 0x82], DM: [0x02, 0x82], C: [0x30, 0xB0], CIO: [0x30, 0xB0], W: [0x31, 0xB1], WR: [0x31, 0xB1], H: [0x32, 0xB2], HR: [0x32, 0xB2], A: [0x33, 0xB3], AR: [0x33, 0xB3], E: [0x20, 0xA0], EM: [0x20, 0xA0], TIM: [0x09, 0x89], CNT: [0x09, 0x89] };
-function parseOmronAddress(input) { try {
-    const m = input.trim().match(/^([A-Za-z]+)([0-9A-Fa-f]+)(?:\.([0-9]+))?$/);
-    if (!m)
-        throw new Error(`Invalid Omron address: ${input}`);
-    const key = m[1].toUpperCase(), a = area[key];
-    if (!a)
-        throw new Error(`Unsupported Omron address: ${input}`);
-    const word = Number.parseInt(m[2], key === 'E' || key === 'EM' ? 16 : 10);
-    const bit = Number(m[3] ?? 0);
-    if (bit < 0 || bit > 15)
-        throw new Error('Invalid bit index');
-    return Core_1.OperateResult.CreateSuccessResult({ BitCode: a[0], WordCode: a[1], AddressStart: word * 16 + bit });
+const area = {
+    D: [0x02, 0x82],
+    DM: [0x02, 0x82],
+    C: [0x30, 0xB0],
+    CIO: [0x30, 0xB0],
+    W: [0x31, 0xB1],
+    WR: [0x31, 0xB1],
+    H: [0x32, 0xB2],
+    HR: [0x32, 0xB2],
+    A: [0x33, 0xB3],
+    AR: [0x33, 0xB3],
+    E: [0x20, 0xA0],
+    EM: [0x20, 0xA0],
+    TIM: [0x09, 0x89],
+    CNT: [0x09, 0x89]
+};
+function parseOmronAddress(input) {
+    try {
+        const m = input.trim().match(/^([A-Za-z]+)([0-9A-Fa-f]+)(?:\.([0-9]+))?$/);
+        if (!m)
+            throw new Error(`Invalid Omron address: ${input}`);
+        const key = m[1].toUpperCase(), a = area[key];
+        if (!a)
+            throw new Error(`Unsupported Omron address: ${input}`);
+        const word = Number.parseInt(m[2], key === 'E' || key === 'EM' ? 16 : 10);
+        const bit = Number(m[3] ?? 0);
+        if (bit < 0 || bit > 15)
+            throw new Error('Invalid bit index');
+        return Core_1.OperateResult.CreateSuccessResult({ BitCode: a[0], WordCode: a[1], AddressStart: word * 16 + bit });
+    }
+    catch (e) {
+        return new Core_1.OperateResult(e.message);
+    }
 }
-catch (e) {
-    return new Core_1.OperateResult(e.message);
-} }
 class OmronFinsNet extends Core_1.DeviceClient {
     ICF = 0x80;
     RSV = 0;
@@ -39,57 +56,181 @@ class OmronFinsNet extends Core_1.DeviceClient {
     ReadSplits = 500;
     PlcType = OmronPlcType.CSCJ;
     ReceiveUntilEmpty = false;
-    constructor(ipAddress, port = 9600) { super(ipAddress, ipAddress === undefined ? undefined : port); this.Port = ipAddress === undefined ? 5000 : port; this.ByteTransform = new Core_1.ByteTransform(Core_1.DataFormat.CDAB); this.ByteTransform.IsStringReverseByteWord = true; }
-    pack(core) { const h = Buffer.alloc(26 + core.length); Buffer.from('FINS').copy(h); h.writeUInt32BE(18 + core.length, 4); h[11] = 2; h[16] = this.ICF; h[17] = this.RSV; h[18] = this.GCT; h[19] = this.DNA; h[20] = this.DA1; h[21] = this.DA2; h[22] = this.SNA; h[23] = this.SA1; h[24] = this.SA2; this.SID = (this.SID + 1) & 255; h[25] = this.SID; core.copy(h, 26); return h; }
-    async transact(core) { const frame = this.pack(core); const r = await this.request(frame, data => { if (data.length < 30)
-        throw new Error('incomplete FINS response'); const n = data.readUInt32BE(4); if (data.length < 8 + n)
-        throw new Error('incomplete FINS response'); return data.subarray(0, 8 + n); }); if (!r.IsSuccess)
-        return r; const b = r.Content; const status = b.readUInt32BE(12); if (status !== 0)
-        return new Core_1.OperateResult(`FINS TCP error ${status}`, status); const end = b.length; return Core_1.OperateResult.CreateSuccessResult(b.subarray(30, end)); }
-    command(address, length, isBit = false, write) { const a = parseOmronAddress(address); if (!a.IsSuccess)
-        return Core_1.OperateResult.CreateFailedResult(a); const d = a.Content; const c = Buffer.alloc(8 + (write?.length ?? 0)); c[0] = 1; c[1] = write ? 2 : 1; c[2] = isBit ? d.BitCode : d.WordCode; c[3] = (d.AddressStart >> 16) & 255; c[4] = (d.AddressStart >> 8) & 255; c[5] = d.AddressStart & 255; c[6] = (length >> 8) & 255; c[7] = length & 255; if (write)
-        write.copy(c, 8); return Core_1.OperateResult.CreateSuccessResult(c); }
-    async Read(address, length) { const c = this.command(address, length, false); if (!c.IsSuccess)
-        return c; return this.transact(c.Content); }
-    async ReadBool(address, length) { const n = length ?? 1, c = this.command(address, n, true); if (!c.IsSuccess)
-        return Core_1.OperateResult.CreateFailedResult(c); const r = await this.transact(c.Content); if (!r.IsSuccess)
-        return Core_1.OperateResult.CreateFailedResult(r); const vals = Array.from(r.Content, x => x !== 0).slice(0, n); return Core_1.OperateResult.CreateSuccessResult(length === undefined ? vals[0] : vals); }
-    async typedRead(address, length, width, fn) { const r = await this.Read(address, length * width / 2); if (!r.IsSuccess)
-        return Core_1.OperateResult.CreateFailedResult(r); const vals = Array.from({ length }, (_, i) => fn(r.Content, i * width)); return Core_1.OperateResult.CreateSuccessResult(length === 1 ? vals[0] : vals); }
-    async ReadInt16(a, l) { return this.typedRead(a, l ?? 1, 2, (b, o) => this.ByteTransform.TransInt16(b, o)); }
-    async ReadUInt16(a, l) { return this.typedRead(a, l ?? 1, 2, (b, o) => this.ByteTransform.TransUInt16(b, o)); }
-    async ReadInt32(a, l) { return this.typedRead(a, l ?? 1, 4, (b, o) => this.ByteTransform.TransInt32(b, o)); }
-    async ReadUInt32(a, l) { return this.typedRead(a, l ?? 1, 4, (b, o) => this.ByteTransform.TransUInt32(b, o)); }
-    async ReadFloat(a, l) { return this.typedRead(a, l ?? 1, 4, (b, o) => this.ByteTransform.TransSingle(b, o)); }
-    async ReadDouble(a, l) { return this.typedRead(a, l ?? 1, 8, (b, o) => this.ByteTransform.TransDouble(b, o)); }
-    async ReadInt64(a, l) { return this.typedRead(a, l ?? 1, 8, (b, o) => this.ByteTransform.TransInt64(b, o)); }
-    async ReadUInt64(a, l) { return this.typedRead(a, l ?? 1, 8, (b, o) => this.ByteTransform.TransUInt64(b, o)); }
-    async Write(address, value) { const isBit = typeof value === 'boolean' || (Array.isArray(value) && typeof value[0] === 'boolean'); let data; if (typeof value === 'boolean')
-        data = Buffer.from([value ? 1 : 0]);
-    else if (typeof value === 'string')
-        data = Buffer.from(value);
-    else if (Buffer.isBuffer(value))
-        data = value;
-    else if (Array.isArray(value) && typeof value[0] === 'boolean')
-        data = Buffer.from(value.map(x => x ? 1 : 0));
-    else
-        data = this.ByteTransform.TransByte(value, 2); const c = this.command(address, isBit ? data.length : data.length / 2, isBit, data); if (!c.IsSuccess)
-        return c; const r = await this.transact(c.Content); 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 Run() { const r = await this.transact(Buffer.from([4, 1, 255, 255, 4])); return r.IsSuccess ? Core_1.OperateResult.CreateSuccessResult() : r; }
-    async Stop() { const r = await this.transact(Buffer.from([4, 2, 255, 255])); return r.IsSuccess ? Core_1.OperateResult.CreateSuccessResult() : r; }
-    async ConnectServerAsync() { return this.ConnectServer(); }
-    async ConnectCloseAsync() { return this.ConnectClose(); }
+    constructor(ipAddress, port = 9600) {
+        super(ipAddress, ipAddress === undefined ? undefined : port);
+        this.Port = ipAddress === undefined ? 5000 : port;
+        this.ByteTransform = new Core_1.ByteTransform(Core_1.DataFormat.CDAB);
+        this.ByteTransform.IsStringReverseByteWord = true;
+    }
+    pack(core) {
+        const h = Buffer.alloc(26 + core.length);
+        Buffer.from('FINS').copy(h);
+        h.writeUInt32BE(18 + core.length, 4);
+        h[11] = 2;
+        h[16] = this.ICF;
+        h[17] = this.RSV;
+        h[18] = this.GCT;
+        h[19] = this.DNA;
+        h[20] = this.DA1;
+        h[21] = this.DA2;
+        h[22] = this.SNA;
+        h[23] = this.SA1;
+        h[24] = this.SA2;
+        this.SID = (this.SID + 1) & 255;
+        h[25] = this.SID;
+        core.copy(h, 26);
+        return h;
+    }
+    async transact(core) {
+        const frame = this.pack(core);
+        const r = await this.request(frame, data => {
+            if (data.length < 30)
+                throw new Error('incomplete FINS response');
+            const n = data.readUInt32BE(4);
+            if (data.length < 8 + n)
+                throw new Error('incomplete FINS response');
+            return data.subarray(0, 8 + n);
+        });
+        if (!r.IsSuccess)
+            return r;
+        const b = r.Content;
+        const status = b.readUInt32BE(12);
+        if (status !== 0)
+            return new Core_1.OperateResult(`FINS TCP error ${status}`, status);
+        const end = b.length;
+        return Core_1.OperateResult.CreateSuccessResult(b.subarray(30, end));
+    }
+    command(address, length, isBit = false, write) {
+        const a = parseOmronAddress(address);
+        if (!a.IsSuccess)
+            return Core_1.OperateResult.CreateFailedResult(a);
+        const d = a.Content;
+        const c = Buffer.alloc(8 + (write?.length ?? 0));
+        c[0] = 1;
+        c[1] = write ? 2 : 1;
+        c[2] = isBit ? d.BitCode : d.WordCode;
+        c[3] = (d.AddressStart >> 16) & 255;
+        c[4] = (d.AddressStart >> 8) & 255;
+        c[5] = d.AddressStart & 255;
+        c[6] = (length >> 8) & 255;
+        c[7] = length & 255;
+        if (write)
+            write.copy(c, 8);
+        return Core_1.OperateResult.CreateSuccessResult(c);
+    }
+    async Read(address, length) {
+        const c = this.command(address, length, false);
+        if (!c.IsSuccess)
+            return c;
+        return this.transact(c.Content);
+    }
+    // FINS 字符串默认使用 UTF-8 编码。
+    async ReadString(address, length, encoding = 'utf8') {
+        const result = await this.Read(address, length);
+        return result.IsSuccess
+            ? Core_1.OperateResult.CreateSuccessResult(this.ByteTransform.TransString(result.Content, encoding))
+            : Core_1.OperateResult.CreateFailedResult(result);
+    }
+    async ReadBool(address, length) {
+        const n = length ?? 1, c = this.command(address, n, true);
+        if (!c.IsSuccess)
+            return Core_1.OperateResult.CreateFailedResult(c);
+        const r = await this.transact(c.Content);
+        if (!r.IsSuccess)
+            return Core_1.OperateResult.CreateFailedResult(r);
+        const vals = Array.from(r.Content, x => x !== 0).slice(0, n);
+        return Core_1.OperateResult.CreateSuccessResult(length === undefined ? vals[0] : vals);
+    }
+    async typedRead(address, length, width, fn) {
+        const r = await this.Read(address, length * width / 2);
+        if (!r.IsSuccess)
+            return Core_1.OperateResult.CreateFailedResult(r);
+        const vals = Array.from({ length }, (_, i) => fn(r.Content, i * width));
+        return Core_1.OperateResult.CreateSuccessResult(length === 1 ? vals[0] : vals);
+    }
+    async ReadInt16(a, l) {
+        return this.typedRead(a, l ?? 1, 2, (b, o) => this.ByteTransform.TransInt16(b, o));
+    }
+    async ReadUInt16(a, l) {
+        return this.typedRead(a, l ?? 1, 2, (b, o) => this.ByteTransform.TransUInt16(b, o));
+    }
+    async ReadInt32(a, l) {
+        return this.typedRead(a, l ?? 1, 4, (b, o) => this.ByteTransform.TransInt32(b, o));
+    }
+    async ReadUInt32(a, l) {
+        return this.typedRead(a, l ?? 1, 4, (b, o) => this.ByteTransform.TransUInt32(b, o));
+    }
+    async ReadFloat(a, l) {
+        return this.typedRead(a, l ?? 1, 4, (b, o) => this.ByteTransform.TransSingle(b, o));
+    }
+    async ReadDouble(a, l) {
+        return this.typedRead(a, l ?? 1, 8, (b, o) => this.ByteTransform.TransDouble(b, o));
+    }
+    async ReadInt64(a, l) {
+        return this.typedRead(a, l ?? 1, 8, (b, o) => this.ByteTransform.TransInt64(b, o));
+    }
+    async ReadUInt64(a, l) {
+        return this.typedRead(a, l ?? 1, 8, (b, o) => this.ByteTransform.TransUInt64(b, o));
+    }
+    async Write(address, value) {
+        const isBit = typeof value === 'boolean' || (Array.isArray(value) && typeof value[0] === 'boolean');
+        let data;
+        if (typeof value === 'boolean')
+            data = Buffer.from([value ? 1 : 0]);
+        else if (typeof value === 'string')
+            data = Buffer.from(value);
+        else if (Buffer.isBuffer(value))
+            data = value;
+        else if (Array.isArray(value) && typeof value[0] === 'boolean')
+            data = Buffer.from(value.map(x => x ? 1 : 0));
+        else
+            data = this.ByteTransform.TransByte(value, 2);
+        const c = this.command(address, isBit ? data.length : data.length / 2, isBit, data);
+        if (!c.IsSuccess)
+            return c;
+        const r = await this.transact(c.Content);
+        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 Run() {
+        const r = await this.transact(Buffer.from([4, 1, 255, 255, 4]));
+        return r.IsSuccess ? Core_1.OperateResult.CreateSuccessResult() : r;
+    }
+    async Stop() {
+        const r = await this.transact(Buffer.from([4, 2, 255, 255]));
+        return r.IsSuccess ? Core_1.OperateResult.CreateSuccessResult() : r;
+    }
+    async ConnectServerAsync() {
+        return this.ConnectServer();
+    }
+    async ConnectCloseAsync() {
+        return this.ConnectClose();
+    }
 }
 exports.OmronFinsNet = OmronFinsNet;
-class OmronFinsUdp extends OmronFinsNet {
-}
-exports.OmronFinsUdp = OmronFinsUdp;

package/dist/omron/OmronFinsUdp.d.ts

@@ -0,0 +1,41 @@
+import { DeviceUdpNet } from '../core/DeviceUdpNet';
+import { OperateResult } from '../core/Core';
+import { INetMessage } from '../core/INetMessage';
+/**
+ * Omron FINS UDP 客户端
+ * 用于通过 FINS/UDP 与设备通信。
+ */
+export declare class OmronFinsUdp extends DeviceUdpNet {
+    DA1: number;
+    DA2: number;
+    SA1: number;
+    SA2: number;
+    SID: number;
+    constructor(ipAddress?: string, port?: number);
+    protected GetNewNetMessage(): INetMessage;
+    /**
+     * 构建 FINS 命令帧
+     */
+    private buildFinsCommand;
+    /**
+     * 读取数据区
+     */
+    Read(address: string, length: number): Promise<OperateResult<Buffer>>;
+    ReadString(address: string, length: number, encoding?: BufferEncoding): Promise<OperateResult<string>>;
+    /**
+     * 读取 UInt16
+     */
+    ReadUInt16(address: string, length?: number): Promise<OperateResult<number | number[]>>;
+    /**
+     * 读取 Int16
+     */
+    ReadInt16(address: string, length?: number): Promise<OperateResult<number | number[]>>;
+    /**
+     * 读取 Float
+     */
+    ReadFloat(address: string, length?: number): Promise<OperateResult<number | number[]>>;
+    /**
+     * 写入数据区
+     */
+    Write(address: string, data: Buffer): Promise<OperateResult<void>>;
+}

package/dist/omron/OmronFinsUdp.js

@@ -0,0 +1,146 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.OmronFinsUdp = void 0;
+const DeviceUdpNet_1 = require("../core/DeviceUdpNet");
+const Core_1 = require("../core/Core");
+const INetMessage_1 = require("../core/INetMessage");
+/**
+ * Omron FINS UDP 客户端
+ * 用于通过 FINS/UDP 与设备通信。
+ */
+class OmronFinsUdp extends DeviceUdpNet_1.DeviceUdpNet {
+    DA1 = 0; // 目标网络地址
+    DA2 = 0; // 目标节点地址
+    SA1 = 0; // 源网络地址
+    SA2 = 0; // 源节点地址
+    SID = 0; // 服务 ID
+    constructor(ipAddress, port = 9600) {
+        super(ipAddress, port);
+        this.ByteTransform.DataFormat = Core_1.DataFormat.CDAB;
+    }
+    GetNewNetMessage() {
+        return new INetMessage_1.FinsUdpMessage();
+    }
+    /**
+     * 构建 FINS 命令帧
+     */
+    buildFinsCommand(command) {
+        const header = Buffer.alloc(10);
+        // FINS 头部
+        header[0] = 0x80; // ICF
+        header[1] = 0x00; // RSV
+        header[2] = 0x02; // GCT
+        header[3] = this.DA1; // DNA
+        header[4] = this.DA2; // DA1
+        header[5] = 0x00; // DA2
+        header[6] = this.SA1; // SNA
+        header[7] = this.SA2; // SA1
+        header[8] = 0x00; // SA2
+        header[9] = this.SID++; // SID
+        return Buffer.concat([header, command]);
+    }
+    /**
+     * 读取数据区
+     */
+    async Read(address, length) {
+        // 解析地址（简化实现，实际应该更复杂）
+        const addr = parseInt(address);
+        const cmd = Buffer.alloc(8);
+        cmd[0] = 0x01; // MRC: 读取命令
+        cmd[1] = 0x01; // SRC: 读取子命令
+        cmd[2] = 0x82; // 存储区代码（DM区）
+        cmd.writeUInt16BE(addr, 3); // 起始地址
+        cmd[5] = 0x00; // bit
+        cmd.writeUInt16BE(length, 6); // 长度
+        const frame = this.buildFinsCommand(cmd);
+        const result = await this.request(frame);
+        if (!result.IsSuccess)
+            return result;
+        const response = result.Content;
+        if (response.length < 12) {
+            return new Core_1.OperateResult('Invalid FINS response length', -1);
+        }
+        // 检查响应码
+        const endCode = response.readUInt16BE(10);
+        if (endCode !== 0) {
+            return new Core_1.OperateResult(`FINS error code: ${endCode}`, endCode);
+        }
+        // 提取数据
+        return Core_1.OperateResult.CreateSuccessResult(response.subarray(12));
+    }
+    // FINS 字符串默认使用 UTF-8 编码。
+    async ReadString(address, length, encoding = 'utf8') {
+        const result = await this.Read(address, length);
+        return result.IsSuccess
+            ? Core_1.OperateResult.CreateSuccessResult(this.ByteTransform.TransString(result.Content, encoding))
+            : Core_1.OperateResult.CreateFailedResult(result);
+    }
+    /**
+     * 读取 UInt16
+     */
+    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);
+    }
+    /**
+     * 读取 Int16
+     */
+    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);
+    }
+    /**
+     * 读取 Float
+     */
+    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 Write(address, data) {
+        const addr = parseInt(address);
+        const length = Math.ceil(data.length / 2);
+        const cmd = Buffer.alloc(8 + data.length);
+        cmd[0] = 0x01; // MRC: 写入命令
+        cmd[1] = 0x02; // SRC: 写入子命令
+        cmd[2] = 0x82; // 存储区代码（DM区）
+        cmd.writeUInt16BE(addr, 3);
+        cmd[5] = 0x00;
+        cmd.writeUInt16BE(length, 6);
+        data.copy(cmd, 8);
+        const frame = this.buildFinsCommand(cmd);
+        const result = await this.request(frame);
+        if (!result.IsSuccess)
+            return Core_1.OperateResult.CreateFailedResult(result);
+        const response = result.Content;
+        if (response.length < 12) {
+            return new Core_1.OperateResult('Invalid FINS response length', -1);
+        }
+        const endCode = response.readUInt16BE(10);
+        if (endCode !== 0) {
+            return new Core_1.OperateResult(`FINS error code: ${endCode}`, endCode);
+        }
+        return Core_1.OperateResult.CreateSuccessResult();
+    }
+}
+exports.OmronFinsUdp = OmronFinsUdp;

package/dist/siemens/SiemensS7Net.d.ts

@@ -48,6 +48,12 @@ export declare class SiemensS7Net extends DeviceClient {
     ReadInt64(a: string, l?: number): Promise<OperateResult<any>>;
     ReadUInt64(a: string, l?: number): Promise<OperateResult<any>>;
     ReadString(address: string, length?: number, encoding?: BufferEncoding): Promise<OperateResult<string>>;
+    /**
+     * 读取西门子专用 S7 字符串。前几个字节保存字符串元数据，
+     * 因此需要先读取长度，再读取实际字符串内容。S200 Smart 只有当前长度字节，
+     * 其他 S7 CPU 保存最大长度和当前长度两个字节。
+     */
+    ReadS7String(address: string, encoding?: BufferEncoding): Promise<OperateResult<string>>;
     Write(address: string, value: Buffer | number | boolean | string | number[] | boolean[]): Promise<OperateResult<any>>;
     WriteByte(a: string, v: number): Promise<OperateResult<any>>;
     WriteInt16(a: string, v: number): Promise<OperateResult<any>>;

package/dist/siemens/SiemensS7Net.js

@@ -64,7 +64,7 @@ class SiemensS7Net extends Core_1.DeviceClient {
         super(ipAddress, ipAddress === undefined ? undefined : 102);
         this.Port = port ?? 102;
         this.PlcType = siemens;
-        // S7 values are transmitted most-significant byte first.
+        // S7 数据按高字节在前的顺序传输。
         this.ByteTransform = new Core_1.ByteTransform(Core_1.DataFormat.ABCD);
     }
     static parseTpkt(data) {
@@ -111,7 +111,11 @@ class SiemensS7Net extends Core_1.DeviceClient {
         return tpkt;
     }
     messageId = 1;
-    nextMessageId() { const id = this.messageId; this.messageId = (this.messageId + 1) & 0xffff; return id; }
+    nextMessageId() {
+        const id = this.messageId;
+        this.messageId = (this.messageId + 1) & 0xffff;
+        return id;
+    }
     async ConnectServer() {
         const connected = await super.ConnectServer();
         if (!connected.IsSuccess || this.initialized)
@@ -127,10 +131,16 @@ class SiemensS7Net extends Core_1.DeviceClient {
                 return second;
             this.initialized = true;
             return Core_1.OperateResult.CreateSuccessResult();
-        })().finally(() => { this.initializing = undefined; });
+        })().finally(() => {
+            this.initializing = undefined;
+        });
         return this.initializing;
     }
-    async ConnectClose() { this.initialized = false; this.initializing = undefined; return super.ConnectClose(); }
+    async ConnectClose() {
+        this.initialized = false;
+        this.initializing = undefined;
+        return super.ConnectClose();
+    }
     connectionSetupPacket() {
         const packet = Buffer.from([3, 0, 0, 22, 0x11, 0xe0, 0, 0, 0, 1, 0, 0xc0, 1, 10, 0xc1, 2, 1, 2, 0xc2, 2, 1, 0]);
         packet[20] = this.ConnectionType;
@@ -199,10 +209,39 @@ class SiemensS7Net extends Core_1.DeviceClient {
     async ReadUInt64(a, l) {
         return this.typedRead(a, l ?? 1, 8, (b, o) => this.ByteTransform.TransUInt64(b, o));
     }
-    async ReadString(address, length, encoding = 'utf8') {
+    async ReadString(address, length, encoding = 'ascii') {
         const r = await this.Read(address, length ?? 254);
         return r.IsSuccess ? Core_1.OperateResult.CreateSuccessResult(this.ByteTransform.TransString(r.Content, encoding)) : Core_1.OperateResult.CreateFailedResult(r);
     }
+    /**
+     * 读取西门子专用 S7 字符串。前几个字节保存字符串元数据，
+     * 因此需要先读取长度，再读取实际字符串内容。S200 Smart 只有当前长度字节，
+     * 其他 S7 CPU 保存最大长度和当前长度两个字节。
+     */
+    async ReadS7String(address, encoding = 'ascii') {
+        if (this.PlcType === SiemensPLCS.S200Smart) {
+            const header = await this.Read(address, 1);
+            if (!header.IsSuccess)
+                return Core_1.OperateResult.CreateFailedResult(header);
+            const length = header.Content[0];
+            const data = await this.Read(address, length + 1);
+            if (!data.IsSuccess)
+                return Core_1.OperateResult.CreateFailedResult(data);
+            return Core_1.OperateResult.CreateSuccessResult(Buffer.from(data.Content.subarray(1, 1 + length)).toString(encoding));
+        }
+        const header = await this.Read(address, 2);
+        if (!header.IsSuccess)
+            return Core_1.OperateResult.CreateFailedResult(header);
+        const maxLength = header.Content[0];
+        const length = header.Content[1];
+        if (maxLength === 0 || maxLength === 0xff || length > maxLength) {
+            return new Core_1.OperateResult('Value in plc is not string type');
+        }
+        const data = await this.Read(address, length + 2);
+        if (!data.IsSuccess)
+            return Core_1.OperateResult.CreateFailedResult(data);
+        return Core_1.OperateResult.CreateSuccessResult(Buffer.from(data.Content.subarray(2, 2 + length)).toString(encoding));
+    }
     async Write(address, value) {
         const a = parseS7Address(address);
         if (!a.IsSuccess)
@@ -211,7 +250,7 @@ class SiemensS7Net extends Core_1.DeviceClient {
         if (typeof value === 'boolean')
             data = Buffer.from([value ? 1 : 0]);
         else if (typeof value === 'string')
-            data = Buffer.from(value);
+            data = Buffer.from(value, 'ascii');
         else if (Buffer.isBuffer(value))
             data = value;
         else if (Array.isArray(value) && typeof value[0] === 'boolean')

package/dist/xinjie/XinJETcpNet.d.ts

@@ -0,0 +1,18 @@
+import { ModbusTcpNet } from '../modbus/ModbusTcpNet';
+import { OperateResult } from '../core/Core';
+export declare enum XinJESeries {
+    XC = "XC",
+    XD = "XD",
+    XL = "XL"
+}
+export declare class XinJETcpNet extends ModbusTcpNet {
+    Series: XinJESeries;
+    constructor(ipAddress?: string, port?: number, series?: XinJESeries);
+    private CalculateXinJEStartAddress;
+    private TranslateToModbusAddress;
+    private ParseXCAddress;
+    private ParseXDXLAddress;
+    Read(address: string, length: number): Promise<OperateResult<Buffer>>;
+    ReadBool(address: string, length?: number): Promise<OperateResult<boolean | boolean[]>>;
+    ReadInt16(address: string, length?: number): Promise<OperateResult<number | number[]>>;
+}