zigbee-herdsman 0.57.3 → 1.0.0

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

@@ -37,7 +37,6 @@ const logger_1 = require("../../../utils/logger");
 const ZSpec = __importStar(require("../../../zspec"));
 const Zcl = __importStar(require("../../../zspec/zcl"));
 const Zdo = __importStar(require("../../../zspec/zdo"));
-const buffaloZdo_1 = require("../../../zspec/zdo/buffaloZdo");
 const serialPortUtils_1 = __importDefault(require("../../serialPortUtils"));
 const socketPortUtils_1 = __importDefault(require("../../socketPortUtils"));
 const consts_1 = require("../consts");
@@ -52,18 +51,6 @@ const math_1 = require("../utils/math");
 const endpoints_1 = require("./endpoints");
 const oneWaitress_1 = require("./oneWaitress");
 const NS = 'zh:ember';
-/** Enum to pass strings from numbers up to Z2M. */
-var RoutingTableStatus;
-(function (RoutingTableStatus) {
-    RoutingTableStatus[RoutingTableStatus["ACTIVE"] = 0] = "ACTIVE";
-    RoutingTableStatus[RoutingTableStatus["DISCOVERY_UNDERWAY"] = 1] = "DISCOVERY_UNDERWAY";
-    RoutingTableStatus[RoutingTableStatus["DISCOVERY_FAILED"] = 2] = "DISCOVERY_FAILED";
-    RoutingTableStatus[RoutingTableStatus["INACTIVE"] = 3] = "INACTIVE";
-    RoutingTableStatus[RoutingTableStatus["VALIDATION_UNDERWAY"] = 4] = "VALIDATION_UNDERWAY";
-    RoutingTableStatus[RoutingTableStatus["RESERVED1"] = 5] = "RESERVED1";
-    RoutingTableStatus[RoutingTableStatus["RESERVED2"] = 6] = "RESERVED2";
-    RoutingTableStatus[RoutingTableStatus["RESERVED3"] = 7] = "RESERVED3";
-})(RoutingTableStatus || (RoutingTableStatus = {}));
 var NetworkInitAction;
 (function (NetworkInitAction) {
     /** Ain't that nice! */
@@ -364,7 +351,7 @@ class EmberAdapter extends __1.Adapter {
                             if (status !== enums_1.SLStatus.OK) {
                                 throw new Error(`Failed to register group '${multicastEntry.multicastId}' in multicast table with status=${enums_1.SLStatus[status]}.`);
                             }
-                            logger_1.logger.debug(`Registered multicast table entry (${tableIdx}): ${JSON.stringify(multicastEntry)}.`, NS);
+                            logger_1.logger.debug(() => `Registered multicast table entry (${tableIdx}): ${JSON.stringify(multicastEntry)}.`, NS);
                         });
                     }
                     catch (error) {
@@ -386,9 +373,9 @@ class EmberAdapter extends __1.Adapter {
      * @param messageContents The content of the response.
      */
     async onZDOResponse(apsFrame, sender, messageContents) {
-        try {
-            const payload = buffaloZdo_1.BuffaloZdo.readResponse(apsFrame.clusterId, messageContents);
-            logger_1.logger.debug(`<~~~ [ZDO ${Zdo.ClusterId[apsFrame.clusterId]} from=${sender} ${payload ? JSON.stringify(payload) : 'OK'}]`, NS);
+        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', {
@@ -403,8 +390,8 @@ class EmberAdapter extends __1.Adapter {
                 });
             }
         }
-        catch (error) {
-            this.oneWaitress.resolveZDO(sender, apsFrame, error);
+        else {
+            this.oneWaitress.resolveZDO(sender, apsFrame, new Zdo.StatusError(status));
         }
     }
     /**
@@ -563,7 +550,7 @@ class EmberAdapter extends __1.Adapter {
         }
         this.networkCache.parameters = parameters;
         this.networkCache.eui64 = await this.ezsp.ezspGetEui64();
-        logger_1.logger.debug(`[INIT] Network Ready! ${JSON.stringify(this.networkCache)}`, NS);
+        logger_1.logger.debug(() => `[INIT] Network Ready! ${JSON.stringify(this.networkCache)}`, NS);
         this.watchdogCountersHandle = setInterval(this.watchdogCounters.bind(this), WATCHDOG_COUNTERS_FEED_INTERVAL);
         return result;
     }
@@ -621,7 +608,7 @@ class EmberAdapter extends __1.Adapter {
                 if (status !== enums_1.SLStatus.OK) {
                     throw new Error(`Failed to register group '${multicastId}' in multicast table with status=${enums_1.SLStatus[status]}.`);
                 }
-                logger_1.logger.debug(`Registered multicast table entry (${this.multicastTable.length}): ${JSON.stringify(multicastEntry)}.`, NS);
+                logger_1.logger.debug(() => `Registered multicast table entry (${this.multicastTable.length}): ${JSON.stringify(multicastEntry)}.`, NS);
                 this.multicastTable.push(multicastEntry.multicastId);
             }
         }
@@ -662,7 +649,7 @@ class EmberAdapter extends __1.Adapter {
             // network
             await this.oneWaitress.startWaitingForEvent({ eventName: oneWaitress_1.OneWaitressEvents.STACK_STATUS_NETWORK_UP }, DEFAULT_NETWORK_REQUEST_TIMEOUT, '[INIT TC] Network init');
             const [npStatus, nodeType, netParams] = await this.ezsp.ezspGetNetworkParameters();
-            logger_1.logger.debug(`[INIT TC] Current adapter network: nodeType=${enums_1.EmberNodeType[nodeType]} params=${JSON.stringify(netParams)}`, NS);
+            logger_1.logger.debug(() => `[INIT TC] Current adapter network: nodeType=${enums_1.EmberNodeType[nodeType]} params=${JSON.stringify(netParams)}`, NS);
             if (npStatus === enums_1.SLStatus.OK &&
                 nodeType === enums_1.EmberNodeType.COORDINATOR &&
                 this.networkOptions.panID === netParams.panId &&
@@ -813,7 +800,7 @@ class EmberAdapter extends __1.Adapter {
             nwkUpdateId: 0,
             channels: ZSpec.ALL_802_15_4_CHANNELS_MASK,
         };
-        logger_1.logger.info(`[INIT FORM] Forming new network with: ${JSON.stringify(netParams)}`, NS);
+        logger_1.logger.info(() => `[INIT FORM] Forming new network with: ${JSON.stringify(netParams)}`, NS);
         status = await this.ezsp.ezspFormNetwork(netParams);
         if (status !== enums_1.SLStatus.OK) {
             throw new Error(`[INIT FORM] Failed form network request with status=${enums_1.SLStatus[status]}.`);
@@ -938,7 +925,7 @@ class EmberAdapter extends __1.Adapter {
      *       On the other hand, the more often this runs, the more secure the network is...
      */
     async broadcastNetworkKeyUpdate() {
-        return this.queue.execute(async () => {
+        return await this.queue.execute(async () => {
             logger_1.logger.warning(`[TRUST CENTER] Performing a network key update. This might take a while and disrupt normal operation.`, NS);
             // zero-filled = let stack generate new random network key
             let status = await this.ezsp.ezspBroadcastNextNetworkKey({ contents: Buffer.alloc(consts_2.EMBER_ENCRYPTION_KEY_SIZE) });
@@ -1081,7 +1068,7 @@ class EmberAdapter extends __1.Adapter {
         if (versionStruct.type !== enums_1.EmberVersionType.GA) {
             logger_1.logger.warning(`Adapter is running a non-GA version (${enums_1.EmberVersionType[versionStruct.type]}).`, NS);
         }
-        logger_1.logger.info(`Adapter version info: ${JSON.stringify(this.version)}`, NS);
+        logger_1.logger.info(() => `Adapter version info: ${JSON.stringify(this.version)}`, NS);
     }
     /**
      * This function sets an EZSP config value.
@@ -1139,31 +1126,6 @@ class EmberAdapter extends __1.Adapter {
         const [status, reContext] = await this.ezsp.ezspAesMmoHash(context, true, data);
         return [status, reContext?.result];
     }
-    /**
-     * Enable local permit join and optionally broadcast the ZDO Mgmt_Permit_Join_req message.
-     * This API can be called from any device type and still return EMBER_SUCCESS.
-     * If the API is called from an end device, the permit association bit will just be left off.
-     *
-     * @param duration uint8_t The duration that the permit join bit will remain on
-     * and other devices will be able to join the current network.
-     * @param broadcastMgmtPermitJoin whether or not to broadcast the ZDO Mgmt_Permit_Join_req message.
-     *
-     * @returns status of whether or not permit join was enabled.
-     * @returns apsFrame Will be null if not broadcasting.
-     * @returns messageTag The tag passed to ezspSend${x} function.
-     */
-    async emberPermitJoining(duration, broadcastMgmtPermitJoin) {
-        let status = await this.ezsp.ezspPermitJoining(duration);
-        let apsFrame;
-        let messageTag;
-        logger_1.logger.debug(`Permit joining for ${duration} sec. status=${[status]}`, NS);
-        if (broadcastMgmtPermitJoin) {
-            // `authentication`: TC significance always 1 (zb specs)
-            const zdoPayload = buffaloZdo_1.BuffaloZdo.buildPermitJoining(duration, 1, []);
-            [status, apsFrame, messageTag] = await this.sendZDORequest(ZSpec.BroadcastAddress.DEFAULT, Zdo.ClusterId.PERMIT_JOINING_REQUEST, zdoPayload, exports.DEFAULT_APS_OPTIONS);
-        }
-        return [status, apsFrame, messageTag];
-    }
     /**
      * Set the trust center policy bitmask using decision.
      * @param decision
@@ -1185,7 +1147,7 @@ class EmberAdapter extends __1.Adapter {
                 break;
             }*/
         }
-        return this.emberSetEzspPolicy(enums_2.EzspPolicyId.TRUST_CENTER_POLICY, policy);
+        return await this.emberSetEzspPolicy(enums_2.EzspPolicyId.TRUST_CENTER_POLICY, policy);
     }
     //---- END EZSP wrappers
     //---- START Ember ZDO
@@ -1253,7 +1215,7 @@ class EmberAdapter extends __1.Adapter {
             return false;
         }
         try {
-            return serialPortUtils_1.default.is((0, utils_1.RealpathSync)(path), autoDetectDefinitions);
+            return await serialPortUtils_1.default.is((0, utils_1.RealpathSync)(path), autoDetectDefinitions);
         }
         catch (error) {
             logger_1.logger.debug(`Failed to determine if path is valid: '${error}'`, NS);
@@ -1279,7 +1241,7 @@ class EmberAdapter extends __1.Adapter {
     }
     // queued, non-InterPAN
     async getCoordinator() {
-        return this.queue.execute(async () => {
+        return await this.queue.execute(async () => {
             this.checkInterpanLock();
             // in all likelihood this will be retrieved from cache
             const ieeeAddr = await this.emberGetEui64();
@@ -1315,7 +1277,7 @@ class EmberAdapter extends __1.Adapter {
     // queued
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     async backup(ieeeAddressesInDatabase) {
-        return this.queue.execute(async () => {
+        return await this.queue.execute(async () => {
             // grab fresh version here, bypass cache
             const [netStatus, , netParams] = await this.ezsp.ezspGetNetworkParameters();
             if (netStatus !== enums_1.SLStatus.OK) {
@@ -1384,7 +1346,7 @@ class EmberAdapter extends __1.Adapter {
     }
     // queued, non-InterPAN
     async getNetworkParameters() {
-        return this.queue.execute(async () => {
+        return await this.queue.execute(async () => {
             this.checkInterpanLock();
             // first call will cache for the others, but in all likelihood, it will all be from freshly cached after init
             // since Controller caches this also.
@@ -1400,9 +1362,9 @@ class EmberAdapter extends __1.Adapter {
     }
     // queued
     async changeChannel(newChannel) {
-        return this.queue.execute(async () => {
+        return await this.queue.execute(async () => {
             this.checkInterpanLock();
-            const zdoPayload = buffaloZdo_1.BuffaloZdo.buildChannelChangeRequest(newChannel, null);
+            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]}.`);
@@ -1413,7 +1375,7 @@ class EmberAdapter extends __1.Adapter {
     }
     // queued
     async setTransmitPower(value) {
-        return this.queue.execute(async () => {
+        return await this.queue.execute(async () => {
             const status = await this.ezsp.ezspSetRadioPower(value);
             if (status !== enums_1.SLStatus.OK) {
                 throw new Error(`Failed to set transmit power to ${value} status=${enums_1.SLStatus[status]}.`);
@@ -1443,7 +1405,7 @@ class EmberAdapter extends __1.Adapter {
                 logger_1.logger.debug(`[ADD INSTALL CODE] CRC validated for '${ieeeAddress}'.`, NS);
             }
         }
-        return this.queue.execute(async () => {
+        return await this.queue.execute(async () => {
             // Compute the key from the install code and CRC.
             const [aesStatus, keyContents] = await this.emberAesHashSimple(key);
             if (aesStatus !== enums_1.SLStatus.OK) {
@@ -1512,11 +1474,11 @@ class EmberAdapter extends __1.Adapter {
         };
         if (networkAddress) {
             // specific device that is not `Coordinator`
-            return this.queue.execute(async () => {
+            return await this.queue.execute(async () => {
                 this.checkInterpanLock();
                 await preJoining();
                 // `authentication`: TC significance always 1 (zb specs)
-                const zdoPayload = buffaloZdo_1.BuffaloZdo.buildPermitJoining(seconds, 1, []);
+                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]}.`);
@@ -1529,42 +1491,35 @@ class EmberAdapter extends __1.Adapter {
             });
         }
         else {
-            // coordinator-only, or all
-            return this.queue.execute(async () => {
+            // coordinator-only (0), or all
+            return await this.queue.execute(async () => {
                 this.checkInterpanLock();
                 await preJoining();
-                // local permit join if `Coordinator`-only requested, else local + broadcast
-                const [status] = await this.emberPermitJoining(seconds, networkAddress === ZSpec.COORDINATOR_ADDRESS ? false : true);
+                const status = await this.ezsp.ezspPermitJoining(seconds);
                 if (status !== enums_1.SLStatus.OK) {
-                    throw new Error(`[ZDO] Failed permit joining request with status=${enums_1.SLStatus[status]}.`);
+                    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);
+                    }
                 }
-                // NOTE: because Z2M is refreshing the permit join duration early to prevent it from closing
-                //       (every 200sec, even if only opened for 254sec), we can't wait for the stack opened status,
-                //       as it won't trigger again if already opened... so instead we assume it worked
-                // NOTE2: with EZSP, 255=forever, and 254=max, but since upstream logic uses fixed 254 with interval refresh,
-                //        we can't simply bypass upstream calls if called for "forever" to prevent useless NCP calls (3-4 each time),
-                //        until called with 0 (disable), since we don't know if it was requested for forever or not...
-                // TLDR: upstream logic change required to allow this
-                // if (seconds) {
-                //     await this.oneWaitress.startWaitingForEvent(
-                //         {eventName: OneWaitressEvents.STACK_STATUS_NETWORK_OPENED},
-                //         DEFAULT_ZCL_REQUEST_TIMEOUT,
-                //         '[ZDO] Permit Joining',
-                //     );
-                // } else {
-                //     // NOTE: CLOSED stack status is not triggered if the network was not OPENED in the first place, so don't wait for it
-                //     //       same kind of problem as described above (upstream always tries to close after start, but EZSP already is)
-                // }
             });
         }
     }
     // queued, non-InterPAN
     async lqi(networkAddress) {
-        return this.queue.execute(async () => {
+        return await this.queue.execute(async () => {
             this.checkInterpanLock();
             const neighbors = [];
             const request = async (startIndex) => {
-                const zdoPayload = buffaloZdo_1.BuffaloZdo.buildLqiTableRequest(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]}.`);
@@ -1597,11 +1552,11 @@ class EmberAdapter extends __1.Adapter {
     }
     // queued, non-InterPAN
     async routingTable(networkAddress) {
-        return this.queue.execute(async () => {
+        return await this.queue.execute(async () => {
             this.checkInterpanLock();
             const table = [];
             const request = async (startIndex) => {
-                const zdoPayload = buffaloZdo_1.BuffaloZdo.buildRoutingTableRequest(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]}.`);
@@ -1614,7 +1569,7 @@ class EmberAdapter extends __1.Adapter {
                 for (const entry of result.entryList) {
                     table.push({
                         destinationAddress: entry.destinationAddress,
-                        status: RoutingTableStatus[entry.status], // get str value from enum to satisfy upstream's needs
+                        status: entry.status,
                         nextHop: entry.nextHopAddress,
                     });
                 }
@@ -1632,9 +1587,9 @@ class EmberAdapter extends __1.Adapter {
     }
     // queued, non-InterPAN
     async nodeDescriptor(networkAddress) {
-        return this.queue.execute(async () => {
+        return await this.queue.execute(async () => {
             this.checkInterpanLock();
-            const zdoPayload = buffaloZdo_1.BuffaloZdo.buildNodeDescriptorRequest(networkAddress);
+            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]}.`);
@@ -1657,9 +1612,9 @@ class EmberAdapter extends __1.Adapter {
                     break;
             }
             /* istanbul ignore else */
-            if (result.serverMask.stackComplianceResivion < CURRENT_ZIGBEE_SPEC_REVISION) {
+            if (result.serverMask.stackComplianceRevision < CURRENT_ZIGBEE_SPEC_REVISION) {
                 // always 0 before rev. 21 where field was added
-                const rev = result.serverMask.stackComplianceResivion < 21 ? 'pre-21' : result.serverMask.stackComplianceResivion;
+                const rev = result.serverMask.stackComplianceRevision < 21 ? 'pre-21' : result.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 };
@@ -1667,9 +1622,9 @@ class EmberAdapter extends __1.Adapter {
     }
     // queued, non-InterPAN
     async activeEndpoints(networkAddress) {
-        return this.queue.execute(async () => {
+        return await this.queue.execute(async () => {
             this.checkInterpanLock();
-            const zdoPayload = buffaloZdo_1.BuffaloZdo.buildActiveEndpointsRequest(networkAddress);
+            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]}.`);
@@ -1684,9 +1639,9 @@ class EmberAdapter extends __1.Adapter {
     }
     // queued, non-InterPAN
     async simpleDescriptor(networkAddress, endpointID) {
-        return this.queue.execute(async () => {
+        return await this.queue.execute(async () => {
             this.checkInterpanLock();
-            const zdoPayload = buffaloZdo_1.BuffaloZdo.buildSimpleDescriptorRequest(networkAddress, endpointID);
+            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]}.`);
@@ -1707,9 +1662,9 @@ class EmberAdapter extends __1.Adapter {
     }
     // queued, non-InterPAN
     async bind(destinationNetworkAddress, sourceIeeeAddress, sourceEndpoint, clusterID, destinationAddressOrGroup, type, destinationEndpoint) {
-        return this.queue.execute(async () => {
+        return await this.queue.execute(async () => {
             this.checkInterpanLock();
-            const zdoPayload = buffaloZdo_1.BuffaloZdo.buildBindRequest(sourceIeeeAddress, sourceEndpoint, clusterID, type === 'group' ? Zdo.MULTICAST_BINDING : Zdo.UNICAST_BINDING, destinationAddressOrGroup, // not used with MULTICAST_BINDING
+            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);
@@ -1725,9 +1680,9 @@ class EmberAdapter extends __1.Adapter {
     }
     // queued, non-InterPAN
     async unbind(destinationNetworkAddress, sourceIeeeAddress, sourceEndpoint, clusterID, destinationAddressOrGroup, type, destinationEndpoint) {
-        return this.queue.execute(async () => {
+        return await this.queue.execute(async () => {
             this.checkInterpanLock();
-            const zdoPayload = buffaloZdo_1.BuffaloZdo.buildUnbindRequest(sourceIeeeAddress, sourceEndpoint, clusterID, type === 'group' ? Zdo.MULTICAST_BINDING : Zdo.UNICAST_BINDING, destinationAddressOrGroup, // not used with MULTICAST_BINDING
+            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);
@@ -1743,9 +1698,9 @@ class EmberAdapter extends __1.Adapter {
     }
     // queued, non-InterPAN
     async removeDevice(networkAddress, ieeeAddr) {
-        return this.queue.execute(async () => {
+        return await this.queue.execute(async () => {
             this.checkInterpanLock();
-            const zdoPayload = buffaloZdo_1.BuffaloZdo.buildLeaveRequest(ieeeAddr, Zdo.LeaveRequestFlags.WITHOUT_REJOIN);
+            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]}.`);
@@ -1783,9 +1738,9 @@ class EmberAdapter extends __1.Adapter {
             apsFrame.options &= ~enums_1.EmberApsOption.RETRY;
         }
         const data = zclFrame.toBuffer();
-        return this.queue.execute(async () => {
+        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=${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 {
@@ -1850,9 +1805,9 @@ class EmberAdapter extends __1.Adapter {
             sequence: 0, // set by stack
         };
         const data = zclFrame.toBuffer();
-        return this.queue.execute(async () => {
+        return await this.queue.execute(async () => {
             this.checkInterpanLock();
-            logger_1.logger.debug(`~~~> [ZCL GROUP apsFrame=${JSON.stringify(apsFrame)} header=${JSON.stringify(zclFrame.header)}]`, NS);
+            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
             apsFrame, data, 0, // alias
@@ -1877,9 +1832,9 @@ class EmberAdapter extends __1.Adapter {
             sequence: 0, // set by stack
         };
         const data = zclFrame.toBuffer();
-        return this.queue.execute(async () => {
+        return await this.queue.execute(async () => {
             this.checkInterpanLock();
-            logger_1.logger.debug(`~~~> [ZCL BROADCAST apsFrame=${JSON.stringify(apsFrame)} header=${JSON.stringify(zclFrame.header)}]`, NS);
+            logger_1.logger.debug(() => `~~~> [ZCL BROADCAST 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.BROADCAST, destination, apsFrame, data, 0, // alias
             0);
@@ -1895,7 +1850,7 @@ class EmberAdapter extends __1.Adapter {
     // TODO: check all this touchlink/interpan stuff
     // queued
     async setChannelInterPAN(channel) {
-        return this.queue.execute(async () => {
+        return await this.queue.execute(async () => {
             this.interpanLock = true;
             const status = await this.ezsp.ezspSetLogicalAndRadioChannel(channel);
             if (status !== enums_1.SLStatus.OK) {
@@ -1906,7 +1861,7 @@ class EmberAdapter extends __1.Adapter {
     }
     // queued
     async sendZclFrameInterPANToIeeeAddr(zclFrame, ieeeAddress) {
-        return this.queue.execute(async () => {
+        return await this.queue.execute(async () => {
             const msgBuffalo = new buffalo_1.EzspBuffalo(Buffer.alloc(consts_1.MAXIMUM_INTERPAN_LENGTH));
             // cache-enabled getters
             const sourcePanId = await this.emberGetPanId();
@@ -1921,7 +1876,7 @@ class EmberAdapter extends __1.Adapter {
             msgBuffalo.writeUInt8(enums_1.EmberInterpanMessageType.UNICAST | consts_1.INTERPAN_APS_FRAME_TYPE); // apsFrameControl
             msgBuffalo.writeUInt16(zclFrame.cluster.ID);
             msgBuffalo.writeUInt16(ZSpec.TOUCHLINK_PROFILE_ID);
-            logger_1.logger.debug(`~~~> [ZCL TOUCHLINK to=${ieeeAddress} header=${JSON.stringify(zclFrame.header)}]`, NS);
+            logger_1.logger.debug(() => `~~~> [ZCL TOUCHLINK to=${ieeeAddress} header=${JSON.stringify(zclFrame.header)}]`, NS);
             const status = await this.ezsp.ezspSendRawMessage(Buffer.concat([msgBuffalo.getWritten(), zclFrame.toBuffer()]), enums_1.EmberTransmitPriority.NORMAL, true);
             if (status !== enums_1.SLStatus.OK) {
                 throw new Error(`~x~> [ZCL TOUCHLINK to=${ieeeAddress}] Failed to send with status=${enums_1.SLStatus[status]}.`);
@@ -1946,7 +1901,7 @@ class EmberAdapter extends __1.Adapter {
             groupId: ZSpec.BroadcastAddress.SLEEPY,
             sequence: 0, // set by stack
         };
-        return this.queue.execute(async () => {
+        return await this.queue.execute(async () => {
             const msgBuffalo = new buffalo_1.EzspBuffalo(Buffer.alloc(consts_1.MAXIMUM_INTERPAN_LENGTH));
             // cache-enabled getters
             const sourcePanId = await this.emberGetPanId();
@@ -1962,7 +1917,7 @@ class EmberAdapter extends __1.Adapter {
             msgBuffalo.writeUInt16(apsFrame.clusterId);
             msgBuffalo.writeUInt16(apsFrame.profileId);
             const data = Buffer.concat([msgBuffalo.getWritten(), zclFrame.toBuffer()]);
-            logger_1.logger.debug(`~~~> [ZCL TOUCHLINK BROADCAST header=${JSON.stringify(zclFrame.header)}]`, NS);
+            logger_1.logger.debug(() => `~~~> [ZCL TOUCHLINK BROADCAST header=${JSON.stringify(zclFrame.header)}]`, NS);
             const status = await this.ezsp.ezspSendRawMessage(data, enums_1.EmberTransmitPriority.NORMAL, true);
             if (status !== enums_1.SLStatus.OK) {
                 throw new Error(`~x~> [ZCL TOUCHLINK BROADCAST] Failed to send with status=${enums_1.SLStatus[status]}.`);
@@ -1979,7 +1934,7 @@ class EmberAdapter extends __1.Adapter {
     }
     // queued
     async restoreChannelInterPAN() {
-        return this.queue.execute(async () => {
+        return await this.queue.execute(async () => {
             const status = await this.ezsp.ezspSetLogicalAndRadioChannel(this.networkOptions.channelList[0]);
             if (status !== enums_1.SLStatus.OK) {
                 throw new Error(`Failed to restore InterPAN channel to '${this.networkOptions.channelList[0]}' with status=${enums_1.SLStatus[status]}.`);