njs-modbus 1.3.0 → 1.3.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/index.d.ts CHANGED
@@ -156,11 +156,18 @@ interface AbstractApplicationLayerEvents {
156
156
  }, response: (data: Buffer) => Promise<void>];
157
157
  }
158
158
  declare abstract class AbstractApplicationLayer extends EventEmitter<AbstractApplicationLayerEvents> {
159
+ abstract startWaitingResponse(preCheck: ((frame: ApplicationDataUnit & {
160
+ buffer: Buffer;
161
+ }) => boolean | number | undefined)[], callback: (error: Error | null, frame?: ApplicationDataUnit & {
162
+ buffer: Buffer;
163
+ }) => void): void;
164
+ abstract stopWaitingResponse(): void;
159
165
  abstract encode(data: ApplicationDataUnit): Buffer;
160
166
  abstract destroy(): void;
161
167
  }
162
168
 
163
169
  declare class RtuApplicationLayer extends AbstractApplicationLayer {
170
+ private _waitingResponse?;
164
171
  private _timerThreePointFive?;
165
172
  private _bufferRx;
166
173
  private _removeAllListeners;
@@ -172,25 +179,45 @@ declare class RtuApplicationLayer extends AbstractApplicationLayer {
172
179
  */
173
180
  intervalBetweenFrames?: `${number}bit` | `${number}ms`);
174
181
  private framing;
182
+ startWaitingResponse(preCheck: ((frame: ApplicationDataUnit & {
183
+ buffer: Buffer;
184
+ }) => boolean | number | undefined)[], callback: (error: Error | null, frame?: ApplicationDataUnit & {
185
+ buffer: Buffer;
186
+ }) => void): void;
187
+ stopWaitingResponse(): void;
175
188
  encode(data: ApplicationDataUnit): Buffer;
176
189
  destroy(): void;
177
190
  }
178
191
 
179
192
  declare class AsciiApplicationLayer extends AbstractApplicationLayer {
193
+ private _waitingResponse?;
180
194
  private _status;
181
195
  private _frame;
182
196
  private _removeAllListeners;
183
197
  constructor(physicalLayer: SerialPhysicalLayer | TcpServerPhysicalLayer | TcpClientPhysicalLayer | UdpPhysicalLayer);
184
198
  private framing;
199
+ startWaitingResponse(preCheck: ((frame: ApplicationDataUnit & {
200
+ buffer: Buffer;
201
+ }) => boolean | number | undefined)[], callback: (error: Error | null, frame?: ApplicationDataUnit & {
202
+ buffer: Buffer;
203
+ }) => void): void;
204
+ stopWaitingResponse(): void;
185
205
  encode(data: ApplicationDataUnit): Buffer;
186
206
  destroy(): void;
187
207
  }
188
208
 
189
209
  declare class TcpApplicationLayer extends AbstractApplicationLayer {
210
+ private _waitingResponse?;
190
211
  private _transactionId;
191
212
  private _removeAllListeners;
192
213
  constructor(physicalLayer: TcpServerPhysicalLayer | TcpClientPhysicalLayer | UdpPhysicalLayer);
193
214
  private framing;
215
+ startWaitingResponse(preCheck: ((frame: ApplicationDataUnit & {
216
+ buffer: Buffer;
217
+ }) => boolean | number | undefined)[], callback: (error: Error | null, frame?: ApplicationDataUnit & {
218
+ buffer: Buffer;
219
+ }) => void): void;
220
+ stopWaitingResponse(): void;
194
221
  encode(data: ApplicationDataUnit): Buffer;
195
222
  destroy(): void;
196
223
  }
@@ -210,42 +237,41 @@ declare class ModbusMaster<A extends AbstractApplicationLayer, P extends Abstrac
210
237
  private applicationLayer;
211
238
  private physicalLayer;
212
239
  timeout: number;
213
- private _responses;
214
240
  get isOpen(): boolean;
215
241
  get destroyed(): boolean;
216
242
  constructor(applicationLayer: A, physicalLayer: P, timeout?: number);
217
243
  private waitResponse;
218
244
  private writeFC1Or2;
219
245
  writeFC1: this['readCoils'];
220
- readCoils(unit: 0, address: number, length: number, timeout?: number): void;
246
+ readCoils(unit: 0, address: number, length: number, timeout?: number): Promise<void>;
221
247
  readCoils(unit: number, address: number, length: number, timeout?: number): Promise<ReturnValue<boolean[]>>;
222
248
  writeFC2: this['readDiscreteInputs'];
223
- readDiscreteInputs(unit: 0, address: number, length: number, timeout?: number): void;
249
+ readDiscreteInputs(unit: 0, address: number, length: number, timeout?: number): Promise<void>;
224
250
  readDiscreteInputs(unit: number, address: number, length: number, timeout?: number): Promise<ReturnValue<boolean[]>>;
225
251
  private writeFC3Or4;
226
252
  writeFC3: this['readHoldingRegisters'];
227
- readHoldingRegisters(unit: 0, address: number, length: number, timeout?: number): void;
253
+ readHoldingRegisters(unit: 0, address: number, length: number, timeout?: number): Promise<void>;
228
254
  readHoldingRegisters(unit: number, address: number, length: number, timeout?: number): Promise<ReturnValue<number[]>>;
229
255
  writeFC4: this['readInputRegisters'];
230
- readInputRegisters(unit: 0, address: number, length: number, timeout?: number): void;
256
+ readInputRegisters(unit: 0, address: number, length: number, timeout?: number): Promise<void>;
231
257
  readInputRegisters(unit: number, address: number, length: number, timeout?: number): Promise<ReturnValue<number[]>>;
232
258
  writeFC5: this['writeSingleCoil'];
233
- writeSingleCoil(unit: 0, address: number, value: boolean, timeout?: number): void;
259
+ writeSingleCoil(unit: 0, address: number, value: boolean, timeout?: number): Promise<void>;
234
260
  writeSingleCoil(unit: number, address: number, value: boolean, timeout?: number): Promise<ReturnValue<boolean>>;
235
261
  writeFC6: this['writeSingleRegister'];
236
- writeSingleRegister(unit: 0, address: number, value: number, timeout?: number): void;
262
+ writeSingleRegister(unit: 0, address: number, value: number, timeout?: number): Promise<void>;
237
263
  writeSingleRegister(unit: number, address: number, value: number, timeout?: number): Promise<ReturnValue<number>>;
238
264
  writeFC15: this['writeMultipleCoils'];
239
- writeMultipleCoils(unit: 0, address: number, value: boolean[], timeout?: number): void;
265
+ writeMultipleCoils(unit: 0, address: number, value: boolean[], timeout?: number): Promise<void>;
240
266
  writeMultipleCoils(unit: number, address: number, value: boolean[], timeout?: number): Promise<ReturnValue<boolean[]>>;
241
267
  writeFC16: this['writeMultipleRegisters'];
242
- writeMultipleRegisters(unit: 0, address: number, value: number[], timeout?: number): void;
268
+ writeMultipleRegisters(unit: 0, address: number, value: number[], timeout?: number): Promise<void>;
243
269
  writeMultipleRegisters(unit: number, address: number, value: number[], timeout?: number): Promise<ReturnValue<number[]>>;
244
270
  handleFC17: this['reportServerId'];
245
- reportServerId(unit: 0, timeout?: number): void;
271
+ reportServerId(unit: 0, timeout?: number): Promise<void>;
246
272
  reportServerId(unit: number, timeout?: number): Promise<ReturnValue<ServerId>>;
247
273
  handleFC22: this['maskWriteRegister'];
248
- maskWriteRegister(unit: 0, address: number, andMask: number, orMask: number, timeout?: number): void;
274
+ maskWriteRegister(unit: 0, address: number, andMask: number, orMask: number, timeout?: number): Promise<void>;
249
275
  maskWriteRegister(unit: number, address: number, andMask: number, orMask: number, timeout?: number): Promise<ReturnValue<{
250
276
  andMask: number;
251
277
  orMask: number;
@@ -257,7 +283,7 @@ declare class ModbusMaster<A extends AbstractApplicationLayer, P extends Abstrac
257
283
  }, write: {
258
284
  address: number;
259
285
  value: number[];
260
- }, timeout?: number): void;
286
+ }, timeout?: number): Promise<void>;
261
287
  readAndWriteMultipleRegisters(unit: number, read: {
262
288
  address: number;
263
289
  length: number;
@@ -266,7 +292,7 @@ declare class ModbusMaster<A extends AbstractApplicationLayer, P extends Abstrac
266
292
  value: number[];
267
293
  }, timeout?: number): Promise<ReturnValue<number[]>>;
268
294
  handleFC43_14: this['readDeviceIdentification'];
269
- readDeviceIdentification(unit: 0, readDeviceIDCode: number, objectId: number, timeout?: number): void;
295
+ readDeviceIdentification(unit: 0, readDeviceIDCode: number, objectId: number, timeout?: number): Promise<void>;
270
296
  readDeviceIdentification(unit: number, readDeviceIDCode: number, objectId: number, timeout?: number): Promise<ReturnValue<DeviceIdentification>>;
271
297
  open(...args: Parameters<P['open']>): Promise<void>;
272
298
  close(): Promise<void>;