njs-modbus 1.0.0 → 1.1.0

package/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2025 Xie Jay
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/README.md

@@ -181,7 +181,7 @@ For more advanced examples, check out [examples](/examples) included in the repo
 
 ## Contributing
 
-Please read our [contributing guide](/CONTRIBUTING.md) first.
+Please read our [contributing guide](/CODE_OF_CONDUCT.md) first.
 
 ## License
 

package/dist/index.cjs

@@ -158,7 +158,7 @@ class TcpClientPhysicalLayer extends AbstractPhysicalLayer {
         }
         return new Promise((resolve, reject) => {
             let called = false;
-            this._socket.connect(Object.assign(Object.assign({}, options), { port: 502 }), () => {
+            this._socket.connect(options !== null && options !== void 0 ? options : { port: 502 }, () => {
                 called = true;
                 this._isOpen = true;
                 this._socket.on('data', (data) => {
@@ -279,7 +279,7 @@ class TcpServerPhysicalLayer extends AbstractPhysicalLayer {
         return new Promise((resolve, reject) => {
             var _a;
             let called = false;
-            this._server.listen(Object.assign(Object.assign({}, options), { port: (_a = options.port) !== null && _a !== void 0 ? _a : 502 }), () => {
+            this._server.listen(Object.assign(Object.assign({}, options), { port: (_a = options === null || options === void 0 ? void 0 : options.port) !== null && _a !== void 0 ? _a : 502 }), () => {
                 called = true;
                 this._isOpen = true;
                 this._sockets.clear();
@@ -410,7 +410,7 @@ class UdpPhysicalLayer extends AbstractPhysicalLayer {
             var _a;
             if (this.isServer) {
                 let called = false;
-                this._socket.bind(Object.assign(Object.assign({}, options), { port: (_a = options.port) !== null && _a !== void 0 ? _a : 502 }), () => {
+                this._socket.bind(Object.assign(Object.assign({}, options), { port: (_a = options === null || options === void 0 ? void 0 : options.port) !== null && _a !== void 0 ? _a : 502 }), () => {
                     called = true;
                     this._isOpen = true;
                     this._socket.on('close', () => {
@@ -472,8 +472,22 @@ class AbstractApplicationLayer extends EventEmitter {
 }
 
 function checkRange(value, range) {
-    if (range && range[0] < range[1]) {
-        return (Array.isArray(value) ? value : [value]).every((n) => n >= range[0] && n <= range[1]);
+    if (range) {
+        if (typeof range[0] === 'number' && typeof range[1] === 'number') {
+            if (range[0] < range[1]) {
+                return (Array.isArray(value) ? value : [value]).every((n) => n >= range[0] && n <= range[1]);
+            }
+        }
+        else if (range.length > 0) {
+            for (const r of range) {
+                if (r[0] < r[1]) {
+                    if ((Array.isArray(value) ? value : [value]).every((n) => n >= r[0] && n <= r[1])) {
+                        return true;
+                    }
+                }
+            }
+            return false;
+        }
     }
     return true;
 }
@@ -1368,14 +1382,14 @@ class ModbusSlave extends EventEmitter {
         });
     }
     handleFC1(frame, response) {
-        var _a;
+        var _a, _b;
         if (frame.data.length === 4) {
             if (this.model.readCoils) {
                 const bufferRx = Buffer.from(frame.data);
                 const address = bufferRx.readUInt16BE(0);
                 const length = bufferRx.readUInt16BE(2);
                 if (length >= 0x0001 && length <= 0x07d0) {
-                    if (checkRange([address, address + length], (_a = this.model.addressRange) === null || _a === void 0 ? void 0 : _a.coils)) {
+                    if (checkRange([address, address + length], (_b = (_a = this.model).getAddressRange) === null || _b === void 0 ? void 0 : _b.call(_a).coils)) {
                         Promise.resolve(this.model.readCoils(address, length))
                             .then((coils) => {
                             const bufferTx = Buffer.alloc(Math.ceil(length / 8));
@@ -1404,14 +1418,14 @@ class ModbusSlave extends EventEmitter {
         }
     }
     handleFC2(frame, response) {
-        var _a;
+        var _a, _b;
         if (frame.data.length === 4) {
             if (this.model.readDiscreteInputs) {
                 const bufferRx = Buffer.from(frame.data);
                 const address = bufferRx.readUInt16BE(0);
                 const length = bufferRx.readUInt16BE(2);
                 if (length >= 0x0001 && length <= 0x07d0) {
-                    if (checkRange([address, address + length], (_a = this.model.addressRange) === null || _a === void 0 ? void 0 : _a.discreteInputs)) {
+                    if (checkRange([address, address + length], (_b = (_a = this.model).getAddressRange) === null || _b === void 0 ? void 0 : _b.call(_a).discreteInputs)) {
                         Promise.resolve(this.model.readDiscreteInputs(address, length))
                             .then((discreteInputs) => {
                             const bufferTx = Buffer.alloc(Math.ceil(length / 8));
@@ -1440,14 +1454,14 @@ class ModbusSlave extends EventEmitter {
         }
     }
     handleFC3(frame, response) {
-        var _a;
+        var _a, _b;
         if (frame.data.length === 4) {
             if (this.model.readHoldingRegisters) {
                 const bufferRx = Buffer.from(frame.data);
                 const address = bufferRx.readUInt16BE(0);
                 const length = bufferRx.readUInt16BE(2);
                 if (length >= 0x0001 && length <= 0x007d) {
-                    if (checkRange([address, address + length], (_a = this.model.addressRange) === null || _a === void 0 ? void 0 : _a.holdingRegisters)) {
+                    if (checkRange([address, address + length], (_b = (_a = this.model).getAddressRange) === null || _b === void 0 ? void 0 : _b.call(_a).holdingRegisters)) {
                         Promise.resolve(this.model.readHoldingRegisters(address, length))
                             .then((registers) => {
                             const bufferTx = Buffer.alloc(length * 2);
@@ -1474,14 +1488,14 @@ class ModbusSlave extends EventEmitter {
         }
     }
     handleFC4(frame, response) {
-        var _a;
+        var _a, _b;
         if (frame.data.length === 4) {
             if (this.model.readInputRegisters) {
                 const bufferRx = Buffer.from(frame.data);
                 const address = bufferRx.readUInt16BE(0);
                 const length = bufferRx.readUInt16BE(2);
                 if (length >= 0x0001 && length <= 0x007d) {
-                    if (checkRange([address, address + length], (_a = this.model.addressRange) === null || _a === void 0 ? void 0 : _a.inputRegisters)) {
+                    if (checkRange([address, address + length], (_b = (_a = this.model).getAddressRange) === null || _b === void 0 ? void 0 : _b.call(_a).inputRegisters)) {
                         Promise.resolve(this.model.readInputRegisters(address, length))
                             .then((registers) => {
                             const bufferTx = Buffer.alloc(length * 2);
@@ -1508,14 +1522,14 @@ class ModbusSlave extends EventEmitter {
         }
     }
     handleFC5(frame, response) {
-        var _a;
+        var _a, _b;
         if (frame.data.length === 4) {
             if (this.model.writeSingleCoil) {
                 const bufferRx = Buffer.from(frame.data);
                 const address = bufferRx.readUInt16BE(0);
                 const value = bufferRx.readUInt16BE(2);
                 if (value === 0x0000 || value === 0xff00) {
-                    if (checkRange(address, (_a = this.model.addressRange) === null || _a === void 0 ? void 0 : _a.coils)) {
+                    if (checkRange(address, (_b = (_a = this.model).getAddressRange) === null || _b === void 0 ? void 0 : _b.call(_a).coils)) {
                         Promise.resolve(this.model.writeSingleCoil(address, value === 0xff00))
                             .then(() => {
                             response(this.applicationLayer.encode(frame));
@@ -1538,14 +1552,14 @@ class ModbusSlave extends EventEmitter {
         }
     }
     handleFC6(frame, response) {
-        var _a;
+        var _a, _b;
         if (frame.data.length === 4) {
             if (this.model.writeSingleRegister) {
                 const bufferRx = Buffer.from(frame.data);
                 const address = bufferRx.readUInt16BE(0);
                 const value = bufferRx.readUInt16BE(2);
                 if (value >= 0x0000 && value <= 0xffff) {
-                    if (checkRange(address, (_a = this.model.addressRange) === null || _a === void 0 ? void 0 : _a.holdingRegisters)) {
+                    if (checkRange(address, (_b = (_a = this.model).getAddressRange) === null || _b === void 0 ? void 0 : _b.call(_a).holdingRegisters)) {
                         Promise.resolve(this.model.writeSingleRegister(address, value))
                             .then(() => {
                             response(this.applicationLayer.encode(frame));
@@ -1568,7 +1582,7 @@ class ModbusSlave extends EventEmitter {
         }
     }
     handleFC15(frame, response) {
-        var _a;
+        var _a, _b;
         if (frame.data.length > 5 && frame.data.length === 5 + frame.data[4]) {
             if (this.model.writeMultipleCoils || this.model.writeSingleCoil) {
                 const bufferRx = Buffer.from(frame.data);
@@ -1576,7 +1590,7 @@ class ModbusSlave extends EventEmitter {
                 const length = bufferRx.readUInt16BE(2);
                 const byteCount = bufferRx[4];
                 if (length >= 0x0001 && length <= 0x07b0 && byteCount === Math.ceil(length / 8)) {
-                    if (checkRange([address, address + length], (_a = this.model.addressRange) === null || _a === void 0 ? void 0 : _a.coils)) {
+                    if (checkRange([address, address + length], (_b = (_a = this.model).getAddressRange) === null || _b === void 0 ? void 0 : _b.call(_a).coils)) {
                         const value = Array.from({ length }).map((_, index) => (bufferRx[5 + ~~(index / 8)] & (1 << index % 8)) > 0);
                         Promise.resolve(this.model.writeMultipleCoils
                             ? this.model.writeMultipleCoils(address, value)
@@ -1602,7 +1616,7 @@ class ModbusSlave extends EventEmitter {
         }
     }
     handleFC16(frame, response) {
-        var _a;
+        var _a, _b;
         if (frame.data.length > 5 && frame.data.length === 5 + frame.data[4]) {
             if (this.model.writeMultipleRegisters || this.model.writeSingleRegister) {
                 const bufferRx = Buffer.from(frame.data);
@@ -1610,7 +1624,7 @@ class ModbusSlave extends EventEmitter {
                 const length = bufferRx.readUInt16BE(2);
                 const byteCount = bufferRx[4];
                 if (length >= 0x0001 && length <= 0x007b && byteCount === length * 2) {
-                    if (checkRange([address, address + length], (_a = this.model.addressRange) === null || _a === void 0 ? void 0 : _a.holdingRegisters)) {
+                    if (checkRange([address, address + length], (_b = (_a = this.model).getAddressRange) === null || _b === void 0 ? void 0 : _b.call(_a).holdingRegisters)) {
                         const value = Array.from({ length }).map((_, index) => bufferRx.readUInt16BE(5 + index * 2));
                         Promise.resolve(this.model.writeMultipleRegisters
                             ? this.model.writeMultipleRegisters(address, value)
@@ -1652,14 +1666,14 @@ class ModbusSlave extends EventEmitter {
         }
     }
     handleFC22(frame, response) {
-        var _a;
+        var _a, _b;
         if (frame.data.length === 6) {
             if (this.model.maskWriteRegister || (this.model.readHoldingRegisters && this.model.writeSingleRegister)) {
                 const bufferRx = Buffer.from(frame.data);
                 const address = bufferRx.readUInt16BE(0);
                 const andMask = bufferRx.readUInt16BE(2);
                 const orMask = bufferRx.readUInt16BE(4);
-                if (checkRange(address, (_a = this.model.addressRange) === null || _a === void 0 ? void 0 : _a.holdingRegisters)) {
+                if (checkRange(address, (_b = (_a = this.model).getAddressRange) === null || _b === void 0 ? void 0 : _b.call(_a).holdingRegisters)) {
                     Promise.resolve(this.model.maskWriteRegister
                         ? this.model.maskWriteRegister(address, andMask, orMask)
                         : Promise.resolve(this.model.readHoldingRegisters(address, 1)).then(([value]) => {
@@ -1682,7 +1696,7 @@ class ModbusSlave extends EventEmitter {
         }
     }
     handleFC23(frame, response) {
-        var _a;
+        var _a, _b;
         if (frame.data.length > 9 && frame.data.length === 9 + frame.data[8]) {
             if (this.model.readHoldingRegisters && (this.model.writeMultipleRegisters || this.model.writeSingleRegister)) {
                 const bufferRx = Buffer.from(frame.data);
@@ -1700,7 +1714,7 @@ class ModbusSlave extends EventEmitter {
                     length.write >= 0x0001 &&
                     length.write <= 0x0079 &&
                     byteCount === length.write * 2) {
-                    if (checkRange([address.read, address.read + length.read, address.write, address.write + length.write], (_a = this.model.addressRange) === null || _a === void 0 ? void 0 : _a.holdingRegisters)) {
+                    if (checkRange([address.read, address.read + length.read, address.write, address.write + length.write], (_b = (_a = this.model).getAddressRange) === null || _b === void 0 ? void 0 : _b.call(_a).holdingRegisters)) {
                         const value = Array.from({ length: length.write }).map((_, index) => bufferRx.readUInt16BE(9 + index * 2));
                         Promise.resolve(this.model.writeMultipleRegisters
                             ? this.model.writeMultipleRegisters(address.write, value)

package/dist/index.d.ts

@@ -77,7 +77,7 @@ declare class TcpClientPhysicalLayer extends AbstractPhysicalLayer {
     get isOpen(): boolean;
     get destroyed(): boolean;
     constructor(options?: SocketConstructorOpts);
-    open(options: Partial<SocketConnectOpts>): Promise<void>;
+    open(options?: SocketConnectOpts): Promise<void>;
     write(data: Buffer): Promise<void>;
     close(): Promise<void>;
     destroy(): Promise<void>;
@@ -92,7 +92,7 @@ declare class TcpServerPhysicalLayer extends AbstractPhysicalLayer {
     get isOpen(): boolean;
     get destroyed(): boolean;
     constructor(options?: NetConnectOpts);
-    open(options: ListenOptions): Promise<void>;
+    open(options?: ListenOptions): Promise<void>;
     write(data: Buffer): Promise<void>;
     close(): Promise<void>;
     destroy(): Promise<void>;
@@ -118,7 +118,7 @@ declare class UdpPhysicalLayer extends AbstractPhysicalLayer {
         port?: number;
         address?: string;
     });
-    open(options: BindOptions): Promise<void>;
+    open(options?: BindOptions): Promise<void>;
     write(data: Buffer): Promise<void>;
     close(): Promise<void>;
     destroy(): Promise<void>;
@@ -298,11 +298,11 @@ interface ModbusSlaveModel {
     readDeviceIdentification?: FConvertPromise<() => {
         [index: number]: string;
     }>;
-    addressRange?: {
-        discreteInputs?: [number, number];
-        coils?: [number, number];
-        inputRegisters?: [number, number];
-        holdingRegisters?: [number, number];
+    getAddressRange?: () => {
+        discreteInputs?: [number, number] | [number, number][];
+        coils?: [number, number] | [number, number][];
+        inputRegisters?: [number, number] | [number, number][];
+        holdingRegisters?: [number, number] | [number, number][];
     };
 }
 interface ModbusSlaveEvents {

package/dist/index.mjs

@@ -156,7 +156,7 @@ class TcpClientPhysicalLayer extends AbstractPhysicalLayer {
         }
         return new Promise((resolve, reject) => {
             let called = false;
-            this._socket.connect(Object.assign(Object.assign({}, options), { port: 502 }), () => {
+            this._socket.connect(options !== null && options !== void 0 ? options : { port: 502 }, () => {
                 called = true;
                 this._isOpen = true;
                 this._socket.on('data', (data) => {
@@ -277,7 +277,7 @@ class TcpServerPhysicalLayer extends AbstractPhysicalLayer {
         return new Promise((resolve, reject) => {
             var _a;
             let called = false;
-            this._server.listen(Object.assign(Object.assign({}, options), { port: (_a = options.port) !== null && _a !== void 0 ? _a : 502 }), () => {
+            this._server.listen(Object.assign(Object.assign({}, options), { port: (_a = options === null || options === void 0 ? void 0 : options.port) !== null && _a !== void 0 ? _a : 502 }), () => {
                 called = true;
                 this._isOpen = true;
                 this._sockets.clear();
@@ -408,7 +408,7 @@ class UdpPhysicalLayer extends AbstractPhysicalLayer {
             var _a;
             if (this.isServer) {
                 let called = false;
-                this._socket.bind(Object.assign(Object.assign({}, options), { port: (_a = options.port) !== null && _a !== void 0 ? _a : 502 }), () => {
+                this._socket.bind(Object.assign(Object.assign({}, options), { port: (_a = options === null || options === void 0 ? void 0 : options.port) !== null && _a !== void 0 ? _a : 502 }), () => {
                     called = true;
                     this._isOpen = true;
                     this._socket.on('close', () => {
@@ -470,8 +470,22 @@ class AbstractApplicationLayer extends EventEmitter {
 }
 
 function checkRange(value, range) {
-    if (range && range[0] < range[1]) {
-        return (Array.isArray(value) ? value : [value]).every((n) => n >= range[0] && n <= range[1]);
+    if (range) {
+        if (typeof range[0] === 'number' && typeof range[1] === 'number') {
+            if (range[0] < range[1]) {
+                return (Array.isArray(value) ? value : [value]).every((n) => n >= range[0] && n <= range[1]);
+            }
+        }
+        else if (range.length > 0) {
+            for (const r of range) {
+                if (r[0] < r[1]) {
+                    if ((Array.isArray(value) ? value : [value]).every((n) => n >= r[0] && n <= r[1])) {
+                        return true;
+                    }
+                }
+            }
+            return false;
+        }
     }
     return true;
 }
@@ -1366,14 +1380,14 @@ class ModbusSlave extends EventEmitter {
         });
     }
     handleFC1(frame, response) {
-        var _a;
+        var _a, _b;
         if (frame.data.length === 4) {
             if (this.model.readCoils) {
                 const bufferRx = Buffer.from(frame.data);
                 const address = bufferRx.readUInt16BE(0);
                 const length = bufferRx.readUInt16BE(2);
                 if (length >= 0x0001 && length <= 0x07d0) {
-                    if (checkRange([address, address + length], (_a = this.model.addressRange) === null || _a === void 0 ? void 0 : _a.coils)) {
+                    if (checkRange([address, address + length], (_b = (_a = this.model).getAddressRange) === null || _b === void 0 ? void 0 : _b.call(_a).coils)) {
                         Promise.resolve(this.model.readCoils(address, length))
                             .then((coils) => {
                             const bufferTx = Buffer.alloc(Math.ceil(length / 8));
@@ -1402,14 +1416,14 @@ class ModbusSlave extends EventEmitter {
         }
     }
     handleFC2(frame, response) {
-        var _a;
+        var _a, _b;
         if (frame.data.length === 4) {
             if (this.model.readDiscreteInputs) {
                 const bufferRx = Buffer.from(frame.data);
                 const address = bufferRx.readUInt16BE(0);
                 const length = bufferRx.readUInt16BE(2);
                 if (length >= 0x0001 && length <= 0x07d0) {
-                    if (checkRange([address, address + length], (_a = this.model.addressRange) === null || _a === void 0 ? void 0 : _a.discreteInputs)) {
+                    if (checkRange([address, address + length], (_b = (_a = this.model).getAddressRange) === null || _b === void 0 ? void 0 : _b.call(_a).discreteInputs)) {
                         Promise.resolve(this.model.readDiscreteInputs(address, length))
                             .then((discreteInputs) => {
                             const bufferTx = Buffer.alloc(Math.ceil(length / 8));
@@ -1438,14 +1452,14 @@ class ModbusSlave extends EventEmitter {
         }
     }
     handleFC3(frame, response) {
-        var _a;
+        var _a, _b;
         if (frame.data.length === 4) {
             if (this.model.readHoldingRegisters) {
                 const bufferRx = Buffer.from(frame.data);
                 const address = bufferRx.readUInt16BE(0);
                 const length = bufferRx.readUInt16BE(2);
                 if (length >= 0x0001 && length <= 0x007d) {
-                    if (checkRange([address, address + length], (_a = this.model.addressRange) === null || _a === void 0 ? void 0 : _a.holdingRegisters)) {
+                    if (checkRange([address, address + length], (_b = (_a = this.model).getAddressRange) === null || _b === void 0 ? void 0 : _b.call(_a).holdingRegisters)) {
                         Promise.resolve(this.model.readHoldingRegisters(address, length))
                             .then((registers) => {
                             const bufferTx = Buffer.alloc(length * 2);
@@ -1472,14 +1486,14 @@ class ModbusSlave extends EventEmitter {
         }
     }
     handleFC4(frame, response) {
-        var _a;
+        var _a, _b;
         if (frame.data.length === 4) {
             if (this.model.readInputRegisters) {
                 const bufferRx = Buffer.from(frame.data);
                 const address = bufferRx.readUInt16BE(0);
                 const length = bufferRx.readUInt16BE(2);
                 if (length >= 0x0001 && length <= 0x007d) {
-                    if (checkRange([address, address + length], (_a = this.model.addressRange) === null || _a === void 0 ? void 0 : _a.inputRegisters)) {
+                    if (checkRange([address, address + length], (_b = (_a = this.model).getAddressRange) === null || _b === void 0 ? void 0 : _b.call(_a).inputRegisters)) {
                         Promise.resolve(this.model.readInputRegisters(address, length))
                             .then((registers) => {
                             const bufferTx = Buffer.alloc(length * 2);
@@ -1506,14 +1520,14 @@ class ModbusSlave extends EventEmitter {
         }
     }
     handleFC5(frame, response) {
-        var _a;
+        var _a, _b;
         if (frame.data.length === 4) {
             if (this.model.writeSingleCoil) {
                 const bufferRx = Buffer.from(frame.data);
                 const address = bufferRx.readUInt16BE(0);
                 const value = bufferRx.readUInt16BE(2);
                 if (value === 0x0000 || value === 0xff00) {
-                    if (checkRange(address, (_a = this.model.addressRange) === null || _a === void 0 ? void 0 : _a.coils)) {
+                    if (checkRange(address, (_b = (_a = this.model).getAddressRange) === null || _b === void 0 ? void 0 : _b.call(_a).coils)) {
                         Promise.resolve(this.model.writeSingleCoil(address, value === 0xff00))
                             .then(() => {
                             response(this.applicationLayer.encode(frame));
@@ -1536,14 +1550,14 @@ class ModbusSlave extends EventEmitter {
         }
     }
     handleFC6(frame, response) {
-        var _a;
+        var _a, _b;
         if (frame.data.length === 4) {
             if (this.model.writeSingleRegister) {
                 const bufferRx = Buffer.from(frame.data);
                 const address = bufferRx.readUInt16BE(0);
                 const value = bufferRx.readUInt16BE(2);
                 if (value >= 0x0000 && value <= 0xffff) {
-                    if (checkRange(address, (_a = this.model.addressRange) === null || _a === void 0 ? void 0 : _a.holdingRegisters)) {
+                    if (checkRange(address, (_b = (_a = this.model).getAddressRange) === null || _b === void 0 ? void 0 : _b.call(_a).holdingRegisters)) {
                         Promise.resolve(this.model.writeSingleRegister(address, value))
                             .then(() => {
                             response(this.applicationLayer.encode(frame));
@@ -1566,7 +1580,7 @@ class ModbusSlave extends EventEmitter {
         }
     }
     handleFC15(frame, response) {
-        var _a;
+        var _a, _b;
         if (frame.data.length > 5 && frame.data.length === 5 + frame.data[4]) {
             if (this.model.writeMultipleCoils || this.model.writeSingleCoil) {
                 const bufferRx = Buffer.from(frame.data);
@@ -1574,7 +1588,7 @@ class ModbusSlave extends EventEmitter {
                 const length = bufferRx.readUInt16BE(2);
                 const byteCount = bufferRx[4];
                 if (length >= 0x0001 && length <= 0x07b0 && byteCount === Math.ceil(length / 8)) {
-                    if (checkRange([address, address + length], (_a = this.model.addressRange) === null || _a === void 0 ? void 0 : _a.coils)) {
+                    if (checkRange([address, address + length], (_b = (_a = this.model).getAddressRange) === null || _b === void 0 ? void 0 : _b.call(_a).coils)) {
                         const value = Array.from({ length }).map((_, index) => (bufferRx[5 + ~~(index / 8)] & (1 << index % 8)) > 0);
                         Promise.resolve(this.model.writeMultipleCoils
                             ? this.model.writeMultipleCoils(address, value)
@@ -1600,7 +1614,7 @@ class ModbusSlave extends EventEmitter {
         }
     }
     handleFC16(frame, response) {
-        var _a;
+        var _a, _b;
         if (frame.data.length > 5 && frame.data.length === 5 + frame.data[4]) {
             if (this.model.writeMultipleRegisters || this.model.writeSingleRegister) {
                 const bufferRx = Buffer.from(frame.data);
@@ -1608,7 +1622,7 @@ class ModbusSlave extends EventEmitter {
                 const length = bufferRx.readUInt16BE(2);
                 const byteCount = bufferRx[4];
                 if (length >= 0x0001 && length <= 0x007b && byteCount === length * 2) {
-                    if (checkRange([address, address + length], (_a = this.model.addressRange) === null || _a === void 0 ? void 0 : _a.holdingRegisters)) {
+                    if (checkRange([address, address + length], (_b = (_a = this.model).getAddressRange) === null || _b === void 0 ? void 0 : _b.call(_a).holdingRegisters)) {
                         const value = Array.from({ length }).map((_, index) => bufferRx.readUInt16BE(5 + index * 2));
                         Promise.resolve(this.model.writeMultipleRegisters
                             ? this.model.writeMultipleRegisters(address, value)
@@ -1650,14 +1664,14 @@ class ModbusSlave extends EventEmitter {
         }
     }
     handleFC22(frame, response) {
-        var _a;
+        var _a, _b;
         if (frame.data.length === 6) {
             if (this.model.maskWriteRegister || (this.model.readHoldingRegisters && this.model.writeSingleRegister)) {
                 const bufferRx = Buffer.from(frame.data);
                 const address = bufferRx.readUInt16BE(0);
                 const andMask = bufferRx.readUInt16BE(2);
                 const orMask = bufferRx.readUInt16BE(4);
-                if (checkRange(address, (_a = this.model.addressRange) === null || _a === void 0 ? void 0 : _a.holdingRegisters)) {
+                if (checkRange(address, (_b = (_a = this.model).getAddressRange) === null || _b === void 0 ? void 0 : _b.call(_a).holdingRegisters)) {
                     Promise.resolve(this.model.maskWriteRegister
                         ? this.model.maskWriteRegister(address, andMask, orMask)
                         : Promise.resolve(this.model.readHoldingRegisters(address, 1)).then(([value]) => {
@@ -1680,7 +1694,7 @@ class ModbusSlave extends EventEmitter {
         }
     }
     handleFC23(frame, response) {
-        var _a;
+        var _a, _b;
         if (frame.data.length > 9 && frame.data.length === 9 + frame.data[8]) {
             if (this.model.readHoldingRegisters && (this.model.writeMultipleRegisters || this.model.writeSingleRegister)) {
                 const bufferRx = Buffer.from(frame.data);
@@ -1698,7 +1712,7 @@ class ModbusSlave extends EventEmitter {
                     length.write >= 0x0001 &&
                     length.write <= 0x0079 &&
                     byteCount === length.write * 2) {
-                    if (checkRange([address.read, address.read + length.read, address.write, address.write + length.write], (_a = this.model.addressRange) === null || _a === void 0 ? void 0 : _a.holdingRegisters)) {
+                    if (checkRange([address.read, address.read + length.read, address.write, address.write + length.write], (_b = (_a = this.model).getAddressRange) === null || _b === void 0 ? void 0 : _b.call(_a).holdingRegisters)) {
                         const value = Array.from({ length: length.write }).map((_, index) => bufferRx.readUInt16BE(9 + index * 2));
                         Promise.resolve(this.model.writeMultipleRegisters
                             ? this.model.writeMultipleRegisters(address.write, value)

package/dist/src/layers/physical/tcp-client-physical-layer.d.ts

@@ -8,7 +8,7 @@ export declare class TcpClientPhysicalLayer extends AbstractPhysicalLayer {
     get isOpen(): boolean;
     get destroyed(): boolean;
     constructor(options?: SocketConstructorOpts);
-    open(options: Partial<SocketConnectOpts>): Promise<void>;
+    open(options?: SocketConnectOpts): Promise<void>;
     write(data: Buffer): Promise<void>;
     close(): Promise<void>;
     destroy(): Promise<void>;

package/dist/src/layers/physical/tcp-server-physical-layer.d.ts

@@ -9,7 +9,7 @@ export declare class TcpServerPhysicalLayer extends AbstractPhysicalLayer {
     get isOpen(): boolean;
     get destroyed(): boolean;
     constructor(options?: NetConnectOpts);
-    open(options: ListenOptions): Promise<void>;
+    open(options?: ListenOptions): Promise<void>;
     write(data: Buffer): Promise<void>;
     close(): Promise<void>;
     destroy(): Promise<void>;

package/dist/src/layers/physical/udp-physical-layer.d.ts

@@ -20,7 +20,7 @@ export declare class UdpPhysicalLayer extends AbstractPhysicalLayer {
         port?: number;
         address?: string;
     });
-    open(options: BindOptions): Promise<void>;
+    open(options?: BindOptions): Promise<void>;
     write(data: Buffer): Promise<void>;
     close(): Promise<void>;
     destroy(): Promise<void>;

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

@@ -33,11 +33,11 @@ export interface ModbusSlaveModel {
     readDeviceIdentification?: FConvertPromise<() => {
         [index: number]: string;
     }>;
-    addressRange?: {
-        discreteInputs?: [number, number];
-        coils?: [number, number];
-        inputRegisters?: [number, number];
-        holdingRegisters?: [number, number];
+    getAddressRange?: () => {
+        discreteInputs?: [number, number] | [number, number][];
+        coils?: [number, number] | [number, number][];
+        inputRegisters?: [number, number] | [number, number][];
+        holdingRegisters?: [number, number] | [number, number][];
     };
 }
 interface ModbusSlaveEvents {

package/dist/src/utils/checkRange.d.ts

@@ -1,2 +1 @@
-export declare function checkRange(value: number, range?: [number, number]): boolean;
-export declare function checkRange(values: number[], range?: [number, number]): boolean;
+export declare function checkRange(value: number | number[], range?: [number, number] | [number, number][]): boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "njs-modbus",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "description": "A pure JavaScript implemetation of Modbus for NodeJS.",
   "keywords": [
     "modbus",