@willieee802/zigbee-herdsman 0.34.3 → 0.48.1

package/dist/controller/helpers/request.js

@@ -38,8 +38,8 @@ class Request {
         this.func = func;
         this.frame = frame;
         this.expires = timeout + Date.now();
-        this.sendPolicy = sendPolicy ?? (typeof frame.getCommand !== 'function' ?
-            undefined : Request.defaultSendPolicy[frame.getCommand().ID]);
+        this.sendPolicy = sendPolicy ?? (!frame.command ?
+            undefined : Request.defaultSendPolicy[frame.command.ID]);
         this.resolveQueue = resolve === undefined ?
             new Array() : new Array(resolve);
         this.rejectQueue = reject === 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.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"requestQueue.d.ts","sourceRoot":"","sources":["../../../src/controller/helpers/requestQueue.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,QAAQ,EAAC,MAAM,UAAU,CAAC;AAClC,OAAO,OAAO,MAAM,WAAW,CAAC;AAWhC,cAAM,YAAa,SAAQ,GAAG,CAAC,OAAO,CAAC;IAEnC,OAAO,CAAC,cAAc,CAAU;IAChC,OAAO,CAAC,EAAE,CAAS;IACnB,OAAO,CAAC,iBAAiB,CAAS;gBAErB,QAAQ,EAAE,QAAQ;IASlB,IAAI,CAAC,WAAW,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAuCzC,KAAK,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IASxD,MAAM,CAAC,UAAU,EAAE,OAAO,GAAG,IAAI;CAmD3C;AAED,eAAe,YAAY,CAAC"}
+{"version":3,"file":"requestQueue.d.ts","sourceRoot":"","sources":["../../../src/controller/helpers/requestQueue.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,QAAQ,EAAC,MAAM,UAAU,CAAC;AAClC,OAAO,OAAO,MAAM,WAAW,CAAC;AAOhC,cAAM,YAAa,SAAQ,GAAG,CAAC,OAAO,CAAC;IAEnC,OAAO,CAAC,cAAc,CAAU;IAChC,OAAO,CAAC,EAAE,CAAS;IACnB,OAAO,CAAC,iBAAiB,CAAS;gBAErB,QAAQ,EAAE,QAAQ;IASlB,IAAI,CAAC,WAAW,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAqCzC,KAAK,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAQxD,MAAM,CAAC,UAAU,EAAE,OAAO,GAAG,IAAI;CAkD3C;AAED,eAAe,YAAY,CAAC"}

package/dist/controller/helpers/requestQueue.js

@@ -1,13 +1,7 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-const debug_1 = __importDefault(require("debug"));
-const debug = {
-    info: (0, debug_1.default)('zigbee-herdsman:helpers:requestQueue'),
-    error: (0, debug_1.default)('zigbee-herdsman:helpers:requestQeue'),
-};
+const logger_1 = require("../../utils/logger");
+const NS = 'zh:controller:requestqueue';
 class RequestQueue extends Set {
     sendInProgress;
     ID;
@@ -22,7 +16,7 @@ class RequestQueue extends Set {
         if (this.size === 0)
             return;
         if (!fastPolling && this.sendInProgress) {
-            debug.info(`Request Queue (${this.deviceIeeeAddress}/${this.ID}): sendPendingRequests already in progress`);
+            logger_1.logger.debug(`Request Queue (${this.deviceIeeeAddress}/${this.ID}): sendPendingRequests already in progress`, NS);
             return;
         }
         this.sendInProgress = true;
@@ -30,69 +24,66 @@ class RequestQueue extends Set {
         const now = Date.now();
         for (const request of this) {
             if (now > request.expires) {
-                debug.info(`Request Queue (${this.deviceIeeeAddress}/${this.ID}): discard after timeout. ` +
-                    `Size before: ${this.size}`);
+                logger_1.logger.debug(`Request Queue (${this.deviceIeeeAddress}/${this.ID}): discard after timeout. Size before: ${this.size}`, NS);
                 request.reject();
                 this.delete(request);
             }
         }
-        debug.info(`Request Queue (${this.deviceIeeeAddress}/${this.ID}): send pending requests (` +
-            `${this.size}, ${fastPolling})`);
+        logger_1.logger.debug(`Request Queue (${this.deviceIeeeAddress}/${this.ID}): send pending requests (${this.size}, ${fastPolling})`, NS);
         for (const request of this) {
             if (fastPolling || request.sendPolicy !== 'bulk') {
                 try {
                     const result = await request.send();
-                    debug.info(`Request Queue (${this.deviceIeeeAddress}/${this.ID}): send success`);
+                    logger_1.logger.debug(`Request Queue (${this.deviceIeeeAddress}/${this.ID}): send success`, NS);
                     request.resolve(result);
                     this.delete(request);
                 }
                 catch (error) {
-                    debug.info(`Request Queue (${this.deviceIeeeAddress}/${this.ID}): send failed, expires in ` +
-                        `${(request.expires - now) / 1000} seconds`);
+                    logger_1.logger.debug(`Request Queue (${this.deviceIeeeAddress}/${this.ID}): send failed, expires in ` +
+                        `${(request.expires - now) / 1000} seconds`, NS);
                 }
             }
         }
         this.sendInProgress = false;
     }
     async queue(request) {
-        debug.info(`Request Queue (${this.deviceIeeeAddress}/${this.ID}): Sending when active. ` +
-            `Expires: ${request.expires}`);
+        logger_1.logger.debug(`Request Queue (${this.deviceIeeeAddress}/${this.ID}): Sending when active. Expires: ${request.expires}`, NS);
         return new Promise((resolve, reject) => {
             request.addCallbacks(resolve, reject);
             this.add(request);
         });
     }
     filter(newRequest) {
-        if (this.size === 0 || !(typeof newRequest.frame.getCommand === 'function')) {
+        if (this.size === 0 || !(newRequest.frame.command)) {
             return;
         }
-        const clusterID = newRequest.frame.Cluster.ID;
-        const payload = newRequest.frame.Payload;
-        const commandID = newRequest.frame.getCommand().ID;
-        debug.info(`Request Queue (${this.deviceIeeeAddress}/${this.ID}): ZCL ${newRequest.frame.getCommand().name} ` +
-            `command, filter requests. Before: ${this.size}`);
+        const clusterID = newRequest.frame.cluster.ID;
+        const payload = newRequest.frame.payload;
+        const commandID = newRequest.frame.command.ID;
+        logger_1.logger.debug(`Request Queue (${this.deviceIeeeAddress}/${this.ID}): ZCL ${newRequest.frame.command.name} ` +
+            `command, filter requests. Before: ${this.size}`, NS);
         for (const request of this) {
-            if (request?.frame?.Cluster?.ID === undefined || typeof request.frame.getCommand !== 'function') {
+            if (request?.frame?.cluster?.ID === undefined || !request.frame.command) {
                 continue;
             }
             if (['bulk', 'queue', 'immediate'].includes(request.sendPolicy)) {
                 continue;
             }
             /* istanbul ignore else */
-            if (request.frame.Cluster.ID === clusterID && request.frame.getCommand().ID === commandID) {
+            if (request.frame.cluster.ID === clusterID && request.frame.command.ID === commandID) {
                 /* istanbul ignore else */
                 if (newRequest.sendPolicy === 'keep-payload'
-                    && JSON.stringify(request.frame.Payload) === JSON.stringify(payload)) {
-                    debug.info(`Request Queue (${this.deviceIeeeAddress}/${this.ID}): Merge duplicate request`);
+                    && JSON.stringify(request.frame.payload) === JSON.stringify(payload)) {
+                    logger_1.logger.debug(`Request Queue (${this.deviceIeeeAddress}/${this.ID}): Merge duplicate request`, NS);
                     this.delete(request);
                     newRequest.moveCallbacks(request);
                 }
                 else if ((newRequest.sendPolicy === 'keep-command' || newRequest.sendPolicy === 'keep-cmd-undiv') &&
-                    Array.isArray(request.frame.Payload)) {
-                    const filteredPayload = request.frame.Payload.filter((oldEl) => !payload.find((newEl) => oldEl.attrId === newEl.attrId));
+                    Array.isArray(request.frame.payload)) {
+                    const filteredPayload = request.frame.payload.filter((oldEl) => !payload.find((newEl) => oldEl.attrId === newEl.attrId));
                     if (filteredPayload.length == 0) {
-                        debug.info(`Request Queue (${this.deviceIeeeAddress}/${this.ID}): Remove & reject request`);
-                        if (JSON.stringify(request.frame.Payload) === JSON.stringify(payload)) {
+                        logger_1.logger.debug(`Request Queue (${this.deviceIeeeAddress}/${this.ID}): Remove & reject request`, NS);
+                        if (JSON.stringify(request.frame.payload) === JSON.stringify(payload)) {
                             newRequest.moveCallbacks(request);
                         }
                         else {
@@ -102,14 +93,13 @@ class RequestQueue extends Set {
                     }
                     else if (newRequest.sendPolicy !== 'keep-cmd-undiv') {
                         // remove all duplicate attributes if we shall not write undivided
-                        request.frame.Payload = filteredPayload;
-                        debug.info(`Request Queue (${this.deviceIeeeAddress}/${this.ID}): `
-                            + `Remove commands from request`);
+                        request.frame.payload = filteredPayload;
+                        logger_1.logger.debug(`Request Queue (${this.deviceIeeeAddress}/${this.ID}): Remove commands from request`, NS);
                     }
                 }
             }
         }
-        debug.info(`Request Queue (${this.deviceIeeeAddress}/${this.ID}): After: ${this.size}`);
+        logger_1.logger.debug(`Request Queue (${this.deviceIeeeAddress}/${this.ID}): After: ${this.size}`, NS);
     }
 }
 exports.default = RequestQueue;

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

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

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

@@ -1,8 +1,9 @@
-import { ZclFrame } from '../../zcl';
+import * as Zcl from '../../zspec/zcl';
+import { CustomClusters } from '../../zspec/zcl/definition/tstype';
 interface KeyValue {
     [s: string]: number | string;
 }
-declare function attributeKeyValue(frame: ZclFrame, deviceManufacturerID: number): KeyValue;
-declare function attributeList(frame: ZclFrame, deviceManufacturerID: number): Array<string | number>;
+declare function attributeKeyValue(frame: Zcl.Frame, deviceManufacturerID: number, customClusters: CustomClusters): KeyValue;
+declare function attributeList(frame: Zcl.Frame, deviceManufacturerID: number, customClusters: CustomClusters): Array<string | number>;
 export { attributeKeyValue, attributeList, };
 //# sourceMappingURL=zclFrameConverter.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"zclFrameConverter.d.ts","sourceRoot":"","sources":["../../../src/controller/helpers/zclFrameConverter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,QAAQ,EAAoB,MAAM,WAAW,CAAC;AAItD,UAAU,QAAQ;IAAE,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,CAAA;CAAC;AAejD,iBAAS,iBAAiB,CAAC,KAAK,EAAE,QAAQ,EAAE,oBAAoB,EAAE,MAAM,GAAG,QAAQ,CAalF;AAED,iBAAS,aAAa,CAAC,KAAK,EAAE,QAAQ,EAAE,oBAAoB,EAAE,MAAM,GAAG,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC,CAa5F;AAED,OAAO,EACH,iBAAiB,EACjB,aAAa,GAChB,CAAC"}
+{"version":3,"file":"zclFrameConverter.d.ts","sourceRoot":"","sources":["../../../src/controller/helpers/zclFrameConverter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,GAAG,MAAM,iBAAiB,CAAC;AACvC,OAAO,EAAU,cAAc,EAAC,MAAM,mCAAmC,CAAC;AAE1E,UAAU,QAAQ;IAAE,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,CAAA;CAAC;AAejD,iBAAS,iBAAiB,CAAC,KAAK,EAAE,GAAG,CAAC,KAAK,EAAE,oBAAoB,EAAE,MAAM,EAAE,cAAc,EAAE,cAAc,GAAG,QAAQ,CAanH;AAED,iBAAS,aAAa,CAAC,KAAK,EAAE,GAAG,CAAC,KAAK,EAAE,oBAAoB,EAAE,MAAM,EAAE,cAAc,EAAE,cAAc,GAAG,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC,CAa7H;AAED,OAAO,EACH,iBAAiB,EACjB,aAAa,GAChB,CAAC"}

package/dist/controller/helpers/zclFrameConverter.js

@@ -1,27 +1,46 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.attributeList = exports.attributeKeyValue = void 0;
-const zcl_1 = require("../../zcl");
-const manufacturerCode_1 = __importDefault(require("../../zcl/definition/manufacturerCode"));
+const Zcl = __importStar(require("../../zspec/zcl"));
 // Legrand devices (e.g. 4129) fail to set the manufacturerSpecific flag and
 // manufacturerCode in the frame header, despite using specific attributes.
 // This leads to incorrect reported attribute names.
 // Remap the attributes using the target device's manufacturer ID
 // if the header is lacking the information.
-function getCluster(frame, deviceManufacturerID) {
-    let cluster = frame.Cluster;
-    if (!frame?.Header?.manufacturerCode && frame?.Cluster && deviceManufacturerID == manufacturerCode_1.default.LegrandNetatmo) {
-        cluster = zcl_1.Utils.getCluster(frame.Cluster.ID, deviceManufacturerID);
+function getCluster(frame, deviceManufacturerID, customClusters) {
+    let cluster = frame.cluster;
+    if (!frame?.header?.manufacturerCode && frame?.cluster && deviceManufacturerID == Zcl.ManufacturerCode.LEGRAND_GROUP) {
+        cluster = Zcl.Utils.getCluster(frame.cluster.ID, deviceManufacturerID, customClusters);
     }
     return cluster;
 }
-function attributeKeyValue(frame, deviceManufacturerID) {
+function attributeKeyValue(frame, deviceManufacturerID, customClusters) {
     const payload = {};
-    const cluster = getCluster(frame, deviceManufacturerID);
-    for (const item of frame.Payload) {
+    const cluster = getCluster(frame, deviceManufacturerID, customClusters);
+    for (const item of frame.payload) {
         try {
             const attribute = cluster.getAttribute(item.attrId);
             payload[attribute.name] = item.attrData;
@@ -33,10 +52,10 @@ function attributeKeyValue(frame, deviceManufacturerID) {
     return payload;
 }
 exports.attributeKeyValue = attributeKeyValue;
-function attributeList(frame, deviceManufacturerID) {
+function attributeList(frame, deviceManufacturerID, customClusters) {
     const payload = [];
-    const cluster = getCluster(frame, deviceManufacturerID);
-    for (const item of frame.Payload) {
+    const cluster = getCluster(frame, deviceManufacturerID, customClusters);
+    for (const item of frame.payload) {
         try {
             const attribute = cluster.getAttribute(item.attrId);
             payload.push(attribute.name);

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

@@ -1 +1 @@
-{"version":3,"file":"zclFrameConverter.js","sourceRoot":"","sources":["../../../src/controller/helpers/zclFrameConverter.ts"],"names":[],"mappings":";;;;;;AAAA,mCAAsD;AAEtD,6FAAqE;AAIrE,4EAA4E;AAC5E,2EAA2E;AAC3E,oDAAoD;AACpD,iEAAiE;AACjE,4CAA4C;AAC5C,SAAS,UAAU,CAAC,KAAe,EAAE,oBAA4B;IAC7D,IAAI,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC;IAC5B,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,gBAAgB,IAAI,KAAK,EAAE,OAAO,IAAI,oBAAoB,IAAI,0BAAgB,CAAC,cAAc,EAAE,CAAC;QAChH,OAAO,GAAG,WAAQ,CAAC,UAAU,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,EAAE,oBAAoB,CAAC,CAAC;IAC1E,CAAC;IACD,OAAO,OAAO,CAAC;AACnB,CAAC;AAED,SAAS,iBAAiB,CAAC,KAAe,EAAE,oBAA4B;IACpE,MAAM,OAAO,GAAa,EAAE,CAAC;IAC7B,MAAM,OAAO,GAAG,UAAU,CAAC,KAAK,EAAE,oBAAoB,CAAC,CAAC;IAExD,KAAK,MAAM,IAAI,IAAI,KAAK,CAAC,OAAO,EAAE,CAAC;QAC/B,IAAI,CAAC;YACD,MAAM,SAAS,GAAG,OAAO,CAAC,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACpD,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC;QAC5C,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC;QACzC,CAAC;IACL,CAAC;IACD,OAAO,OAAO,CAAC;AACnB,CAAC;AAkBG,8CAAiB;AAhBrB,SAAS,aAAa,CAAC,KAAe,EAAE,oBAA4B;IAChE,MAAM,OAAO,GAA2B,EAAE,CAAC;IAC3C,MAAM,OAAO,GAAG,UAAU,CAAC,KAAK,EAAE,oBAAoB,CAAC,CAAC;IAExD,KAAK,MAAM,IAAI,IAAI,KAAK,CAAC,OAAO,EAAE,CAAC;QAC/B,IAAI,CAAC;YACD,MAAM,SAAS,GAAG,OAAO,CAAC,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACpD,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QACjC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAC9B,CAAC;IACL,CAAC;IACD,OAAO,OAAO,CAAC;AACnB,CAAC;AAIG,sCAAa"}
+{"version":3,"file":"zclFrameConverter.js","sourceRoot":"","sources":["../../../src/controller/helpers/zclFrameConverter.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,qDAAuC;AAKvC,4EAA4E;AAC5E,2EAA2E;AAC3E,oDAAoD;AACpD,iEAAiE;AACjE,4CAA4C;AAC5C,SAAS,UAAU,CAAC,KAAgB,EAAE,oBAA4B,EAAE,cAA8B;IAC9F,IAAI,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC;IAC5B,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,gBAAgB,IAAI,KAAK,EAAE,OAAO,IAAI,oBAAoB,IAAI,GAAG,CAAC,gBAAgB,CAAC,aAAa,EAAE,CAAC;QACnH,OAAO,GAAG,GAAG,CAAC,KAAK,CAAC,UAAU,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,EAAE,oBAAoB,EAAE,cAAc,CAAC,CAAC;IAC3F,CAAC;IACD,OAAO,OAAO,CAAC;AACnB,CAAC;AAED,SAAS,iBAAiB,CAAC,KAAgB,EAAE,oBAA4B,EAAE,cAA8B;IACrG,MAAM,OAAO,GAAa,EAAE,CAAC;IAC7B,MAAM,OAAO,GAAG,UAAU,CAAC,KAAK,EAAE,oBAAoB,EAAE,cAAc,CAAC,CAAC;IAExE,KAAK,MAAM,IAAI,IAAI,KAAK,CAAC,OAAO,EAAE,CAAC;QAC/B,IAAI,CAAC;YACD,MAAM,SAAS,GAAG,OAAO,CAAC,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACpD,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC;QAC5C,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC;QACzC,CAAC;IACL,CAAC;IACD,OAAO,OAAO,CAAC;AACnB,CAAC;AAkBG,8CAAiB;AAhBrB,SAAS,aAAa,CAAC,KAAgB,EAAE,oBAA4B,EAAE,cAA8B;IACjG,MAAM,OAAO,GAA2B,EAAE,CAAC;IAC3C,MAAM,OAAO,GAAG,UAAU,CAAC,KAAK,EAAE,oBAAoB,EAAE,cAAc,CAAC,CAAC;IAExE,KAAK,MAAM,IAAI,IAAI,KAAK,CAAC,OAAO,EAAE,CAAC;QAC/B,IAAI,CAAC;YACD,MAAM,SAAS,GAAG,OAAO,CAAC,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACpD,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QACjC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAC9B,CAAC;IACL,CAAC;IACD,OAAO,OAAO,CAAC;AACnB,CAAC;AAIG,sCAAa"}

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

@@ -2,6 +2,8 @@ import { KeyValue, DeviceType } from '../tstype';
 import { Events as AdapterEvents } from '../../adapter';
 import Endpoint from './endpoint';
 import Entity from './entity';
+import * as Zcl from '../../zspec/zcl';
+import { ClusterDefinition, CustomClusters } from '../../zspec/zcl/definition/tstype';
 interface LQI {
     neighbors: {
         ieeeAddr: string;
@@ -18,6 +20,7 @@ interface RoutingTable {
         nextHop: number;
     }[];
 }
+type CustomReadResponse = (frame: Zcl.Frame, endpoint: Endpoint) => boolean;
 declare class Device extends Entity {
     private databaseID;
     private readonly ID;
@@ -40,11 +43,12 @@ declare class Device extends Entity {
     private _zclVersion?;
     private _linkquality?;
     private _skipDefaultResponse;
-    private _skipTimeResponse;
+    private _customReadResponse?;
     private _deleted;
     private _lastDefaultResponseSequenceNumber;
     private _checkinInterval;
     private _pendingRequestTimeout;
+    private _customClusters;
     get ieeeAddr(): string;
     set ieeeAddr(ieeeAddr: string);
     get applicationVersion(): number;
@@ -79,12 +83,13 @@ declare class Device extends Entity {
     set linkquality(linkquality: number);
     get skipDefaultResponse(): boolean;
     set skipDefaultResponse(skipDefaultResponse: boolean);
-    get skipTimeResponse(): boolean;
-    set skipTimeResponse(skipTimeResponse: boolean);
+    get customReadResponse(): CustomReadResponse;
+    set customReadResponse(customReadResponse: CustomReadResponse);
     get checkinInterval(): number;
     set checkinInterval(checkinInterval: number);
     get pendingRequestTimeout(): number;
     set pendingRequestTimeout(pendingRequestTimeout: number);
+    get customClusters(): CustomClusters;
     meta: KeyValue;
     private static devices;
     static readonly ReportablePropertiesMapping: {
@@ -102,13 +107,14 @@ declare class Device extends Entity {
     updateLastSeen(): void;
     private resetPendingRequestTimeout;
     private hasPendingRequests;
-    onZclData(dataPayload: AdapterEvents.ZclDataPayload, endpoint: Endpoint): Promise<void>;
+    onZclData(dataPayload: AdapterEvents.ZclPayload, frame: Zcl.Frame, endpoint: Endpoint): Promise<void>;
     private static fromDatabaseEntry;
     private toDatabaseEntry;
     save(writeDatabase?: boolean): void;
     private static loadFromDatabaseIfNecessary;
+    static find(databaseID: number, ieeeOrNwkAddress: string | number, includeDeleted?: boolean): Device;
     static byIeeeAddr(databaseID: number, ieeeAddr: string, includeDeleted?: boolean): Device;
-    static byNetworkAddress(networkAddress: number, databaseID: number): Device;
+    static byNetworkAddress(networkAddress: number, databaseID: number, includeDeleted?: boolean): Device;
     static byType(type: DeviceType, databaseID: number): Device[];
     static all(): Device[];
     static allByDatabaseID(databaseID: number): Device[];
@@ -128,6 +134,7 @@ declare class Device extends Entity {
     lqi(): Promise<LQI>;
     routingTable(): Promise<RoutingTable>;
     ping(disableRecovery?: boolean): Promise<void>;
+    addCustomCluster(name: string, cluster: ClusterDefinition): void;
 }
 export default Device;
 //# sourceMappingURL=device.d.ts.map

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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"}