njs-modbus 2.0.1 → 2.1.0

package/README.md

@@ -8,6 +8,7 @@ A pure JavaScript implementation of MODBUS for NodeJS.
 [![npm download](http://img.shields.io/npm/dw/njs-modbus.svg?style=flat-square)](http://www.npm-stats.com/~packages/njs-modbus)
 [![npm latest package](http://img.shields.io/npm/v/njs-modbus/latest.svg?style=flat-square)](https://www.npmjs.com/package/njs-modbus)
 [![npm bundle size](https://img.shields.io/bundlephobia/minzip/njs-modbus?style=flat-square)](https://bundlephobia.com/package/njs-modbus)
+[![CI](https://img.shields.io/github/actions/workflow/status/xiejay97/njs-modbus/ci.yml?branch=main&style=flat-square)](https://github.com/xiejay97/njs-modbus/actions)
 <!-- prettier-ignore-end -->
 
 </div>
@@ -188,7 +189,7 @@ If you broadcast over serial (RTU or ASCII), per Modbus over Serial Line V1.02
 const sleep = (ms: number) => new Promise((resolve) => setTimeout(resolve, ms));
 
 await master.writeSingleRegister(0, 0x0000, 0x1234); // broadcast
-await sleep(100);                                     // turnaround — tune per devices
+await sleep(100); // turnaround — tune per devices
 await master.writeSingleRegister(1, 0x0000, 0x5678); // unicast to next slave
 ```
 

package/dist/index.cjs

@@ -1305,7 +1305,7 @@ class RtuApplicationLayer extends AbstractApplicationLayer {
         for (const removeListener of this._removeAllListeners) {
             removeListener();
         }
-        this._removeAllListeners.length = 0;
+        this._removeAllListeners = [];
         for (const state of this._states.values()) {
             this.clearStateTimers(state);
         }
@@ -1514,7 +1514,7 @@ class AsciiApplicationLayer extends AbstractApplicationLayer {
         for (const removeListener of this._removeAllListeners) {
             removeListener();
         }
-        this._removeAllListeners.length = 0;
+        this._removeAllListeners = [];
         this._states.clear();
     }
 }
@@ -1644,7 +1644,7 @@ class TcpApplicationLayer extends AbstractApplicationLayer {
         for (const removeListener of this._removeAllListeners) {
             removeListener();
         }
-        this._removeAllListeners.length = 0;
+        this._removeAllListeners = [];
         this._buffers.clear();
     }
 }
@@ -1796,12 +1796,6 @@ class ModbusMaster extends EventEmitter {
             writable: true,
             value: 1
         });
-        Object.defineProperty(this, "_closed", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: false
-        });
         Object.defineProperty(this, "_cleanLevel", {
             enumerable: true,
             configurable: true,
@@ -1960,7 +1954,7 @@ class ModbusMaster extends EventEmitter {
     }
     _exchange(adu, preCheck, timeout, broadcast) {
         return new Promise((resolve, reject) => {
-            if (this._closed) {
+            if (this._cleanLevel !== 'none') {
                 reject(new ModbusError(ModbusErrorCode.MASTER_CLOSED, 'Master closed'));
                 return;
             }
@@ -2113,7 +2107,7 @@ class ModbusMaster extends EventEmitter {
             if (frame) {
                 const runStatusIndex = 1 + serverIdLength;
                 return Object.assign(Object.assign({}, frame), { data: {
-                        serverId: serverIdLength === 1 ? frame.data[1] : Array.from(frame.data.subarray(1, runStatusIndex)),
+                        serverId: Array.from(frame.data.subarray(1, runStatusIndex)),
                         runIndicatorStatus: frame.data[runStatusIndex] === 0xff,
                         additionalData: Array.from(frame.data.subarray(runStatusIndex + 1)),
                     } });
@@ -2230,7 +2224,6 @@ class ModbusMaster extends EventEmitter {
         }
         const errorCode = level === 'destroy' ? ModbusErrorCode.MASTER_DESTROYED : ModbusErrorCode.MASTER_CLOSED;
         const message = level === 'destroy' ? 'Master destroyed' : 'Master closed';
-        this._closed = true;
         const queued = this._queue.splice(0);
         for (const item of queued) {
             item.cancel(new ModbusError(errorCode, message));
@@ -2243,7 +2236,6 @@ class ModbusMaster extends EventEmitter {
             return Promise.reject(new ModbusError(ModbusErrorCode.PORT_DESTROYED, 'Master is destroyed'));
         }
         this._cleanLevel = 'none';
-        this._closed = false;
         this._nextTid = 1;
         return this.physicalLayer.open(...args);
     }
@@ -2352,14 +2344,14 @@ class ModbusSlave extends EventEmitter {
             if (!q) {
                 return;
             }
-            q.items.length = 0;
+            q.items = [];
             if (!q.processing) {
                 this._queues.delete(connection.id);
             }
         });
         physicalLayer.on('close', () => {
             for (const q of this._queues.values()) {
-                q.items.length = 0;
+                q.items = [];
             }
             this._queues.clear();
             this.emit('close');
@@ -2648,8 +2640,8 @@ class ModbusSlave extends EventEmitter {
                 return;
             }
             try {
-                const { serverId = (_a = model.unit) !== null && _a !== void 0 ? _a : 1, runIndicatorStatus = true, additionalData = [] } = yield model.reportServerId();
-                const serverIdBytes = Array.isArray(serverId) ? serverId : [serverId];
+                const { serverId = [(_a = model.unit) !== null && _a !== void 0 ? _a : 1], runIndicatorStatus = true, additionalData = [] } = yield model.reportServerId();
+                const serverIdBytes = serverId;
                 const byteCount = serverIdBytes.length + 1 + additionalData.length;
                 if (byteCount > 255) {
                     yield this.responseError(frame, response, getErrorByCode(exports.ErrorCode.SERVER_DEVICE_FAILURE));
@@ -3063,7 +3055,7 @@ class ModbusSlave extends EventEmitter {
             return;
         }
         for (const q of this._queues.values()) {
-            q.items.length = 0;
+            q.items = [];
         }
         this._queues.clear();
         this._locks.clear();

package/dist/index.d.ts

@@ -12,7 +12,7 @@ interface ApplicationDataUnit {
 }
 interface ServerId {
     /** Server ID; may be 1 byte (number) or multi-byte (number[]) per device spec. */
-    serverId?: number | number[];
+    serverId?: number[];
     runIndicatorStatus?: boolean;
     additionalData?: number[];
 }
@@ -421,7 +421,6 @@ declare class ModbusMaster<A extends AbstractApplicationLayer, P extends Abstrac
     private _queue;
     private _draining;
     private _nextTid;
-    private _closed;
     private _cleanLevel;
     timeout: number;
     readonly concurrent: boolean;

package/dist/index.mjs

@@ -1303,7 +1303,7 @@ class RtuApplicationLayer extends AbstractApplicationLayer {
         for (const removeListener of this._removeAllListeners) {
             removeListener();
         }
-        this._removeAllListeners.length = 0;
+        this._removeAllListeners = [];
         for (const state of this._states.values()) {
             this.clearStateTimers(state);
         }
@@ -1512,7 +1512,7 @@ class AsciiApplicationLayer extends AbstractApplicationLayer {
         for (const removeListener of this._removeAllListeners) {
             removeListener();
         }
-        this._removeAllListeners.length = 0;
+        this._removeAllListeners = [];
         this._states.clear();
     }
 }
@@ -1642,7 +1642,7 @@ class TcpApplicationLayer extends AbstractApplicationLayer {
         for (const removeListener of this._removeAllListeners) {
             removeListener();
         }
-        this._removeAllListeners.length = 0;
+        this._removeAllListeners = [];
         this._buffers.clear();
     }
 }
@@ -1794,12 +1794,6 @@ class ModbusMaster extends EventEmitter {
             writable: true,
             value: 1
         });
-        Object.defineProperty(this, "_closed", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: false
-        });
         Object.defineProperty(this, "_cleanLevel", {
             enumerable: true,
             configurable: true,
@@ -1958,7 +1952,7 @@ class ModbusMaster extends EventEmitter {
     }
     _exchange(adu, preCheck, timeout, broadcast) {
         return new Promise((resolve, reject) => {
-            if (this._closed) {
+            if (this._cleanLevel !== 'none') {
                 reject(new ModbusError(ModbusErrorCode.MASTER_CLOSED, 'Master closed'));
                 return;
             }
@@ -2111,7 +2105,7 @@ class ModbusMaster extends EventEmitter {
             if (frame) {
                 const runStatusIndex = 1 + serverIdLength;
                 return Object.assign(Object.assign({}, frame), { data: {
-                        serverId: serverIdLength === 1 ? frame.data[1] : Array.from(frame.data.subarray(1, runStatusIndex)),
+                        serverId: Array.from(frame.data.subarray(1, runStatusIndex)),
                         runIndicatorStatus: frame.data[runStatusIndex] === 0xff,
                         additionalData: Array.from(frame.data.subarray(runStatusIndex + 1)),
                     } });
@@ -2228,7 +2222,6 @@ class ModbusMaster extends EventEmitter {
         }
         const errorCode = level === 'destroy' ? ModbusErrorCode.MASTER_DESTROYED : ModbusErrorCode.MASTER_CLOSED;
         const message = level === 'destroy' ? 'Master destroyed' : 'Master closed';
-        this._closed = true;
         const queued = this._queue.splice(0);
         for (const item of queued) {
             item.cancel(new ModbusError(errorCode, message));
@@ -2241,7 +2234,6 @@ class ModbusMaster extends EventEmitter {
             return Promise.reject(new ModbusError(ModbusErrorCode.PORT_DESTROYED, 'Master is destroyed'));
         }
         this._cleanLevel = 'none';
-        this._closed = false;
         this._nextTid = 1;
         return this.physicalLayer.open(...args);
     }
@@ -2350,14 +2342,14 @@ class ModbusSlave extends EventEmitter {
             if (!q) {
                 return;
             }
-            q.items.length = 0;
+            q.items = [];
             if (!q.processing) {
                 this._queues.delete(connection.id);
             }
         });
         physicalLayer.on('close', () => {
             for (const q of this._queues.values()) {
-                q.items.length = 0;
+                q.items = [];
             }
             this._queues.clear();
             this.emit('close');
@@ -2646,8 +2638,8 @@ class ModbusSlave extends EventEmitter {
                 return;
             }
             try {
-                const { serverId = (_a = model.unit) !== null && _a !== void 0 ? _a : 1, runIndicatorStatus = true, additionalData = [] } = yield model.reportServerId();
-                const serverIdBytes = Array.isArray(serverId) ? serverId : [serverId];
+                const { serverId = [(_a = model.unit) !== null && _a !== void 0 ? _a : 1], runIndicatorStatus = true, additionalData = [] } = yield model.reportServerId();
+                const serverIdBytes = serverId;
                 const byteCount = serverIdBytes.length + 1 + additionalData.length;
                 if (byteCount > 255) {
                     yield this.responseError(frame, response, getErrorByCode(ErrorCode.SERVER_DEVICE_FAILURE));
@@ -3061,7 +3053,7 @@ class ModbusSlave extends EventEmitter {
             return;
         }
         for (const q of this._queues.values()) {
-            q.items.length = 0;
+            q.items = [];
         }
         this._queues.clear();
         this._locks.clear();

package/dist/src/master/master.d.ts

@@ -30,7 +30,6 @@ export declare class ModbusMaster<A extends AbstractApplicationLayer, P extends
     private _queue;
     private _draining;
     private _nextTid;
-    private _closed;
     private _cleanLevel;
     timeout: number;
     readonly concurrent: boolean;

package/dist/src/types.d.ts

@@ -8,7 +8,7 @@ export interface ApplicationDataUnit {
 }
 export interface ServerId {
     /** Server ID; may be 1 byte (number) or multi-byte (number[]) per device spec. */
-    serverId?: number | number[];
+    serverId?: number[];
     runIndicatorStatus?: boolean;
     additionalData?: number[];
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "njs-modbus",
-  "version": "2.0.1",
+  "version": "2.1.0",
   "description": "A pure JavaScript implemetation of Modbus for NodeJS.",
   "keywords": [
     "modbus",
@@ -20,6 +20,7 @@
   },
   "license": "MIT",
   "author": "Xie Jay <xiejay97@gmail.com>",
+  "packageManager": "pnpm@10.10.0",
   "sideEffects": false,
   "type": "module",
   "main": "dist/index.cjs",
@@ -32,7 +33,7 @@
   ],
   "scripts": {
     "build": "rollup -c",
-    "test": "tsx --test \"test/*.test.ts\"",
+    "test": "tsx --test test/*.test.ts",
     "util:sort-package-json": "sort-package-json"
   },
   "devDependencies": {
@@ -59,6 +60,7 @@
     "serialport": ">=12.0.0",
     "sort-package-json": "^3.2.1",
     "tslib": "^2.8.1",
+    "tsx": "^4.21.0",
     "typescript": "~5.8.3",
     "typescript-eslint": "^8.34.0"
   },