njs-modbus 1.3.4 → 1.4.0

package/README.md

@@ -66,6 +66,7 @@ npm install njs-modbus
 ### Modbus RTU Master
 
 ```typescript
+import type { ModbusSlaveModel } from 'njs-modbus';
 import { SerialPhysicalLayer, RtuApplicationLayer, ModbusMaster } from 'njs-modbus';
 
 const physicalLayer = new SerialPhysicalLayer({ path: 'COM1', baudRate: 9600, dataBits: 8, parity: 'none', stopBits: 1 });
@@ -100,72 +101,70 @@ const MB_SERVER = {
 
 const physicalLayer = new SerialPhysicalLayer({ path: 'COM1', baudRate: 9600, dataBits: 8, parity: 'none', stopBits: 1 });
 const applicationLayer = new RtuApplicationLayer(physicalLayer);
+const slave1: ModbusSlaveModel = {
+  readDiscreteInputs: (address, length) => {
+    return Array.from({ length }).map((_, i) => {
+      const discreteInput = MB_SERVER.discreteInputs.get(address + i);
+      if (typeof discreteInput === 'undefined') {
+        return false;
+      }
+      return discreteInput;
+    });
+  },
+
+  readCoils: (address, length) => {
+    return Array.from({ length }).map((_, i) => {
+      const coil = MB_SERVER.coils.get(address + i);
+      if (typeof coil === 'undefined') {
+        return false;
+      }
+      return coil;
+    });
+  },
+  writeSingleCoil: (address, value) => {
+    MB_SERVER.coils.set(address, value);
+  },
+
+  readInputRegisters: (address, length) => {
+    return Array.from({ length }).map((_, i) => {
+      const inputRegister = MB_SERVER.inputRegisters.get(address + i);
+      if (typeof inputRegister === 'undefined') {
+        return 0;
+      }
+      return inputRegister;
+    });
+  },
 
-const modbusSlave = new ModbusSlave(
-  {
-    readDiscreteInputs: (address, length) => {
-      return Array.from({ length }).map((_, i) => {
-        const discreteInput = MB_SERVER.discreteInputs.get(address + i);
-        if (typeof discreteInput === 'undefined') {
-          return false;
-        }
-        return discreteInput;
-      });
-    },
-
-    readCoils: (address, length) => {
-      return Array.from({ length }).map((_, i) => {
-        const coil = MB_SERVER.coils.get(address + i);
-        if (typeof coil === 'undefined') {
-          return false;
-        }
-        return coil;
-      });
-    },
-    writeSingleCoil: (address, value) => {
-      MB_SERVER.coils.set(address, value);
-    },
-
-    readInputRegisters: (address, length) => {
-      return Array.from({ length }).map((_, i) => {
-        const inputRegister = MB_SERVER.inputRegisters.get(address + i);
-        if (typeof inputRegister === 'undefined') {
-          return 0;
-        }
-        return inputRegister;
-      });
-    },
-
-    readHoldingRegisters: (address, length) => {
-      return Array.from({ length }).map((_, i) => {
-        const holdingRegister = MB_SERVER.holdingRegisters.get(address + i);
-        if (typeof holdingRegister === 'undefined') {
-          return 0;
-        }
-        return holdingRegister;
-      });
-    },
-    writeSingleRegister: (address, value) => {
-      MB_SERVER.holdingRegisters.set(address, value);
-    },
-
-    reportServerId: () => ({ additionalData: [1, 2, 3] }),
-
-    readDeviceIdentification: () => ({
-      0x00: 'Basic:VendorName',
-      0x01: 'Basic:ProductCode',
-      0x02: 'Basic:MajorMinorRevision',
-      0x03: 'Regular:VendorUrl',
-      0x04: 'Regular:ProductName',
-      0x05: 'Regular:ModelName',
-      0x06: 'Regular:UserApplicationName',
-      0x80: 'Extended:Extended',
-      0xff: 'Extended:Extended',
-    }),
+  readHoldingRegisters: (address, length) => {
+    return Array.from({ length }).map((_, i) => {
+      const holdingRegister = MB_SERVER.holdingRegisters.get(address + i);
+      if (typeof holdingRegister === 'undefined') {
+        return 0;
+      }
+      return holdingRegister;
+    });
+  },
+  writeSingleRegister: (address, value) => {
+    MB_SERVER.holdingRegisters.set(address, value);
   },
-  applicationLayer,
-  physicalLayer,
-);
+
+  reportServerId: () => ({ additionalData: [1, 2, 3] }),
+
+  readDeviceIdentification: () => ({
+    0x00: 'Basic:VendorName',
+    0x01: 'Basic:ProductCode',
+    0x02: 'Basic:MajorMinorRevision',
+    0x03: 'Regular:VendorUrl',
+    0x04: 'Regular:ProductName',
+    0x05: 'Regular:ModelName',
+    0x06: 'Regular:UserApplicationName',
+    0x80: 'Extended:Extended',
+    0xff: 'Extended:Extended',
+  }),
+};
+
+const modbusSlave = new ModbusSlave(applicationLayer, physicalLayer);
+modbusSlave.add(slave1);
 
 modbusSlave
   .open()

package/dist/index.cjs

@@ -545,6 +545,7 @@ function lrc(data) {
     return (~data.reduce((sum, n) => sum + n, 0) + 1) & 0xff;
 }
 
+const MAX_FRAME_LENGTH = 256;
 class RtuApplicationLayer extends AbstractApplicationLayer {
     constructor(physicalLayer, 
     /**
@@ -609,11 +610,16 @@ class RtuApplicationLayer extends AbstractApplicationLayer {
                     }
                 });
             };
-            if (threePointFiveT) {
-                this._timerThreePointFive = setTimeout(handleData, threePointFiveT);
+            if (this._bufferRx.length >= MAX_FRAME_LENGTH) {
+                handleData();
             }
             else {
-                handleData();
+                if (threePointFiveT) {
+                    this._timerThreePointFive = setTimeout(handleData, threePointFiveT);
+                }
+                else {
+                    handleData();
+                }
             }
         };
         physicalLayer.on('data', handleData);
@@ -1498,14 +1504,8 @@ class ModbusSlave extends EventEmitter {
     get destroyed() {
         return this.physicalLayer.destroyed;
     }
-    constructor(model, applicationLayer, physicalLayer) {
+    constructor(applicationLayer, physicalLayer) {
         super();
-        Object.defineProperty(this, "model", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: model
-        });
         Object.defineProperty(this, "applicationLayer", {
             enumerable: true,
             configurable: true,
@@ -1518,17 +1518,14 @@ class ModbusSlave extends EventEmitter {
             writable: true,
             value: physicalLayer
         });
-        Object.defineProperty(this, "unit", {
+        Object.defineProperty(this, "models", {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: 1
+            value: new Map()
         });
-        if (typeof model.unit !== 'undefined') {
-            this.unit = model.unit;
-        }
-        applicationLayer.on('framing', (frame, _response) => __awaiter(this, void 0, void 0, function* () {
-            if (!(frame.unit === 0x00 || frame.unit === this.unit)) {
+        applicationLayer.on('framing', (frame, _response) => {
+            if (!(frame.unit === 0x00 || this.models.has(frame.unit))) {
                 return;
             }
             const response = (data) => __awaiter(this, void 0, void 0, function* () {
@@ -1540,74 +1537,85 @@ class ModbusSlave extends EventEmitter {
                 }
                 catch (error) { }
             });
-            if (model.interceptor) {
-                try {
-                    const data = yield model.interceptor(frame.fc, frame.data);
-                    if (data) {
-                        response(this.applicationLayer.encode(Object.assign(Object.assign({}, frame), { data })));
-                        return;
+            const intercept = (model) => __awaiter(this, void 0, void 0, function* () {
+                if (model.interceptor) {
+                    try {
+                        const data = yield model.interceptor(frame.fc, frame.data);
+                        if (data) {
+                            response(this.applicationLayer.encode(Object.assign(Object.assign({}, frame), { data })));
+                            return 'break';
+                        }
+                    }
+                    catch (error) {
+                        this.responseError(frame, response, error);
+                        return 'break';
                     }
                 }
-                catch (error) {
-                    this.responseError(frame, response, error);
-                    return;
-                }
-            }
-            switch (frame.fc) {
-                case 0x01: {
-                    this.handleFC1(frame, response);
-                    break;
-                }
-                case 0x02: {
-                    this.handleFC2(frame, response);
-                    break;
-                }
-                case 0x03: {
-                    this.handleFC3(frame, response);
-                    break;
-                }
-                case 0x04: {
-                    this.handleFC4(frame, response);
-                    break;
-                }
-                case 0x05: {
-                    this.handleFC5(frame, response);
-                    break;
-                }
-                case 0x06: {
-                    this.handleFC6(frame, response);
-                    break;
-                }
-                case 0x0f: {
-                    this.handleFC15(frame, response);
-                    break;
-                }
-                case 0x10: {
-                    this.handleFC16(frame, response);
-                    break;
-                }
-                case 0x11: {
-                    this.handleFC17(frame, response);
-                    break;
-                }
-                case 0x16: {
-                    this.handleFC22(frame, response);
-                    break;
-                }
-                case 0x17: {
-                    this.handleFC23(frame, response);
-                    break;
-                }
-                case 0x2b: {
-                    this.handleFC43_14(frame, response);
-                    break;
-                }
-                default: {
-                    this.responseError(frame, response, getErrorByCode(exports.ErrorCode.ILLEGAL_FUNCTION));
-                    break;
+            });
+            const handleFC = (model) => {
+                switch (frame.fc) {
+                    case 0x01: {
+                        this.handleFC1(model, frame, response);
+                        break;
+                    }
+                    case 0x02: {
+                        this.handleFC2(model, frame, response);
+                        break;
+                    }
+                    case 0x03: {
+                        this.handleFC3(model, frame, response);
+                        break;
+                    }
+                    case 0x04: {
+                        this.handleFC4(model, frame, response);
+                        break;
+                    }
+                    case 0x05: {
+                        this.handleFC5(model, frame, response);
+                        break;
+                    }
+                    case 0x06: {
+                        this.handleFC6(model, frame, response);
+                        break;
+                    }
+                    case 0x0f: {
+                        this.handleFC15(model, frame, response);
+                        break;
+                    }
+                    case 0x10: {
+                        this.handleFC16(model, frame, response);
+                        break;
+                    }
+                    case 0x11: {
+                        this.handleFC17(model, frame, response);
+                        break;
+                    }
+                    case 0x16: {
+                        this.handleFC22(model, frame, response);
+                        break;
+                    }
+                    case 0x17: {
+                        this.handleFC23(model, frame, response);
+                        break;
+                    }
+                    case 0x2b: {
+                        this.handleFC43_14(model, frame, response);
+                        break;
+                    }
+                    default: {
+                        this.responseError(frame, response, getErrorByCode(exports.ErrorCode.ILLEGAL_FUNCTION));
+                        break;
+                    }
                 }
+            };
+            for (const model of frame.unit === 0x00 ? this.models.values() : [this.models.get(frame.unit)]) {
+                intercept(model).then((res) => {
+                    if (res !== 'break') {
+                        handleFC(model);
+                    }
+                });
             }
-        }));
+        });
         physicalLayer.on('error', (error) => {
             this.emit('error', error);
         });
@@ -1615,16 +1623,16 @@ class ModbusSlave extends EventEmitter {
             this.emit('close');
         });
     }
-    handleFC1(frame, response) {
-        var _a, _b;
+    handleFC1(model, frame, response) {
+        var _a;
         if (frame.data.length === 4) {
-            if (this.model.readCoils) {
+            if (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], (_b = (_a = this.model).getAddressRange) === null || _b === void 0 ? void 0 : _b.call(_a).coils)) {
-                        Promise.resolve(this.model.readCoils(address, length))
+                    if (checkRange([address, address + length], (_a = model.getAddressRange) === null || _a === void 0 ? void 0 : _a.call(model).coils)) {
+                        Promise.resolve(model.readCoils(address, length))
                             .then((coils) => {
                             const bufferTx = Buffer.alloc(Math.ceil(length / 8));
                             coils.forEach((coil, index) => {
@@ -1651,16 +1659,16 @@ class ModbusSlave extends EventEmitter {
             }
         }
     }
-    handleFC2(frame, response) {
-        var _a, _b;
+    handleFC2(model, frame, response) {
+        var _a;
         if (frame.data.length === 4) {
-            if (this.model.readDiscreteInputs) {
+            if (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], (_b = (_a = this.model).getAddressRange) === null || _b === void 0 ? void 0 : _b.call(_a).discreteInputs)) {
-                        Promise.resolve(this.model.readDiscreteInputs(address, length))
+                    if (checkRange([address, address + length], (_a = model.getAddressRange) === null || _a === void 0 ? void 0 : _a.call(model).discreteInputs)) {
+                        Promise.resolve(model.readDiscreteInputs(address, length))
                             .then((discreteInputs) => {
                             const bufferTx = Buffer.alloc(Math.ceil(length / 8));
                             discreteInputs.forEach((discreteInput, index) => {
@@ -1687,16 +1695,16 @@ class ModbusSlave extends EventEmitter {
             }
         }
     }
-    handleFC3(frame, response) {
-        var _a, _b;
+    handleFC3(model, frame, response) {
+        var _a;
         if (frame.data.length === 4) {
-            if (this.model.readHoldingRegisters) {
+            if (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], (_b = (_a = this.model).getAddressRange) === null || _b === void 0 ? void 0 : _b.call(_a).holdingRegisters)) {
-                        Promise.resolve(this.model.readHoldingRegisters(address, length))
+                    if (checkRange([address, address + length], (_a = model.getAddressRange) === null || _a === void 0 ? void 0 : _a.call(model).holdingRegisters)) {
+                        Promise.resolve(model.readHoldingRegisters(address, length))
                             .then((registers) => {
                             const bufferTx = Buffer.alloc(length * 2);
                             registers.forEach((register, index) => {
@@ -1721,16 +1729,16 @@ class ModbusSlave extends EventEmitter {
             }
         }
     }
-    handleFC4(frame, response) {
-        var _a, _b;
+    handleFC4(model, frame, response) {
+        var _a;
         if (frame.data.length === 4) {
-            if (this.model.readInputRegisters) {
+            if (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], (_b = (_a = this.model).getAddressRange) === null || _b === void 0 ? void 0 : _b.call(_a).inputRegisters)) {
-                        Promise.resolve(this.model.readInputRegisters(address, length))
+                    if (checkRange([address, address + length], (_a = model.getAddressRange) === null || _a === void 0 ? void 0 : _a.call(model).inputRegisters)) {
+                        Promise.resolve(model.readInputRegisters(address, length))
                             .then((registers) => {
                             const bufferTx = Buffer.alloc(length * 2);
                             registers.forEach((register, index) => {
@@ -1755,16 +1763,16 @@ class ModbusSlave extends EventEmitter {
             }
         }
     }
-    handleFC5(frame, response) {
-        var _a, _b;
+    handleFC5(model, frame, response) {
+        var _a;
         if (frame.data.length === 4) {
-            if (this.model.writeSingleCoil) {
+            if (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, (_b = (_a = this.model).getAddressRange) === null || _b === void 0 ? void 0 : _b.call(_a).coils)) {
-                        Promise.resolve(this.model.writeSingleCoil(address, value === 0xff00))
+                    if (checkRange(address, (_a = model.getAddressRange) === null || _a === void 0 ? void 0 : _a.call(model).coils)) {
+                        Promise.resolve(model.writeSingleCoil(address, value === 0xff00))
                             .then(() => {
                             response(this.applicationLayer.encode(frame));
                         })
@@ -1785,16 +1793,16 @@ class ModbusSlave extends EventEmitter {
             }
         }
     }
-    handleFC6(frame, response) {
-        var _a, _b;
+    handleFC6(model, frame, response) {
+        var _a;
         if (frame.data.length === 4) {
-            if (this.model.writeSingleRegister) {
+            if (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, (_b = (_a = this.model).getAddressRange) === null || _b === void 0 ? void 0 : _b.call(_a).holdingRegisters)) {
-                        Promise.resolve(this.model.writeSingleRegister(address, value))
+                    if (checkRange(address, (_a = model.getAddressRange) === null || _a === void 0 ? void 0 : _a.call(model).holdingRegisters)) {
+                        Promise.resolve(model.writeSingleRegister(address, value))
                             .then(() => {
                             response(this.applicationLayer.encode(frame));
                         })
@@ -1815,20 +1823,20 @@ class ModbusSlave extends EventEmitter {
             }
         }
     }
-    handleFC15(frame, response) {
-        var _a, _b;
+    handleFC15(model, frame, response) {
+        var _a;
         if (frame.data.length > 5 && frame.data.length === 5 + frame.data[4]) {
-            if (this.model.writeMultipleCoils || this.model.writeSingleCoil) {
+            if (model.writeMultipleCoils || model.writeSingleCoil) {
                 const bufferRx = Buffer.from(frame.data);
                 const address = bufferRx.readUInt16BE(0);
                 const length = bufferRx.readUInt16BE(2);
                 const byteCount = bufferRx[4];
                 if (length >= 0x0001 && length <= 0x07b0 && byteCount === Math.ceil(length / 8)) {
-                    if (checkRange([address, address + length], (_b = (_a = this.model).getAddressRange) === null || _b === void 0 ? void 0 : _b.call(_a).coils)) {
+                    if (checkRange([address, address + length], (_a = model.getAddressRange) === null || _a === void 0 ? void 0 : _a.call(model).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)
-                            : Promise.all(value.map((v, i) => this.model.writeSingleCoil(address + i, v))))
+                        Promise.resolve(model.writeMultipleCoils
+                            ? model.writeMultipleCoils(address, value)
+                            : Promise.all(value.map((v, i) => model.writeSingleCoil(address + i, v))))
                             .then(() => {
                             response(this.applicationLayer.encode(Object.assign(Object.assign({}, frame), { data: Array.from(bufferRx).slice(0, 4) })));
                         })
@@ -1849,20 +1857,20 @@ class ModbusSlave extends EventEmitter {
             }
         }
     }
-    handleFC16(frame, response) {
-        var _a, _b;
+    handleFC16(model, frame, response) {
+        var _a;
         if (frame.data.length > 5 && frame.data.length === 5 + frame.data[4]) {
-            if (this.model.writeMultipleRegisters || this.model.writeSingleRegister) {
+            if (model.writeMultipleRegisters || model.writeSingleRegister) {
                 const bufferRx = Buffer.from(frame.data);
                 const address = bufferRx.readUInt16BE(0);
                 const length = bufferRx.readUInt16BE(2);
                 const byteCount = bufferRx[4];
                 if (length >= 0x0001 && length <= 0x007b && byteCount === length * 2) {
-                    if (checkRange([address, address + length], (_b = (_a = this.model).getAddressRange) === null || _b === void 0 ? void 0 : _b.call(_a).holdingRegisters)) {
+                    if (checkRange([address, address + length], (_a = model.getAddressRange) === null || _a === void 0 ? void 0 : _a.call(model).holdingRegisters)) {
                         const value = Array.from({ length }).map((_, index) => bufferRx.readUInt16BE(5 + index * 2));
-                        Promise.resolve(this.model.writeMultipleRegisters
-                            ? this.model.writeMultipleRegisters(address, value)
-                            : Promise.all(value.map((v, i) => this.model.writeSingleRegister(address + i, v))))
+                        Promise.resolve(model.writeMultipleRegisters
+                            ? model.writeMultipleRegisters(address, value)
+                            : Promise.all(value.map((v, i) => model.writeSingleRegister(address + i, v))))
                             .then(() => {
                             response(this.applicationLayer.encode(Object.assign(Object.assign({}, frame), { data: Array.from(bufferRx).slice(0, 4) })));
                         })
@@ -1883,11 +1891,13 @@ class ModbusSlave extends EventEmitter {
             }
         }
     }
-    handleFC17(frame, response) {
+    handleFC17(model, frame, response) {
         if (frame.data.length === 0) {
-            if (this.model.reportServerId) {
-                Promise.resolve(this.model.reportServerId())
-                    .then(({ serverId = this.unit, runIndicatorStatus = true, additionalData = [] }) => {
+            if (model.reportServerId) {
+                Promise.resolve(model.reportServerId())
+                    .then((_a) => {
+                    var _b;
+                    var { serverId = (_b = model.unit) !== null && _b !== void 0 ? _b : 1, runIndicatorStatus = true, additionalData = [] } = _a;
                     response(this.applicationLayer.encode(Object.assign(Object.assign({}, frame), { data: [2 + additionalData.length, serverId, runIndicatorStatus ? 0xff : 0x00].concat(additionalData) })));
                 })
                     .catch((error) => {
@@ -1899,19 +1909,19 @@ class ModbusSlave extends EventEmitter {
             }
         }
     }
-    handleFC22(frame, response) {
-        var _a, _b;
+    handleFC22(model, frame, response) {
+        var _a;
         if (frame.data.length === 6) {
-            if (this.model.maskWriteRegister || (this.model.readHoldingRegisters && this.model.writeSingleRegister)) {
+            if (model.maskWriteRegister || (model.readHoldingRegisters && 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, (_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]) => {
-                            return Promise.resolve(this.model.writeSingleRegister(address, (value & andMask) | (orMask & (~andMask & 0xff))));
+                if (checkRange(address, (_a = model.getAddressRange) === null || _a === void 0 ? void 0 : _a.call(model).holdingRegisters)) {
+                    Promise.resolve(model.maskWriteRegister
+                        ? model.maskWriteRegister(address, andMask, orMask)
+                        : Promise.resolve(model.readHoldingRegisters(address, 1)).then(([value]) => {
+                            return Promise.resolve(model.writeSingleRegister(address, (value & andMask) | (orMask & (~andMask & 0xff))));
                         }))
                         .then(() => {
                         response(this.applicationLayer.encode(frame));
@@ -1929,10 +1939,10 @@ class ModbusSlave extends EventEmitter {
             }
         }
     }
-    handleFC23(frame, response) {
-        var _a, _b;
+    handleFC23(model, frame, response) {
+        var _a;
         if (frame.data.length > 9 && frame.data.length === 9 + frame.data[8]) {
-            if (this.model.readHoldingRegisters && (this.model.writeMultipleRegisters || this.model.writeSingleRegister)) {
+            if (model.readHoldingRegisters && (model.writeMultipleRegisters || model.writeSingleRegister)) {
                 const bufferRx = Buffer.from(frame.data);
                 const address = {
                     read: bufferRx.readUInt16BE(0),
@@ -1948,12 +1958,12 @@ 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], (_b = (_a = this.model).getAddressRange) === null || _b === void 0 ? void 0 : _b.call(_a).holdingRegisters)) {
+                    if (checkRange([address.read, address.read + length.read, address.write, address.write + length.write], (_a = model.getAddressRange) === null || _a === void 0 ? void 0 : _a.call(model).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)
-                            : Promise.all(value.map((v, i) => this.model.writeSingleRegister(address.write + i, v))))
-                            .then(() => Promise.resolve(this.model.readHoldingRegisters(address.read, length.read)))
+                        Promise.resolve(model.writeMultipleRegisters
+                            ? model.writeMultipleRegisters(address.write, value)
+                            : Promise.all(value.map((v, i) => model.writeSingleRegister(address.write + i, v))))
+                            .then(() => Promise.resolve(model.readHoldingRegisters(address.read, length.read)))
                             .then((registers) => {
                             const bufferTx = Buffer.alloc(length.read * 2);
                             registers.forEach((register, index) => {
@@ -1978,9 +1988,9 @@ class ModbusSlave extends EventEmitter {
             }
         }
     }
-    handleFC43_14(frame, response) {
+    handleFC43_14(model, frame, response) {
         if (frame.data.length === 3) {
-            if (frame.data[0] === 0x0e && this.model.readDeviceIdentification) {
+            if (frame.data[0] === 0x0e && model.readDeviceIdentification) {
                 const readDeviceIDCode = frame.data[1];
                 let objectID = frame.data[2];
                 switch (readDeviceIDCode) {
@@ -2014,7 +2024,7 @@ class ModbusSlave extends EventEmitter {
                         return;
                     }
                 }
-                Promise.resolve(this.model.readDeviceIdentification())
+                Promise.resolve(model.readDeviceIdentification())
                     .then((identification) => {
                     const objects = new Map([
                         [0x00, 'null'],
@@ -2092,6 +2102,13 @@ class ModbusSlave extends EventEmitter {
     responseError(frame, response, error) {
         response(this.applicationLayer.encode(Object.assign(Object.assign({}, frame), { fc: frame.fc | 0x80, data: [getCodeByError(error)] })));
     }
+    add(model) {
+        var _a;
+        this.models.set((_a = model.unit) !== null && _a !== void 0 ? _a : 1, model);
+    }
+    remove(unit) {
+        this.models.delete(unit);
+    }
     open(...args) {
         return this.physicalLayer.open(...args);
     }

package/dist/index.d.ts

@@ -342,13 +342,12 @@ interface ModbusSlaveEvents {
     close: [];
 }
 declare class ModbusSlave<A extends AbstractApplicationLayer, P extends AbstractPhysicalLayer> extends EventEmitter<ModbusSlaveEvents> {
-    private model;
     private applicationLayer;
     private physicalLayer;
-    unit: number;
+    models: Map<number, ModbusSlaveModel>;
     get isOpen(): boolean;
     get destroyed(): boolean;
-    constructor(model: ModbusSlaveModel, applicationLayer: A, physicalLayer: P);
+    constructor(applicationLayer: A, physicalLayer: P);
     private handleFC1;
     private handleFC2;
     private handleFC3;
@@ -362,6 +361,8 @@ declare class ModbusSlave<A extends AbstractApplicationLayer, P extends Abstract
     private handleFC23;
     private handleFC43_14;
     private responseError;
+    add(model: ModbusSlaveModel): void;
+    remove(unit: number): void;
     open(...args: Parameters<P['open']>): Promise<void>;
     close(): Promise<void>;
     destroy(): Promise<void>;

package/dist/index.mjs

@@ -543,6 +543,7 @@ function lrc(data) {
     return (~data.reduce((sum, n) => sum + n, 0) + 1) & 0xff;
 }
 
+const MAX_FRAME_LENGTH = 256;
 class RtuApplicationLayer extends AbstractApplicationLayer {
     constructor(physicalLayer, 
     /**
@@ -607,11 +608,16 @@ class RtuApplicationLayer extends AbstractApplicationLayer {
                     }
                 });
             };
-            if (threePointFiveT) {
-                this._timerThreePointFive = setTimeout(handleData, threePointFiveT);
+            if (this._bufferRx.length >= MAX_FRAME_LENGTH) {
+                handleData();
             }
             else {
-                handleData();
+                if (threePointFiveT) {
+                    this._timerThreePointFive = setTimeout(handleData, threePointFiveT);
+                }
+                else {
+                    handleData();
+                }
             }
         };
         physicalLayer.on('data', handleData);
@@ -1496,14 +1502,8 @@ class ModbusSlave extends EventEmitter {
     get destroyed() {
         return this.physicalLayer.destroyed;
     }
-    constructor(model, applicationLayer, physicalLayer) {
+    constructor(applicationLayer, physicalLayer) {
         super();
-        Object.defineProperty(this, "model", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: model
-        });
         Object.defineProperty(this, "applicationLayer", {
             enumerable: true,
             configurable: true,
@@ -1516,17 +1516,14 @@ class ModbusSlave extends EventEmitter {
             writable: true,
             value: physicalLayer
         });
-        Object.defineProperty(this, "unit", {
+        Object.defineProperty(this, "models", {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: 1
+            value: new Map()
         });
-        if (typeof model.unit !== 'undefined') {
-            this.unit = model.unit;
-        }
-        applicationLayer.on('framing', (frame, _response) => __awaiter(this, void 0, void 0, function* () {
-            if (!(frame.unit === 0x00 || frame.unit === this.unit)) {
+        applicationLayer.on('framing', (frame, _response) => {
+            if (!(frame.unit === 0x00 || this.models.has(frame.unit))) {
                 return;
             }
             const response = (data) => __awaiter(this, void 0, void 0, function* () {
@@ -1538,74 +1535,85 @@ class ModbusSlave extends EventEmitter {
                 }
                 catch (error) { }
             });
-            if (model.interceptor) {
-                try {
-                    const data = yield model.interceptor(frame.fc, frame.data);
-                    if (data) {
-                        response(this.applicationLayer.encode(Object.assign(Object.assign({}, frame), { data })));
-                        return;
+            const intercept = (model) => __awaiter(this, void 0, void 0, function* () {
+                if (model.interceptor) {
+                    try {
+                        const data = yield model.interceptor(frame.fc, frame.data);
+                        if (data) {
+                            response(this.applicationLayer.encode(Object.assign(Object.assign({}, frame), { data })));
+                            return 'break';
+                        }
+                    }
+                    catch (error) {
+                        this.responseError(frame, response, error);
+                        return 'break';
                     }
                 }
-                catch (error) {
-                    this.responseError(frame, response, error);
-                    return;
-                }
-            }
-            switch (frame.fc) {
-                case 0x01: {
-                    this.handleFC1(frame, response);
-                    break;
-                }
-                case 0x02: {
-                    this.handleFC2(frame, response);
-                    break;
-                }
-                case 0x03: {
-                    this.handleFC3(frame, response);
-                    break;
-                }
-                case 0x04: {
-                    this.handleFC4(frame, response);
-                    break;
-                }
-                case 0x05: {
-                    this.handleFC5(frame, response);
-                    break;
-                }
-                case 0x06: {
-                    this.handleFC6(frame, response);
-                    break;
-                }
-                case 0x0f: {
-                    this.handleFC15(frame, response);
-                    break;
-                }
-                case 0x10: {
-                    this.handleFC16(frame, response);
-                    break;
-                }
-                case 0x11: {
-                    this.handleFC17(frame, response);
-                    break;
-                }
-                case 0x16: {
-                    this.handleFC22(frame, response);
-                    break;
-                }
-                case 0x17: {
-                    this.handleFC23(frame, response);
-                    break;
-                }
-                case 0x2b: {
-                    this.handleFC43_14(frame, response);
-                    break;
-                }
-                default: {
-                    this.responseError(frame, response, getErrorByCode(ErrorCode.ILLEGAL_FUNCTION));
-                    break;
+            });
+            const handleFC = (model) => {
+                switch (frame.fc) {
+                    case 0x01: {
+                        this.handleFC1(model, frame, response);
+                        break;
+                    }
+                    case 0x02: {
+                        this.handleFC2(model, frame, response);
+                        break;
+                    }
+                    case 0x03: {
+                        this.handleFC3(model, frame, response);
+                        break;
+                    }
+                    case 0x04: {
+                        this.handleFC4(model, frame, response);
+                        break;
+                    }
+                    case 0x05: {
+                        this.handleFC5(model, frame, response);
+                        break;
+                    }
+                    case 0x06: {
+                        this.handleFC6(model, frame, response);
+                        break;
+                    }
+                    case 0x0f: {
+                        this.handleFC15(model, frame, response);
+                        break;
+                    }
+                    case 0x10: {
+                        this.handleFC16(model, frame, response);
+                        break;
+                    }
+                    case 0x11: {
+                        this.handleFC17(model, frame, response);
+                        break;
+                    }
+                    case 0x16: {
+                        this.handleFC22(model, frame, response);
+                        break;
+                    }
+                    case 0x17: {
+                        this.handleFC23(model, frame, response);
+                        break;
+                    }
+                    case 0x2b: {
+                        this.handleFC43_14(model, frame, response);
+                        break;
+                    }
+                    default: {
+                        this.responseError(frame, response, getErrorByCode(ErrorCode.ILLEGAL_FUNCTION));
+                        break;
+                    }
                 }
+            };
+            for (const model of frame.unit === 0x00 ? this.models.values() : [this.models.get(frame.unit)]) {
+                intercept(model).then((res) => {
+                    if (res !== 'break') {
+                        handleFC(model);
+                    }
+                });
             }
-        }));
+        });
         physicalLayer.on('error', (error) => {
             this.emit('error', error);
         });
@@ -1613,16 +1621,16 @@ class ModbusSlave extends EventEmitter {
             this.emit('close');
         });
     }
-    handleFC1(frame, response) {
-        var _a, _b;
+    handleFC1(model, frame, response) {
+        var _a;
         if (frame.data.length === 4) {
-            if (this.model.readCoils) {
+            if (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], (_b = (_a = this.model).getAddressRange) === null || _b === void 0 ? void 0 : _b.call(_a).coils)) {
-                        Promise.resolve(this.model.readCoils(address, length))
+                    if (checkRange([address, address + length], (_a = model.getAddressRange) === null || _a === void 0 ? void 0 : _a.call(model).coils)) {
+                        Promise.resolve(model.readCoils(address, length))
                             .then((coils) => {
                             const bufferTx = Buffer.alloc(Math.ceil(length / 8));
                             coils.forEach((coil, index) => {
@@ -1649,16 +1657,16 @@ class ModbusSlave extends EventEmitter {
             }
         }
     }
-    handleFC2(frame, response) {
-        var _a, _b;
+    handleFC2(model, frame, response) {
+        var _a;
         if (frame.data.length === 4) {
-            if (this.model.readDiscreteInputs) {
+            if (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], (_b = (_a = this.model).getAddressRange) === null || _b === void 0 ? void 0 : _b.call(_a).discreteInputs)) {
-                        Promise.resolve(this.model.readDiscreteInputs(address, length))
+                    if (checkRange([address, address + length], (_a = model.getAddressRange) === null || _a === void 0 ? void 0 : _a.call(model).discreteInputs)) {
+                        Promise.resolve(model.readDiscreteInputs(address, length))
                             .then((discreteInputs) => {
                             const bufferTx = Buffer.alloc(Math.ceil(length / 8));
                             discreteInputs.forEach((discreteInput, index) => {
@@ -1685,16 +1693,16 @@ class ModbusSlave extends EventEmitter {
             }
         }
     }
-    handleFC3(frame, response) {
-        var _a, _b;
+    handleFC3(model, frame, response) {
+        var _a;
         if (frame.data.length === 4) {
-            if (this.model.readHoldingRegisters) {
+            if (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], (_b = (_a = this.model).getAddressRange) === null || _b === void 0 ? void 0 : _b.call(_a).holdingRegisters)) {
-                        Promise.resolve(this.model.readHoldingRegisters(address, length))
+                    if (checkRange([address, address + length], (_a = model.getAddressRange) === null || _a === void 0 ? void 0 : _a.call(model).holdingRegisters)) {
+                        Promise.resolve(model.readHoldingRegisters(address, length))
                             .then((registers) => {
                             const bufferTx = Buffer.alloc(length * 2);
                             registers.forEach((register, index) => {
@@ -1719,16 +1727,16 @@ class ModbusSlave extends EventEmitter {
             }
         }
     }
-    handleFC4(frame, response) {
-        var _a, _b;
+    handleFC4(model, frame, response) {
+        var _a;
         if (frame.data.length === 4) {
-            if (this.model.readInputRegisters) {
+            if (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], (_b = (_a = this.model).getAddressRange) === null || _b === void 0 ? void 0 : _b.call(_a).inputRegisters)) {
-                        Promise.resolve(this.model.readInputRegisters(address, length))
+                    if (checkRange([address, address + length], (_a = model.getAddressRange) === null || _a === void 0 ? void 0 : _a.call(model).inputRegisters)) {
+                        Promise.resolve(model.readInputRegisters(address, length))
                             .then((registers) => {
                             const bufferTx = Buffer.alloc(length * 2);
                             registers.forEach((register, index) => {
@@ -1753,16 +1761,16 @@ class ModbusSlave extends EventEmitter {
             }
         }
     }
-    handleFC5(frame, response) {
-        var _a, _b;
+    handleFC5(model, frame, response) {
+        var _a;
         if (frame.data.length === 4) {
-            if (this.model.writeSingleCoil) {
+            if (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, (_b = (_a = this.model).getAddressRange) === null || _b === void 0 ? void 0 : _b.call(_a).coils)) {
-                        Promise.resolve(this.model.writeSingleCoil(address, value === 0xff00))
+                    if (checkRange(address, (_a = model.getAddressRange) === null || _a === void 0 ? void 0 : _a.call(model).coils)) {
+                        Promise.resolve(model.writeSingleCoil(address, value === 0xff00))
                             .then(() => {
                             response(this.applicationLayer.encode(frame));
                         })
@@ -1783,16 +1791,16 @@ class ModbusSlave extends EventEmitter {
             }
         }
     }
-    handleFC6(frame, response) {
-        var _a, _b;
+    handleFC6(model, frame, response) {
+        var _a;
         if (frame.data.length === 4) {
-            if (this.model.writeSingleRegister) {
+            if (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, (_b = (_a = this.model).getAddressRange) === null || _b === void 0 ? void 0 : _b.call(_a).holdingRegisters)) {
-                        Promise.resolve(this.model.writeSingleRegister(address, value))
+                    if (checkRange(address, (_a = model.getAddressRange) === null || _a === void 0 ? void 0 : _a.call(model).holdingRegisters)) {
+                        Promise.resolve(model.writeSingleRegister(address, value))
                             .then(() => {
                             response(this.applicationLayer.encode(frame));
                         })
@@ -1813,20 +1821,20 @@ class ModbusSlave extends EventEmitter {
             }
         }
     }
-    handleFC15(frame, response) {
-        var _a, _b;
+    handleFC15(model, frame, response) {
+        var _a;
         if (frame.data.length > 5 && frame.data.length === 5 + frame.data[4]) {
-            if (this.model.writeMultipleCoils || this.model.writeSingleCoil) {
+            if (model.writeMultipleCoils || model.writeSingleCoil) {
                 const bufferRx = Buffer.from(frame.data);
                 const address = bufferRx.readUInt16BE(0);
                 const length = bufferRx.readUInt16BE(2);
                 const byteCount = bufferRx[4];
                 if (length >= 0x0001 && length <= 0x07b0 && byteCount === Math.ceil(length / 8)) {
-                    if (checkRange([address, address + length], (_b = (_a = this.model).getAddressRange) === null || _b === void 0 ? void 0 : _b.call(_a).coils)) {
+                    if (checkRange([address, address + length], (_a = model.getAddressRange) === null || _a === void 0 ? void 0 : _a.call(model).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)
-                            : Promise.all(value.map((v, i) => this.model.writeSingleCoil(address + i, v))))
+                        Promise.resolve(model.writeMultipleCoils
+                            ? model.writeMultipleCoils(address, value)
+                            : Promise.all(value.map((v, i) => model.writeSingleCoil(address + i, v))))
                             .then(() => {
                             response(this.applicationLayer.encode(Object.assign(Object.assign({}, frame), { data: Array.from(bufferRx).slice(0, 4) })));
                         })
@@ -1847,20 +1855,20 @@ class ModbusSlave extends EventEmitter {
             }
         }
     }
-    handleFC16(frame, response) {
-        var _a, _b;
+    handleFC16(model, frame, response) {
+        var _a;
         if (frame.data.length > 5 && frame.data.length === 5 + frame.data[4]) {
-            if (this.model.writeMultipleRegisters || this.model.writeSingleRegister) {
+            if (model.writeMultipleRegisters || model.writeSingleRegister) {
                 const bufferRx = Buffer.from(frame.data);
                 const address = bufferRx.readUInt16BE(0);
                 const length = bufferRx.readUInt16BE(2);
                 const byteCount = bufferRx[4];
                 if (length >= 0x0001 && length <= 0x007b && byteCount === length * 2) {
-                    if (checkRange([address, address + length], (_b = (_a = this.model).getAddressRange) === null || _b === void 0 ? void 0 : _b.call(_a).holdingRegisters)) {
+                    if (checkRange([address, address + length], (_a = model.getAddressRange) === null || _a === void 0 ? void 0 : _a.call(model).holdingRegisters)) {
                         const value = Array.from({ length }).map((_, index) => bufferRx.readUInt16BE(5 + index * 2));
-                        Promise.resolve(this.model.writeMultipleRegisters
-                            ? this.model.writeMultipleRegisters(address, value)
-                            : Promise.all(value.map((v, i) => this.model.writeSingleRegister(address + i, v))))
+                        Promise.resolve(model.writeMultipleRegisters
+                            ? model.writeMultipleRegisters(address, value)
+                            : Promise.all(value.map((v, i) => model.writeSingleRegister(address + i, v))))
                             .then(() => {
                             response(this.applicationLayer.encode(Object.assign(Object.assign({}, frame), { data: Array.from(bufferRx).slice(0, 4) })));
                         })
@@ -1881,11 +1889,13 @@ class ModbusSlave extends EventEmitter {
             }
         }
     }
-    handleFC17(frame, response) {
+    handleFC17(model, frame, response) {
         if (frame.data.length === 0) {
-            if (this.model.reportServerId) {
-                Promise.resolve(this.model.reportServerId())
-                    .then(({ serverId = this.unit, runIndicatorStatus = true, additionalData = [] }) => {
+            if (model.reportServerId) {
+                Promise.resolve(model.reportServerId())
+                    .then((_a) => {
+                    var _b;
+                    var { serverId = (_b = model.unit) !== null && _b !== void 0 ? _b : 1, runIndicatorStatus = true, additionalData = [] } = _a;
                     response(this.applicationLayer.encode(Object.assign(Object.assign({}, frame), { data: [2 + additionalData.length, serverId, runIndicatorStatus ? 0xff : 0x00].concat(additionalData) })));
                 })
                     .catch((error) => {
@@ -1897,19 +1907,19 @@ class ModbusSlave extends EventEmitter {
             }
         }
     }
-    handleFC22(frame, response) {
-        var _a, _b;
+    handleFC22(model, frame, response) {
+        var _a;
         if (frame.data.length === 6) {
-            if (this.model.maskWriteRegister || (this.model.readHoldingRegisters && this.model.writeSingleRegister)) {
+            if (model.maskWriteRegister || (model.readHoldingRegisters && 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, (_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]) => {
-                            return Promise.resolve(this.model.writeSingleRegister(address, (value & andMask) | (orMask & (~andMask & 0xff))));
+                if (checkRange(address, (_a = model.getAddressRange) === null || _a === void 0 ? void 0 : _a.call(model).holdingRegisters)) {
+                    Promise.resolve(model.maskWriteRegister
+                        ? model.maskWriteRegister(address, andMask, orMask)
+                        : Promise.resolve(model.readHoldingRegisters(address, 1)).then(([value]) => {
+                            return Promise.resolve(model.writeSingleRegister(address, (value & andMask) | (orMask & (~andMask & 0xff))));
                         }))
                         .then(() => {
                         response(this.applicationLayer.encode(frame));
@@ -1927,10 +1937,10 @@ class ModbusSlave extends EventEmitter {
             }
         }
     }
-    handleFC23(frame, response) {
-        var _a, _b;
+    handleFC23(model, frame, response) {
+        var _a;
         if (frame.data.length > 9 && frame.data.length === 9 + frame.data[8]) {
-            if (this.model.readHoldingRegisters && (this.model.writeMultipleRegisters || this.model.writeSingleRegister)) {
+            if (model.readHoldingRegisters && (model.writeMultipleRegisters || model.writeSingleRegister)) {
                 const bufferRx = Buffer.from(frame.data);
                 const address = {
                     read: bufferRx.readUInt16BE(0),
@@ -1946,12 +1956,12 @@ 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], (_b = (_a = this.model).getAddressRange) === null || _b === void 0 ? void 0 : _b.call(_a).holdingRegisters)) {
+                    if (checkRange([address.read, address.read + length.read, address.write, address.write + length.write], (_a = model.getAddressRange) === null || _a === void 0 ? void 0 : _a.call(model).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)
-                            : Promise.all(value.map((v, i) => this.model.writeSingleRegister(address.write + i, v))))
-                            .then(() => Promise.resolve(this.model.readHoldingRegisters(address.read, length.read)))
+                        Promise.resolve(model.writeMultipleRegisters
+                            ? model.writeMultipleRegisters(address.write, value)
+                            : Promise.all(value.map((v, i) => model.writeSingleRegister(address.write + i, v))))
+                            .then(() => Promise.resolve(model.readHoldingRegisters(address.read, length.read)))
                             .then((registers) => {
                             const bufferTx = Buffer.alloc(length.read * 2);
                             registers.forEach((register, index) => {
@@ -1976,9 +1986,9 @@ class ModbusSlave extends EventEmitter {
             }
         }
     }
-    handleFC43_14(frame, response) {
+    handleFC43_14(model, frame, response) {
         if (frame.data.length === 3) {
-            if (frame.data[0] === 0x0e && this.model.readDeviceIdentification) {
+            if (frame.data[0] === 0x0e && model.readDeviceIdentification) {
                 const readDeviceIDCode = frame.data[1];
                 let objectID = frame.data[2];
                 switch (readDeviceIDCode) {
@@ -2012,7 +2022,7 @@ class ModbusSlave extends EventEmitter {
                         return;
                     }
                 }
-                Promise.resolve(this.model.readDeviceIdentification())
+                Promise.resolve(model.readDeviceIdentification())
                     .then((identification) => {
                     const objects = new Map([
                         [0x00, 'null'],
@@ -2090,6 +2100,13 @@ class ModbusSlave extends EventEmitter {
     responseError(frame, response, error) {
         response(this.applicationLayer.encode(Object.assign(Object.assign({}, frame), { fc: frame.fc | 0x80, data: [getCodeByError(error)] })));
     }
+    add(model) {
+        var _a;
+        this.models.set((_a = model.unit) !== null && _a !== void 0 ? _a : 1, model);
+    }
+    remove(unit) {
+        this.models.delete(unit);
+    }
     open(...args) {
         return this.physicalLayer.open(...args);
     }

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

@@ -45,13 +45,12 @@ interface ModbusSlaveEvents {
     close: [];
 }
 export declare class ModbusSlave<A extends AbstractApplicationLayer, P extends AbstractPhysicalLayer> extends EventEmitter<ModbusSlaveEvents> {
-    private model;
     private applicationLayer;
     private physicalLayer;
-    unit: number;
+    models: Map<number, ModbusSlaveModel>;
     get isOpen(): boolean;
     get destroyed(): boolean;
-    constructor(model: ModbusSlaveModel, applicationLayer: A, physicalLayer: P);
+    constructor(applicationLayer: A, physicalLayer: P);
     private handleFC1;
     private handleFC2;
     private handleFC3;
@@ -65,6 +64,8 @@ export declare class ModbusSlave<A extends AbstractApplicationLayer, P extends A
     private handleFC23;
     private handleFC43_14;
     private responseError;
+    add(model: ModbusSlaveModel): void;
+    remove(unit: number): void;
     open(...args: Parameters<P['open']>): Promise<void>;
     close(): Promise<void>;
     destroy(): Promise<void>;

package/dist/test/master.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/test/slave.d.ts

@@ -0,0 +1 @@
+export {};

package/package.json

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