njs-modbus 2.0.0 → 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

@@ -423,6 +423,9 @@ class SerialPhysicalLayer extends AbstractPhysicalLayer {
         });
     }
     destroy() {
+        if (this._destroyed) {
+            return Promise.resolve();
+        }
         this._destroyed = true;
         return this.close().then(() => {
             this.removeAllListeners();
@@ -562,6 +565,9 @@ class TcpClientPhysicalLayer extends AbstractPhysicalLayer {
         });
     }
     destroy() {
+        if (this._destroyed) {
+            return Promise.resolve();
+        }
         this._destroyed = true;
         return this.close().then(() => {
             this.removeAllListeners();
@@ -711,10 +717,18 @@ class TcpServerPhysicalLayer extends AbstractPhysicalLayer {
             for (const [socket] of this._connections) {
                 socket.destroy();
             }
-            server.close();
+            try {
+                server.close();
+            }
+            catch (_a) {
+                resolve();
+            }
         });
     }
     destroy() {
+        if (this._destroyed) {
+            return Promise.resolve();
+        }
         this._destroyed = true;
         return this.close().then(() => {
             this.removeAllListeners();
@@ -945,6 +959,9 @@ class UdpPhysicalLayer extends AbstractPhysicalLayer {
         });
     }
     destroy() {
+        if (this._destroyed) {
+            return Promise.resolve();
+        }
         this._destroyed = true;
         return this.close().then(() => {
             this.removeAllListeners();
@@ -1024,6 +1041,12 @@ class RtuApplicationLayer extends AbstractApplicationLayer {
             writable: true,
             value: void 0
         });
+        Object.defineProperty(this, "_destroyed", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: false
+        });
         const { intervalBetweenFrames, interCharTimeout } = options;
         let threePointFiveT = 0;
         let onePointFiveT = 0;
@@ -1274,14 +1297,20 @@ class RtuApplicationLayer extends AbstractApplicationLayer {
         return buffer;
     }
     destroy() {
+        if (this._destroyed) {
+            return;
+        }
+        this._destroyed = true;
         this.removeAllListeners();
         for (const removeListener of this._removeAllListeners) {
             removeListener();
         }
+        this._removeAllListeners = [];
         for (const state of this._states.values()) {
             this.clearStateTimers(state);
         }
         this._states.clear();
+        this._customFunctionCodes.clear();
     }
 }
 
@@ -1334,6 +1363,12 @@ class AsciiApplicationLayer extends AbstractApplicationLayer {
             writable: true,
             value: []
         });
+        Object.defineProperty(this, "_destroyed", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: false
+        });
         this.lenientHex = (_a = options.lenientHex) !== null && _a !== void 0 ? _a : false;
         const lenientHex = this.lenientHex;
         const isHexChar = (value) => {
@@ -1471,10 +1506,15 @@ class AsciiApplicationLayer extends AbstractApplicationLayer {
         return out;
     }
     destroy() {
+        if (this._destroyed) {
+            return;
+        }
+        this._destroyed = true;
         this.removeAllListeners();
         for (const removeListener of this._removeAllListeners) {
             removeListener();
         }
+        this._removeAllListeners = [];
         this._states.clear();
     }
 }
@@ -1508,6 +1548,12 @@ class TcpApplicationLayer extends AbstractApplicationLayer {
             writable: true,
             value: []
         });
+        Object.defineProperty(this, "_destroyed", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: false
+        });
         const handleData = (data, response, connection) => {
             var _a;
             let buffer = (_a = this._buffers.get(connection.id)) !== null && _a !== void 0 ? _a : EMPTY_BUFFER;
@@ -1590,10 +1636,15 @@ class TcpApplicationLayer extends AbstractApplicationLayer {
         return buffer;
     }
     destroy() {
+        if (this._destroyed) {
+            return;
+        }
+        this._destroyed = true;
         this.removeAllListeners();
         for (const removeListener of this._removeAllListeners) {
             removeListener();
         }
+        this._removeAllListeners = [];
         this._buffers.clear();
     }
 }
@@ -1704,7 +1755,7 @@ class ModbusMaster extends EventEmitter {
         return this.physicalLayer.isOpen;
     }
     get destroyed() {
-        return this.physicalLayer.destroyed;
+        return this._cleanLevel === 'destroy' || this.physicalLayer.destroyed;
     }
     constructor(applicationLayer, physicalLayer, options = {}) {
         var _a, _b;
@@ -1745,11 +1796,11 @@ class ModbusMaster extends EventEmitter {
             writable: true,
             value: 1
         });
-        Object.defineProperty(this, "_closed", {
+        Object.defineProperty(this, "_cleanLevel", {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: false
+            value: 'none'
         });
         Object.defineProperty(this, "timeout", {
             enumerable: true,
@@ -1903,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;
             }
@@ -2056,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)),
                     } });
@@ -2164,26 +2215,42 @@ class ModbusMaster extends EventEmitter {
             }
         });
     }
+    _clean(level) {
+        if (this._cleanLevel === 'destroy') {
+            return;
+        }
+        if (this._cleanLevel === 'close' && level === 'close') {
+            return;
+        }
+        const errorCode = level === 'destroy' ? ModbusErrorCode.MASTER_DESTROYED : ModbusErrorCode.MASTER_CLOSED;
+        const message = level === 'destroy' ? 'Master destroyed' : 'Master closed';
+        const queued = this._queue.splice(0);
+        for (const item of queued) {
+            item.cancel(new ModbusError(errorCode, message));
+        }
+        this._masterSession.stopAll(new ModbusError(errorCode, message));
+        this._cleanLevel = level;
+    }
     open(...args) {
-        this._closed = false;
+        if (this._cleanLevel === 'destroy') {
+            return Promise.reject(new ModbusError(ModbusErrorCode.PORT_DESTROYED, 'Master is destroyed'));
+        }
+        this._cleanLevel = 'none';
+        this._nextTid = 1;
         return this.physicalLayer.open(...args);
     }
     close() {
-        this._closed = true;
-        const queued = this._queue.splice(0);
-        for (const item of queued) {
-            item.cancel(new ModbusError(ModbusErrorCode.MASTER_CLOSED, 'Master closed'));
+        if (this._cleanLevel === 'destroy') {
+            return Promise.resolve();
         }
-        this._masterSession.stopAll(new ModbusError(ModbusErrorCode.MASTER_CLOSED, 'Master closed'));
+        this._clean('close');
         return this.physicalLayer.close();
     }
     destroy() {
-        this._closed = true;
-        const queued = this._queue.splice(0);
-        for (const item of queued) {
-            item.cancel(new ModbusError(ModbusErrorCode.MASTER_DESTROYED, 'Master destroyed'));
+        if (this._cleanLevel === 'destroy') {
+            return Promise.resolve();
         }
-        this._masterSession.stopAll(new ModbusError(ModbusErrorCode.MASTER_DESTROYED, 'Master destroyed'));
+        this._clean('destroy');
         this.removeAllListeners();
         this.applicationLayer.destroy();
         return this.physicalLayer.destroy();
@@ -2195,7 +2262,7 @@ class ModbusSlave extends EventEmitter {
         return this.physicalLayer.isOpen;
     }
     get destroyed() {
-        return this.physicalLayer.destroyed;
+        return this._cleanLevel === 'destroy' || this.physicalLayer.destroyed;
     }
     constructor(applicationLayer, physicalLayer, options = {}) {
         var _a;
@@ -2242,6 +2309,12 @@ class ModbusSlave extends EventEmitter {
             writable: true,
             value: new Map()
         });
+        Object.defineProperty(this, "_cleanLevel", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: 'none'
+        });
         this.concurrent = (_a = options.concurrent) !== null && _a !== void 0 ? _a : false;
         if (this.concurrent && this.applicationLayer.PROTOCOL !== 'TCP') {
             throw new ModbusError(ModbusErrorCode.CONCURRENT_NOT_TCP, 'concurrent mode requires a Modbus TCP application layer');
@@ -2271,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');
@@ -2567,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));
@@ -2974,14 +3047,40 @@ class ModbusSlave extends EventEmitter {
         this._customFunctionCodes.delete(fc);
         this.applicationLayer.removeCustomFunctionCode(fc);
     }
+    _clean(level) {
+        if (this._cleanLevel === 'destroy') {
+            return;
+        }
+        if (this._cleanLevel === 'close' && level === 'close') {
+            return;
+        }
+        for (const q of this._queues.values()) {
+            q.items = [];
+        }
+        this._queues.clear();
+        this._locks.clear();
+        if (level === 'destroy') {
+            this._customFunctionCodes.clear();
+            this.models.clear();
+        }
+        this._cleanLevel = level;
+    }
     open(...args) {
+        this._cleanLevel = 'none';
         return this.physicalLayer.open(...args);
     }
     close() {
+        if (this._cleanLevel === 'destroy') {
+            return Promise.resolve();
+        }
+        this._clean('close');
         return this.physicalLayer.close();
     }
     destroy() {
-        this._locks.clear();
+        if (this._cleanLevel === 'destroy') {
+            return Promise.resolve();
+        }
+        this._clean('destroy');
         this.removeAllListeners();
         this.applicationLayer.destroy();
         return this.physicalLayer.destroy();

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[];
 }
@@ -313,6 +313,7 @@ declare class AsciiApplicationLayer extends AbstractApplicationLayer {
     readonly lenientHex: boolean;
     private _states;
     private _removeAllListeners;
+    private _destroyed;
     constructor(physicalLayer: SerialPhysicalLayer | TcpServerPhysicalLayer | TcpClientPhysicalLayer | UdpPhysicalLayer, options?: AsciiApplicationLayerOptions);
     private getState;
     flush(): void;
@@ -362,6 +363,7 @@ declare class RtuApplicationLayer extends AbstractApplicationLayer {
     private _removeAllListeners;
     private _threePointFiveT;
     private _onePointFiveT;
+    private _destroyed;
     constructor(physicalLayer: SerialPhysicalLayer | TcpServerPhysicalLayer | TcpClientPhysicalLayer | UdpPhysicalLayer, options?: RtuApplicationLayerOptions);
     private getState;
     private clearStateTimers;
@@ -383,6 +385,7 @@ declare class TcpApplicationLayer extends AbstractApplicationLayer {
     private _transactionId;
     private _buffers;
     private _removeAllListeners;
+    private _destroyed;
     constructor(physicalLayer: TcpServerPhysicalLayer | TcpClientPhysicalLayer | UdpPhysicalLayer);
     private tryExtract;
     private processFrame;
@@ -418,7 +421,7 @@ declare class ModbusMaster<A extends AbstractApplicationLayer, P extends Abstrac
     private _queue;
     private _draining;
     private _nextTid;
-    private _closed;
+    private _cleanLevel;
     timeout: number;
     readonly concurrent: boolean;
     get isOpen(): boolean;
@@ -484,6 +487,7 @@ declare class ModbusMaster<A extends AbstractApplicationLayer, P extends Abstrac
     removeCustomFunctionCode(fc: number): void;
     sendCustomFC(unit: 0, fc: number, data: Buffer | number[], timeout?: number): Promise<void>;
     sendCustomFC(unit: number, fc: number, data: Buffer | number[], timeout?: number): Promise<Buffer>;
+    private _clean;
     open(...args: Parameters<P['open']>): Promise<void>;
     close(): Promise<void>;
     destroy(): Promise<void>;
@@ -563,6 +567,7 @@ declare class ModbusSlave<A extends AbstractApplicationLayer, P extends Abstract
     private _queues;
     private _customFunctionCodes;
     private _locks;
+    private _cleanLevel;
     get isOpen(): boolean;
     get destroyed(): boolean;
     constructor(applicationLayer: A, physicalLayer: P, options?: ModbusSlaveOptions);
@@ -588,6 +593,7 @@ declare class ModbusSlave<A extends AbstractApplicationLayer, P extends Abstract
     remove(unit: number): void;
     addCustomFunctionCode(cfc: CustomFunctionCode): void;
     removeCustomFunctionCode(fc: number): void;
+    private _clean;
     open(...args: Parameters<P['open']>): Promise<void>;
     close(): Promise<void>;
     destroy(): Promise<void>;

package/dist/index.mjs

@@ -421,6 +421,9 @@ class SerialPhysicalLayer extends AbstractPhysicalLayer {
         });
     }
     destroy() {
+        if (this._destroyed) {
+            return Promise.resolve();
+        }
         this._destroyed = true;
         return this.close().then(() => {
             this.removeAllListeners();
@@ -560,6 +563,9 @@ class TcpClientPhysicalLayer extends AbstractPhysicalLayer {
         });
     }
     destroy() {
+        if (this._destroyed) {
+            return Promise.resolve();
+        }
         this._destroyed = true;
         return this.close().then(() => {
             this.removeAllListeners();
@@ -709,10 +715,18 @@ class TcpServerPhysicalLayer extends AbstractPhysicalLayer {
             for (const [socket] of this._connections) {
                 socket.destroy();
             }
-            server.close();
+            try {
+                server.close();
+            }
+            catch (_a) {
+                resolve();
+            }
         });
     }
     destroy() {
+        if (this._destroyed) {
+            return Promise.resolve();
+        }
         this._destroyed = true;
         return this.close().then(() => {
             this.removeAllListeners();
@@ -943,6 +957,9 @@ class UdpPhysicalLayer extends AbstractPhysicalLayer {
         });
     }
     destroy() {
+        if (this._destroyed) {
+            return Promise.resolve();
+        }
         this._destroyed = true;
         return this.close().then(() => {
             this.removeAllListeners();
@@ -1022,6 +1039,12 @@ class RtuApplicationLayer extends AbstractApplicationLayer {
             writable: true,
             value: void 0
         });
+        Object.defineProperty(this, "_destroyed", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: false
+        });
         const { intervalBetweenFrames, interCharTimeout } = options;
         let threePointFiveT = 0;
         let onePointFiveT = 0;
@@ -1272,14 +1295,20 @@ class RtuApplicationLayer extends AbstractApplicationLayer {
         return buffer;
     }
     destroy() {
+        if (this._destroyed) {
+            return;
+        }
+        this._destroyed = true;
         this.removeAllListeners();
         for (const removeListener of this._removeAllListeners) {
             removeListener();
         }
+        this._removeAllListeners = [];
         for (const state of this._states.values()) {
             this.clearStateTimers(state);
         }
         this._states.clear();
+        this._customFunctionCodes.clear();
     }
 }
 
@@ -1332,6 +1361,12 @@ class AsciiApplicationLayer extends AbstractApplicationLayer {
             writable: true,
             value: []
         });
+        Object.defineProperty(this, "_destroyed", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: false
+        });
         this.lenientHex = (_a = options.lenientHex) !== null && _a !== void 0 ? _a : false;
         const lenientHex = this.lenientHex;
         const isHexChar = (value) => {
@@ -1469,10 +1504,15 @@ class AsciiApplicationLayer extends AbstractApplicationLayer {
         return out;
     }
     destroy() {
+        if (this._destroyed) {
+            return;
+        }
+        this._destroyed = true;
         this.removeAllListeners();
         for (const removeListener of this._removeAllListeners) {
             removeListener();
         }
+        this._removeAllListeners = [];
         this._states.clear();
     }
 }
@@ -1506,6 +1546,12 @@ class TcpApplicationLayer extends AbstractApplicationLayer {
             writable: true,
             value: []
         });
+        Object.defineProperty(this, "_destroyed", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: false
+        });
         const handleData = (data, response, connection) => {
             var _a;
             let buffer = (_a = this._buffers.get(connection.id)) !== null && _a !== void 0 ? _a : EMPTY_BUFFER;
@@ -1588,10 +1634,15 @@ class TcpApplicationLayer extends AbstractApplicationLayer {
         return buffer;
     }
     destroy() {
+        if (this._destroyed) {
+            return;
+        }
+        this._destroyed = true;
         this.removeAllListeners();
         for (const removeListener of this._removeAllListeners) {
             removeListener();
         }
+        this._removeAllListeners = [];
         this._buffers.clear();
     }
 }
@@ -1702,7 +1753,7 @@ class ModbusMaster extends EventEmitter {
         return this.physicalLayer.isOpen;
     }
     get destroyed() {
-        return this.physicalLayer.destroyed;
+        return this._cleanLevel === 'destroy' || this.physicalLayer.destroyed;
     }
     constructor(applicationLayer, physicalLayer, options = {}) {
         var _a, _b;
@@ -1743,11 +1794,11 @@ class ModbusMaster extends EventEmitter {
             writable: true,
             value: 1
         });
-        Object.defineProperty(this, "_closed", {
+        Object.defineProperty(this, "_cleanLevel", {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: false
+            value: 'none'
         });
         Object.defineProperty(this, "timeout", {
             enumerable: true,
@@ -1901,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;
             }
@@ -2054,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)),
                     } });
@@ -2162,26 +2213,42 @@ class ModbusMaster extends EventEmitter {
             }
         });
     }
+    _clean(level) {
+        if (this._cleanLevel === 'destroy') {
+            return;
+        }
+        if (this._cleanLevel === 'close' && level === 'close') {
+            return;
+        }
+        const errorCode = level === 'destroy' ? ModbusErrorCode.MASTER_DESTROYED : ModbusErrorCode.MASTER_CLOSED;
+        const message = level === 'destroy' ? 'Master destroyed' : 'Master closed';
+        const queued = this._queue.splice(0);
+        for (const item of queued) {
+            item.cancel(new ModbusError(errorCode, message));
+        }
+        this._masterSession.stopAll(new ModbusError(errorCode, message));
+        this._cleanLevel = level;
+    }
     open(...args) {
-        this._closed = false;
+        if (this._cleanLevel === 'destroy') {
+            return Promise.reject(new ModbusError(ModbusErrorCode.PORT_DESTROYED, 'Master is destroyed'));
+        }
+        this._cleanLevel = 'none';
+        this._nextTid = 1;
         return this.physicalLayer.open(...args);
     }
     close() {
-        this._closed = true;
-        const queued = this._queue.splice(0);
-        for (const item of queued) {
-            item.cancel(new ModbusError(ModbusErrorCode.MASTER_CLOSED, 'Master closed'));
+        if (this._cleanLevel === 'destroy') {
+            return Promise.resolve();
         }
-        this._masterSession.stopAll(new ModbusError(ModbusErrorCode.MASTER_CLOSED, 'Master closed'));
+        this._clean('close');
         return this.physicalLayer.close();
     }
     destroy() {
-        this._closed = true;
-        const queued = this._queue.splice(0);
-        for (const item of queued) {
-            item.cancel(new ModbusError(ModbusErrorCode.MASTER_DESTROYED, 'Master destroyed'));
+        if (this._cleanLevel === 'destroy') {
+            return Promise.resolve();
         }
-        this._masterSession.stopAll(new ModbusError(ModbusErrorCode.MASTER_DESTROYED, 'Master destroyed'));
+        this._clean('destroy');
         this.removeAllListeners();
         this.applicationLayer.destroy();
         return this.physicalLayer.destroy();
@@ -2193,7 +2260,7 @@ class ModbusSlave extends EventEmitter {
         return this.physicalLayer.isOpen;
     }
     get destroyed() {
-        return this.physicalLayer.destroyed;
+        return this._cleanLevel === 'destroy' || this.physicalLayer.destroyed;
     }
     constructor(applicationLayer, physicalLayer, options = {}) {
         var _a;
@@ -2240,6 +2307,12 @@ class ModbusSlave extends EventEmitter {
             writable: true,
             value: new Map()
         });
+        Object.defineProperty(this, "_cleanLevel", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: 'none'
+        });
         this.concurrent = (_a = options.concurrent) !== null && _a !== void 0 ? _a : false;
         if (this.concurrent && this.applicationLayer.PROTOCOL !== 'TCP') {
             throw new ModbusError(ModbusErrorCode.CONCURRENT_NOT_TCP, 'concurrent mode requires a Modbus TCP application layer');
@@ -2269,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');
@@ -2565,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));
@@ -2972,14 +3045,40 @@ class ModbusSlave extends EventEmitter {
         this._customFunctionCodes.delete(fc);
         this.applicationLayer.removeCustomFunctionCode(fc);
     }
+    _clean(level) {
+        if (this._cleanLevel === 'destroy') {
+            return;
+        }
+        if (this._cleanLevel === 'close' && level === 'close') {
+            return;
+        }
+        for (const q of this._queues.values()) {
+            q.items = [];
+        }
+        this._queues.clear();
+        this._locks.clear();
+        if (level === 'destroy') {
+            this._customFunctionCodes.clear();
+            this.models.clear();
+        }
+        this._cleanLevel = level;
+    }
     open(...args) {
+        this._cleanLevel = 'none';
         return this.physicalLayer.open(...args);
     }
     close() {
+        if (this._cleanLevel === 'destroy') {
+            return Promise.resolve();
+        }
+        this._clean('close');
         return this.physicalLayer.close();
     }
     destroy() {
-        this._locks.clear();
+        if (this._cleanLevel === 'destroy') {
+            return Promise.resolve();
+        }
+        this._clean('destroy');
         this.removeAllListeners();
         this.applicationLayer.destroy();
         return this.physicalLayer.destroy();

package/dist/src/layers/application/ascii-application-layer.d.ts

@@ -15,6 +15,7 @@ export declare class AsciiApplicationLayer extends AbstractApplicationLayer {
     readonly lenientHex: boolean;
     private _states;
     private _removeAllListeners;
+    private _destroyed;
     constructor(physicalLayer: SerialPhysicalLayer | TcpServerPhysicalLayer | TcpClientPhysicalLayer | UdpPhysicalLayer, options?: AsciiApplicationLayerOptions);
     private getState;
     flush(): void;

package/dist/src/layers/application/rtu-application-layer.d.ts

@@ -43,6 +43,7 @@ export declare class RtuApplicationLayer extends AbstractApplicationLayer {
     private _removeAllListeners;
     private _threePointFiveT;
     private _onePointFiveT;
+    private _destroyed;
     constructor(physicalLayer: SerialPhysicalLayer | TcpServerPhysicalLayer | TcpClientPhysicalLayer | UdpPhysicalLayer, options?: RtuApplicationLayerOptions);
     private getState;
     private clearStateTimers;

package/dist/src/layers/application/tcp-application-layer.d.ts

@@ -6,6 +6,7 @@ export declare class TcpApplicationLayer extends AbstractApplicationLayer {
     private _transactionId;
     private _buffers;
     private _removeAllListeners;
+    private _destroyed;
     constructor(physicalLayer: TcpServerPhysicalLayer | TcpClientPhysicalLayer | UdpPhysicalLayer);
     private tryExtract;
     private processFrame;

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

@@ -30,7 +30,7 @@ export declare class ModbusMaster<A extends AbstractApplicationLayer, P extends
     private _queue;
     private _draining;
     private _nextTid;
-    private _closed;
+    private _cleanLevel;
     timeout: number;
     readonly concurrent: boolean;
     get isOpen(): boolean;
@@ -96,6 +96,7 @@ export declare class ModbusMaster<A extends AbstractApplicationLayer, P extends
     removeCustomFunctionCode(fc: number): void;
     sendCustomFC(unit: 0, fc: number, data: Buffer | number[], timeout?: number): Promise<void>;
     sendCustomFC(unit: number, fc: number, data: Buffer | number[], timeout?: number): Promise<Buffer>;
+    private _clean;
     open(...args: Parameters<P['open']>): Promise<void>;
     close(): Promise<void>;
     destroy(): Promise<void>;

package/dist/src/slave/slave.d.ts

@@ -60,6 +60,7 @@ export declare class ModbusSlave<A extends AbstractApplicationLayer, P extends A
     private _queues;
     private _customFunctionCodes;
     private _locks;
+    private _cleanLevel;
     get isOpen(): boolean;
     get destroyed(): boolean;
     constructor(applicationLayer: A, physicalLayer: P, options?: ModbusSlaveOptions);
@@ -85,6 +86,7 @@ export declare class ModbusSlave<A extends AbstractApplicationLayer, P extends A
     remove(unit: number): void;
     addCustomFunctionCode(cfc: CustomFunctionCode): void;
     removeCustomFunctionCode(fc: number): void;
+    private _clean;
     open(...args: Parameters<P['open']>): Promise<void>;
     close(): Promise<void>;
     destroy(): Promise<void>;

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.0",
+  "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"
   },