zigbee-herdsman 0.31.0 → 0.32.1

package/dist/adapter/zigate/driver/zigate.js

@@ -122,39 +122,26 @@ class ZiGate extends events_1.EventEmitter {
     open() {
         return this.portType === 'serial' ? this.openSerialPort() : this.openSocketPort();
     }
-    close() {
-        debug.info('close');
-        return new Promise((resolve, reject) => {
-            if (this.initialized) {
-                this.initialized = false;
-                this.portWrite = null;
-                if (this.portType === 'serial') {
-                    this.serialPort.flush(() => {
-                        this.serialPort.close((error) => {
-                            this.serialPort = null;
-                            error == null ?
-                                resolve() :
-                                reject(new Error(`Error while closing serialPort '${error}'`));
-                            this.emit('close');
-                        });
-                    });
+    async close() {
+        debug.info('closing');
+        this.queue.clear();
+        if (this.initialized) {
+            this.portWrite = null;
+            this.initialized = false;
+            if (this.portType === 'serial') {
+                try {
+                    await this.serialPort.asyncFlushAndClose();
                 }
-                else {
-                    // @ts-ignore
-                    this.socketPort.destroy((error) => {
-                        this.socketPort = null;
-                        error == null ?
-                            resolve() :
-                            reject(new Error(`Error while closing serialPort '${error}'`));
-                        this.emit('close');
-                    });
+                catch (error) {
+                    this.emit('close');
+                    throw error;
                 }
             }
             else {
-                resolve();
-                this.emit('close');
+                this.socketPort.destroy();
             }
-        });
+        }
+        this.emit('close');
     }
     waitFor(matcher, timeout = timeouts.default) {
         return this.waitress.waitFor(matcher, timeout);
@@ -172,28 +159,20 @@ class ZiGate extends events_1.EventEmitter {
         this.parser = this.serialPort.pipe(new parser_delimiter_1.DelimiterParser({ delimiter: [frame_1.default.STOP_BYTE], includeDelimiter: true }));
         this.parser.on('data', this.onSerialData.bind(this));
         this.portWrite = this.serialPort;
-        return new Promise((resolve, reject) => {
-            this.serialPort.open(async (err) => {
-                if (err) {
-                    this.serialPort = null;
-                    this.parser = null;
-                    this.path = null;
-                    this.initialized = false;
-                    const error = `Error while opening serialPort '${err}'`;
-                    debug.error(error);
-                    reject(new Error(error));
-                }
-                else {
-                    debug.log('Successfully connected ZiGate port \'' + this.path + '\'');
-                    this.serialPort.on('error', (error) => {
-                        debug.error(`serialPort error: ${error}`);
-                    });
-                    this.serialPort.on('close', this.onPortClose.bind(this));
-                    this.initialized = true;
-                    resolve();
-                }
-            });
-        });
+        try {
+            await this.serialPort.asyncOpen();
+            debug.log('Serialport opened');
+            this.serialPort.once('close', this.onPortClose.bind(this));
+            this.serialPort.once('error', this.onPortError.bind(this));
+            this.initialized = true;
+        }
+        catch (error) {
+            this.initialized = false;
+            if (this.serialPort.isOpen) {
+                this.serialPort.close();
+            }
+            throw error;
+        }
     }
     async openSocketPort() {
         const info = socketPortUtils_1.default.parseTcpPath(this.path);
@@ -215,7 +194,7 @@ class ZiGate extends events_1.EventEmitter {
                 self.initialized = true;
                 resolve();
             });
-            this.socketPort.once('close', this.onPortClose);
+            this.socketPort.once('close', this.onPortClose.bind(this));
             this.socketPort.on('error', (error) => {
                 debug.log('Socket error', error);
                 // reject(new Error(`Error while opening socket`));
@@ -225,11 +204,11 @@ class ZiGate extends events_1.EventEmitter {
             this.socketPort.connect(info.port, info.host);
         });
     }
-    onSerialError(err) {
-        debug.error('serial error: ', err);
+    onPortError(error) {
+        debug.error(`Port error: ${error}`);
     }
     onPortClose() {
-        debug.log('serial closed');
+        debug.log('Port closed');
         this.initialized = false;
         this.emit('close');
     }

package/dist/adapter/zigate/driver/zigate.js.map

@@ -1 +1 @@
-{"version":3,"file":"zigate.js","sourceRoot":"","sources":["../../../../src/adapter/zigate/driver/zigate.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"zigate.js","sourceRoot":"","sources":["../../../../src/adapter/zigate/driver/zigate.ts"],"names":[],"mappings":"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"}

package/dist/controller/helpers/request.d.ts

@@ -1,4 +1,4 @@
-import { SendRequestWhen, SendPolicy } from '../tstype';
+import { SendPolicy } from '../tstype';
 import * as Zcl from '../../zcl';
 declare class Request<Type = any> {
     static defaultSendPolicy: {
@@ -8,11 +8,10 @@ declare class Request<Type = any> {
     frame: Zcl.ZclFrame;
     expires: number;
     sendPolicy: SendPolicy;
-    sendWhen: SendRequestWhen;
     private resolveQueue;
     private rejectQueue;
     private lastError;
-    constructor(func: (frame: Zcl.ZclFrame) => Promise<Type>, frame: Zcl.ZclFrame, timeout: number, sendWhen?: SendRequestWhen, sendPolicy?: SendPolicy, lastError?: Error, resolve?: (value: Type) => void, reject?: (error: Error) => void);
+    constructor(func: (frame: Zcl.ZclFrame) => Promise<Type>, frame: Zcl.ZclFrame, timeout: number, sendPolicy?: SendPolicy, lastError?: Error, resolve?: (value: Type) => void, reject?: (error: Error) => void);
     moveCallbacks(from: Request<Type>): void;
     addCallbacks(resolve: (value: Type) => void, reject: (error: Error) => void): void;
     reject(error?: Error): void;

package/dist/controller/helpers/request.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"request.d.ts","sourceRoot":"","sources":["../../../src/controller/helpers/request.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,eAAe,EAAE,UAAU,EAAC,MAAM,WAAW,CAAC;AACtD,OAAO,KAAK,GAAG,MAAM,WAAW,CAAC;AAGjC,cAAM,OAAO,CAAC,IAAI,GAAG,GAAG;IAEpB,MAAM,CAAC,iBAAiB,EAAE;QAAC,CAAC,GAAG,EAAE,MAAM,GAAG,UAAU,CAAA;KAAC,CAwBnD;IAEF,OAAO,CAAC,IAAI,CAAyC;IACrD,KAAK,EAAE,GAAG,CAAC,QAAQ,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,UAAU,CAAC;IACvB,QAAQ,EAAE,eAAe,CAAC;IAC1B,OAAO,CAAC,YAAY,CAA+B;IACnD,OAAO,CAAC,WAAW,CAAiC;IACpD,OAAO,CAAC,SAAS,CAAQ;gBACZ,IAAI,EAAE,CAAC,KAAK,EAAE,GAAG,CAAC,QAAQ,KAAK,OAAO,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,GAAG,CAAC,QAAQ,EAAE,OAAO,EAAE,MAAM,EAC3F,QAAQ,CAAC,EAAE,eAAe,EAAE,UAAU,CAAC,EAAE,UAAU,EAAE,SAAS,CAAC,EAAE,KAAK,EACtE,OAAO,CAAC,EAAC,CAAC,KAAK,EAAE,IAAI,KAAK,IAAI,EAAE,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI;IAcnE,aAAa,CAAC,IAAI,EAAE,OAAO,CAAE,IAAI,CAAC,GAAI,IAAI;IAO1C,YAAY,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,IAAI,KAAK,IAAI,EAAE,MAAM,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,GAAG,IAAI;IAKlF,MAAM,CAAC,KAAK,CAAC,EAAE,KAAK,GAAG,IAAI;IAK3B,OAAO,CAAC,KAAK,EAAE,IAAI,GAAG,IAAI;IAKpB,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;CAQ9B;AAED,eAAe,OAAO,CAAC"}
+{"version":3,"file":"request.d.ts","sourceRoot":"","sources":["../../../src/controller/helpers/request.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAC,MAAM,WAAW,CAAC;AACrC,OAAO,KAAK,GAAG,MAAM,WAAW,CAAC;AAGjC,cAAM,OAAO,CAAC,IAAI,GAAG,GAAG;IAEpB,MAAM,CAAC,iBAAiB,EAAE;QAAC,CAAC,GAAG,EAAE,MAAM,GAAG,UAAU,CAAA;KAAC,CAwBnD;IAEF,OAAO,CAAC,IAAI,CAAyC;IACrD,KAAK,EAAE,GAAG,CAAC,QAAQ,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,UAAU,CAAC;IACvB,OAAO,CAAC,YAAY,CAA+B;IACnD,OAAO,CAAC,WAAW,CAAiC;IACpD,OAAO,CAAC,SAAS,CAAQ;gBACZ,IAAI,EAAE,CAAC,KAAK,EAAE,GAAG,CAAC,QAAQ,KAAK,OAAO,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,GAAG,CAAC,QAAQ,EAAE,OAAO,EAAE,MAAM,EAC3F,UAAU,CAAC,EAAE,UAAU,EAAE,SAAS,CAAC,EAAE,KAAK,EAC1C,OAAO,CAAC,EAAC,CAAC,KAAK,EAAE,IAAI,KAAK,IAAI,EAAE,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI;IAanE,aAAa,CAAC,IAAI,EAAE,OAAO,CAAE,IAAI,CAAC,GAAI,IAAI;IAO1C,YAAY,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,IAAI,KAAK,IAAI,EAAE,MAAM,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,GAAG,IAAI;IAKlF,MAAM,CAAC,KAAK,CAAC,EAAE,KAAK,GAAG,IAAI;IAK3B,OAAO,CAAC,KAAK,EAAE,IAAI,GAAG,IAAI;IAKpB,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;CAQ9B;AAED,eAAe,OAAO,CAAC"}

package/dist/controller/helpers/request.js

@@ -31,15 +31,13 @@ class Request {
     frame;
     expires;
     sendPolicy;
-    sendWhen;
     resolveQueue;
     rejectQueue;
     lastError;
-    constructor(func, frame, timeout, sendWhen, sendPolicy, lastError, resolve, reject) {
+    constructor(func, frame, timeout, sendPolicy, lastError, resolve, reject) {
         this.func = func;
         this.frame = frame;
-        this.sendWhen = sendWhen ?? 'active',
-            this.expires = timeout + Date.now();
+        this.expires = timeout + Date.now();
         this.sendPolicy = sendPolicy ?? (typeof frame.getCommand !== 'function' ?
             undefined : Request.defaultSendPolicy[frame.getCommand().ID]);
         this.resolveQueue = resolve === undefined ?

package/dist/controller/helpers/request.js.map

@@ -1 +1 @@
-{"version":3,"file":"request.js","sourceRoot":"","sources":["../../../src/controller/helpers/request.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"request.js","sourceRoot":"","sources":["../../../src/controller/helpers/request.ts"],"names":[],"mappings":"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"}

package/dist/controller/helpers/requestQueue.js

@@ -39,7 +39,7 @@ class RequestQueue extends Set {
         debug.info(`Request Queue (${this.deviceIeeeAddress}/${this.ID}): send pending requests (` +
             `${this.size}, ${fastPolling})`);
         for (const request of this) {
-            if (fastPolling || (request.sendWhen !== 'fastpoll' && request.sendPolicy !== 'bulk')) {
+            if (fastPolling || request.sendPolicy !== 'bulk') {
                 try {
                     const result = await request.send();
                     debug.info(`Request Queue (${this.deviceIeeeAddress}/${this.ID}): send success`);

package/dist/controller/helpers/requestQueue.js.map

@@ -1 +1 @@
-{"version":3,"file":"requestQueue.js","sourceRoot":"","sources":["../../../src/controller/helpers/requestQueue.ts"],"names":[],"mappings":";;;;;AAGA,kDAA0B;AAE1B,MAAM,KAAK,GAAG;IACV,IAAI,EAAE,IAAA,eAAK,EAAC,sCAAsC,CAAC;IACnD,KAAK,EAAE,IAAA,eAAK,EAAC,qCAAqC,CAAC;CACtD,CAAC;AAKF,MAAM,YAAa,SAAQ,GAAY;IAE3B,cAAc,CAAU;IACxB,EAAE,CAAS;IACX,iBAAiB,CAAS;IAElC,YAAa,QAAkB;QAE3B,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,cAAc,GAAG,KAAK,CAAC;QAC5B,IAAI,CAAC,EAAE,GAAG,QAAQ,CAAC,EAAE,CAAC;QACtB,IAAI,CAAC,iBAAiB,GAAG,QAAQ,CAAC,iBAAiB,CAAC;IACxD,CAAC;IAGM,KAAK,CAAC,IAAI,CAAC,WAAoB;QAClC,IAAI,IAAI,CAAC,IAAI,KAAK,CAAC;YAAE,OAAO;QAE5B,IAAI,CAAC,WAAW,IAAI,IAAI,CAAC,cAAc,EAAE,CAAC;YACtC,KAAK,CAAC,IAAI,CAAC,kBAAkB,IAAI,CAAC,iBAAiB,IAAI,IAAI,CAAC,EAAE,4CAA4C,CAAC,CAAC;YAC5G,OAAO;QACX,CAAC;QACD,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC;QAE3B,gCAAgC;QAChC,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACvB,KAAK,MAAM,OAAO,IAAI,IAAI,EAAE,CAAC;YACzB,IAAI,GAAG,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;gBACxB,KAAK,CAAC,IAAI,CAAC,kBAAkB,IAAI,CAAC,iBAAiB,IAAI,IAAI,CAAC,EAAE,4BAA4B;oBAC1F,gBAAgB,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;gBAC7B,OAAO,CAAC,MAAM,EAAE,CAAC;gBACjB,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;YACzB,CAAC;QACL,CAAC;QAED,KAAK,CAAC,IAAI,CAAC,kBAAkB,IAAI,CAAC,iBAAiB,IAAI,IAAI,CAAC,EAAE,4BAA4B;YACtF,GAAG,IAAI,CAAC,IAAI,KAAK,WAAW,GAAG,CAAC,CAAC;QAErC,KAAK,MAAM,OAAO,IAAI,IAAI,EAAE,CAAC;YACzB,IAAI,WAAW,IAAI,CAAC,OAAO,CAAC,QAAQ,KAAK,UAAU,IAAI,OAAO,CAAC,UAAU,KAAK,MAAM,CAAC,EAAE,CAAC;gBACpF,IAAI,CAAC;oBACD,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,IAAI,EAAE,CAAC;oBACpC,KAAK,CAAC,IAAI,CAAC,kBAAkB,IAAI,CAAC,iBAAiB,IAAI,IAAI,CAAC,EAAE,iBAAiB,CAAC,CAAC;oBACjF,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;oBACxB,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;gBACzB,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBACb,KAAK,CAAC,IAAI,CAAC,kBAAkB,IAAI,CAAC,iBAAiB,IAAI,IAAI,CAAC,EAAE,6BAA6B;wBACvF,GAAG,CAAC,OAAO,CAAC,OAAO,GAAG,GAAG,CAAC,GAAG,IAAI,UAAU,CAAC,CAAC;gBACrD,CAAC;YACL,CAAC;QACL,CAAC;QACD,IAAI,CAAC,cAAc,GAAG,KAAK,CAAC;IAChC,CAAC;IAEM,KAAK,CAAC,KAAK,CAAO,OAAsB;QAC3C,KAAK,CAAC,IAAI,CAAC,kBAAkB,IAAI,CAAC,iBAAiB,IAAI,IAAI,CAAC,EAAE,0BAA0B;YACpF,YAAY,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;QACnC,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAQ,EAAE;YACzC,OAAO,CAAC,YAAY,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;YACtC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QACtB,CAAC,CAAC,CAAC;IACP,CAAC;IAEM,MAAM,CAAC,UAAmB;QAE7B,IAAG,IAAI,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC,OAAO,UAAU,CAAC,KAAK,CAAC,UAAU,KAAK,UAAU,CAAC,EAAE,CAAC;YACzE,OAAO;QACX,CAAC;QACD,MAAM,SAAS,GAAG,UAAU,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC;QAC9C,MAAM,OAAO,GAAG,UAAU,CAAC,KAAK,CAAC,OAAO,CAAC;QACzC,MAAM,SAAS,GAAG,UAAU,CAAC,KAAK,CAAC,UAAU,EAAE,CAAC,EAAE,CAAC;QAEnD,KAAK,CAAC,IAAI,CAAC,kBAAkB,IAAI,CAAC,iBAAiB,IAAI,IAAI,CAAC,EAAE,UAAU,UAAU,CAAC,KAAK,CAAC,UAAU,EAAE,CAAC,IAAI,GAAG;YACzG,qCAAqC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;QAEtD,KAAK,MAAM,OAAO,IAAI,IAAI,EAAE,CAAC;YACzB,IAAI,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,KAAK,SAAS,IAAI,OAAO,OAAO,CAAC,KAAK,CAAC,UAAU,KAAK,UAAU,EAAE,CAAC;gBAC9F,SAAS;YACb,CAAC;YACD,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,WAAW,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC;gBAC9D,SAAS;YACb,CAAC;YACD,0BAA0B;YAC1B,IAAG,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,KAAK,SAAS,IAAI,OAAO,CAAC,KAAK,CAAC,UAAU,EAAE,CAAC,EAAE,KAAK,SAAS,EAAE,CAAC;gBACvF,0BAA0B;gBAC1B,IAAI,UAAU,CAAC,UAAU,KAAK,cAAc;uBACrC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC;oBACvE,KAAK,CAAC,IAAI,CAAC,kBAAkB,IAAI,CAAC,iBAAiB,IAAI,IAAI,CAAC,EAAE,4BAA4B,CAAC,CAAC;oBAC5F,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;oBACrB,UAAU,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;gBACtC,CAAC;qBACI,IAAI,CAAC,UAAU,CAAC,UAAU,KAAK,cAAc,IAAI,UAAU,CAAC,UAAU,KAAK,gBAAgB,CAAC;oBACzF,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC;oBAC3C,MAAM,eAAe,GAAG,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,KAAuB,EAAE,EAAE,CAC7E,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,KAAuB,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,KAAK,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC;oBAC/E,IAAI,eAAe,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC;wBAC9B,KAAK,CAAC,IAAI,CAAC,kBAAkB,IAAI,CAAC,iBAAiB,IAAI,IAAI,CAAC,EAAE,4BAA4B,CAAC,CAAC;wBAC5F,IAAI,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC;4BACpE,UAAU,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;wBACtC,CAAC;6BAAM,CAAC;4BACJ,OAAO,CAAC,MAAM,EAAE,CAAC;wBACrB,CAAC;wBACD,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;oBACzB,CAAC;yBAAM,IAAI,UAAU,CAAC,UAAU,KAAK,gBAAgB,EAAE,CAAC;wBACpD,kEAAkE;wBACjE,OAAO,CAAC,KAA+B,CAAC,OAAO,GAAG,eAAe,CAAC;wBACnE,KAAK,CAAC,IAAI,CAAC,kBAAkB,IAAI,CAAC,iBAAiB,IAAI,IAAI,CAAC,EAAE,KAAK;8BAC7D,8BAA8B,CAAC,CAAC;oBAC1C,CAAC;gBACL,CAAC;YACL,CAAC;QACL,CAAC;QACD,KAAK,CAAC,IAAI,CAAC,kBAAkB,IAAI,CAAC,iBAAiB,IAAI,IAAI,CAAC,EAAE,aAAa,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;IAC5F,CAAC;CACJ;AAED,kBAAe,YAAY,CAAC"}
+{"version":3,"file":"requestQueue.js","sourceRoot":"","sources":["../../../src/controller/helpers/requestQueue.ts"],"names":[],"mappings":"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"}

package/dist/controller/model/device.d.ts

@@ -1,4 +1,4 @@
-import { KeyValue, DeviceType, SendRequestWhen } from '../tstype';
+import { KeyValue, DeviceType } from '../tstype';
 import { Events as AdapterEvents } from '../../adapter';
 import Endpoint from './endpoint';
 import Entity from './entity';
@@ -41,7 +41,6 @@ declare class Device extends Entity {
     private _skipDefaultResponse;
     private _skipTimeResponse;
     private _deleted;
-    private _defaultSendRequestWhen?;
     private _lastDefaultResponseSequenceNumber;
     private _checkinInterval;
     private _pendingRequestTimeout;
@@ -81,8 +80,6 @@ declare class Device extends Entity {
     set skipDefaultResponse(skipDefaultResponse: boolean);
     get skipTimeResponse(): boolean;
     set skipTimeResponse(skipTimeResponse: boolean);
-    get defaultSendRequestWhen(): SendRequestWhen;
-    set defaultSendRequestWhen(defaultSendRequestWhen: SendRequestWhen);
     get checkinInterval(): number;
     get pendingRequestTimeout(): number;
     set pendingRequestTimeout(pendingRequestTimeout: number);

package/dist/controller/model/device.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"device.d.ts","sourceRoot":"","sources":["../../../src/controller/model/device.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"device.d.ts","sourceRoot":"","sources":["../../../src/controller/model/device.ts"],"names":[],"mappings":"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"}

package/dist/controller/model/device.js

@@ -65,7 +65,6 @@ class Device extends entity_1.default {
     _skipDefaultResponse;
     _skipTimeResponse;
     _deleted;
-    _defaultSendRequestWhen;
     _lastDefaultResponseSequenceNumber;
     _checkinInterval;
     _pendingRequestTimeout;
@@ -113,10 +112,6 @@ class Device extends entity_1.default {
     set skipDefaultResponse(skipDefaultResponse) { this._skipDefaultResponse = skipDefaultResponse; }
     get skipTimeResponse() { return this._skipTimeResponse; }
     set skipTimeResponse(skipTimeResponse) { this._skipTimeResponse = skipTimeResponse; }
-    get defaultSendRequestWhen() { return this._defaultSendRequestWhen; }
-    set defaultSendRequestWhen(defaultSendRequestWhen) {
-        this._defaultSendRequestWhen = defaultSendRequestWhen;
-    }
     get checkinInterval() { return this._checkinInterval; }
     get pendingRequestTimeout() { return this._pendingRequestTimeout; }
     set pendingRequestTimeout(pendingRequestTimeout) { this._pendingRequestTimeout = pendingRequestTimeout; }
@@ -135,7 +130,7 @@ class Device extends entity_1.default {
         dateCode: { key: 'dateCode', set: (v, d) => { d.dateCode = v; } },
         swBuildId: { key: 'softwareBuildID', set: (v, d) => { d.softwareBuildID = v; } },
     };
-    constructor(ID, type, ieeeAddr, networkAddress, manufacturerID, endpoints, manufacturerName, powerSource, modelID, applicationVersion, stackVersion, zclVersion, hardwareVersion, dateCode, softwareBuildID, interviewCompleted, meta, lastSeen, defaultSendRequestWhen, checkinInterval, pendingRequestTimeout) {
+    constructor(ID, type, ieeeAddr, networkAddress, manufacturerID, endpoints, manufacturerName, powerSource, modelID, applicationVersion, stackVersion, zclVersion, hardwareVersion, dateCode, softwareBuildID, interviewCompleted, meta, lastSeen, checkinInterval, pendingRequestTimeout) {
         super();
         this.ID = ID;
         this._type = type;
@@ -158,7 +153,6 @@ class Device extends entity_1.default {
         this._skipTimeResponse = false;
         this.meta = meta;
         this._lastSeen = lastSeen;
-        this._defaultSendRequestWhen = defaultSendRequestWhen;
         this._checkinInterval = checkinInterval;
         this._pendingRequestTimeout = pendingRequestTimeout;
     }
@@ -250,10 +244,10 @@ class Device extends entity_1.default {
                         fastPollTimeout: 0,
                     };
                     debug.log(`check-in from ${this.ieeeAddr}: accepting fast-poll`);
-                    await endpoint.command(frame.Cluster.ID, 'checkinRsp', payload, { sendWhen: 'immediate' });
+                    await endpoint.command(frame.Cluster.ID, 'checkinRsp', payload, { sendPolicy: 'immediate' });
                     // This is a good time to read the checkin interval if we haven't stored it previously
                     if (this._checkinInterval === undefined) {
-                        const pollPeriod = await endpoint.read('genPollCtrl', ['checkinInterval'], { sendWhen: 'immediate' });
+                        const pollPeriod = await endpoint.read('genPollCtrl', ['checkinInterval'], { sendPolicy: 'immediate' });
                         this._checkinInterval = pollPeriod.checkinInterval / 4; // convert to seconds
                         this.pendingRequestTimeout = this._checkinInterval * 1000; // milliseconds
                         debug.log(`Request Queue (${this.ieeeAddr}): default expiration timeout set to ${this.pendingRequestTimeout}`);
@@ -262,7 +256,7 @@ class Device extends entity_1.default {
                     // We *must* end fast-poll when we're done sending things. Otherwise
                     // we cause undue power-drain.
                     debug.log(`check-in from ${this.ieeeAddr}: stopping fast-poll`);
-                    await endpoint.command(frame.Cluster.ID, 'fastPollStop', {}, { sendWhen: 'immediate' });
+                    await endpoint.command(frame.Cluster.ID, 'fastPollStop', {}, { sendPolicy: 'immediate' });
                 }
                 else {
                     const payload = {
@@ -270,7 +264,7 @@ class Device extends entity_1.default {
                         fastPollTimeout: 0,
                     };
                     debug.log(`check-in from ${this.ieeeAddr}: declining fast-poll`);
-                    await endpoint.command(frame.Cluster.ID, 'checkinRsp', payload, { sendWhen: 'immediate' });
+                    await endpoint.command(frame.Cluster.ID, 'checkinRsp', payload, { sendPolicy: 'immediate' });
                 }
             }
             catch (error) {
@@ -315,20 +309,6 @@ class Device extends entity_1.default {
         if (entry.type === 'Group') {
             throw new Error('Cannot load device from group');
         }
-        let defaultSendRequestWhen = entry.defaultSendRequestWhen;
-        /* istanbul ignore next */
-        if (defaultSendRequestWhen == null) {
-            // Guess defaultSendRequestWhen based on old useImplicitCheckin/defaultSendWhenActive
-            if (entry.hasOwnProperty('useImplicitCheckin') && !entry.useImplicitCheckin) {
-                defaultSendRequestWhen = 'fastpoll';
-            }
-            else if (entry.hasOwnProperty('defaultSendWhenActive') && entry.defaultSendWhenActive) {
-                defaultSendRequestWhen = 'active';
-            }
-            else {
-                defaultSendRequestWhen = 'immediate';
-            }
-        }
         // default: no timeout (messages expire immediately after first send attempt)
         let pendingRequestTimeout = 0;
         if ((endpoints.filter((e) => e.supportsInputCluster('genPollCtrl'))).length > 0) {
@@ -341,7 +321,7 @@ class Device extends entity_1.default {
             }
         }
         debug.log(`Request Queue (${ieeeAddr}): default expiration timeout set to ${pendingRequestTimeout}`);
-        return new Device(entry.id, entry.type, ieeeAddr, networkAddress, entry.manufId, endpoints, entry.manufName, entry.powerSource, entry.modelId, entry.appVersion, entry.stackVersion, entry.zclVersion, entry.hwVersion, entry.dateCode, entry.swBuildId, entry.interviewCompleted, meta, entry.lastSeen || null, defaultSendRequestWhen, entry.checkinInterval, pendingRequestTimeout);
+        return new Device(entry.id, entry.type, ieeeAddr, networkAddress, entry.manufId, endpoints, entry.manufName, entry.powerSource, entry.modelId, entry.appVersion, entry.stackVersion, entry.zclVersion, entry.hwVersion, entry.dateCode, entry.swBuildId, entry.interviewCompleted, meta, entry.lastSeen || null, entry.checkinInterval, pendingRequestTimeout);
     }
     toDatabaseEntry() {
         const epList = this.endpoints.map((e) => e.ID);
@@ -355,8 +335,7 @@ class Device extends entity_1.default {
             modelId: this.modelID, epList, endpoints, appVersion: this.applicationVersion,
             stackVersion: this.stackVersion, hwVersion: this.hardwareVersion, dateCode: this.dateCode,
             swBuildId: this.softwareBuildID, zclVersion: this.zclVersion, interviewCompleted: this.interviewCompleted,
-            meta: this.meta, lastSeen: this.lastSeen, defaultSendRequestWhen: this.defaultSendRequestWhen,
-            checkinInterval: this.checkinInterval
+            meta: this.meta, lastSeen: this.lastSeen, checkinInterval: this.checkinInterval
         };
     }
     save(writeDatabase = true) {
@@ -402,7 +381,7 @@ class Device extends entity_1.default {
             return endpoint_1.default.create(e.ID, e.profileID, e.deviceID, e.inputClusters, e.outputClusters, networkAddress, ieeeAddr);
         });
         const ID = entity_1.default.database.newID();
-        const device = new Device(ID, type, ieeeAddr, networkAddress, manufacturerID, endpointsMapped, manufacturerName, powerSource, modelID, undefined, undefined, undefined, undefined, undefined, undefined, interviewCompleted, {}, null, 'immediate', undefined, 0);
+        const device = new Device(ID, type, ieeeAddr, networkAddress, manufacturerID, endpointsMapped, manufacturerName, powerSource, modelID, undefined, undefined, undefined, undefined, undefined, undefined, interviewCompleted, {}, null, undefined, 0);
         entity_1.default.database.insert(device.toDatabaseEntry());
         Device.devices[device.ieeeAddr] = device;
         return device;
@@ -540,7 +519,7 @@ class Device extends entity_1.default {
             debug.log("Interview - Detected potential TuYa end device, reading modelID and manufacturerName...");
             try {
                 const endpoint = endpoint_1.default.create(1, undefined, undefined, [], [], this.networkAddress, this.ieeeAddr);
-                const result = await endpoint.read('genBasic', ['modelId', 'manufacturerName'], { sendWhen: 'immediate' });
+                const result = await endpoint.read('genBasic', ['modelId', 'manufacturerName'], { sendPolicy: 'immediate' });
                 Object.entries(result)
                     .forEach((entry) => Device.ReportablePropertiesMapping[entry[0]].set(entry[1], this));
             }
@@ -587,7 +566,7 @@ class Device extends entity_1.default {
                         try {
                             let result;
                             try {
-                                result = await endpoint.read('genBasic', [key], { sendWhen: 'immediate' });
+                                result = await endpoint.read('genBasic', [key], { sendPolicy: 'immediate' });
                             }
                             catch (error) {
                                 // Reading attributes can fail for many reason, e.g. it could be that device rejoins
@@ -598,7 +577,7 @@ class Device extends entity_1.default {
                                     debug.log(`Interview - first ${item.key} retrieval attempt failed, ` +
                                         `retrying after 10 seconds...`);
                                     await (0, utils_1.Wait)(10000);
-                                    result = await endpoint.read('genBasic', [key], { sendWhen: 'immediate' });
+                                    result = await endpoint.read('genBasic', [key], { sendPolicy: 'immediate' });
                                 }
                                 else {
                                     throw error;
@@ -619,12 +598,12 @@ class Device extends entity_1.default {
         // Enroll IAS device
         for (const endpoint of this.endpoints.filter((e) => e.supportsInputCluster('ssIasZone'))) {
             debug.log(`Interview - IAS - enrolling '${this.ieeeAddr}' endpoint '${endpoint.ID}'`);
-            const stateBefore = await endpoint.read('ssIasZone', ['iasCieAddr', 'zoneState'], { sendWhen: 'immediate' });
+            const stateBefore = await endpoint.read('ssIasZone', ['iasCieAddr', 'zoneState'], { sendPolicy: 'immediate' });
             debug.log(`Interview - IAS - before enrolling state: '${JSON.stringify(stateBefore)}'`);
             // Do not enroll when device has already been enrolled
             if (stateBefore.zoneState !== 1 || stateBefore.iasCieAddr !== coordinator.ieeeAddr) {
                 debug.log(`Interview - IAS - not enrolled, enrolling`);
-                await endpoint.write('ssIasZone', { 'iasCieAddr': coordinator.ieeeAddr }, { sendWhen: 'immediate' });
+                await endpoint.write('ssIasZone', { 'iasCieAddr': coordinator.ieeeAddr }, { sendPolicy: 'immediate' });
                 debug.log(`Interview - IAS - wrote iasCieAddr`);
                 // There are 2 enrollment procedures:
                 // - Auto enroll: coordinator has to send enrollResponse without receiving an enroll request
@@ -635,11 +614,11 @@ class Device extends entity_1.default {
                 await (0, utils_1.Wait)(500);
                 debug.log(`IAS - '${this.ieeeAddr}' sending enroll response (auto enroll)`);
                 const payload = { enrollrspcode: 0, zoneid: 23 };
-                await endpoint.command('ssIasZone', 'enrollRsp', payload, { disableDefaultResponse: true, sendWhen: 'immediate' });
+                await endpoint.command('ssIasZone', 'enrollRsp', payload, { disableDefaultResponse: true, sendPolicy: 'immediate' });
                 let enrolled = false;
                 for (let attempt = 0; attempt < 20; attempt++) {
                     await (0, utils_1.Wait)(500);
-                    const stateAfter = await endpoint.read('ssIasZone', ['iasCieAddr', 'zoneState'], { sendWhen: 'immediate' });
+                    const stateAfter = await endpoint.read('ssIasZone', ['iasCieAddr', 'zoneState'], { sendPolicy: 'immediate' });
                     debug.log(`Interview - IAS - after enrolling state (${attempt}): '${JSON.stringify(stateAfter)}'`);
                     if (stateAfter.zoneState === 1) {
                         enrolled = true;
@@ -662,15 +641,9 @@ class Device extends entity_1.default {
             for (const endpoint of this.endpoints.filter((e) => e.supportsInputCluster('genPollCtrl'))) {
                 debug.log(`Interview - Poll control - binding '${this.ieeeAddr}' endpoint '${endpoint.ID}'`);
                 await endpoint.bind('genPollCtrl', coordinator.endpoints[0]);
-                const pollPeriod = await endpoint.read('genPollCtrl', ['checkinInterval'], { sendWhen: 'immediate' });
+                const pollPeriod = await endpoint.read('genPollCtrl', ['checkinInterval'], { sendPolicy: 'immediate' });
                 this._checkinInterval = pollPeriod.checkinInterval / 4; // convert to seconds
                 this.pendingRequestTimeout = this._checkinInterval * 1000; // milliseconds
-                if (pollPeriod.checkinInterval <= 2400) { // 10 minutes
-                    this.defaultSendRequestWhen = 'fastpoll';
-                }
-                else {
-                    this.defaultSendRequestWhen = 'active';
-                }
             }
         }
         catch (error) {