ts-communication 1.0.0 → 1.1.0

package/dist/xinjie/XinJETcpNet.js

@@ -0,0 +1,106 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.XinJETcpNet = exports.XinJESeries = void 0;
+const ModbusTcpNet_1 = require("../modbus/ModbusTcpNet");
+const Core_1 = require("../core/Core");
+var XinJESeries;
+(function (XinJESeries) {
+    XinJESeries["XC"] = "XC";
+    XinJESeries["XD"] = "XD";
+    XinJESeries["XL"] = "XL";
+})(XinJESeries || (exports.XinJESeries = XinJESeries = {}));
+class XinJETcpNet extends ModbusTcpNet_1.ModbusTcpNet {
+    Series = XinJESeries.XC;
+    constructor(ipAddress, port = 502, series = XinJESeries.XC) {
+        super(ipAddress, port);
+        this.Series = series;
+    }
+    CalculateXinJEStartAddress(address) {
+        if (address.indexOf('.') < 0)
+            return parseInt(address, 8);
+        const parts = address.split('.');
+        return parseInt(parts[0], 8) * 8 + parseInt(parts[1]);
+    }
+    TranslateToModbusAddress(address, modbusCode) {
+        let station = '';
+        const sm = address.match(/^s=(\d+);(.*)$/i);
+        if (sm) {
+            station = 's=' + sm[1] + ';';
+            address = sm[2];
+        }
+        const upper = address.toUpperCase();
+        if (this.Series === XinJESeries.XC) {
+            return this.ParseXCAddress(station, address, modbusCode);
+        }
+        else {
+            return this.ParseXDXLAddress(station, address, modbusCode);
+        }
+    }
+    ParseXCAddress(station, address, modbusCode) {
+        try {
+            const upper = address.toUpperCase();
+            if (modbusCode === 1 || modbusCode === 5 || modbusCode === 15) {
+                if (upper.startsWith('X')) {
+                    const addr = this.CalculateXinJEStartAddress(upper.substring(1));
+                    return Core_1.OperateResult.CreateSuccessResult(station + (addr + 16384));
+                }
+                if (upper.startsWith('Y')) {
+                    const addr = this.CalculateXinJEStartAddress(upper.substring(1));
+                    return Core_1.OperateResult.CreateSuccessResult(station + (addr + 18432));
+                }
+                if (upper.startsWith('M')) {
+                    const addr = parseInt(upper.substring(1));
+                    return Core_1.OperateResult.CreateSuccessResult(station + (addr >= 8000 ? addr - 8000 + 24576 : addr));
+                }
+            }
+            else {
+                if (upper.startsWith('D')) {
+                    const addr = parseInt(upper.substring(1));
+                    return Core_1.OperateResult.CreateSuccessResult(station + (addr >= 8000 ? addr - 8000 + 16384 : addr));
+                }
+            }
+            return new Core_1.OperateResult('Unsupported address: ' + address, -1);
+        }
+        catch (e) {
+            return new Core_1.OperateResult('Address parse error', -1);
+        }
+    }
+    ParseXDXLAddress(station, address, modbusCode) {
+        try {
+            const upper = address.toUpperCase();
+            if (modbusCode === 1 || modbusCode === 5 || modbusCode === 15) {
+                if (upper.startsWith('X')) {
+                    const addr = this.CalculateXinJEStartAddress(upper.substring(1));
+                    if (addr < 4096)
+                        return Core_1.OperateResult.CreateSuccessResult(station + (addr + 20480));
+                    return Core_1.OperateResult.CreateSuccessResult(station + (addr - 4096 + 20736));
+                }
+                if (upper.startsWith('M')) {
+                    return Core_1.OperateResult.CreateSuccessResult(station + parseInt(upper.substring(1)));
+                }
+            }
+            else {
+                if (upper.startsWith('D')) {
+                    return Core_1.OperateResult.CreateSuccessResult(station + parseInt(upper.substring(1)));
+                }
+            }
+            return new Core_1.OperateResult('Unsupported address: ' + address, -1);
+        }
+        catch (e) {
+            return new Core_1.OperateResult('Address parse error', -1);
+        }
+    }
+    async Read(address, length) {
+        const a = this.TranslateToModbusAddress(address, 3);
+        return a.IsSuccess ? super.Read(a.Content, length) : Core_1.OperateResult.CreateFailedResult(a);
+    }
+    async ReadBool(address, length) {
+        const a = this.TranslateToModbusAddress(address, 1);
+        return a.IsSuccess ? super.ReadBool(a.Content, length) : Core_1.OperateResult.CreateFailedResult(a);
+    }
+    async ReadInt16(address, length) {
+        const a = this.TranslateToModbusAddress(address, 3);
+        return a.IsSuccess ? super.ReadInt16(a.Content, length) : Core_1.OperateResult.CreateFailedResult(a);
+    }
+}
+exports.XinJETcpNet = XinJETcpNet;

package/package.json

@@ -1,11 +1,12 @@
 {
   "name": "ts-communication",
-  "version": "1.0.0",
-  "description": "工业 PLC 通讯库，支持 Siemens S7、Melsec MC、Omron FINS、Inovance 和 Modbus。",
+  "version": "1.1.0",
+  "description": "工业 PLC 通讯库，支持 Siemens S7、Melsec MC、Omron FINS、Inovance、Invt、Delta、GE SRTP、XinJE 和 Modbus。",
   "main": "dist/XCommunication.js",
   "types": "dist/XCommunication.d.ts",
   "files": [
-    "dist"
+    "dist",
+    "LICENSE"
   ],
   "scripts": {
     "build": "tsc -p tsconfig.json",
@@ -23,11 +24,23 @@
     "modbus",
     "modbus-tcp",
     "modbus-rtu",
+    "invt",
+    "delta",
+    "ge-srtp",
+    "xinje",
     "typescript",
     "nodejs"
   ],
   "author": "X Communication",
   "license": "ISC",
+  "repository": {
+    "type": "git",
+    "url": "git+https://gitee.com/woshixiaoao1/ts-communication.git"
+  },
+  "homepage": "https://gitee.com/woshixiaoao1/ts-communication",
+  "bugs": {
+    "url": "https://gitee.com/woshixiaoao1/ts-communication/issues"
+  },
   "engines": {
     "node": ">=18"
   },