zigbee-herdsman 1.0.0 → 1.1.0

package/dist/adapter/ember/adapter/emberAdapter.js

@@ -312,6 +312,7 @@ class EmberAdapter extends __1.Adapter {
     async onMessageSent(status, type, indexOrDestination, apsFrame, messageTag) {
         switch (status) {
             case enums_1.SLStatus.ZIGBEE_DELIVERY_FAILED: {
+                logger_1.logger.debug(() => `~x~> DELIVERY_FAILED [indexOrDestination=${indexOrDestination} apsFrame=${JSON.stringify(apsFrame)} messageTag=${messageTag}]`, NS);
                 // no ACK was received from the destination
                 switch (type) {
                     case enums_1.EmberOutgoingMessageType.BROADCAST:
@@ -319,7 +320,7 @@ class EmberAdapter extends __1.Adapter {
                     case enums_1.EmberOutgoingMessageType.MULTICAST:
                     case enums_1.EmberOutgoingMessageType.MULTICAST_WITH_ALIAS: {
                         // BC/MC not checking for message sent, avoid unnecessary waitress lookups
-                        logger_1.logger.error(`Delivery of ${enums_1.EmberOutgoingMessageType[type]} failed for '${indexOrDestination}' [apsFrame=${JSON.stringify(apsFrame)} messageTag=${messageTag}]`, NS);
+                        logger_1.logger.error(`Delivery of ${enums_1.EmberOutgoingMessageType[type]} failed for '${indexOrDestination}'.`, NS);
                         break;
                     }
                     default: {
@@ -373,26 +374,20 @@ class EmberAdapter extends __1.Adapter {
      * @param messageContents The content of the response.
      */
     async onZDOResponse(apsFrame, sender, messageContents) {
-        const [status, payload] = Zdo.Buffalo.readResponse(this.hasZdoMessageOverhead, apsFrame.clusterId, messageContents);
-        if (status === Zdo.Status.SUCCESS) {
-            logger_1.logger.debug(() => `<~~~ [ZDO ${Zdo.ClusterId[apsFrame.clusterId]} from=${sender} ${payload ? JSON.stringify(payload) : 'OK'}]`, NS);
-            this.oneWaitress.resolveZDO(sender, apsFrame, payload);
-            if (apsFrame.clusterId === Zdo.ClusterId.NETWORK_ADDRESS_RESPONSE) {
-                this.emit('networkAddress', {
-                    networkAddress: payload.nwkAddress,
-                    ieeeAddr: payload.eui64,
-                });
-            }
-            else if (apsFrame.clusterId === Zdo.ClusterId.END_DEVICE_ANNOUNCE) {
-                this.emit('deviceAnnounce', {
-                    networkAddress: payload.nwkAddress,
-                    ieeeAddr: payload.eui64,
-                });
+        const result = Zdo.Buffalo.readResponse(this.hasZdoMessageOverhead, apsFrame.clusterId, messageContents);
+        logger_1.logger.debug(() => `<~~~ [ZDO ${Zdo.ClusterId[apsFrame.clusterId]} from=${sender} ${result[1] ? JSON.stringify(result[1]) : 'OK'}]`, NS);
+        if (apsFrame.clusterId === Zdo.ClusterId.NETWORK_ADDRESS_RESPONSE) {
+            // special case to properly resolve a NETWORK_ADDRESS_RESPONSE following a NETWORK_ADDRESS_REQUEST (based on EUI64 from ZDO payload)
+            // NOTE: if response has invalid status (no EUI64 available), response waiter will eventually time out
+            /* istanbul ignore else */
+            if (Zdo.Buffalo.checkStatus(result)) {
+                this.oneWaitress.resolveZDO(result[1].eui64, apsFrame, result);
             }
         }
         else {
-            this.oneWaitress.resolveZDO(sender, apsFrame, new Zdo.StatusError(status));
+            this.oneWaitress.resolveZDO(sender, apsFrame, result);
         }
+        this.emit('zdoResponse', apsFrame.clusterId, result);
     }
     /**
      * Emitted from @see Ezsp.ezspIncomingMessageHandler @see Ezsp.ezspGpepIncomingMessageHandler
@@ -1164,48 +1159,6 @@ class EmberAdapter extends __1.Adapter {
     nextZDORequestSequence() {
         return (this.zdoRequestSequence = ++this.zdoRequestSequence & APPLICATION_ZDO_SEQUENCE_MASK);
     }
-    /**
-     * ZDO
-     *
-     * @param destination
-     * @param clusterId uint16_t
-     * @param messageContents Content of the ZDO request (sequence to be assigned at index zero)
-     * @param options
-     * @returns status Indicates success or failure (with reason) of send
-     * @returns apsFrame The APS Frame resulting of the request being built and sent (`sequence` set from stack-given value).
-     * @returns messageTag The tag passed to ezspSend${x} function.
-     */
-    async sendZDORequest(destination, clusterId, messageContents, options) {
-        const messageTag = this.nextZDORequestSequence();
-        messageContents[0] = messageTag;
-        const apsFrame = {
-            profileId: Zdo.ZDO_PROFILE_ID,
-            clusterId,
-            sourceEndpoint: Zdo.ZDO_ENDPOINT,
-            destinationEndpoint: Zdo.ZDO_ENDPOINT,
-            options,
-            groupId: 0,
-            sequence: 0, // set by stack
-        };
-        if (destination === ZSpec.BroadcastAddress.DEFAULT ||
-            destination === ZSpec.BroadcastAddress.RX_ON_WHEN_IDLE ||
-            destination === ZSpec.BroadcastAddress.SLEEPY) {
-            logger_1.logger.debug(`~~~> [ZDO ${Zdo.ClusterId[clusterId]} BROADCAST to=${destination} messageTag=${messageTag} messageContents=${messageContents.toString('hex')}]`, NS);
-            const [status, apsSequence] = await this.ezsp.ezspSendBroadcast(ZSpec.NULL_NODE_ID, // alias
-            destination, 0, // nwkSequence
-            apsFrame, ZDO_REQUEST_RADIUS, messageTag, messageContents);
-            apsFrame.sequence = apsSequence;
-            logger_1.logger.debug(`~~~> [SENT ZDO type=BROADCAST apsSequence=${apsSequence} messageTag=${messageTag} status=${enums_1.SLStatus[status]}`, NS);
-            return [status, apsFrame, messageTag];
-        }
-        else {
-            logger_1.logger.debug(`~~~> [ZDO ${Zdo.ClusterId[clusterId]} UNICAST to=${destination} messageTag=${messageTag} messageContents=${messageContents.toString('hex')}]`, NS);
-            const [status, apsSequence] = await this.ezsp.ezspSendUnicast(enums_1.EmberOutgoingMessageType.DIRECT, destination, apsFrame, messageTag, messageContents);
-            apsFrame.sequence = apsSequence;
-            logger_1.logger.debug(`~~~> [SENT ZDO type=DIRECT apsSequence=${apsSequence} messageTag=${messageTag} status=${enums_1.SLStatus[status]}`, NS);
-            return [status, apsFrame, messageTag];
-        }
-    }
     //---- END Ember ZDO
     //-- START Adapter implementation
     /* istanbul ignore next */
@@ -1362,16 +1315,11 @@ class EmberAdapter extends __1.Adapter {
     }
     // queued
     async changeChannel(newChannel) {
-        return await this.queue.execute(async () => {
-            this.checkInterpanLock();
-            const zdoPayload = Zdo.Buffalo.buildRequest(this.hasZdoMessageOverhead, Zdo.ClusterId.NWK_UPDATE_REQUEST, [newChannel], 0xfe, undefined, undefined, undefined);
-            const [status] = await this.sendZDORequest(ZSpec.BroadcastAddress.SLEEPY, Zdo.ClusterId.NWK_UPDATE_REQUEST, zdoPayload, exports.DEFAULT_APS_OPTIONS);
-            if (status !== enums_1.SLStatus.OK) {
-                throw new Error(`[ZDO] Failed broadcast channel change to '${newChannel}' with status=${enums_1.SLStatus[status]}.`);
-            }
-            await this.oneWaitress.startWaitingForEvent({ eventName: oneWaitress_1.OneWaitressEvents.STACK_STATUS_CHANNEL_CHANGED }, DEFAULT_NETWORK_REQUEST_TIMEOUT * 2, // observed to ~9sec
-            '[ZDO] Change Channel');
-        });
+        const clusterId = Zdo.ClusterId.NWK_UPDATE_REQUEST;
+        const zdoPayload = Zdo.Buffalo.buildRequest(this.hasZdoMessageOverhead, clusterId, [newChannel], 0xfe, undefined, undefined, undefined);
+        await this.sendZdo(ZSpec.BLANK_EUI64, ZSpec.BroadcastAddress.SLEEPY, clusterId, zdoPayload, true /* handled below */);
+        await this.oneWaitress.startWaitingForEvent({ eventName: oneWaitress_1.OneWaitressEvents.STACK_STATUS_CHANNEL_CHANGED }, DEFAULT_NETWORK_REQUEST_TIMEOUT * 2, // observed to ~9sec
+        '[ZDO] Change Channel');
     }
     // queued
     async setTransmitPower(value) {
@@ -1444,9 +1392,59 @@ class EmberAdapter extends __1.Adapter {
             promise: waiter.start().promise,
         };
     }
-    //---- ZDO
+    async sendZdo(ieeeAddress, networkAddress, clusterId, payload, disableResponse) {
+        return await this.queue.execute(async () => {
+            this.checkInterpanLock();
+            const clusterName = Zdo.ClusterId[clusterId];
+            const messageTag = this.nextZDORequestSequence();
+            payload[0] = messageTag;
+            const apsFrame = {
+                profileId: Zdo.ZDO_PROFILE_ID,
+                clusterId,
+                sourceEndpoint: Zdo.ZDO_ENDPOINT,
+                destinationEndpoint: Zdo.ZDO_ENDPOINT,
+                options: exports.DEFAULT_APS_OPTIONS,
+                groupId: 0,
+                sequence: 0, // set by stack
+            };
+            let status;
+            let apsSequence;
+            if (ZSpec.Utils.isBroadcastAddress(networkAddress)) {
+                logger_1.logger.debug(() => `~~~> [ZDO ${clusterName} BROADCAST to=${networkAddress} messageTag=${messageTag} payload=${payload.toString('hex')}]`, NS);
+                [status, apsSequence] = await this.ezsp.ezspSendBroadcast(ZSpec.NULL_NODE_ID, // alias
+                networkAddress, 0, // nwkSequence
+                apsFrame, ZDO_REQUEST_RADIUS, messageTag, payload);
+                apsFrame.sequence = apsSequence;
+                logger_1.logger.debug(`~~~> [SENT ZDO BROADCAST messageTag=${messageTag} apsSequence=${apsSequence} status=${enums_1.SLStatus[status]}]`, NS);
+                if (status !== enums_1.SLStatus.OK) {
+                    throw new Error(`~x~> [ZDO ${clusterName} BROADCAST to=${networkAddress} messageTag=${messageTag}] Failed to send request with status=${enums_1.SLStatus[status]}.`);
+                }
+            }
+            else {
+                logger_1.logger.debug(() => `~~~> [ZDO ${clusterName} UNICAST to=${ieeeAddress}:${networkAddress} messageTag=${messageTag} payload=${payload.toString('hex')}]`, NS);
+                [status, apsSequence] = await this.ezsp.ezspSendUnicast(enums_1.EmberOutgoingMessageType.DIRECT, networkAddress, apsFrame, messageTag, payload);
+                apsFrame.sequence = apsSequence;
+                logger_1.logger.debug(`~~~> [SENT ZDO UNICAST messageTag=${messageTag} apsSequence=${apsSequence} status=${enums_1.SLStatus[status]}]`, NS);
+                if (status !== enums_1.SLStatus.OK) {
+                    throw new Error(`~x~> [ZDO ${clusterName} UNICAST to=${ieeeAddress}:${networkAddress} messageTag=${messageTag}] Failed to send request with status=${enums_1.SLStatus[status]}.`);
+                }
+            }
+            if (!disableResponse) {
+                const responseClusterId = Zdo.Utils.getResponseClusterId(clusterId);
+                /* istanbul ignore else */
+                if (responseClusterId) {
+                    return await this.oneWaitress.startWaitingFor({
+                        target: responseClusterId === Zdo.ClusterId.NETWORK_ADDRESS_RESPONSE ? ieeeAddress : networkAddress,
+                        apsFrame,
+                        zdoResponseClusterId: responseClusterId,
+                    }, DEFAULT_REQUEST_TIMEOUT);
+                }
+            }
+        }, networkAddress /* TODO: replace with ieeeAddress once zdo moved upstream */);
+    }
     // queued, non-InterPAN
     async permitJoin(seconds, networkAddress) {
+        const clusterId = Zdo.ClusterId.PERMIT_JOINING_REQUEST;
         const preJoining = async () => {
             if (seconds) {
                 const plaintextKey = { contents: Buffer.from(consts_1.ZIGBEE_PROFILE_INTEROPERABILITY_LINK_KEY) };
@@ -1474,62 +1472,49 @@ class EmberAdapter extends __1.Adapter {
         };
         if (networkAddress) {
             // specific device that is not `Coordinator`
-            return await this.queue.execute(async () => {
+            await this.queue.execute(async () => {
                 this.checkInterpanLock();
                 await preJoining();
-                // `authentication`: TC significance always 1 (zb specs)
-                const zdoPayload = Zdo.Buffalo.buildRequest(this.hasZdoMessageOverhead, Zdo.ClusterId.PERMIT_JOINING_REQUEST, seconds, 1, []);
-                const [status, apsFrame] = await this.sendZDORequest(networkAddress, Zdo.ClusterId.PERMIT_JOINING_REQUEST, zdoPayload, exports.DEFAULT_APS_OPTIONS);
-                if (status !== enums_1.SLStatus.OK) {
-                    throw new Error(`[ZDO] Failed permit joining request for '${networkAddress}' with status=${enums_1.SLStatus[status]}.`);
-                }
-                await this.oneWaitress.startWaitingFor({
-                    target: networkAddress,
-                    apsFrame,
-                    responseClusterId: Zdo.ClusterId.PERMIT_JOINING_RESPONSE,
-                }, DEFAULT_REQUEST_TIMEOUT);
             });
+            // `authentication`: TC significance always 1 (zb specs)
+            const zdoPayload = Zdo.Buffalo.buildRequest(this.hasZdoMessageOverhead, clusterId, seconds, 1, []);
+            const result = await this.sendZdo(ZSpec.BLANK_EUI64, networkAddress, clusterId, zdoPayload, false);
+            /* istanbul ignore next */
+            if (!Zdo.Buffalo.checkStatus(result)) {
+                // TODO: will disappear once moved upstream
+                throw new Zdo.StatusError(result[0]);
+            }
         }
         else {
             // coordinator-only (0), or all
-            return await this.queue.execute(async () => {
+            await this.queue.execute(async () => {
                 this.checkInterpanLock();
                 await preJoining();
-                const status = await this.ezsp.ezspPermitJoining(seconds);
-                if (status !== enums_1.SLStatus.OK) {
-                    throw new Error(`[ZDO] Failed coordinator permit joining request with status=${enums_1.SLStatus[status]}.`);
-                }
-                logger_1.logger.debug(`Permit joining on coordinator for ${seconds} sec.`, NS);
-                // broadcast permit joining ZDO
-                if (networkAddress === undefined) {
-                    // `authentication`: TC significance always 1 (zb specs)
-                    const zdoPayload = Zdo.Buffalo.buildRequest(this.hasZdoMessageOverhead, Zdo.ClusterId.PERMIT_JOINING_REQUEST, seconds, 1, []);
-                    const [bcStatus] = await this.sendZDORequest(ZSpec.BroadcastAddress.DEFAULT, Zdo.ClusterId.PERMIT_JOINING_REQUEST, zdoPayload, exports.DEFAULT_APS_OPTIONS);
-                    if (bcStatus !== enums_1.SLStatus.OK) {
-                        // don't throw, coordinator succeeded at least
-                        logger_1.logger.error(`[ZDO] Failed broadcast permit joining request with status=${enums_1.SLStatus[bcStatus]}.`, NS);
-                    }
-                }
             });
+            const status = await this.ezsp.ezspPermitJoining(seconds);
+            if (status !== enums_1.SLStatus.OK) {
+                throw new Error(`[ZDO] Failed coordinator permit joining request with status=${enums_1.SLStatus[status]}.`);
+            }
+            logger_1.logger.debug(`Permit joining on coordinator for ${seconds} sec.`, NS);
+            // broadcast permit joining ZDO
+            if (networkAddress === undefined) {
+                // `authentication`: TC significance always 1 (zb specs)
+                const zdoPayload = Zdo.Buffalo.buildRequest(this.hasZdoMessageOverhead, clusterId, seconds, 1, []);
+                await this.sendZdo(ZSpec.BLANK_EUI64, ZSpec.BroadcastAddress.DEFAULT, clusterId, zdoPayload, true);
+            }
         }
     }
     // queued, non-InterPAN
     async lqi(networkAddress) {
-        return await this.queue.execute(async () => {
-            this.checkInterpanLock();
-            const neighbors = [];
-            const request = async (startIndex) => {
-                const zdoPayload = Zdo.Buffalo.buildRequest(this.hasZdoMessageOverhead, Zdo.ClusterId.LQI_TABLE_REQUEST, startIndex);
-                const [status, apsFrame] = await this.sendZDORequest(networkAddress, Zdo.ClusterId.LQI_TABLE_REQUEST, zdoPayload, exports.DEFAULT_APS_OPTIONS);
-                if (status !== enums_1.SLStatus.OK) {
-                    throw new Error(`[ZDO] Failed LQI request for '${networkAddress}' (index '${startIndex}') with status=${enums_1.SLStatus[status]}.`);
-                }
-                const result = await this.oneWaitress.startWaitingFor({
-                    target: networkAddress,
-                    apsFrame,
-                    responseClusterId: Zdo.ClusterId.LQI_TABLE_RESPONSE,
-                }, DEFAULT_REQUEST_TIMEOUT);
-                for (const entry of result.entryList) {
+        const clusterId = Zdo.ClusterId.LQI_TABLE_REQUEST;
+        const neighbors = [];
+        const request = async (startIndex) => {
+            const zdoPayload = Zdo.Buffalo.buildRequest(this.hasZdoMessageOverhead, clusterId, startIndex);
+            const result = await this.sendZdo(ZSpec.BLANK_EUI64, networkAddress, clusterId, zdoPayload, false);
+            /* istanbul ignore else */
+            if (Zdo.Buffalo.checkStatus(result)) {
+                const payload = result[1];
+                for (const entry of payload.entryList) {
                     neighbors.push({
                         ieeeAddr: entry.eui64,
                         networkAddress: entry.nwkAddress,
@@ -1538,69 +1523,65 @@ class EmberAdapter extends __1.Adapter {
                         depth: entry.depth,
                     });
                 }
-                return [result.neighborTableEntries, result.entryList.length];
-            };
-            let [tableEntries, entryCount] = await request(0);
-            const size = tableEntries;
-            let nextStartIndex = entryCount;
-            while (neighbors.length < size) {
-                [tableEntries, entryCount] = await request(nextStartIndex);
-                nextStartIndex += entryCount;
-            }
-            return { neighbors };
-        }, networkAddress);
+                return [payload.neighborTableEntries, payload.entryList.length];
+            }
+            else {
+                // TODO: will disappear once moved upstream
+                throw new Zdo.StatusError(result[0]);
+            }
+        };
+        let [tableEntries, entryCount] = await request(0);
+        const size = tableEntries;
+        let nextStartIndex = entryCount;
+        while (neighbors.length < size) {
+            [tableEntries, entryCount] = await request(nextStartIndex);
+            nextStartIndex += entryCount;
+        }
+        return { neighbors };
     }
     // queued, non-InterPAN
     async routingTable(networkAddress) {
-        return await this.queue.execute(async () => {
-            this.checkInterpanLock();
-            const table = [];
-            const request = async (startIndex) => {
-                const zdoPayload = Zdo.Buffalo.buildRequest(this.hasZdoMessageOverhead, Zdo.ClusterId.ROUTING_TABLE_REQUEST, startIndex);
-                const [status, apsFrame] = await this.sendZDORequest(networkAddress, Zdo.ClusterId.ROUTING_TABLE_REQUEST, zdoPayload, exports.DEFAULT_APS_OPTIONS);
-                if (status !== enums_1.SLStatus.OK) {
-                    throw new Error(`[ZDO] Failed routing table request for '${networkAddress}' (index '${startIndex}') with status=${enums_1.SLStatus[status]}.`);
-                }
-                const result = await this.oneWaitress.startWaitingFor({
-                    target: networkAddress,
-                    apsFrame,
-                    responseClusterId: Zdo.ClusterId.ROUTING_TABLE_RESPONSE,
-                }, DEFAULT_REQUEST_TIMEOUT);
-                for (const entry of result.entryList) {
+        const clusterId = Zdo.ClusterId.ROUTING_TABLE_REQUEST;
+        const table = [];
+        const request = async (startIndex) => {
+            const zdoPayload = Zdo.Buffalo.buildRequest(this.hasZdoMessageOverhead, clusterId, startIndex);
+            const result = await this.sendZdo(ZSpec.BLANK_EUI64, networkAddress, clusterId, zdoPayload, false);
+            /* istanbul ignore else */
+            if (Zdo.Buffalo.checkStatus(result)) {
+                const payload = result[1];
+                for (const entry of payload.entryList) {
                     table.push({
                         destinationAddress: entry.destinationAddress,
                         status: entry.status,
                         nextHop: entry.nextHopAddress,
                     });
                 }
-                return [result.routingTableEntries, result.entryList.length];
-            };
-            let [tableEntries, entryCount] = await request(0);
-            const size = tableEntries;
-            let nextStartIndex = entryCount;
-            while (table.length < size) {
-                [tableEntries, entryCount] = await request(nextStartIndex);
-                nextStartIndex += entryCount;
-            }
-            return { table };
-        }, networkAddress);
+                return [payload.routingTableEntries, payload.entryList.length];
+            }
+            else {
+                // TODO: will disappear once moved upstream
+                throw new Zdo.StatusError(result[0]);
+            }
+        };
+        let [tableEntries, entryCount] = await request(0);
+        const size = tableEntries;
+        let nextStartIndex = entryCount;
+        while (table.length < size) {
+            [tableEntries, entryCount] = await request(nextStartIndex);
+            nextStartIndex += entryCount;
+        }
+        return { table };
     }
     // queued, non-InterPAN
     async nodeDescriptor(networkAddress) {
-        return await this.queue.execute(async () => {
-            this.checkInterpanLock();
-            const zdoPayload = Zdo.Buffalo.buildRequest(this.hasZdoMessageOverhead, Zdo.ClusterId.NODE_DESCRIPTOR_REQUEST, networkAddress);
-            const [status, apsFrame] = await this.sendZDORequest(networkAddress, Zdo.ClusterId.NODE_DESCRIPTOR_REQUEST, zdoPayload, exports.DEFAULT_APS_OPTIONS);
-            if (status !== enums_1.SLStatus.OK) {
-                throw new Error(`[ZDO] Failed node descriptor request for '${networkAddress}' with status=${enums_1.SLStatus[status]}.`);
-            }
-            const result = await this.oneWaitress.startWaitingFor({
-                target: networkAddress,
-                apsFrame,
-                responseClusterId: Zdo.ClusterId.NODE_DESCRIPTOR_RESPONSE,
-            }, DEFAULT_REQUEST_TIMEOUT);
+        const clusterId = Zdo.ClusterId.NODE_DESCRIPTOR_REQUEST;
+        const zdoPayload = Zdo.Buffalo.buildRequest(this.hasZdoMessageOverhead, clusterId, networkAddress);
+        const result = await this.sendZdo(ZSpec.BLANK_EUI64, networkAddress, clusterId, zdoPayload, false);
+        /* istanbul ignore else */
+        if (Zdo.Buffalo.checkStatus(result)) {
+            const payload = result[1];
             let type = 'Unknown';
-            switch (result.logicalType) {
+            switch (payload.logicalType) {
                 case 0x0:
                     type = 'Coordinator';
                     break;
@@ -1612,105 +1593,90 @@ class EmberAdapter extends __1.Adapter {
                     break;
             }
             /* istanbul ignore else */
-            if (result.serverMask.stackComplianceRevision < CURRENT_ZIGBEE_SPEC_REVISION) {
+            if (payload.serverMask.stackComplianceRevision < CURRENT_ZIGBEE_SPEC_REVISION) {
                 // always 0 before rev. 21 where field was added
-                const rev = result.serverMask.stackComplianceRevision < 21 ? 'pre-21' : result.serverMask.stackComplianceRevision;
+                const rev = payload.serverMask.stackComplianceRevision < 21 ? 'pre-21' : payload.serverMask.stackComplianceRevision;
                 logger_1.logger.warning(`[ZDO] Device '${networkAddress}' is only compliant to revision '${rev}' of the ZigBee specification (current revision: ${CURRENT_ZIGBEE_SPEC_REVISION}).`, NS);
             }
-            return { type, manufacturerCode: result.manufacturerCode };
-        }, networkAddress);
+            return { type, manufacturerCode: payload.manufacturerCode };
+        }
+        else {
+            // TODO: will disappear once moved upstream
+            throw new Zdo.StatusError(result[0]);
+        }
     }
     // queued, non-InterPAN
     async activeEndpoints(networkAddress) {
-        return await this.queue.execute(async () => {
-            this.checkInterpanLock();
-            const zdoPayload = Zdo.Buffalo.buildRequest(this.hasZdoMessageOverhead, Zdo.ClusterId.ACTIVE_ENDPOINTS_REQUEST, networkAddress);
-            const [status, apsFrame] = await this.sendZDORequest(networkAddress, Zdo.ClusterId.ACTIVE_ENDPOINTS_REQUEST, zdoPayload, exports.DEFAULT_APS_OPTIONS);
-            if (status !== enums_1.SLStatus.OK) {
-                throw new Error(`[ZDO] Failed active endpoints request for '${networkAddress}' with status=${enums_1.SLStatus[status]}.`);
-            }
-            const result = await this.oneWaitress.startWaitingFor({
-                target: networkAddress,
-                apsFrame,
-                responseClusterId: Zdo.ClusterId.ACTIVE_ENDPOINTS_RESPONSE,
-            }, DEFAULT_REQUEST_TIMEOUT);
-            return { endpoints: result.endpointList };
-        }, networkAddress);
+        const clusterId = Zdo.ClusterId.ACTIVE_ENDPOINTS_REQUEST;
+        const zdoPayload = Zdo.Buffalo.buildRequest(this.hasZdoMessageOverhead, clusterId, networkAddress);
+        const result = await this.sendZdo(ZSpec.BLANK_EUI64, networkAddress, clusterId, zdoPayload, false);
+        /* istanbul ignore else */
+        if (Zdo.Buffalo.checkStatus(result)) {
+            const payload = result[1];
+            return { endpoints: payload.endpointList };
+        }
+        else {
+            // TODO: will disappear once moved upstream
+            throw new Zdo.StatusError(result[0]);
+        }
     }
     // queued, non-InterPAN
     async simpleDescriptor(networkAddress, endpointID) {
-        return await this.queue.execute(async () => {
-            this.checkInterpanLock();
-            const zdoPayload = Zdo.Buffalo.buildRequest(this.hasZdoMessageOverhead, Zdo.ClusterId.SIMPLE_DESCRIPTOR_REQUEST, networkAddress, endpointID);
-            const [status, apsFrame] = await this.sendZDORequest(networkAddress, Zdo.ClusterId.SIMPLE_DESCRIPTOR_REQUEST, zdoPayload, exports.DEFAULT_APS_OPTIONS);
-            if (status !== enums_1.SLStatus.OK) {
-                throw new Error(`[ZDO] Failed simple descriptor request for '${networkAddress}' endpoint '${endpointID}' with status=${enums_1.SLStatus[status]}.`);
-            }
-            const result = await this.oneWaitress.startWaitingFor({
-                target: networkAddress,
-                apsFrame,
-                responseClusterId: Zdo.ClusterId.SIMPLE_DESCRIPTOR_RESPONSE,
-            }, DEFAULT_REQUEST_TIMEOUT);
+        const clusterId = Zdo.ClusterId.SIMPLE_DESCRIPTOR_REQUEST;
+        const zdoPayload = Zdo.Buffalo.buildRequest(this.hasZdoMessageOverhead, clusterId, networkAddress, endpointID);
+        const result = await this.sendZdo(ZSpec.BLANK_EUI64, networkAddress, clusterId, zdoPayload, false);
+        /* istanbul ignore else */
+        if (Zdo.Buffalo.checkStatus(result)) {
+            const payload = result[1];
             return {
-                profileID: result.profileId,
-                endpointID: result.endpoint,
-                deviceID: result.deviceId,
-                inputClusters: result.inClusterList,
-                outputClusters: result.outClusterList,
+                profileID: payload.profileId,
+                endpointID: payload.endpoint,
+                deviceID: payload.deviceId,
+                inputClusters: payload.inClusterList,
+                outputClusters: payload.outClusterList,
             };
-        }, networkAddress);
+        }
+        else {
+            // TODO: will disappear once moved upstream
+            throw new Zdo.StatusError(result[0]);
+        }
     }
     // queued, non-InterPAN
     async bind(destinationNetworkAddress, sourceIeeeAddress, sourceEndpoint, clusterID, destinationAddressOrGroup, type, destinationEndpoint) {
-        return await this.queue.execute(async () => {
-            this.checkInterpanLock();
-            const zdoPayload = Zdo.Buffalo.buildRequest(this.hasZdoMessageOverhead, Zdo.ClusterId.BIND_REQUEST, sourceIeeeAddress, sourceEndpoint, clusterID, type === 'group' ? Zdo.MULTICAST_BINDING : Zdo.UNICAST_BINDING, destinationAddressOrGroup, // not used with MULTICAST_BINDING
-            destinationAddressOrGroup, // not used with UNICAST_BINDING
-            destinationEndpoint ?? 0);
-            const [status, apsFrame] = await this.sendZDORequest(destinationNetworkAddress, Zdo.ClusterId.BIND_REQUEST, zdoPayload, exports.DEFAULT_APS_OPTIONS);
-            if (status !== enums_1.SLStatus.OK) {
-                throw new Error(`[ZDO] Failed bind request for '${destinationNetworkAddress}' destination '${destinationAddressOrGroup}' endpoint '${destinationEndpoint}' with status=${enums_1.SLStatus[status]}.`);
-            }
-            await this.oneWaitress.startWaitingFor({
-                target: destinationNetworkAddress,
-                apsFrame,
-                responseClusterId: Zdo.ClusterId.BIND_RESPONSE,
-            }, DEFAULT_REQUEST_TIMEOUT);
-        }, destinationNetworkAddress);
+        const clusterId = Zdo.ClusterId.BIND_REQUEST;
+        const zdoPayload = Zdo.Buffalo.buildRequest(this.hasZdoMessageOverhead, clusterId, sourceIeeeAddress, sourceEndpoint, clusterID, type === 'group' ? Zdo.MULTICAST_BINDING : Zdo.UNICAST_BINDING, destinationAddressOrGroup, // not used with MULTICAST_BINDING
+        destinationAddressOrGroup, // not used with UNICAST_BINDING
+        destinationEndpoint ?? 0);
+        const result = await this.sendZdo(ZSpec.BLANK_EUI64, destinationNetworkAddress, clusterId, zdoPayload, false);
+        /* istanbul ignore next */
+        if (!Zdo.Buffalo.checkStatus(result)) {
+            // TODO: will disappear once moved upstream
+            throw new Zdo.StatusError(result[0]);
+        }
     }
     // queued, non-InterPAN
     async unbind(destinationNetworkAddress, sourceIeeeAddress, sourceEndpoint, clusterID, destinationAddressOrGroup, type, destinationEndpoint) {
-        return await this.queue.execute(async () => {
-            this.checkInterpanLock();
-            const zdoPayload = Zdo.Buffalo.buildRequest(this.hasZdoMessageOverhead, Zdo.ClusterId.UNBIND_REQUEST, sourceIeeeAddress, sourceEndpoint, clusterID, type === 'group' ? Zdo.MULTICAST_BINDING : Zdo.UNICAST_BINDING, destinationAddressOrGroup, // not used with MULTICAST_BINDING
-            destinationAddressOrGroup, // not used with UNICAST_BINDING
-            destinationEndpoint ?? 0);
-            const [status, apsFrame] = await this.sendZDORequest(destinationNetworkAddress, Zdo.ClusterId.UNBIND_REQUEST, zdoPayload, exports.DEFAULT_APS_OPTIONS);
-            if (status !== enums_1.SLStatus.OK) {
-                throw new Error(`[ZDO] Failed unbind request for '${destinationNetworkAddress}' destination '${destinationAddressOrGroup}' endpoint '${destinationEndpoint}' with status=${enums_1.SLStatus[status]}.`);
-            }
-            await this.oneWaitress.startWaitingFor({
-                target: destinationNetworkAddress,
-                apsFrame,
-                responseClusterId: Zdo.ClusterId.UNBIND_RESPONSE,
-            }, DEFAULT_REQUEST_TIMEOUT);
-        }, destinationNetworkAddress);
+        const clusterId = Zdo.ClusterId.UNBIND_REQUEST;
+        const zdoPayload = Zdo.Buffalo.buildRequest(this.hasZdoMessageOverhead, clusterId, sourceIeeeAddress, sourceEndpoint, clusterID, type === 'group' ? Zdo.MULTICAST_BINDING : Zdo.UNICAST_BINDING, destinationAddressOrGroup, // not used with MULTICAST_BINDING
+        destinationAddressOrGroup, // not used with UNICAST_BINDING
+        destinationEndpoint ?? 0);
+        const result = await this.sendZdo(ZSpec.BLANK_EUI64, destinationNetworkAddress, clusterId, zdoPayload, false);
+        /* istanbul ignore next */
+        if (!Zdo.Buffalo.checkStatus(result)) {
+            // TODO: will disappear once moved upstream
+            throw new Zdo.StatusError(result[0]);
+        }
     }
     // queued, non-InterPAN
     async removeDevice(networkAddress, ieeeAddr) {
-        return await this.queue.execute(async () => {
-            this.checkInterpanLock();
-            const zdoPayload = Zdo.Buffalo.buildRequest(this.hasZdoMessageOverhead, Zdo.ClusterId.LEAVE_REQUEST, ieeeAddr, Zdo.LeaveRequestFlags.WITHOUT_REJOIN);
-            const [status, apsFrame] = await this.sendZDORequest(networkAddress, Zdo.ClusterId.LEAVE_REQUEST, zdoPayload, exports.DEFAULT_APS_OPTIONS);
-            if (status !== enums_1.SLStatus.OK) {
-                throw new Error(`[ZDO] Failed remove device request for '${networkAddress}' target '${ieeeAddr}' with status=${enums_1.SLStatus[status]}.`);
-            }
-            await this.oneWaitress.startWaitingFor({
-                target: networkAddress,
-                apsFrame,
-                responseClusterId: Zdo.ClusterId.LEAVE_RESPONSE,
-            }, DEFAULT_REQUEST_TIMEOUT);
-        }, networkAddress);
+        const clusterId = Zdo.ClusterId.LEAVE_REQUEST;
+        const zdoPayload = Zdo.Buffalo.buildRequest(this.hasZdoMessageOverhead, clusterId, ieeeAddr, Zdo.LeaveRequestFlags.WITHOUT_REJOIN);
+        const result = await this.sendZdo(ZSpec.BLANK_EUI64, networkAddress, clusterId, zdoPayload, false);
+        /* istanbul ignore next */
+        if (!Zdo.Buffalo.checkStatus(result)) {
+            // TODO: will disappear once moved upstream
+            throw new Zdo.StatusError(result[0]);
+        }
     }
     //---- ZCL
     // queued, non-InterPAN
@@ -1740,7 +1706,7 @@ class EmberAdapter extends __1.Adapter {
         const data = zclFrame.toBuffer();
         return await this.queue.execute(async () => {
             this.checkInterpanLock();
-            logger_1.logger.debug(() => `~~~> [ZCL to=${networkAddress} apsFrame=${JSON.stringify(apsFrame)} header=${JSON.stringify(zclFrame.header)}]`, NS);
+            logger_1.logger.debug(() => `~~~> [ZCL to=${ieeeAddr}:${networkAddress} apsFrame=${JSON.stringify(apsFrame)} header=${JSON.stringify(zclFrame.header)}]`, NS);
             for (let i = 1; i <= QUEUE_MAX_SEND_ATTEMPTS; i++) {
                 let status = enums_1.SLStatus.FAIL;
                 try {
@@ -1767,7 +1733,7 @@ class EmberAdapter extends __1.Adapter {
                     break;
                 }
                 else if (disableRecovery || i == QUEUE_MAX_SEND_ATTEMPTS) {
-                    throw new Error(`~x~> [ZCL to=${networkAddress}] Failed to send request with status=${enums_1.SLStatus[status]}.`);
+                    throw new Error(`~x~> [ZCL to=${ieeeAddr}:${networkAddress} apsFrame=${JSON.stringify(apsFrame)}] Failed to send request with status=${enums_1.SLStatus[status]}.`);
                 }
                 else if (status === enums_1.SLStatus.ZIGBEE_MAX_MESSAGE_LIMIT_REACHED || status === enums_1.SLStatus.BUSY) {
                     await (0, utils_1.Wait)(QUEUE_BUSY_DEFER_MSEC);
@@ -1776,9 +1742,9 @@ class EmberAdapter extends __1.Adapter {
                     await (0, utils_1.Wait)(QUEUE_NETWORK_DOWN_DEFER_MSEC);
                 }
                 else {
-                    throw new Error(`~x~> [ZCL to=${networkAddress}] Failed to send request with status=${enums_1.SLStatus[status]}.`);
+                    throw new Error(`~x~> [ZCL to=${ieeeAddr}:${networkAddress} apsFrame=${JSON.stringify(apsFrame)}] Failed to send request with status=${enums_1.SLStatus[status]}.`);
                 }
-                logger_1.logger.debug(`~x~> [ZCL to=${networkAddress}] Failed to send request attempt ${i}/${QUEUE_MAX_SEND_ATTEMPTS} with status=${enums_1.SLStatus[status]}.`, NS);
+                logger_1.logger.debug(`~x~> [ZCL to=${ieeeAddr}:${networkAddress}] Failed to send request attempt ${i}/${QUEUE_MAX_SEND_ATTEMPTS} with status=${enums_1.SLStatus[status]}.`, NS);
             }
             if (commandResponseId !== undefined) {
                 // NOTE: aps sequence number will have been set by send function
@@ -1809,11 +1775,11 @@ class EmberAdapter extends __1.Adapter {
             this.checkInterpanLock();
             logger_1.logger.debug(() => `~~~> [ZCL GROUP apsFrame=${JSON.stringify(apsFrame)} header=${JSON.stringify(zclFrame.header)}]`, NS);
             // eslint-disable-next-line @typescript-eslint/no-unused-vars
-            const [status, messageTag] = await this.ezsp.send(enums_1.EmberOutgoingMessageType.MULTICAST, apsFrame.groupId, // not used with MULTICAST
+            const [status, messageTag] = await this.ezsp.send(enums_1.EmberOutgoingMessageType.MULTICAST, groupID, // not used with MULTICAST
             apsFrame, data, 0, // alias
             0);
             if (status !== enums_1.SLStatus.OK) {
-                throw new Error(`~x~> [ZCL GROUP] Failed to send with status=${enums_1.SLStatus[status]}.`);
+                throw new Error(`~x~> [ZCL GROUP groupId=${groupID}] Failed to send with status=${enums_1.SLStatus[status]}.`);
             }
             // NOTE: since ezspMessageSentHandler could take a while here, we don't block, it'll just be logged if the delivery failed
             await (0, utils_1.Wait)(QUEUE_BUSY_DEFER_MSEC);
@@ -1839,7 +1805,7 @@ class EmberAdapter extends __1.Adapter {
             const [status, messageTag] = await this.ezsp.send(enums_1.EmberOutgoingMessageType.BROADCAST, destination, apsFrame, data, 0, // alias
             0);
             if (status !== enums_1.SLStatus.OK) {
-                throw new Error(`~x~> [ZCL BROADCAST] Failed to send with status=${enums_1.SLStatus[status]}.`);
+                throw new Error(`~x~> [ZCL BROADCAST destination=${destination}] Failed to send with status=${enums_1.SLStatus[status]}.`);
             }
             // NOTE: since ezspMessageSentHandler could take a while here, we don't block, it'll just be logged if the delivery failed
             await (0, utils_1.Wait)(QUEUE_BUSY_DEFER_MSEC);