@willieee802/zigbee-herdsman 0.36.0 → 0.48.1

package/dist/controller/model/endpoint.js

@@ -27,7 +27,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const entity_1 = __importDefault(require("./entity"));
-const Zcl = __importStar(require("../../zcl"));
+const Zcl = __importStar(require("../../zspec/zcl"));
 const zclTransactionSequenceNumber_1 = __importDefault(require("../helpers/zclTransactionSequenceNumber"));
 const ZclFrameConverter = __importStar(require("../helpers/zclFrameConverter"));
 const request_1 = __importDefault(require("../helpers/request"));
@@ -40,6 +40,9 @@ const debug = {
     info: (0, debug_1.default)("zigbee-herdsman:controller:endpoint"),
     error: (0, debug_1.default)("zigbee-herdsman:controller:endpoint"),
 };
+const logger_1 = require("../../utils/logger");
+const enums_1 = require("../../zspec/enums");
+const NS = 'zh:controller:endpoint';
 class Endpoint extends entity_1.default {
     databaseID;
     deviceID;
@@ -69,20 +72,16 @@ class Endpoint extends entity_1.default {
                 target = group_1.default.byGroupID(entry.groupID, this.databaseID);
             }
             if (target) {
-                return {
-                    target,
-                    cluster: Zcl.Utils.getCluster(entry.cluster, this.getDevice().manufacturerID),
-                };
+                return { target, cluster: this.getCluster(entry.cluster) };
             }
             else {
                 return undefined;
             }
-        })
-            .filter((b) => b !== undefined);
+        }).filter(b => b !== undefined);
     }
     get configuredReportings() {
         return this._configuredReportings.map((entry) => {
-            const cluster = Zcl.Utils.getCluster(entry.cluster, entry.manufacturerCode);
+            const cluster = Zcl.Utils.getCluster(entry.cluster, entry.manufacturerCode, this.getDevice().customClusters);
             let attribute;
             if (cluster.hasAttribute(entry.attrId)) {
                 attribute = cluster.getAttribute(entry.attrId);
@@ -127,35 +126,35 @@ class Endpoint extends entity_1.default {
         return device_1.default.byIeeeAddr(this.databaseID, this.deviceIeeeAddress);
     }
     /**
-   * @param {number|string} clusterKey
-   * @returns {boolean}
-   */
+     * @param {number|string} clusterKey
+     * @returns {boolean}
+     */
     supportsInputCluster(clusterKey) {
-        const cluster = Zcl.Utils.getCluster(clusterKey);
+        const cluster = this.getCluster(clusterKey);
         return this.inputClusters.includes(cluster.ID);
     }
     /**
-   * @param {number|string} clusterKey
-   * @returns {boolean}
-   */
+     * @param {number|string} clusterKey
+     * @returns {boolean}
+     */
     supportsOutputCluster(clusterKey) {
-        const cluster = Zcl.Utils.getCluster(clusterKey);
+        const cluster = this.getCluster(clusterKey);
         return this.outputClusters.includes(cluster.ID);
     }
     /**
-   * @returns {Zcl.TsType.Cluster[]}
-   */
+     * @returns {ZclTypes.Cluster[]}
+     */
     getInputClusters() {
         return this.clusterNumbersToClusters(this.inputClusters);
     }
     /**
-   * @returns {Zcl.TsType.Cluster[]}
-   */
+     * @returns {ZclTypes.Cluster[]}
+     */
     getOutputClusters() {
         return this.clusterNumbersToClusters(this.outputClusters);
     }
     clusterNumbersToClusters(clusterNumbers) {
-        return clusterNumbers.map((c) => Zcl.Utils.getCluster(c, this.getDevice().manufacturerID));
+        return clusterNumbers.map((c) => this.getCluster(c));
     }
     /*
    * CRUD
@@ -189,7 +188,7 @@ class Endpoint extends entity_1.default {
         return new Endpoint(databaseID, ID, profileID, deviceID, inputClusters, outputClusters, deviceNetworkAddress, deviceIeeeAddress, {}, [], [], {});
     }
     saveClusterAttributeKeyValue(clusterKey, list) {
-        const cluster = Zcl.Utils.getCluster(clusterKey);
+        const cluster = this.getCluster(clusterKey);
         if (!this.clusters[cluster.name])
             this.clusters[cluster.name] = { attributes: {} };
         for (const [attribute, value] of Object.entries(list)) {
@@ -197,7 +196,7 @@ class Endpoint extends entity_1.default {
         }
     }
     getClusterAttributeValue(clusterKey, attributeKey) {
-        const cluster = Zcl.Utils.getCluster(clusterKey);
+        const cluster = this.getCluster(clusterKey);
         const attribute = cluster.getAttribute(attributeKey);
         if (this.clusters[cluster.name] && this.clusters[cluster.name].attributes) {
             return this.clusters[cluster.name].attributes[attribute.name];
@@ -214,33 +213,32 @@ class Endpoint extends entity_1.default {
         return entity_1.default.getAdapterByID(this.databaseID).sendZclFrameToEndpoint(this.deviceIeeeAddress, this.deviceNetworkAddress, this.ID, d, options.timeout, options.disableResponse, options.disableRecovery, options.srcEndpoint);
     }) {
         const logPrefix = `Request Queue (${this.deviceIeeeAddress}/${this.ID}): `;
-        const request = new request_1.default(func, frame, this.getDevice().pendingRequestTimeout, options.sendPolicy);
+        const device = this.getDevice();
+        const request = new request_1.default(func, frame, device.pendingRequestTimeout, options.sendPolicy);
         if (request.sendPolicy !== 'bulk') {
             // Check if such a request is already in the queue and remove the old one(s) if necessary
             this.pendingRequests.filter(request);
         }
         // send without queueing if sendPolicy is 'immediate' or if the device has no timeout set
-        if (request.sendPolicy === 'immediate'
-            || !this.getDevice().pendingRequestTimeout) {
-            if (this.getDevice().pendingRequestTimeout > 0) {
-                debug.info(logPrefix + `send ${frame.getCommand().name} request immediately ` +
-                    `(sendPolicy=${options.sendPolicy})`);
+        if (request.sendPolicy === 'immediate' || !device.pendingRequestTimeout) {
+            if (device.pendingRequestTimeout > 0) {
+                logger_1.logger.debug(logPrefix + `send ${frame.command.name} request immediately (sendPolicy=${options.sendPolicy})`, NS);
             }
             return request.send();
         }
         // If this is a bulk message, we queue directly.
         if (request.sendPolicy === 'bulk') {
-            debug.info(logPrefix + `queue request (${this.pendingRequests.size})))`);
+            logger_1.logger.debug(logPrefix + `queue request (${this.pendingRequests.size})`, NS);
             return this.pendingRequests.queue(request);
         }
         try {
-            debug.info(logPrefix + `send request`);
+            logger_1.logger.debug(logPrefix + `send request`, NS);
             return await request.send();
         }
         catch (error) {
             // If we got a failed transaction, the device is likely sleeping.
             // Queue for transmission later.
-            debug.info(logPrefix + `queue request (transaction failed)`);
+            logger_1.logger.debug(logPrefix + `queue request (transaction failed)`, NS);
             return this.pendingRequests.queue(request);
         }
     }
@@ -253,11 +251,10 @@ class Endpoint extends entity_1.default {
             : [payload.statusCode];
         const invalid = codes.find((c) => c !== Zcl.Status.SUCCESS);
         if (invalid)
-            throw new Zcl.ZclStatusError(invalid);
+            throw new Zcl.StatusError(invalid);
     }
     async report(clusterKey, attributes, options) {
-        const cluster = Zcl.Utils.getCluster(clusterKey);
-        options = this.getOptionsWithDefaults(options, true, Zcl.Direction.CLIENT_TO_SERVER, cluster.manufacturerCode);
+        const cluster = this.getCluster(clusterKey);
         const payload = [];
         for (const [nameOrID, value] of Object.entries(attributes)) {
             if (cluster.hasAttribute(nameOrID)) {
@@ -279,22 +276,10 @@ class Endpoint extends entity_1.default {
                 throw new Error(`Unknown attribute '${nameOrID}', specify either an existing attribute or a number`);
             }
         }
-        const log = `Report to ${this.deviceIeeeAddress}/${this.ID} ` +
-            `${cluster.name}(${JSON.stringify(attributes)}, ${JSON.stringify(options)})`;
-        debug.info(log);
-        try {
-            const frame = Zcl.ZclFrame.create(Zcl.FrameType.GLOBAL, options.direction, options.disableDefaultResponse, options.manufacturerCode, options.transactionSequenceNumber ??
-                zclTransactionSequenceNumber_1.default.next(), "report", cluster.ID, payload, options.reservedBits);
-            await this.sendRequest(frame, options);
-        }
-        catch (error) {
-            error.message = `${log} failed (${error.message})`;
-            debug.error(error.message);
-            throw error;
-        }
+        await this.zclCommand(clusterKey, "report", payload, options, attributes);
     }
     async write(clusterKey, attributes, options) {
-        const cluster = Zcl.Utils.getCluster(clusterKey);
+        const cluster = this.getCluster(clusterKey);
         options = this.getOptionsWithDefaults(options, true, Zcl.Direction.CLIENT_TO_SERVER, cluster.manufacturerCode);
         options.manufacturerCode = this.ensureManufacturerCodeIsUniqueAndGet(cluster, Object.keys(attributes), options.manufacturerCode, 'write');
         const payload = [];
@@ -310,27 +295,11 @@ class Endpoint extends entity_1.default {
                 throw new Error(`Unknown attribute '${nameOrID}', specify either an existing attribute or a number`);
             }
         }
-        const log = `Write ${this.deviceIeeeAddress}/${this.ID} ` +
-            `${cluster.name}(${JSON.stringify(attributes)}, ${JSON.stringify(options)})`;
-        debug.info(log);
-        try {
-            const frame = Zcl.ZclFrame.create(Zcl.FrameType.GLOBAL, options.direction, options.disableDefaultResponse, options.manufacturerCode, options.transactionSequenceNumber ??
-                zclTransactionSequenceNumber_1.default.next(), options.writeUndiv ? "writeUndiv" : "write", cluster.ID, payload, options.reservedBits);
-            const result = await this.sendRequest(frame, options);
-            if (!options.disableResponse) {
-                this.checkStatus(result.frame.Payload);
-            }
-        }
-        catch (error) {
-            error.message = `${log} failed (${error.message})`;
-            debug.error(error.message);
-            throw error;
-        }
+        await this.zclCommand(clusterKey, options.writeUndiv ? "writeUndiv" : "write", payload, options, attributes, true);
     }
     async writeResponse(clusterKey, transactionSequenceNumber, attributes, options) {
         (0, assert_1.default)(!options || !options.hasOwnProperty('transactionSequenceNumber'), 'Use parameter');
-        const cluster = Zcl.Utils.getCluster(clusterKey);
-        options = this.getOptionsWithDefaults(options, true, Zcl.Direction.SERVER_TO_CLIENT, cluster.manufacturerCode);
+        const cluster = this.getCluster(clusterKey);
         const payload = [];
         for (const [nameOrID, value] of Object.entries(attributes)) {
             if (value.hasOwnProperty('status')) {
@@ -349,51 +318,25 @@ class Endpoint extends entity_1.default {
                 throw new Error(`Missing attribute 'status'`);
             }
         }
-        const frame = Zcl.ZclFrame.create(Zcl.FrameType.GLOBAL, options.direction, options.disableDefaultResponse, options.manufacturerCode, transactionSequenceNumber, "writeRsp", cluster.ID, payload, options.reservedBits);
-        const log = `WriteResponse ${this.deviceIeeeAddress}/${this.ID} ` +
-            `${cluster.name}(${JSON.stringify(attributes)}, ${JSON.stringify(options)})`;
-        debug.info(log);
-        try {
-            await this.sendRequest(frame, options);
-        }
-        catch (error) {
-            error.message = `${log} failed (${error.message})`;
-            debug.error(error.message);
-            throw error;
-        }
+        await this.zclCommand(clusterKey, 'writeRsp', payload, { direction: Zcl.Direction.SERVER_TO_CLIENT, ...options, transactionSequenceNumber }, attributes);
     }
     async read(clusterKey, attributes, options) {
-        const cluster = Zcl.Utils.getCluster(clusterKey);
+        const device = this.getDevice();
+        const cluster = this.getCluster(clusterKey, device);
         options = this.getOptionsWithDefaults(options, true, Zcl.Direction.CLIENT_TO_SERVER, cluster.manufacturerCode);
         options.manufacturerCode = this.ensureManufacturerCodeIsUniqueAndGet(cluster, attributes, options.manufacturerCode, 'read');
         const payload = [];
         for (const attribute of attributes) {
             payload.push({ attrId: typeof attribute === 'number' ? attribute : cluster.getAttribute(attribute).ID });
         }
-        const frame = Zcl.ZclFrame.create(Zcl.FrameType.GLOBAL, options.direction, options.disableDefaultResponse, options.manufacturerCode, options.transactionSequenceNumber ?? zclTransactionSequenceNumber_1.default.next(), "read", cluster.ID, payload, options.reservedBits);
-        const log = `Read ${this.deviceIeeeAddress}/${this.ID} ` +
-            `${cluster.name}(${JSON.stringify(attributes)}, ${JSON.stringify(options)})`;
-        debug.info(log);
-        try {
-            const result = await this.sendRequest(frame, options);
-            if (!options.disableResponse) {
-                this.checkStatus(result.frame.Payload);
-                return ZclFrameConverter.attributeKeyValue(result.frame, this.getDevice().manufacturerID);
-            }
-            else {
-                return null;
-            }
-        }
-        catch (error) {
-            error.message = `${log} failed (${error.message})`;
-            debug.error(error.message);
-            throw error;
+        const resultFrame = await this.zclCommand(clusterKey, 'read', payload, options, attributes, true);
+        if (resultFrame) {
+            return ZclFrameConverter.attributeKeyValue(resultFrame, device.manufacturerID, device.customClusters);
         }
     }
     async readResponse(clusterKey, transactionSequenceNumber, attributes, options) {
-        (0, assert_1.default)(!options || !options.hasOwnProperty("transactionSequenceNumber"), "Use parameter");
-        const cluster = Zcl.Utils.getCluster(clusterKey);
-        options = this.getOptionsWithDefaults(options, true, Zcl.Direction.SERVER_TO_CLIENT, cluster.manufacturerCode);
+        (0, assert_1.default)(!options || !options.hasOwnProperty('transactionSequenceNumber'), 'Use parameter');
+        const cluster = this.getCluster(clusterKey);
         const payload = [];
         for (const [nameOrID, value] of Object.entries(attributes)) {
             if (cluster.hasAttribute(nameOrID)) {
@@ -417,25 +360,12 @@ class Endpoint extends entity_1.default {
                 throw new Error(`Unknown attribute '${nameOrID}', specify either an existing attribute or a number`);
             }
         }
-        const frame = Zcl.ZclFrame.create(Zcl.FrameType.GLOBAL, options.direction, options.disableDefaultResponse, options.manufacturerCode, transactionSequenceNumber, "readRsp", cluster.ID, payload, options.reservedBits);
-        const log = `ReadResponse ${this.deviceIeeeAddress}/${this.ID} ` +
-            `${cluster.name}(${JSON.stringify(attributes)}, ${JSON.stringify(options)})`;
-        debug.info(log);
-        try {
-            await this.sendRequest(frame, options);
-        }
-        catch (error) {
-            error.message = `${log} failed (${error.message})`;
-            debug.error(error.message);
-            throw error;
-        }
+        await this.zclCommand(clusterKey, 'readRsp', payload, { direction: Zcl.Direction.SERVER_TO_CLIENT, ...options, transactionSequenceNumber }, attributes);
     }
     addBinding(clusterKey, target) {
-        const cluster = Zcl.Utils.getCluster(clusterKey);
-        if (typeof target === "number") {
-            target =
-                group_1.default.byGroupID(target, this.databaseID) ||
-                    group_1.default.create(target, this.databaseID);
+        const cluster = this.getCluster(clusterKey);
+        if (typeof target === 'number') {
+            target = group_1.default.byGroupID(target, this.databaseID) || group_1.default.create(target, this.databaseID);
         }
         if (!this.binds.find((b) => b.cluster.ID === cluster.ID && b.target === target)) {
             if (target instanceof group_1.default) {
@@ -457,26 +387,22 @@ class Endpoint extends entity_1.default {
         }
     }
     async bind(clusterKey, target) {
-        const cluster = Zcl.Utils.getCluster(clusterKey);
-        const type = target instanceof Endpoint ? "endpoint" : "group";
-        if (typeof target === "number") {
-            target =
-                group_1.default.byGroupID(target, this.databaseID) ||
-                    group_1.default.create(target, this.databaseID);
+        const cluster = this.getCluster(clusterKey);
+        const type = target instanceof Endpoint ? 'endpoint' : 'group';
+        if (typeof target === 'number') {
+            target = group_1.default.byGroupID(target, this.databaseID) || group_1.default.create(target, this.databaseID);
         }
         const destinationAddress = target instanceof Endpoint ? target.deviceIeeeAddress : target.groupID;
         const log = `Bind ${this.deviceIeeeAddress}/${this.ID} ${cluster.name} from ` +
-            `'${target instanceof Endpoint
-                ? `${destinationAddress}/${target.ID}`
-                : destinationAddress}'`;
-        debug.info(log);
+            `'${target instanceof Endpoint ? `${destinationAddress}/${target.ID}` : destinationAddress}'`;
+        logger_1.logger.debug(log, NS);
         try {
             await entity_1.default.getAdapterByID(this.databaseID).bind(this.deviceNetworkAddress, this.deviceIeeeAddress, this.ID, cluster.ID, destinationAddress, type, target instanceof Endpoint ? target.ID : null);
             this.addBinding(clusterKey, target);
         }
         catch (error) {
             error.message = `${log} failed (${error.message})`;
-            debug.error(error.message);
+            logger_1.logger.debug(error, NS);
             throw error;
         }
     }
@@ -484,18 +410,16 @@ class Endpoint extends entity_1.default {
         this.getDevice().save();
     }
     async unbind(clusterKey, target) {
-        const cluster = Zcl.Utils.getCluster(clusterKey);
-        const type = target instanceof Endpoint ? "endpoint" : "group";
+        const cluster = this.getCluster(clusterKey);
+        const type = target instanceof Endpoint ? 'endpoint' : 'group';
         const destinationAddress = target instanceof Endpoint
             ? target.deviceIeeeAddress
             : target instanceof group_1.default
                 ? target.groupID
                 : target;
         const log = `Unbind ${this.deviceIeeeAddress}/${this.ID} ${cluster.name} from ` +
-            `'${target instanceof Endpoint
-                ? `${destinationAddress}/${target.ID}`
-                : destinationAddress}'`;
-        debug.info(log);
+            `'${target instanceof Endpoint ? `${destinationAddress}/${target.ID}` : destinationAddress}'`;
+        logger_1.logger.debug(log, NS);
         try {
             await entity_1.default.getAdapterByID(this.databaseID).unbind(this.deviceNetworkAddress, this.deviceIeeeAddress, this.ID, cluster.ID, destinationAddress, type, target instanceof Endpoint ? target.ID : null);
             if (typeof target === "number" &&
@@ -510,29 +434,17 @@ class Endpoint extends entity_1.default {
         }
         catch (error) {
             error.message = `${log} failed (${error.message})`;
-            debug.error(error.message);
+            logger_1.logger.debug(error, NS);
             throw error;
         }
     }
     async defaultResponse(commandID, status, clusterID, transactionSequenceNumber, options) {
-        (0, assert_1.default)(!options || !options.hasOwnProperty("transactionSequenceNumber"), "Use parameter");
-        options = this.getOptionsWithDefaults(options, true, Zcl.Direction.SERVER_TO_CLIENT, null);
+        (0, assert_1.default)(!options || !options.hasOwnProperty('transactionSequenceNumber'), 'Use parameter');
         const payload = { cmdId: commandID, statusCode: status };
-        const frame = Zcl.ZclFrame.create(Zcl.FrameType.GLOBAL, options.direction, options.disableDefaultResponse, options.manufacturerCode, transactionSequenceNumber, "defaultRsp", clusterID, payload, options.reservedBits);
-        const log = `DefaultResponse ${this.deviceIeeeAddress}/${this.ID} ` +
-            `${clusterID}(${commandID}, ${JSON.stringify(options)})`;
-        debug.info(log);
-        try {
-            await this.sendRequest(frame, options);
-        }
-        catch (error) {
-            error.message = `${log} failed (${error.message})`;
-            debug.error(error.message);
-            throw error;
-        }
+        await this.zclCommand(clusterID, 'defaultRsp', payload, { direction: Zcl.Direction.SERVER_TO_CLIENT, ...options, transactionSequenceNumber });
     }
     async configureReporting(clusterKey, items, options) {
-        const cluster = Zcl.Utils.getCluster(clusterKey);
+        const cluster = this.getCluster(clusterKey);
         options = this.getOptionsWithDefaults(options, true, Zcl.Direction.CLIENT_TO_SERVER, cluster.manufacturerCode);
         options.manufacturerCode = this.ensureManufacturerCodeIsUniqueAndGet(cluster, items, options.manufacturerCode, 'configureReporting');
         const payload = items.map((item) => {
@@ -558,93 +470,48 @@ class Endpoint extends entity_1.default {
                 repChange: item.reportableChange,
             };
         });
-        const frame = Zcl.ZclFrame.create(Zcl.FrameType.GLOBAL, options.direction, options.disableDefaultResponse, options.manufacturerCode, options.transactionSequenceNumber ?? zclTransactionSequenceNumber_1.default.next(), "configReport", cluster.ID, payload, options.reservedBits);
-        const log = `ConfigureReporting ${this.deviceIeeeAddress}/${this.ID} ` +
-            `${cluster.name}(${JSON.stringify(items)}, ${JSON.stringify(options)})`;
-        debug.info(log);
-        try {
-            const result = await this.sendRequest(frame, options);
-            if (!options.disableResponse) {
-                this.checkStatus(result.frame.Payload);
-            }
-            for (const e of payload) {
-                this._configuredReportings = this._configuredReportings.filter((c) => !(c.attrId === e.attrId && c.cluster === cluster.ID &&
-                    (!('manufacturerCode' in c) || c.manufacturerCode === options.manufacturerCode)));
-            }
-            for (const entry of payload) {
-                if (entry.maxRepIntval !== 0xffff) {
-                    this._configuredReportings.push({
-                        cluster: cluster.ID,
-                        attrId: entry.attrId,
-                        minRepIntval: entry.minRepIntval,
-                        maxRepIntval: entry.maxRepIntval,
-                        repChange: entry.repChange,
-                        manufacturerCode: options.manufacturerCode,
-                    });
-                }
+        await this.zclCommand(clusterKey, 'configReport', payload, options, items, true);
+        for (const e of payload) {
+            this._configuredReportings = this._configuredReportings.filter((c) => !(c.attrId === e.attrId && c.cluster === cluster.ID &&
+                (!('manufacturerCode' in c) || c.manufacturerCode === options.manufacturerCode)));
+        }
+        for (const entry of payload) {
+            if (entry.maxRepIntval !== 0xFFFF) {
+                this._configuredReportings.push({
+                    cluster: cluster.ID, attrId: entry.attrId, minRepIntval: entry.minRepIntval,
+                    maxRepIntval: entry.maxRepIntval, repChange: entry.repChange,
+                    manufacturerCode: options.manufacturerCode,
+                });
             }
-            this.save();
-        }
-        catch (error) {
-            error.message = `${log} failed (${error.message})`;
-            debug.error(error.message);
-            throw error;
         }
+        this.save();
     }
     async writeStructured(clusterKey, payload, options) {
-        const cluster = Zcl.Utils.getCluster(clusterKey);
-        options = this.getOptionsWithDefaults(options, true, Zcl.Direction.CLIENT_TO_SERVER, cluster.manufacturerCode);
-        const frame = Zcl.ZclFrame.create(Zcl.FrameType.GLOBAL, options.direction, options.disableDefaultResponse, options.manufacturerCode, options.transactionSequenceNumber ?? zclTransactionSequenceNumber_1.default.next(), `writeStructured`, cluster.ID, payload, options.reservedBits);
-        const log = `WriteStructured ${this.deviceIeeeAddress}/${this.ID} ` +
-            `${cluster.name}(${JSON.stringify(payload)}, ${JSON.stringify(options)})`;
-        debug.info(log);
-        try {
-            await this.sendRequest(frame, options);
-            // TODO: support `writeStructuredResponse`
-        }
-        catch (error) {
-            error.message = `${log} failed (${error.message})`;
-            debug.error(error.message);
-            throw error;
-        }
+        await this.zclCommand(clusterKey, 'writeStructured', payload, options);
+        // TODO: support `writeStructuredResponse`
     }
     async command(clusterKey, commandKey, payload, options) {
-        const cluster = Zcl.Utils.getCluster(clusterKey);
-        const command = cluster.getCommand(commandKey);
-        const hasResponse = command.hasOwnProperty("response");
-        options = this.getOptionsWithDefaults(options, hasResponse, Zcl.Direction.CLIENT_TO_SERVER, cluster.manufacturerCode);
-        const frame = Zcl.ZclFrame.create(Zcl.FrameType.SPECIFIC, options.direction, options.disableDefaultResponse, options.manufacturerCode, options.transactionSequenceNumber ?? zclTransactionSequenceNumber_1.default.next(), command.name, cluster.name, payload, options.reservedBits);
-        const log = `Command ${this.deviceIeeeAddress}/${this.ID} ` +
-            `${cluster.name}.${command.name}(${JSON.stringify(payload)}, ${JSON.stringify(options)})`;
-        debug.info(log);
-        try {
-            const result = await this.sendRequest(frame, options);
-            if (result) {
-                return result.frame.Payload;
-            }
-        }
-        catch (error) {
-            error.message = `${log} failed (${error.message})`;
-            debug.error(error.message);
-            throw error;
+        const frame = await this.zclCommand(clusterKey, commandKey, payload, options, null, false, Zcl.FrameType.SPECIFIC);
+        if (frame) {
+            return frame.payload;
         }
     }
     async commandResponse(clusterKey, commandKey, payload, options, transactionSequenceNumber) {
-        (0, assert_1.default)(!options || !options.hasOwnProperty("transactionSequenceNumber"), "Use parameter");
-        const cluster = Zcl.Utils.getCluster(clusterKey);
+        (0, assert_1.default)(!options || !options.hasOwnProperty('transactionSequenceNumber'), 'Use parameter');
+        const device = this.getDevice();
+        const cluster = this.getCluster(clusterKey, device);
         const command = cluster.getCommandResponse(commandKey);
-        transactionSequenceNumber =
-            transactionSequenceNumber || zclTransactionSequenceNumber_1.default.next();
+        transactionSequenceNumber = transactionSequenceNumber || zclTransactionSequenceNumber_1.default.next();
         options = this.getOptionsWithDefaults(options, true, Zcl.Direction.SERVER_TO_CLIENT, cluster.manufacturerCode);
-        const frame = Zcl.ZclFrame.create(Zcl.FrameType.SPECIFIC, options.direction, options.disableDefaultResponse, options.manufacturerCode, transactionSequenceNumber, command.name, cluster.name, payload, options.reservedBits);
+        const frame = Zcl.Frame.create(Zcl.FrameType.SPECIFIC, options.direction, options.disableDefaultResponse, options.manufacturerCode, transactionSequenceNumber, command.name, cluster.name, payload, device.customClusters, options.reservedBits);
         const log = `CommandResponse ${this.deviceIeeeAddress}/${this.ID} ` +
             `${cluster.name}.${command.name}(${JSON.stringify(payload)}, ${JSON.stringify(options)})`;
-        debug.info(log);
+        logger_1.logger.debug(log, NS);
         try {
             await this.sendRequest(frame, options, async (f) => {
                 // Broadcast Green Power responses
                 if (this.ID === 242) {
-                    await entity_1.default.getAdapterByID(this.databaseID).sendZclFrameToAll(242, f, 242);
+                    await entity_1.default.getAdapterByID(this.databaseID).sendZclFrameToAll(242, f, 242, enums_1.BroadcastAddress.RX_ON_WHEN_IDLE);
                 }
                 else {
                     await entity_1.default.getAdapterByID(this.databaseID).sendZclFrameToEndpoint(this.deviceIeeeAddress, this.deviceNetworkAddress, this.ID, f, options.timeout, options.disableResponse, options.disableRecovery, options.srcEndpoint);
@@ -653,19 +520,20 @@ class Endpoint extends entity_1.default {
         }
         catch (error) {
             error.message = `${log} failed (${error.message})`;
-            debug.error(error.message);
+            logger_1.logger.debug(error, NS);
             throw error;
         }
     }
     waitForCommand(clusterKey, commandKey, transactionSequenceNumber, timeout) {
-        const cluster = Zcl.Utils.getCluster(clusterKey);
+        const device = this.getDevice();
+        const cluster = this.getCluster(clusterKey, device);
         const command = cluster.getCommand(commandKey);
         const waiter = entity_1.default.getAdapterByID(this.databaseID).waitFor(this.deviceNetworkAddress, this.ID, Zcl.FrameType.SPECIFIC, Zcl.Direction.CLIENT_TO_SERVER, transactionSequenceNumber, cluster.ID, command.ID, timeout);
         const promise = new Promise((resolve, reject) => {
-            waiter.promise.then((payload) => resolve({
-                header: payload.frame.Header,
-                payload: payload.frame.Payload,
-            }), (error) => reject(error));
+            waiter.promise.then((payload) => {
+                const frame = Zcl.Frame.fromBuffer(payload.clusterID, payload.header, payload.data, device.customClusters);
+                resolve({ header: frame.header, payload: frame.payload });
+            }, (error) => reject(error));
         });
         return { promise, cancel: waiter.cancel };
     }
@@ -679,7 +547,7 @@ class Endpoint extends entity_1.default {
             direction,
             srcEndpoint: null,
             reservedBits: 0,
-            manufacturerCode: manufacturerCode ? manufacturerCode : null,
+            manufacturerCode: manufacturerCode ?? null,
             transactionSequenceNumber: null,
             writeUndiv: false,
             ...providedOptions
@@ -727,6 +595,10 @@ class Endpoint extends entity_1.default {
         });
         group.addMember(this);
     }
+    getCluster(clusterKey, device = undefined) {
+        device = device ?? this.getDevice();
+        return Zcl.Utils.getCluster(clusterKey, device.manufacturerID, device.customClusters);
+    }
     /**
    * Remove endpoint from a group, accepts both a Group and number as parameter.
    * The number parameter type should only be used when removing from a group which is not known
@@ -751,6 +623,45 @@ class Endpoint extends entity_1.default {
             }
         }
     }
+    async zclCommand(clusterKey, commandKey, payload, options, logPayload, checkStatus = false, frameType = Zcl.FrameType.GLOBAL) {
+        const device = this.getDevice();
+        const cluster = this.getCluster(clusterKey, device);
+        const command = (frameType == Zcl.FrameType.GLOBAL) ? Zcl.Utils.getGlobalCommand(commandKey) : cluster.getCommand(commandKey);
+        const hasResponse = (frameType == Zcl.FrameType.GLOBAL) ? true : command.hasOwnProperty('response');
+        options = this.getOptionsWithDefaults(options, hasResponse, Zcl.Direction.CLIENT_TO_SERVER, cluster.manufacturerCode);
+        const frame = Zcl.Frame.create(frameType, options.direction, options.disableDefaultResponse, options.manufacturerCode, options.transactionSequenceNumber ?? zclTransactionSequenceNumber_1.default.next(), command.name, cluster.name, payload, device.customClusters, options.reservedBits);
+        const log = `ZCL command ${this.deviceIeeeAddress}/${this.ID} ` +
+            `${cluster.name}.${command.name}(${JSON.stringify((logPayload) ? logPayload : payload)}, ${JSON.stringify(options)})`;
+        logger_1.logger.debug(log, NS);
+        try {
+            const result = await this.sendRequest(frame, options);
+            if (result) {
+                const resultFrame = Zcl.Frame.fromBuffer(result.clusterID, result.header, result.data, device.customClusters);
+                if (result && checkStatus && !options.disableResponse) {
+                    this.checkStatus(resultFrame.payload);
+                }
+                return resultFrame;
+            }
+        }
+        catch (error) {
+            error.message = `${log} failed (${error.message})`;
+            logger_1.logger.debug(error, NS);
+            throw error;
+        }
+    }
+    async zclCommandBroadcast(endpoint, destination, clusterKey, commandKey, payload, options) {
+        const device = this.getDevice();
+        const cluster = this.getCluster(clusterKey, device);
+        const command = cluster.getCommand(commandKey);
+        options = this.getOptionsWithDefaults(options, true, Zcl.Direction.CLIENT_TO_SERVER, cluster.manufacturerCode);
+        const sourceEndpoint = options.srcEndpoint ?? this.ID;
+        const frame = Zcl.Frame.create(Zcl.FrameType.SPECIFIC, options.direction, true, options.manufacturerCode, options.transactionSequenceNumber ?? zclTransactionSequenceNumber_1.default.next(), command.name, cluster.name, payload, device.customClusters, options.reservedBits);
+        const log = `ZCL command broadcast ${this.deviceIeeeAddress}/${sourceEndpoint} to ${destination}/${endpoint} ` +
+            `${cluster.name}.${command.name}(${JSON.stringify({ payload, options })})`;
+        logger_1.logger.debug(log, NS);
+        // if endpoint===0xFF ("broadcast endpoint"), deliver to all endpoints supporting cluster, should be avoided whenever possible
+        await entity_1.default.getAdapterByID(this.databaseID).sendZclFrameToAll(endpoint, frame, sourceEndpoint, destination);
+    }
 }
 exports.default = Endpoint;
 //# sourceMappingURL=endpoint.js.map