zigbee-herdsman 0.50.1 → 0.52.0

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

@@ -28,32 +28,31 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EmberAdapter = void 0;
 /* istanbul ignore file */
+const crypto_1 = require("crypto");
 const es6_1 = __importDefault(require("fast-deep-equal/es6"));
 const fs_1 = require("fs");
 const path_1 = __importDefault(require("path"));
-const serialPortUtils_1 = __importDefault(require("../../serialPortUtils"));
-const socketPortUtils_1 = __importDefault(require("../../socketPortUtils"));
-const utils_1 = require("../../../utils");
 const __1 = require("../..");
+const utils_1 = require("../../../utils");
+const logger_1 = require("../../../utils/logger");
+const ZSpec = __importStar(require("../../../zspec"));
 const Zcl = __importStar(require("../../../zspec/zcl"));
-const enums_1 = require("../../../zspec/enums");
-const ZSpec = __importStar(require("../../../zspec/consts"));
+const Zdo = __importStar(require("../../../zspec/zdo"));
+const buffaloZdo_1 = require("../../../zspec/zdo/buffaloZdo");
 const events_1 = require("../../events");
-const math_1 = require("../utils/math");
-const ezsp_1 = require("../ezsp/ezsp");
-const consts_1 = require("../ezsp/consts");
-const enums_2 = require("../ezsp/enums");
+const serialPortUtils_1 = __importDefault(require("../../serialPortUtils"));
+const socketPortUtils_1 = __importDefault(require("../../socketPortUtils"));
+const consts_1 = require("../consts");
+const enums_1 = require("../enums");
 const buffalo_1 = require("../ezsp/buffalo");
-const enums_3 = require("../enums");
-const zdo_1 = require("../zdo");
-const consts_2 = require("../consts");
-const requestQueue_1 = require("./requestQueue");
-const endpoints_1 = require("./endpoints");
+const consts_2 = require("../ezsp/consts");
+const enums_2 = require("../ezsp/enums");
+const ezsp_1 = require("../ezsp/ezsp");
+const ezspError_1 = require("../ezspError");
 const initters_1 = require("../utils/initters");
-const crypto_1 = require("crypto");
+const math_1 = require("../utils/math");
+const endpoints_1 = require("./endpoints");
 const oneWaitress_1 = require("./oneWaitress");
-const logger_1 = require("../../../utils/logger");
-// import {EmberTokensManager} from "./tokensManager";
 const NS = 'zh:ember';
 /** Enum to pass strings from numbers up to Z2M. */
 var RoutingTableStatus;
@@ -67,7 +66,6 @@ var RoutingTableStatus;
     RoutingTableStatus[RoutingTableStatus["RESERVED2"] = 6] = "RESERVED2";
     RoutingTableStatus[RoutingTableStatus["RESERVED3"] = 7] = "RESERVED3";
 })(RoutingTableStatus || (RoutingTableStatus = {}));
-;
 var NetworkInitAction;
 (function (NetworkInitAction) {
     /** Ain't that nice! */
@@ -81,7 +79,6 @@ var NetworkInitAction;
     /** Re-form the network using full backed-up data. */
     NetworkInitAction[NetworkInitAction["FORM_BACKUP"] = 4] = "FORM_BACKUP";
 })(NetworkInitAction || (NetworkInitAction = {}));
-;
 /** NOTE: Drivers can override `manufacturer`. Verify logic doesn't work in most cases anyway. */
 const autoDetectDefinitions = [
     /** NOTE: Manuf code "0x1321" for "Shenzhen Sonoff Technologies Co., Ltd." */
@@ -95,9 +92,9 @@ const autoDetectDefinitions = [
  * for coordination between the two entities, and allows both to send ZDO
  * messages with non-conflicting sequence numbers.
  */
-const APPLICATION_ZDO_SEQUENCE_MASK = 0x7F;
-/** Current revision of the spec by zigbee alliance. XXX: what are `Zigbee Pro 2023` devices reporting?? */
-const CURRENT_ZIGBEE_SPEC_REVISION = 23;
+const APPLICATION_ZDO_SEQUENCE_MASK = 0x7f;
+/** Current revision of the spec by zigbee alliance supported by Z2M. */
+const CURRENT_ZIGBEE_SPEC_REVISION = 22;
 /** Each scan period is 15.36ms. Scan for at least 200ms (2^4 + 1 periods) to pick up WiFi beacon frames. */
 const ENERGY_SCAN_DURATION = 4;
 /** Oldest supported EZSP version for backups. Don't take the risk to restore a broken network until older backup versions can be investigated. */
@@ -107,6 +104,10 @@ const BACKUP_OLDEST_SUPPORTED_EZSP_VERSION = 12;
  * NOTE: This is blocking the request queue, so we shouldn't go crazy high.
  */
 const BROADCAST_NETWORK_KEY_SWITCH_WAIT_TIME = 15000;
+const QUEUE_HIGH_COUNT = 4;
+const QUEUE_MAX_SEND_ATTEMPTS = 3;
+const QUEUE_BUSY_DEFER_MSEC = 500;
+const QUEUE_NETWORK_DOWN_DEFER_MSEC = 1500;
 /**
  * Default stack configuration values.
  * @see https://www.silabs.com/documents/public/user-guides/ug100-ezsp-reference-guide.pdf 2.3.1 for descriptions/RAM costs
@@ -123,20 +124,12 @@ const DEFAULT_STACK_CONFIG = {
     CONCENTRATOR_DELIVERY_FAILURE_THRESHOLD: 1, // zigpc: 1, ZigbeeMinimalHost: 3
     CONCENTRATOR_MAX_HOPS: 0, // zigpc: 0
     MAX_END_DEVICE_CHILDREN: 32, // zigpc: 6, nabucasa: 32, Dongle-E (Sonoff firmware): 32
-    APS_UNICAST_MESSAGE_COUNT: 32, // zigpc: 10, darkxst: 20, nabucasa: 20
-    RETRY_QUEUE_SIZE: 16, // nabucasa: 16
-    ADDRESS_TABLE_SIZE: 16, // zigpc: 32, darkxst: 16, nabucasa: 16
-    TRUST_CENTER_ADDRESS_CACHE_SIZE: 2,
-    KEY_TABLE_SIZE: 0, // zigpc: 4
-    BINDING_TABLE_SIZE: 32, // zigpc: 2, Z3GatewayGPCombo: 5, nabucasa: 32
-    BROADCAST_TABLE_SIZE: 15, // zigpc: 15, Z3GatewayGPCombo: 35 - NOTE: Sonoff Dongle-E fails at 35
-    MULTICAST_TABLE_SIZE: 16, // darkxst: 16, nabucasa: 16 - NOTE: should always be at least enough to register FIXED_ENDPOINTS multicastIds
-    NEIGHBOR_TABLE_SIZE: 26, // zigpc: 16, darkxst: 26, nabucasa: 26
-    SOURCE_ROUTE_TABLE_SIZE: 200, // Z3GatewayGPCombo: 100, darkxst: 200, nabucasa: 200
     TRANSIENT_DEVICE_TIMEOUT: 10000,
     END_DEVICE_POLL_TIMEOUT: 8, // zigpc: 8
     TRANSIENT_KEY_TIMEOUT_S: 300, // zigpc: 65535
 };
+/** Default behavior is to disable app key requests */
+const ALLOW_APP_KEY_REQUESTS = false;
 /**
  * NOTE: This from SDK is currently ignored here because of issues in below links:
  * - BUGZID 12261: Concentrators use MTORRs for route discovery and should not enable route discovery in the APS options.
@@ -145,13 +138,7 @@ const DEFAULT_STACK_CONFIG = {
  *
  * Removing `ENABLE_ROUTE_DISCOVERY` leads to devices that won't reconnect/go offline, and various other issues. Keeping it for now.
  */
-const DEFAULT_APS_OPTIONS = (enums_3.EmberApsOption.RETRY | enums_3.EmberApsOption.ENABLE_ROUTE_DISCOVERY | enums_3.EmberApsOption.ENABLE_ADDRESS_DISCOVERY);
-/**
- * Enabling this allows to immediately reject requests that won't be able to get to their destination.
- * However, it causes more NCP calls, notably to get the source route overhead.
- * XXX: Needs further testing before enabling
- */
-const CHECK_APS_PAYLOAD_LENGTH = false;
+const DEFAULT_APS_OPTIONS = enums_1.EmberApsOption.RETRY | enums_1.EmberApsOption.ENABLE_ROUTE_DISCOVERY | enums_1.EmberApsOption.ENABLE_ADDRESS_DISCOVERY;
 /** Time for a ZDO request to get a callback response. ASH is 2400*6 for ACK timeout. */
 const DEFAULT_ZDO_REQUEST_TIMEOUT = 15000; // msec
 /** Time for a ZCL request to get a callback response. ASH is 2400*6 for ACK timeout. */
@@ -169,7 +156,7 @@ const DEFAULT_MANUFACTURER_CODE = Zcl.ManufacturerCode.SILICON_LABORATORIES;
 const WORKAROUND_JOIN_MANUF_IEEE_PREFIX_TO_CODE = {
     // NOTE: Lumi has a new prefix registered since 2021, in case they start using that one with new devices, it might need to be added here too...
     //       "0x18c23c" https://maclookup.app/vendors/lumi-united-technology-co-ltd
-    "0x54ef44": Zcl.ManufacturerCode.LUMI_UNITED_TECHOLOGY_LTD_SHENZHEN,
+    '0x54ef44': Zcl.ManufacturerCode.LUMI_UNITED_TECHOLOGY_LTD_SHENZHEN,
 };
 /**
  * Relay calls between Z2M and EZSP-layer and handle any error that might occur via queue & waitress.
@@ -182,12 +169,10 @@ class EmberAdapter extends __1.Adapter {
     stackConfig;
     ezsp;
     version;
-    requestQueue;
+    queue;
     oneWaitress;
     /** Periodically retrieve counters then clear them. */
     watchdogCountersHandle;
-    /** Hold ZDO request in process. */
-    zdoRequestBuffalo;
     /** Sequence number used for ZDO requests. static uint8_t  */
     zdoRequestSequence;
     /** Default radius used for broadcast ZDO requests. uint8_t */
@@ -202,20 +187,18 @@ class EmberAdapter extends __1.Adapter {
     constructor(networkOptions, serialPortOptions, backupPath, adapterOptions) {
         super(networkOptions, serialPortOptions, backupPath, adapterOptions);
         this.stackConfig = this.loadStackConfig();
-        const delay = (typeof this.adapterOptions.delay === 'number') ? Math.min(Math.max(this.adapterOptions.delay, 5), 60) : 5;
+        const delay = typeof this.adapterOptions.delay === 'number' ? Math.min(Math.max(this.adapterOptions.delay, 5), 60) : 5;
         logger_1.logger.debug(`Using delay=${delay}.`, NS);
-        this.requestQueue = new requestQueue_1.EmberRequestQueue(delay);
+        this.queue = new utils_1.Queue(typeof this.adapterOptions.concurrent === 'number' ? Math.min(Math.max(this.adapterOptions.concurrent, 1), 32) : 16);
         this.oneWaitress = new oneWaitress_1.EmberOneWaitress();
-        this.zdoRequestBuffalo = new buffalo_1.EzspBuffalo(Buffer.alloc(consts_1.EZSP_MAX_FRAME_LENGTH));
-        this.ezsp = new ezsp_1.Ezsp(delay, serialPortOptions);
-        this.ezsp.on(ezsp_1.EzspEvents.STACK_STATUS, this.onStackStatus.bind(this));
-        this.ezsp.on(ezsp_1.EzspEvents.MESSAGE_SENT, this.onMessageSent.bind(this));
+        this.ezsp = new ezsp_1.Ezsp(serialPortOptions);
         this.ezsp.on(ezsp_1.EzspEvents.ZDO_RESPONSE, this.onZDOResponse.bind(this));
-        this.ezsp.on(ezsp_1.EzspEvents.END_DEVICE_ANNOUNCE, this.onEndDeviceAnnounce.bind(this));
         this.ezsp.on(ezsp_1.EzspEvents.INCOMING_MESSAGE, this.onIncomingMessage.bind(this));
         this.ezsp.on(ezsp_1.EzspEvents.TOUCHLINK_MESSAGE, this.onTouchlinkMessage.bind(this));
-        this.ezsp.on(ezsp_1.EzspEvents.GREENPOWER_MESSAGE, this.onGreenpowerMessage.bind(this));
+        this.ezsp.on(ezsp_1.EzspEvents.STACK_STATUS, this.onStackStatus.bind(this));
         this.ezsp.on(ezsp_1.EzspEvents.TRUST_CENTER_JOIN, this.onTrustCenterJoin.bind(this));
+        this.ezsp.on(ezsp_1.EzspEvents.MESSAGE_SENT, this.onMessageSent.bind(this));
+        this.ezsp.on(ezsp_1.EzspEvents.GREENPOWER_MESSAGE, this.onGreenpowerMessage.bind(this));
     }
     loadStackConfig() {
         // store stack config in same dir as backup
@@ -224,16 +207,16 @@ class EmberAdapter extends __1.Adapter {
             const customConfig = JSON.parse((0, fs_1.readFileSync)(configPath, 'utf8'));
             // set any undefined config to default
             const config = { ...DEFAULT_STACK_CONFIG, ...customConfig };
-            const inRange = (value, min, max) => (value == undefined || value < min || value > max) ? false : true;
+            const inRange = (value, min, max) => (value == undefined || value < min || value > max ? false : true);
             if (!['high', 'low'].includes(config.CONCENTRATOR_RAM_TYPE)) {
                 config.CONCENTRATOR_RAM_TYPE = DEFAULT_STACK_CONFIG.CONCENTRATOR_RAM_TYPE;
                 logger_1.logger.error(`[STACK CONFIG] Invalid CONCENTRATOR_RAM_TYPE, using default.`, NS);
             }
-            if (!inRange(config.CONCENTRATOR_MIN_TIME, 1, 60) || (config.CONCENTRATOR_MIN_TIME >= config.CONCENTRATOR_MAX_TIME)) {
+            if (!inRange(config.CONCENTRATOR_MIN_TIME, 1, 60) || config.CONCENTRATOR_MIN_TIME >= config.CONCENTRATOR_MAX_TIME) {
                 config.CONCENTRATOR_MIN_TIME = DEFAULT_STACK_CONFIG.CONCENTRATOR_MIN_TIME;
                 logger_1.logger.error(`[STACK CONFIG] Invalid CONCENTRATOR_MIN_TIME, using default.`, NS);
             }
-            if (!inRange(config.CONCENTRATOR_MAX_TIME, 30, 300) || (config.CONCENTRATOR_MAX_TIME <= config.CONCENTRATOR_MIN_TIME)) {
+            if (!inRange(config.CONCENTRATOR_MAX_TIME, 30, 300) || config.CONCENTRATOR_MAX_TIME <= config.CONCENTRATOR_MIN_TIME) {
                 config.CONCENTRATOR_MAX_TIME = DEFAULT_STACK_CONFIG.CONCENTRATOR_MAX_TIME;
                 logger_1.logger.error(`[STACK CONFIG] Invalid CONCENTRATOR_MAX_TIME, using default.`, NS);
             }
@@ -253,47 +236,6 @@ class EmberAdapter extends __1.Adapter {
                 config.MAX_END_DEVICE_CHILDREN = DEFAULT_STACK_CONFIG.MAX_END_DEVICE_CHILDREN;
                 logger_1.logger.error(`[STACK CONFIG] Invalid MAX_END_DEVICE_CHILDREN, using default.`, NS);
             }
-            if (!inRange(config.APS_UNICAST_MESSAGE_COUNT, 1, 255)) {
-                config.APS_UNICAST_MESSAGE_COUNT = DEFAULT_STACK_CONFIG.APS_UNICAST_MESSAGE_COUNT;
-                logger_1.logger.error(`[STACK CONFIG] Invalid APS_UNICAST_MESSAGE_COUNT, using default.`, NS);
-            }
-            if (!inRange(config.RETRY_QUEUE_SIZE, 0, 255)) {
-                config.RETRY_QUEUE_SIZE = DEFAULT_STACK_CONFIG.RETRY_QUEUE_SIZE;
-                logger_1.logger.error(`[STACK CONFIG] Invalid RETRY_QUEUE_SIZE, using default.`, NS);
-            }
-            if (!inRange(config.ADDRESS_TABLE_SIZE, 1, 250)) {
-                config.ADDRESS_TABLE_SIZE = DEFAULT_STACK_CONFIG.ADDRESS_TABLE_SIZE;
-                logger_1.logger.error(`[STACK CONFIG] Invalid ADDRESS_TABLE_SIZE, using default.`, NS);
-            }
-            if (!inRange(config.TRUST_CENTER_ADDRESS_CACHE_SIZE, 0, 4)) {
-                config.TRUST_CENTER_ADDRESS_CACHE_SIZE = DEFAULT_STACK_CONFIG.TRUST_CENTER_ADDRESS_CACHE_SIZE;
-                logger_1.logger.error(`[STACK CONFIG] Invalid TRUST_CENTER_ADDRESS_CACHE_SIZE, using default.`, NS);
-            }
-            if (!inRange(config.KEY_TABLE_SIZE, 0, 127)) {
-                config.KEY_TABLE_SIZE = DEFAULT_STACK_CONFIG.KEY_TABLE_SIZE;
-                logger_1.logger.error(`[STACK CONFIG] Invalid KEY_TABLE_SIZE, using default.`, NS);
-            }
-            if (!inRange(config.BINDING_TABLE_SIZE, 0, 127)) {
-                config.BINDING_TABLE_SIZE = DEFAULT_STACK_CONFIG.BINDING_TABLE_SIZE;
-                logger_1.logger.error(`[STACK CONFIG] Invalid BINDING_TABLE_SIZE, using default.`, NS);
-            }
-            if (!inRange(config.BROADCAST_TABLE_SIZE, 15, 254)) {
-                config.BROADCAST_TABLE_SIZE = DEFAULT_STACK_CONFIG.BROADCAST_TABLE_SIZE;
-                logger_1.logger.error(`[STACK CONFIG] Invalid BROADCAST_TABLE_SIZE, using default.`, NS);
-            }
-            // min should always be enough to cover `multicastIds` in `FIXED_ENDPOINTS`
-            if (!inRange(config.MULTICAST_TABLE_SIZE, 5, 250)) {
-                config.MULTICAST_TABLE_SIZE = DEFAULT_STACK_CONFIG.MULTICAST_TABLE_SIZE;
-                logger_1.logger.error(`[STACK CONFIG] Invalid MULTICAST_TABLE_SIZE, using default.`, NS);
-            }
-            if (![16, 26].includes(config.NEIGHBOR_TABLE_SIZE)) {
-                config.NEIGHBOR_TABLE_SIZE = DEFAULT_STACK_CONFIG.NEIGHBOR_TABLE_SIZE;
-                logger_1.logger.error(`[STACK CONFIG] Invalid NEIGHBOR_TABLE_SIZE, using default.`, NS);
-            }
-            if (!inRange(config.SOURCE_ROUTE_TABLE_SIZE, 0, 254)) {
-                config.SOURCE_ROUTE_TABLE_SIZE = DEFAULT_STACK_CONFIG.SOURCE_ROUTE_TABLE_SIZE;
-                logger_1.logger.error(`[STACK CONFIG] Invalid SOURCE_ROUTE_TABLE_SIZE, using default.`, NS);
-            }
             if (!inRange(config.TRANSIENT_DEVICE_TIMEOUT, 0, 65535)) {
                 config.TRANSIENT_DEVICE_TIMEOUT = DEFAULT_STACK_CONFIG.TRANSIENT_DEVICE_TIMEOUT;
                 logger_1.logger.error(`[STACK CONFIG] Invalid TRANSIENT_DEVICE_TIMEOUT, using default.`, NS);
@@ -321,35 +263,35 @@ class EmberAdapter extends __1.Adapter {
         // to be extra careful, should clear network cache upon receiving this.
         this.clearNetworkCache();
         switch (status) {
-            case enums_3.EmberStatus.NETWORK_UP: {
+            case enums_1.SLStatus.NETWORK_UP: {
                 this.oneWaitress.resolveEvent(oneWaitress_1.OneWaitressEvents.STACK_STATUS_NETWORK_UP);
                 logger_1.logger.info(`[STACK STATUS] Network up.`, NS);
                 break;
             }
-            case enums_3.EmberStatus.NETWORK_DOWN: {
+            case enums_1.SLStatus.NETWORK_DOWN: {
                 this.oneWaitress.resolveEvent(oneWaitress_1.OneWaitressEvents.STACK_STATUS_NETWORK_DOWN);
                 logger_1.logger.info(`[STACK STATUS] Network down.`, NS);
                 break;
             }
-            case enums_3.EmberStatus.NETWORK_OPENED: {
+            case enums_1.SLStatus.ZIGBEE_NETWORK_OPENED: {
                 this.oneWaitress.resolveEvent(oneWaitress_1.OneWaitressEvents.STACK_STATUS_NETWORK_OPENED);
                 logger_1.logger.info(`[STACK STATUS] Network opened.`, NS);
                 break;
             }
-            case enums_3.EmberStatus.NETWORK_CLOSED: {
+            case enums_1.SLStatus.ZIGBEE_NETWORK_CLOSED: {
                 this.oneWaitress.resolveEvent(oneWaitress_1.OneWaitressEvents.STACK_STATUS_NETWORK_CLOSED);
                 logger_1.logger.info(`[STACK STATUS] Network closed.`, NS);
                 break;
             }
-            case enums_3.EmberStatus.CHANNEL_CHANGED: {
+            case enums_1.SLStatus.ZIGBEE_CHANNEL_CHANGED: {
                 this.oneWaitress.resolveEvent(oneWaitress_1.OneWaitressEvents.STACK_STATUS_CHANNEL_CHANGED);
                 // invalidate cache
-                this.networkCache.parameters.radioChannel = consts_2.INVALID_RADIO_CHANNEL;
+                this.networkCache.parameters.radioChannel = consts_1.INVALID_RADIO_CHANNEL;
                 logger_1.logger.info(`[STACK STATUS] Channel changed.`, NS);
                 break;
             }
             default: {
-                logger_1.logger.debug(`[STACK STATUS] ${enums_3.EmberStatus[status]}.`, NS);
+                logger_1.logger.debug(`[STACK STATUS] ${enums_1.SLStatus[status]}.`, NS);
                 break;
             }
         }
@@ -364,17 +306,17 @@ class EmberAdapter extends __1.Adapter {
      * @param messageTag
      * @param status
      */
-    async onMessageSent(type, indexOrDestination, apsFrame, messageTag, status) {
-        if (status === enums_3.EmberStatus.DELIVERY_FAILED) {
+    async onMessageSent(status, type, indexOrDestination, apsFrame, messageTag) {
+        if (status === enums_1.SLStatus.ZIGBEE_DELIVERY_FAILED) {
             // no ACK was received from the destination
             switch (type) {
-                case enums_3.EmberOutgoingMessageType.BROADCAST:
-                case enums_3.EmberOutgoingMessageType.BROADCAST_WITH_ALIAS:
-                case enums_3.EmberOutgoingMessageType.MULTICAST:
-                case enums_3.EmberOutgoingMessageType.MULTICAST_WITH_ALIAS: {
+                case enums_1.EmberOutgoingMessageType.BROADCAST:
+                case enums_1.EmberOutgoingMessageType.BROADCAST_WITH_ALIAS:
+                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_3.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}" ` +
+                        `[apsFrame=${JSON.stringify(apsFrame)} messageTag=${messageTag}]`, NS);
                     break;
                 }
                 default: {
@@ -384,9 +326,11 @@ class EmberAdapter extends __1.Adapter {
                 }
             }
         }
-        else if (status === enums_3.EmberStatus.SUCCESS) {
-            if (type === enums_3.EmberOutgoingMessageType.MULTICAST && apsFrame.destinationEndpoint === 0xFF &&
-                apsFrame.groupId < consts_2.EMBER_MIN_BROADCAST_ADDRESS && !this.multicastTable.includes(apsFrame.groupId)) {
+        else if (status === enums_1.SLStatus.OK) {
+            if (type === enums_1.EmberOutgoingMessageType.MULTICAST &&
+                apsFrame.destinationEndpoint === 0xff &&
+                apsFrame.groupId < consts_1.EMBER_MIN_BROADCAST_ADDRESS &&
+                !this.multicastTable.includes(apsFrame.groupId)) {
                 // workaround for devices using multicast for state update (coordinator passthrough)
                 const tableIdx = this.multicastTable.length;
                 const multicastEntry = {
@@ -396,22 +340,20 @@ class EmberAdapter extends __1.Adapter {
                 };
                 // set immediately to avoid potential race
                 this.multicastTable.push(multicastEntry.multicastId);
-                await new Promise((resolve, reject) => {
-                    this.requestQueue.enqueue(async () => {
-                        const status = (await this.ezsp.ezspSetMulticastTableEntry(tableIdx, multicastEntry));
-                        if (status !== enums_3.EmberStatus.SUCCESS) {
-                            logger_1.logger.error(`Failed to register group "${multicastEntry.multicastId}" in multicast table with status=${enums_3.EmberStatus[status]}.`, NS);
-                            return status;
+                try {
+                    await this.queue.execute(async () => {
+                        const status = await this.ezsp.ezspSetMulticastTableEntry(tableIdx, multicastEntry);
+                        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);
-                        resolve();
-                        return enums_3.EmberStatus.SUCCESS;
-                    }, (reason) => {
-                        // remove to allow retry on next occurrence
-                        this.multicastTable.splice(tableIdx, 1);
-                        reject(reason);
-                    }, true);
-                });
+                    });
+                }
+                catch (error) {
+                    // remove to allow retry on next occurrence
+                    this.multicastTable.splice(tableIdx, 1);
+                    throw error;
+                }
             }
         }
         // shouldn't be any other status
@@ -419,26 +361,31 @@ class EmberAdapter extends __1.Adapter {
     /**
      * Emitted from @see Ezsp.ezspIncomingMessageHandler
      *
-     * @param clusterId The ZDO response cluster ID.
+     * @param apsFrame The APS frame associated with the response.
      * @param sender The sender of the response. Should match `payload.nodeId` in many responses.
-     * @param payload If null, the response indicated a failure.
+     * @param messageContents The content of the response.
      */
-    async onZDOResponse(status, sender, apsFrame, payload) {
-        this.oneWaitress.resolveZDO(status, sender, apsFrame, payload);
-    }
-    /**
-     * Emitted from @see Ezsp.ezspIncomingMessageHandler
-     *
-     * @param sender
-     * @param nodeId
-     * @param eui64
-     * @param macCapFlags
-     */
-    async onEndDeviceAnnounce(sender, apsFrame, payload) {
-        // reduced function device
-        // if ((payload.capabilities.deviceType === 0)) {
-        // }
-        this.emit(events_1.Events.deviceAnnounce, { networkAddress: payload.nodeId, ieeeAddr: payload.eui64 });
+    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);
+            this.oneWaitress.resolveZDO(sender, apsFrame, payload);
+            if (apsFrame.clusterId === Zdo.ClusterId.NETWORK_ADDRESS_RESPONSE) {
+                this.emit(events_1.Events.networkAddress, {
+                    networkAddress: payload.nwkAddress,
+                    ieeeAddr: payload.eui64,
+                });
+            }
+            else if (apsFrame.clusterId === Zdo.ClusterId.END_DEVICE_ANNOUNCE) {
+                this.emit(events_1.Events.deviceAnnounce, {
+                    networkAddress: payload.nwkAddress,
+                    ieeeAddr: payload.eui64,
+                });
+            }
+        }
+        catch (error) {
+            this.oneWaitress.resolveZDO(sender, apsFrame, error);
+        }
     }
     /**
      * Emitted from @see Ezsp.ezspIncomingMessageHandler
@@ -458,7 +405,7 @@ class EmberAdapter extends __1.Adapter {
             endpoint: apsFrame.sourceEndpoint,
             linkquality: lastHopLqi,
             groupID: apsFrame.groupId,
-            wasBroadcast: ((type === enums_3.EmberIncomingMessageType.BROADCAST) || (type === enums_3.EmberIncomingMessageType.BROADCAST_LOOPBACK)),
+            wasBroadcast: type === enums_1.EmberIncomingMessageType.BROADCAST || type === enums_1.EmberIncomingMessageType.BROADCAST_LOOPBACK,
             destinationEndpoint: apsFrame.destinationEndpoint,
         };
         this.oneWaitress.resolveZCL(payload);
@@ -543,7 +490,7 @@ class EmberAdapter extends __1.Adapter {
      * @param parentOfNewNodeId
      */
     async onTrustCenterJoin(newNodeId, newNodeEui64, status, policyDecision, parentOfNewNodeId) {
-        if (status === enums_3.EmberDeviceUpdate.DEVICE_LEFT) {
+        if (status === enums_1.EmberDeviceUpdate.DEVICE_LEFT) {
             const payload = {
                 networkAddress: newNodeId,
                 ieeeAddr: newNodeEui64,
@@ -551,7 +498,7 @@ class EmberAdapter extends __1.Adapter {
             this.emit(events_1.Events.deviceLeave, payload);
         }
         else {
-            if (policyDecision !== enums_3.EmberJoinDecision.DENY_JOIN) {
+            if (policyDecision !== enums_1.EmberJoinDecision.DENY_JOIN) {
                 const payload = {
                     networkAddress: newNodeId,
                     ieeeAddr: newNodeEui64,
@@ -559,15 +506,11 @@ class EmberAdapter extends __1.Adapter {
                 // set workaround manuf code if necessary, or revert to default if previous joined device required workaround and new one does not
                 const joinManufCode = WORKAROUND_JOIN_MANUF_IEEE_PREFIX_TO_CODE[newNodeEui64.substring(0, 8)] ?? DEFAULT_MANUFACTURER_CODE;
                 if (this.manufacturerCode !== joinManufCode) {
-                    await new Promise((resolve, reject) => {
-                        this.requestQueue.enqueue(async () => {
-                            logger_1.logger.debug(`[WORKAROUND] Setting coordinator manufacturer code to ${Zcl.ManufacturerCode[joinManufCode]}.`, NS);
-                            await this.ezsp.ezspSetManufacturerCode(joinManufCode);
-                            this.manufacturerCode = joinManufCode;
-                            this.emit(events_1.Events.deviceJoined, payload);
-                            resolve();
-                            return enums_3.EmberStatus.SUCCESS;
-                        }, reject, true);
+                    await this.queue.execute(async () => {
+                        logger_1.logger.debug(`[WORKAROUND] Setting coordinator manufacturer code to ${Zcl.ManufacturerCode[joinManufCode]}.`, NS);
+                        await this.ezsp.ezspSetManufacturerCode(joinManufCode);
+                        this.manufacturerCode = joinManufCode;
+                        this.emit(events_1.Events.deviceJoined, payload);
                     });
                 }
                 else {
@@ -580,22 +523,18 @@ class EmberAdapter extends __1.Adapter {
         }
     }
     async watchdogCounters() {
-        await new Promise((resolve, reject) => {
-            this.requestQueue.enqueue(async () => {
-                // listed as per EmberCounterType
-                const ncpCounters = (await this.ezsp.ezspReadAndClearCounters());
-                logger_1.logger.info(`[NCP COUNTERS] ${ncpCounters.join(',')}`, NS);
-                const ashCounters = this.ezsp.ash.readAndClearCounters();
-                logger_1.logger.info(`[ASH COUNTERS] ${ashCounters.join(',')}`, NS);
-                resolve();
-                return enums_3.EmberStatus.SUCCESS;
-            }, reject);
+        await this.queue.execute(async () => {
+            // listed as per EmberCounterType
+            const ncpCounters = await this.ezsp.ezspReadAndClearCounters();
+            logger_1.logger.info(`[NCP COUNTERS] ${ncpCounters.join(',')}`, NS);
+            const ashCounters = this.ezsp.ash.readAndClearCounters();
+            logger_1.logger.info(`[ASH COUNTERS] ${ashCounters.join(',')}`, NS);
         });
     }
     initVariables() {
         this.ezsp.removeAllListeners(ezsp_1.EzspEvents.NCP_NEEDS_RESET_AND_INIT);
         clearInterval(this.watchdogCountersHandle);
-        this.zdoRequestBuffalo.setPosition(0);
+        this.queue.clear();
         this.zdoRequestSequence = 0; // start at 1
         this.zdoRequestRadius = 255;
         this.interpanLock = false;
@@ -609,96 +548,49 @@ class EmberAdapter extends __1.Adapter {
      * This is called by start and on internal reset.
      */
     async initEzsp() {
-        let result = "resumed";
+        let result = 'resumed';
         // NOTE: something deep in this call can throw too
-        const startResult = (await this.ezsp.start());
-        if (startResult !== enums_3.EzspStatus.SUCCESS) {
-            throw new Error(`Failed to start EZSP layer with status=${enums_3.EzspStatus[startResult]}.`);
+        const startResult = await this.ezsp.start();
+        if (startResult !== enums_1.EzspStatus.SUCCESS) {
+            throw new Error(`Failed to start EZSP layer with status=${enums_1.EzspStatus[startResult]}.`);
         }
         // call before any other command, else fails
         await this.emberVersion();
-        await this.initNCPPreConfiguration();
-        await this.initNCPAddressTable();
-        await this.initNCPConfiguration();
-        // WARNING: From here on EZSP commands that affect memory allocation on the NCP should no longer be called (like resizing tables)
-        await this.registerFixedEndpoints();
-        this.clearNetworkCache();
-        result = (await this.initTrustCenter());
-        // after network UP, as per SDK, ensures clean slate
-        await this.initNCPConcentrator();
-        // await (this.emberStartEnergyScan());// TODO: via config of some kind, better off waiting for UI supports though
-        // populate network cache info
-        const [status, , parameters] = (await this.ezsp.ezspGetNetworkParameters());
-        if (status !== enums_3.EmberStatus.SUCCESS) {
-            throw new Error(`Failed to get network parameters with status=${enums_3.EmberStatus[status]}.`);
-        }
-        this.networkCache.parameters = parameters;
-        this.networkCache.status = (await this.ezsp.ezspNetworkState());
-        this.networkCache.eui64 = (await this.ezsp.ezspGetEui64());
-        logger_1.logger.debug(`[INIT] Network Ready! ${JSON.stringify(this.networkCache)}`, NS);
-        this.watchdogCountersHandle = setInterval(this.watchdogCounters.bind(this), WATCHDOG_COUNTERS_FEED_INTERVAL);
-        this.requestQueue.startDispatching();
-        return result;
-    }
-    /**
-     * NCP Config init. Should always be called first in the init stack (after version cmd).
-     * @returns
-     */
-    async initNCPPreConfiguration() {
-        // this can only decrease, not increase, NCP-side value
-        await this.emberSetEzspConfigValue(enums_2.EzspConfigId.ADDRESS_TABLE_SIZE, this.stackConfig.ADDRESS_TABLE_SIZE);
-        await this.emberSetEzspConfigValue(enums_2.EzspConfigId.TRUST_CENTER_ADDRESS_CACHE_SIZE, this.stackConfig.TRUST_CENTER_ADDRESS_CACHE_SIZE);
-        // BUG 14222: If stack profile is 2 (ZigBee Pro), we need to enforce
-        // the standard stack configuration values for that feature set.
-        /** MAC indirect timeout should be 7.68 secs */
+        /** MAC indirect timeout should be 7.68 secs (STACK_PROFILE_ZIGBEE_PRO) */
         await this.emberSetEzspConfigValue(enums_2.EzspConfigId.INDIRECT_TRANSMISSION_TIMEOUT, 7680);
-        /** Max hops should be 2 * nwkMaxDepth, where nwkMaxDepth is 15 */
+        /** Max hops should be 2 * nwkMaxDepth, where nwkMaxDepth is 15 (STACK_PROFILE_ZIGBEE_PRO) */
         await this.emberSetEzspConfigValue(enums_2.EzspConfigId.MAX_HOPS, 30);
-        await this.emberSetEzspConfigValue(enums_2.EzspConfigId.TX_POWER_MODE, enums_3.EmberTXPowerMode.USE_TOKEN);
         await this.emberSetEzspConfigValue(enums_2.EzspConfigId.SUPPORTED_NETWORKS, 1);
-        await this.emberSetEzspValue(enums_2.EzspValueId.END_DEVICE_KEEP_ALIVE_SUPPORT_MODE, 1, [enums_3.EmberKeepAliveMode.KEEP_ALIVE_SUPPORT_ALL]);
         // allow other devices to modify the binding table
         await this.emberSetEzspPolicy(enums_2.EzspPolicyId.BINDING_MODIFICATION_POLICY, enums_2.EzspDecisionId.CHECK_BINDING_MODIFICATIONS_ARE_VALID_ENDPOINT_CLUSTERS);
-        // return message tag and message contents in ezspMessageSentHandler()
-        await this.emberSetEzspPolicy(enums_2.EzspPolicyId.MESSAGE_CONTENTS_IN_CALLBACK_POLICY, enums_2.EzspDecisionId.MESSAGE_TAG_AND_CONTENTS_IN_CALLBACK);
-        await this.emberSetEzspValue(enums_2.EzspValueId.MAXIMUM_INCOMING_TRANSFER_SIZE, 2, (0, math_1.lowHighBytes)(consts_2.MAXIMUM_APS_PAYLOAD_LENGTH));
-        await this.emberSetEzspValue(enums_2.EzspValueId.MAXIMUM_OUTGOING_TRANSFER_SIZE, 2, (0, math_1.lowHighBytes)(consts_2.MAXIMUM_APS_PAYLOAD_LENGTH));
+        // return message tag only in ezspMessageSentHandler()
+        await this.emberSetEzspPolicy(enums_2.EzspPolicyId.MESSAGE_CONTENTS_IN_CALLBACK_POLICY, enums_2.EzspDecisionId.MESSAGE_TAG_ONLY_IN_CALLBACK);
         await this.emberSetEzspValue(enums_2.EzspValueId.TRANSIENT_DEVICE_TIMEOUT, 2, (0, math_1.lowHighBytes)(this.stackConfig.TRANSIENT_DEVICE_TIMEOUT));
         await this.ezsp.ezspSetManufacturerCode(this.manufacturerCode);
         // network security init
-        await this.emberSetEzspConfigValue(enums_2.EzspConfigId.STACK_PROFILE, consts_2.STACK_PROFILE_ZIGBEE_PRO);
-        await this.emberSetEzspConfigValue(enums_2.EzspConfigId.SECURITY_LEVEL, consts_2.SECURITY_LEVEL_Z3);
-    }
-    /**
-     * NCP Address table init.
-     * @returns
-     */
-    async initNCPAddressTable() {
-        const desiredTableSize = this.stackConfig.ADDRESS_TABLE_SIZE;
-        // If the host and the ncp disagree on the address table size, explode.
-        const [status, addressTableSize] = (await this.ezsp.ezspGetConfigurationValue(enums_2.EzspConfigId.ADDRESS_TABLE_SIZE));
-        // After the change of ncp memory model in UC, we can not increase the default NCP table sizes anymore.
-        // Therefore, checking for desiredTableSize == (ncp)addressTableSize might not be always true anymore
-        // assert(desiredTableSize <= addressTableSize);
-        if ((status !== enums_3.EzspStatus.SUCCESS) || (addressTableSize > desiredTableSize)) {
-            throw new Error(`[INIT] NCP (${addressTableSize}) disagrees with Host (min ${desiredTableSize}) on table size. status=${enums_3.EzspStatus[status]}`);
-        }
-    }
-    /**
-     * NCP configuration init
-     */
-    async initNCPConfiguration() {
-        await this.emberSetEzspConfigValue(enums_2.EzspConfigId.BINDING_TABLE_SIZE, this.stackConfig.BINDING_TABLE_SIZE);
-        await this.emberSetEzspConfigValue(enums_2.EzspConfigId.KEY_TABLE_SIZE, this.stackConfig.KEY_TABLE_SIZE);
+        await this.emberSetEzspConfigValue(enums_2.EzspConfigId.STACK_PROFILE, consts_1.STACK_PROFILE_ZIGBEE_PRO);
+        await this.emberSetEzspConfigValue(enums_2.EzspConfigId.SECURITY_LEVEL, consts_1.SECURITY_LEVEL_Z3);
+        // common configs
         await this.emberSetEzspConfigValue(enums_2.EzspConfigId.MAX_END_DEVICE_CHILDREN, this.stackConfig.MAX_END_DEVICE_CHILDREN);
-        await this.emberSetEzspConfigValue(enums_2.EzspConfigId.APS_UNICAST_MESSAGE_COUNT, this.stackConfig.APS_UNICAST_MESSAGE_COUNT);
-        await this.emberSetEzspConfigValue(enums_2.EzspConfigId.BROADCAST_TABLE_SIZE, this.stackConfig.BROADCAST_TABLE_SIZE);
-        await this.emberSetEzspConfigValue(enums_2.EzspConfigId.NEIGHBOR_TABLE_SIZE, this.stackConfig.NEIGHBOR_TABLE_SIZE);
         await this.emberSetEzspConfigValue(enums_2.EzspConfigId.END_DEVICE_POLL_TIMEOUT, this.stackConfig.END_DEVICE_POLL_TIMEOUT);
         await this.emberSetEzspConfigValue(enums_2.EzspConfigId.TRANSIENT_KEY_TIMEOUT_S, this.stackConfig.TRANSIENT_KEY_TIMEOUT_S);
-        await this.emberSetEzspConfigValue(enums_2.EzspConfigId.RETRY_QUEUE_SIZE, this.stackConfig.RETRY_QUEUE_SIZE);
-        await this.emberSetEzspConfigValue(enums_2.EzspConfigId.SOURCE_ROUTE_TABLE_SIZE, this.stackConfig.SOURCE_ROUTE_TABLE_SIZE);
-        await this.emberSetEzspConfigValue(enums_2.EzspConfigId.MULTICAST_TABLE_SIZE, this.stackConfig.MULTICAST_TABLE_SIZE);
+        // WARNING: From here on EZSP commands that affect memory allocation on the NCP should no longer be called (like resizing tables)
+        await this.registerFixedEndpoints();
+        this.clearNetworkCache();
+        result = await this.initTrustCenter();
+        // after network UP, as per SDK, ensures clean slate
+        await this.initNCPConcentrator();
+        // populate network cache info
+        const [status, , parameters] = await this.ezsp.ezspGetNetworkParameters();
+        if (status !== enums_1.SLStatus.OK) {
+            throw new Error(`Failed to get network parameters with status=${enums_1.SLStatus[status]}.`);
+        }
+        this.networkCache.parameters = parameters;
+        this.networkCache.status = await this.ezsp.ezspNetworkState();
+        this.networkCache.eui64 = await this.ezsp.ezspGetEui64();
+        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;
     }
     /**
      * NCP concentrator init. Also enables source route discovery mode with RESCHEDULE.
@@ -715,11 +607,11 @@ class EmberAdapter extends __1.Adapter {
      * (through a target node that is neither the trust center nor one of its neighboring routers.)
      */
     async initNCPConcentrator() {
-        const status = (await this.ezsp.ezspSetConcentrator(true, (this.stackConfig.CONCENTRATOR_RAM_TYPE === 'low') ? consts_2.EMBER_LOW_RAM_CONCENTRATOR : consts_2.EMBER_HIGH_RAM_CONCENTRATOR, this.stackConfig.CONCENTRATOR_MIN_TIME, this.stackConfig.CONCENTRATOR_MAX_TIME, this.stackConfig.CONCENTRATOR_ROUTE_ERROR_THRESHOLD, this.stackConfig.CONCENTRATOR_DELIVERY_FAILURE_THRESHOLD, this.stackConfig.CONCENTRATOR_MAX_HOPS));
-        if (status !== enums_3.EmberStatus.SUCCESS) {
-            throw new Error(`[CONCENTRATOR] Failed to set concentrator with status=${status}.`);
+        const status = await this.ezsp.ezspSetConcentrator(true, this.stackConfig.CONCENTRATOR_RAM_TYPE === 'low' ? consts_1.EMBER_LOW_RAM_CONCENTRATOR : consts_1.EMBER_HIGH_RAM_CONCENTRATOR, this.stackConfig.CONCENTRATOR_MIN_TIME, this.stackConfig.CONCENTRATOR_MAX_TIME, this.stackConfig.CONCENTRATOR_ROUTE_ERROR_THRESHOLD, this.stackConfig.CONCENTRATOR_DELIVERY_FAILURE_THRESHOLD, this.stackConfig.CONCENTRATOR_MAX_HOPS);
+        if (status !== enums_1.SLStatus.OK) {
+            throw new Error(`[CONCENTRATOR] Failed to set concentrator with status=${enums_1.SLStatus[status]}.`);
         }
-        const remainTilMTORR = (await this.ezsp.ezspSetSourceRouteDiscoveryMode(enums_3.EmberSourceRouteDiscoveryMode.RESCHEDULE));
+        const remainTilMTORR = await this.ezsp.ezspSetSourceRouteDiscoveryMode(enums_1.EmberSourceRouteDiscoveryMode.RESCHEDULE);
         logger_1.logger.info(`[CONCENTRATOR] Started source route discovery. ${remainTilMTORR}ms until next broadcast.`, NS);
     }
     /**
@@ -731,18 +623,18 @@ class EmberAdapter extends __1.Adapter {
                 logger_1.logger.debug(`Multi-network not currently supported. Skipping endpoint ${JSON.stringify(ep)}.`, NS);
                 continue;
             }
-            const [epStatus,] = (await this.ezsp.ezspGetEndpointFlags(ep.endpoint));
+            const [epStatus] = await this.ezsp.ezspGetEndpointFlags(ep.endpoint);
             // endpoint not already registered
-            if (epStatus !== enums_3.EzspStatus.SUCCESS) {
+            if (epStatus !== enums_1.SLStatus.OK) {
                 // check to see if ezspAddEndpoint needs to be called
                 // if ezspInit is called without NCP reset, ezspAddEndpoint is not necessary and will return an error
-                const status = (await this.ezsp.ezspAddEndpoint(ep.endpoint, ep.profileId, ep.deviceId, ep.deviceVersion, ep.inClusterList.slice(), // copy
-                ep.outClusterList.slice()));
-                if (status === enums_3.EzspStatus.SUCCESS) {
-                    logger_1.logger.debug(`Registered endpoint "${ep.endpoint}" with status=${enums_3.EzspStatus[status]}.`, NS);
+                const status = await this.ezsp.ezspAddEndpoint(ep.endpoint, ep.profileId, ep.deviceId, ep.deviceVersion, ep.inClusterList.slice(), // copy
+                ep.outClusterList.slice());
+                if (status === enums_1.SLStatus.OK) {
+                    logger_1.logger.debug(`Registered endpoint '${ep.endpoint}'.`, NS);
                 }
                 else {
-                    throw new Error(`Failed to register endpoint "${ep.endpoint}" with status=${enums_3.EzspStatus[status]}.`);
+                    throw new Error(`Failed to register endpoint "${ep.endpoint}" with status=${enums_1.SLStatus[status]}.`);
                 }
             }
             else {
@@ -754,9 +646,9 @@ class EmberAdapter extends __1.Adapter {
                     endpoint: ep.endpoint,
                     networkIndex: ep.networkIndex,
                 };
-                const status = (await this.ezsp.ezspSetMulticastTableEntry(this.multicastTable.length, multicastEntry));
-                if (status !== enums_3.EmberStatus.SUCCESS) {
-                    throw new Error(`Failed to register group "${multicastId}" in multicast table with status=${enums_3.EmberStatus[status]}.`);
+                const status = await this.ezsp.ezspSetMulticastTableEntry(this.multicastTable.length, multicastEntry);
+                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);
                 this.multicastTable.push(multicastEntry.multicastId);
@@ -770,49 +662,49 @@ class EmberAdapter extends __1.Adapter {
     async initTrustCenter() {
         // init TC policies
         {
-            let status = (await this.emberSetEzspPolicy(enums_2.EzspPolicyId.TC_KEY_REQUEST_POLICY, enums_2.EzspDecisionId.ALLOW_TC_KEY_REQUESTS_AND_SEND_CURRENT_KEY));
-            if (status !== enums_3.EzspStatus.SUCCESS) {
-                throw new Error(`[INIT TC] Failed to set EzspPolicyId TC_KEY_REQUEST_POLICY to ALLOW_TC_KEY_REQUESTS_AND_SEND_CURRENT_KEY `
-                    + `with status=${enums_3.EzspStatus[status]}.`);
+            let status = await this.emberSetEzspPolicy(enums_2.EzspPolicyId.TC_KEY_REQUEST_POLICY, enums_2.EzspDecisionId.ALLOW_TC_KEY_REQUESTS_AND_SEND_CURRENT_KEY);
+            if (status !== enums_1.SLStatus.OK) {
+                throw new Error(`[INIT TC] Failed to set EzspPolicyId TC_KEY_REQUEST_POLICY to ALLOW_TC_KEY_REQUESTS_AND_SEND_CURRENT_KEY ` +
+                    `with status=${enums_1.SLStatus[status]}.`);
             }
-            const appKeyPolicy = this.stackConfig.KEY_TABLE_SIZE ? enums_2.EzspDecisionId.ALLOW_APP_KEY_REQUESTS : enums_2.EzspDecisionId.DENY_APP_KEY_REQUESTS;
-            status = (await this.emberSetEzspPolicy(enums_2.EzspPolicyId.APP_KEY_REQUEST_POLICY, appKeyPolicy));
-            if (status !== enums_3.EzspStatus.SUCCESS) {
-                throw new Error(`[INIT TC] Failed to set EzspPolicyId APP_KEY_REQUEST_POLICY to ${enums_2.EzspDecisionId[appKeyPolicy]} `
-                    + `with status=${enums_3.EzspStatus[status]}.`);
+            const appKeyRequestsPolicy = ALLOW_APP_KEY_REQUESTS ? enums_2.EzspDecisionId.ALLOW_APP_KEY_REQUESTS : enums_2.EzspDecisionId.DENY_APP_KEY_REQUESTS;
+            status = await this.emberSetEzspPolicy(enums_2.EzspPolicyId.APP_KEY_REQUEST_POLICY, appKeyRequestsPolicy);
+            if (status !== enums_1.SLStatus.OK) {
+                throw new Error(`[INIT TC] Failed to set EzspPolicyId APP_KEY_REQUEST_POLICY to ${enums_2.EzspDecisionId[appKeyRequestsPolicy]} ` +
+                    `with status=${enums_1.SLStatus[status]}.`);
             }
-            status = (await this.emberSetJoinPolicy(enums_3.EmberJoinDecision.USE_PRECONFIGURED_KEY));
-            if (status !== enums_3.EzspStatus.SUCCESS) {
-                throw new Error(`[INIT TC] Failed to set join policy to USE_PRECONFIGURED_KEY with status=${enums_3.EzspStatus[status]}.`);
+            status = await this.emberSetJoinPolicy(enums_1.EmberJoinDecision.USE_PRECONFIGURED_KEY);
+            if (status !== enums_1.SLStatus.OK) {
+                throw new Error(`[INIT TC] Failed to set join policy to USE_PRECONFIGURED_KEY with status=${enums_1.SLStatus[status]}.`);
             }
         }
         const configNetworkKey = Buffer.from(this.networkOptions.networkKey);
         const networkInitStruct = {
-            bitmask: (enums_3.EmberNetworkInitBitmask.PARENT_INFO_IN_TOKEN | enums_3.EmberNetworkInitBitmask.END_DEVICE_REJOIN_ON_REBOOT)
+            bitmask: enums_1.EmberNetworkInitBitmask.PARENT_INFO_IN_TOKEN | enums_1.EmberNetworkInitBitmask.END_DEVICE_REJOIN_ON_REBOOT,
         };
-        const initStatus = (await this.ezsp.ezspNetworkInit(networkInitStruct));
-        logger_1.logger.debug(`[INIT TC] Network init status=${enums_3.EmberStatus[initStatus]}.`, NS);
-        if ((initStatus !== enums_3.EmberStatus.SUCCESS) && (initStatus !== enums_3.EmberStatus.NOT_JOINED)) {
-            throw new Error(`[INIT TC] Failed network init request with status=${enums_3.EmberStatus[initStatus]}.`);
+        const initStatus = await this.ezsp.ezspNetworkInit(networkInitStruct);
+        logger_1.logger.debug(`[INIT TC] Network init status=${enums_1.SLStatus[initStatus]}.`, NS);
+        if (initStatus !== enums_1.SLStatus.OK && initStatus !== enums_1.SLStatus.NOT_JOINED) {
+            throw new Error(`[INIT TC] Failed network init request with status=${enums_1.SLStatus[initStatus]}.`);
         }
         let action = NetworkInitAction.DONE;
-        if (initStatus === enums_3.EmberStatus.SUCCESS) {
+        if (initStatus === enums_1.SLStatus.OK) {
             // 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 network config=${JSON.stringify(this.networkOptions)}`, NS);
-            logger_1.logger.debug(`[INIT TC] Current NCP network: nodeType=${enums_3.EmberNodeType[nodeType]} params=${JSON.stringify(netParams)}`, NS);
-            if ((npStatus === enums_3.EmberStatus.SUCCESS) && (nodeType === enums_3.EmberNodeType.COORDINATOR) && (this.networkOptions.panID === netParams.panId)
-                && ((0, es6_1.default)(this.networkOptions.extendedPanID, netParams.extendedPanId))) {
+            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);
+            if (npStatus === enums_1.SLStatus.OK &&
+                nodeType === enums_1.EmberNodeType.COORDINATOR &&
+                this.networkOptions.panID === netParams.panId &&
+                (0, es6_1.default)(this.networkOptions.extendedPanID, netParams.extendedPanId)) {
                 // config matches adapter so far, no error, we can check the network key
                 const context = (0, initters_1.initSecurityManagerContext)();
-                context.coreKeyType = enums_3.SecManKeyType.NETWORK;
+                context.coreKeyType = enums_1.SecManKeyType.NETWORK;
                 context.keyIndex = 0;
-                const [networkKey, nkStatus] = (await this.ezsp.ezspExportKey(context));
-                if (nkStatus !== enums_3.SLStatus.OK) {
-                    throw new Error(`[BACKUP] Failed to export Network Key with status=${enums_3.SLStatus[nkStatus]}.`);
+                const [nkStatus, networkKey] = await this.ezsp.ezspExportKey(context);
+                if (nkStatus !== enums_1.SLStatus.OK) {
+                    throw new Error(`[BACKUP] Failed to export Network Key with status=${enums_1.SLStatus[nkStatus]}.`);
                 }
-                logger_1.logger.debug(`[INIT TC] Current NCP network: networkKey=${networkKey.contents.toString('hex')}`, NS);
                 // config doesn't match adapter anymore
                 if (!networkKey.contents.equals(configNetworkKey)) {
                     action = NetworkInitAction.LEAVE;
@@ -823,10 +715,10 @@ class EmberAdapter extends __1.Adapter {
                 action = NetworkInitAction.LEAVE;
             }
             if (action === NetworkInitAction.LEAVE) {
-                logger_1.logger.info(`[INIT TC] NCP network does not match config. Leaving network...`, NS);
-                const leaveStatus = (await this.ezsp.ezspLeaveNetwork());
-                if (leaveStatus !== enums_3.EmberStatus.SUCCESS) {
-                    throw new Error(`[INIT TC] Failed leave network request with status=${enums_3.EmberStatus[leaveStatus]}.`);
+                logger_1.logger.info(`[INIT TC] Adapter network does not match config. Leaving network...`, NS);
+                const leaveStatus = await this.ezsp.ezspLeaveNetwork();
+                if (leaveStatus !== enums_1.SLStatus.OK) {
+                    throw new Error(`[INIT TC] Failed leave network request with status=${enums_1.SLStatus[leaveStatus]}.`);
                 }
                 await this.oneWaitress.startWaitingForEvent({ eventName: oneWaitress_1.OneWaitressEvents.STACK_STATUS_NETWORK_DOWN }, DEFAULT_NETWORK_REQUEST_TIMEOUT, '[INIT TC] Leave network');
                 await (0, utils_1.Wait)(200); // settle down
@@ -834,13 +726,13 @@ class EmberAdapter extends __1.Adapter {
             }
         }
         const backup = this.getStoredBackup();
-        if ((initStatus === enums_3.EmberStatus.NOT_JOINED) || (action === NetworkInitAction.LEFT)) {
+        if (initStatus === enums_1.SLStatus.NOT_JOINED || action === NetworkInitAction.LEFT) {
             // no network
             if (backup != null) {
-                if ((this.networkOptions.panID === backup.networkOptions.panId)
-                    && (Buffer.from(this.networkOptions.extendedPanID).equals(backup.networkOptions.extendedPanId))
-                    && (this.networkOptions.channelList.includes(backup.logicalChannel))
-                    && (configNetworkKey.equals(backup.networkOptions.networkKey))) {
+                if (this.networkOptions.panID === backup.networkOptions.panId &&
+                    Buffer.from(this.networkOptions.extendedPanID).equals(backup.networkOptions.extendedPanId) &&
+                    this.networkOptions.channelList.includes(backup.logicalChannel) &&
+                    configNetworkKey.equals(backup.networkOptions.networkKey)) {
                     // config matches backup
                     action = NetworkInitAction.FORM_BACKUP;
                 }
@@ -863,29 +755,27 @@ class EmberAdapter extends __1.Adapter {
                 logger_1.logger.info(`[INIT TC] Forming from backup.`, NS);
                 const keyList = backup.devices.map((device) => {
                     const octets = Array.from(device.ieeeAddress.reverse());
-                    const deviceEui64 = '0x' + octets.map(octet => octet.toString(16).padStart(2, '0')).join("");
-                    const key = {
-                        deviceEui64,
+                    return {
+                        deviceEui64: `0x${octets.map((octet) => octet.toString(16).padStart(2, '0')).join('')}`,
                         key: { contents: device.linkKey.key },
                         outgoingFrameCounter: device.linkKey.txCounter,
                         incomingFrameCounter: device.linkKey.rxCounter,
                     };
-                    return key;
                 });
                 // before forming
                 await this.importLinkKeys(keyList);
-                await this.formNetwork(true, /*from backup*/ backup.networkOptions.networkKey, backup.networkKeyInfo.sequenceNumber, backup.networkOptions.panId, Array.from(backup.networkOptions.extendedPanId), backup.logicalChannel, backup.ezsp.hashed_tclk);
+                await this.formNetwork(true /*from backup*/, backup.networkOptions.networkKey, backup.networkKeyInfo.sequenceNumber, backup.networkOptions.panId, Array.from(backup.networkOptions.extendedPanId), backup.logicalChannel, backup.ezsp.hashed_tclk);
                 result = 'restored';
                 break;
             }
             case NetworkInitAction.FORM_CONFIG: {
                 logger_1.logger.info(`[INIT TC] Forming from config.`, NS);
-                await this.formNetwork(false, /*from config*/ configNetworkKey, 0, this.networkOptions.panID, this.networkOptions.extendedPanID, this.networkOptions.channelList[0], (0, crypto_1.randomBytes)(consts_1.EMBER_ENCRYPTION_KEY_SIZE));
+                await this.formNetwork(false /*from config*/, configNetworkKey, 0, this.networkOptions.panID, this.networkOptions.extendedPanID, this.networkOptions.channelList[0], (0, crypto_1.randomBytes)(consts_2.EMBER_ENCRYPTION_KEY_SIZE));
                 result = 'reset';
                 break;
             }
             case NetworkInitAction.DONE: {
-                logger_1.logger.info(`[INIT TC] NCP network matches config.`, NS);
+                logger_1.logger.info(`[INIT TC] Adapter network matches config.`, NS);
                 break;
             }
             default: {
@@ -893,7 +783,7 @@ class EmberAdapter extends __1.Adapter {
             }
         }
         // can't let frame counter wrap to zero (uint32_t), will force a broadcast after init if getting too close
-        if (backup != null && (backup.networkKeyInfo.frameCounter > 0xFEEEEEEE)) {
+        if (backup != null && backup.networkKeyInfo.frameCounter > 0xfeeeeeee) {
             // XXX: while this remains a pretty low occurrence in most (small) networks,
             //      currently Z2M won't support the key update because of one-way config...
             //      need to investigate handling this properly
@@ -902,9 +792,9 @@ class EmberAdapter extends __1.Adapter {
             // // XXX: no idea here on the proper timer value, but this will block the network for several seconds on exec
             // //      (probably have to take the behavior of sleepy-end devices into account to improve chances of reaching everyone right away?)
             // setTimeout(async () => {
-            //     this.requestQueue.enqueue(async (): Promise<EmberStatus> => {
+            //     this.requestQueue.enqueue(async (): Promise<SLStatus> => {
             //         await this.broadcastNetworkKeyUpdate();
-            //         return EmberStatus.SUCCESS;
+            //         return SLStatus.OK;
             //     }, logger.error, true);// no reject just log error if any, will retry next start, & prioritize so we know it'll run when expected
             // }, 300000);
             logger_1.logger.warning(`[INIT TC] Network key frame counter is reaching its limit. A new network key will have to be instaured soon.`, NS);
@@ -916,30 +806,32 @@ class EmberAdapter extends __1.Adapter {
      */
     async formNetwork(fromBackup, networkKey, networkKeySequenceNumber, panId, extendedPanId, radioChannel, tcLinkKey) {
         const state = {
-            bitmask: (enums_3.EmberInitialSecurityBitmask.TRUST_CENTER_GLOBAL_LINK_KEY | enums_3.EmberInitialSecurityBitmask.HAVE_PRECONFIGURED_KEY
-                | enums_3.EmberInitialSecurityBitmask.HAVE_NETWORK_KEY | enums_3.EmberInitialSecurityBitmask.TRUST_CENTER_USES_HASHED_LINK_KEY
-                | enums_3.EmberInitialSecurityBitmask.REQUIRE_ENCRYPTED_KEY),
+            bitmask: enums_1.EmberInitialSecurityBitmask.TRUST_CENTER_GLOBAL_LINK_KEY |
+                enums_1.EmberInitialSecurityBitmask.HAVE_PRECONFIGURED_KEY |
+                enums_1.EmberInitialSecurityBitmask.HAVE_NETWORK_KEY |
+                enums_1.EmberInitialSecurityBitmask.TRUST_CENTER_USES_HASHED_LINK_KEY |
+                enums_1.EmberInitialSecurityBitmask.REQUIRE_ENCRYPTED_KEY,
             preconfiguredKey: { contents: tcLinkKey },
             networkKey: { contents: networkKey },
             networkKeySequenceNumber: networkKeySequenceNumber,
             preconfiguredTrustCenterEui64: ZSpec.BLANK_EUI64,
         };
         if (fromBackup) {
-            state.bitmask |= enums_3.EmberInitialSecurityBitmask.NO_FRAME_COUNTER_RESET;
+            state.bitmask |= enums_1.EmberInitialSecurityBitmask.NO_FRAME_COUNTER_RESET;
         }
-        let emberStatus = (await this.ezsp.ezspSetInitialSecurityState(state));
-        if (emberStatus !== enums_3.EmberStatus.SUCCESS) {
-            throw new Error(`[INIT FORM] Failed to set initial security state with status=${enums_3.EmberStatus[emberStatus]}.`);
+        let status = await this.ezsp.ezspSetInitialSecurityState(state);
+        if (status !== enums_1.SLStatus.OK) {
+            throw new Error(`[INIT FORM] Failed to set initial security state with status=${enums_1.SLStatus[status]}.`);
         }
-        const extended = (enums_3.EmberExtendedSecurityBitmask.JOINER_GLOBAL_LINK_KEY | enums_3.EmberExtendedSecurityBitmask.NWK_LEAVE_REQUEST_NOT_ALLOWED);
-        const extSecStatus = (await this.ezsp.ezspSetExtendedSecurityBitmask(extended));
-        if (extSecStatus !== enums_3.EzspStatus.SUCCESS) {
-            throw new Error(`[INIT FORM] Failed to set extended security bitmask to ${extended} with status=${enums_3.EzspStatus[extSecStatus]}.`);
+        const extended = enums_1.EmberExtendedSecurityBitmask.JOINER_GLOBAL_LINK_KEY | enums_1.EmberExtendedSecurityBitmask.NWK_LEAVE_REQUEST_NOT_ALLOWED;
+        status = await this.ezsp.ezspSetExtendedSecurityBitmask(extended);
+        if (status !== enums_1.SLStatus.OK) {
+            throw new Error(`[INIT FORM] Failed to set extended security bitmask to ${extended} with status=${enums_1.SLStatus[status]}.`);
         }
-        if (!fromBackup && this.stackConfig.KEY_TABLE_SIZE > 0) {
-            emberStatus = await this.ezsp.ezspClearKeyTable();
-            if (emberStatus !== enums_3.EmberStatus.SUCCESS) {
-                throw new Error(`[INIT FORM] Failed to clear key table with status=${enums_3.EmberStatus[emberStatus]}.`);
+        if (!fromBackup) {
+            status = await this.ezsp.ezspClearKeyTable();
+            if (status !== enums_1.SLStatus.OK) {
+                logger_1.logger.error(`[INIT FORM] Failed to clear key table with status=${enums_1.SLStatus[status]}.`, NS);
             }
         }
         const netParams = {
@@ -947,19 +839,19 @@ class EmberAdapter extends __1.Adapter {
             extendedPanId,
             radioTxPower: 5,
             radioChannel,
-            joinMethod: enums_3.EmberJoinMethod.MAC_ASSOCIATION,
+            joinMethod: enums_1.EmberJoinMethod.MAC_ASSOCIATION,
             nwkManagerId: ZSpec.COORDINATOR_ADDRESS,
             nwkUpdateId: 0,
-            channels: consts_2.EMBER_ALL_802_15_4_CHANNELS_MASK,
+            channels: consts_1.EMBER_ALL_802_15_4_CHANNELS_MASK,
         };
         logger_1.logger.info(`[INIT FORM] Forming new network with: ${JSON.stringify(netParams)}`, NS);
-        emberStatus = (await this.ezsp.ezspFormNetwork(netParams));
-        if (emberStatus !== enums_3.EmberStatus.SUCCESS) {
-            throw new Error(`[INIT FORM] Failed form network request with status=${enums_3.EmberStatus[emberStatus]}.`);
+        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]}.`);
         }
         await this.oneWaitress.startWaitingForEvent({ eventName: oneWaitress_1.OneWaitressEvents.STACK_STATUS_NETWORK_UP }, DEFAULT_NETWORK_REQUEST_TIMEOUT, '[INIT FORM] Form network');
-        const stStatus = await this.ezsp.ezspStartWritingStackTokens();
-        logger_1.logger.debug(`[INIT FORM] Start writing stack tokens status=${enums_3.EzspStatus[stStatus]}.`, NS);
+        status = await this.ezsp.ezspStartWritingStackTokens();
+        logger_1.logger.debug(`[INIT FORM] Start writing stack tokens status=${enums_1.SLStatus[status]}.`, NS);
         logger_1.logger.info(`[INIT FORM] New network formed!`, NS);
     }
     /**
@@ -971,12 +863,12 @@ class EmberAdapter extends __1.Adapter {
         }
         let data;
         try {
-            data = JSON.parse(((0, fs_1.readFileSync)(this.backupPath)).toString());
+            data = JSON.parse((0, fs_1.readFileSync)(this.backupPath).toString());
         }
         catch (error) {
             throw new Error(`[BACKUP] Coordinator backup is corrupted.`);
         }
-        if (data.metadata?.format === "zigpy/open-coordinator-backup" && data.metadata?.version) {
+        if (data.metadata?.format === 'zigpy/open-coordinator-backup' && data.metadata?.version) {
             if (data.metadata?.version !== 1) {
                 throw new Error(`[BACKUP] Unsupported open coordinator backup version (version=${data.metadata?.version}).`);
             }
@@ -1000,27 +892,27 @@ class EmberAdapter extends __1.Adapter {
      * @return List of keys data with AES hashed keys
      */
     async exportLinkKeys() {
-        const [confStatus, keyTableSize] = (await this.ezsp.ezspGetConfigurationValue(enums_2.EzspConfigId.KEY_TABLE_SIZE));
-        if (confStatus !== enums_3.EzspStatus.SUCCESS) {
-            throw new Error(`[BACKUP] Failed to retrieve key table size from NCP with status=${enums_3.EzspStatus[confStatus]}.`);
+        const [confStatus, keyTableSize] = await this.ezsp.ezspGetConfigurationValue(enums_2.EzspConfigId.KEY_TABLE_SIZE);
+        if (confStatus !== enums_1.SLStatus.OK) {
+            throw new Error(`[BACKUP] Failed to retrieve key table size from NCP with status=${enums_1.SLStatus[confStatus]}.`);
         }
-        let deviceEui64;
+        let context;
         let plaintextKey;
         let apsKeyMeta;
         let status;
         const keyList = [];
         for (let i = 0; i < keyTableSize; i++) {
-            [deviceEui64, plaintextKey, apsKeyMeta, status] = (await this.ezsp.ezspExportLinkKeyByIndex(i));
-            logger_1.logger.debug(`[BACKUP] Export link key at index ${i}, status=${enums_3.SLStatus[status]}.`, NS);
+            [status, context, plaintextKey, apsKeyMeta] = await this.ezsp.ezspExportLinkKeyByIndex(i);
+            logger_1.logger.debug(`[BACKUP] Export link key at index ${i}, status=${enums_1.SLStatus[status]}.`, NS);
             // only include key if we could retrieve one at index and hash it properly
-            if (status === enums_3.SLStatus.OK) {
+            if (status === enums_1.SLStatus.OK) {
                 // Rather than give the real link key, the backup contains a hashed version of the key.
                 // This is done to prevent a compromise of the backup data from compromising the current link keys.
                 // This is per the Smart Energy spec.
-                const [hashStatus, hashedKey] = (await this.emberAesHashSimple(plaintextKey.contents));
-                if (hashStatus === enums_3.EmberStatus.SUCCESS) {
+                const [hashStatus, hashedKey] = await this.emberAesHashSimple(plaintextKey.contents);
+                if (hashStatus === enums_1.SLStatus.OK) {
                     keyList.push({
-                        deviceEui64,
+                        deviceEui64: context.eui64,
                         key: { contents: hashedKey },
                         outgoingFrameCounter: apsKeyMeta.outgoingFrameCounter,
                         incomingFrameCounter: apsKeyMeta.incomingFrameCounter,
@@ -1028,7 +920,7 @@ class EmberAdapter extends __1.Adapter {
                 }
                 else {
                     // this should never happen?
-                    logger_1.logger.error(`[BACKUP] Failed to hash link key at index ${i} with status=${enums_3.EmberStatus[hashStatus]}. Omitting from backup.`, NS);
+                    logger_1.logger.error(`[BACKUP] Failed to hash link key at index ${i} with status=${enums_1.SLStatus[hashStatus]}. Omitting from backup.`, NS);
                 }
             }
         }
@@ -1044,30 +936,27 @@ class EmberAdapter extends __1.Adapter {
         if (!backupData?.length) {
             return;
         }
-        const [confStatus, keyTableSize] = (await this.ezsp.ezspGetConfigurationValue(enums_2.EzspConfigId.KEY_TABLE_SIZE));
-        if (confStatus !== enums_3.EzspStatus.SUCCESS) {
-            throw new Error(`[BACKUP] Failed to retrieve key table size from NCP with status=${enums_3.EzspStatus[confStatus]}.`);
+        const [confStatus, keyTableSize] = await this.ezsp.ezspGetConfigurationValue(enums_2.EzspConfigId.KEY_TABLE_SIZE);
+        if (confStatus !== enums_1.SLStatus.OK) {
+            throw new Error(`[BACKUP] Failed to retrieve key table size from NCP with status=${enums_1.SLStatus[confStatus]}.`);
         }
         if (backupData.length > keyTableSize) {
             throw new Error(`[BACKUP] Current key table of ${keyTableSize} is too small to import backup of ${backupData.length}!`);
         }
-        const networkStatus = (await this.emberNetworkState());
-        if (networkStatus !== enums_3.EmberNetworkStatus.NO_NETWORK) {
-            throw new Error(`[BACKUP] Cannot import TC data while network is up, networkStatus=${enums_3.EmberNetworkStatus[networkStatus]}.`);
+        const networkStatus = await this.emberNetworkState();
+        if (networkStatus !== enums_1.EmberNetworkStatus.NO_NETWORK) {
+            throw new Error(`[BACKUP] Cannot import TC data while network is up, networkStatus=${enums_1.EmberNetworkStatus[networkStatus]}.`);
         }
         let status;
         for (let i = 0; i < keyTableSize; i++) {
-            if (i >= backupData.length) {
-                // erase any key index not present in backup but available on the NCP
-                status = (await this.ezsp.ezspEraseKeyTableEntry(i));
-            }
-            else {
-                const importStatus = (await this.ezsp.ezspImportLinkKey(i, backupData[i].deviceEui64, backupData[i].key));
-                status = ((importStatus === enums_3.SLStatus.OK) ? enums_3.EmberStatus.SUCCESS : enums_3.EmberStatus.KEY_TABLE_INVALID_ADDRESS);
-            }
-            if (status !== enums_3.EmberStatus.SUCCESS) {
-                throw new Error(`[BACKUP] Failed to ${((i >= backupData.length) ? "erase" : "set")} key table entry at index ${i} `
-                    + `with status=${enums_3.EmberStatus[status]}`);
+            // erase any key index not present in backup but available on the NCP
+            status =
+                i >= backupData.length
+                    ? await this.ezsp.ezspEraseKeyTableEntry(i)
+                    : await this.ezsp.ezspImportLinkKey(i, backupData[i].deviceEui64, backupData[i].key);
+            if (status !== enums_1.SLStatus.OK) {
+                throw new Error(`[BACKUP] Failed to ${i >= backupData.length ? 'erase' : 'set'} key table entry at index ${i} ` +
+                    `with status=${enums_1.SLStatus[status]}`);
             }
         }
         logger_1.logger.info(`[BACKUP] Imported ${backupData.length} keys.`, NS);
@@ -1079,27 +968,21 @@ class EmberAdapter extends __1.Adapter {
      *       On the other hand, the more often this runs, the more secure the network is...
      */
     async broadcastNetworkKeyUpdate() {
-        return new Promise((resolve, reject) => {
-            this.requestQueue.enqueue(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_1.EMBER_ENCRYPTION_KEY_SIZE) });
-                if (status !== enums_3.EmberStatus.SUCCESS) {
-                    logger_1.logger.error(`[TRUST CENTER] Failed to broadcast next network key with status=${enums_3.EmberStatus[status]}.`, NS);
-                    return status;
-                }
-                // XXX: this will block other requests for a while, but should ensure the key propagates without interference?
-                //      could also stop dispatching entirely and do this outside the queue if necessary/better
-                await (0, utils_1.Wait)(BROADCAST_NETWORK_KEY_SWITCH_WAIT_TIME);
-                status = (await this.ezsp.ezspBroadcastNetworkKeySwitch());
-                if (status !== enums_3.EmberStatus.SUCCESS) {
-                    // XXX: Not sure how likely this is, but this is bad, probably should hard fail?
-                    logger_1.logger.error(`[TRUST CENTER] Failed to broadcast network key switch with status=${enums_3.EmberStatus[status]}.`, NS);
-                    return status;
-                }
-                resolve();
-                return status;
-            }, reject);
+        return 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) });
+            if (status !== enums_1.SLStatus.OK) {
+                throw new Error(`[TRUST CENTER] Failed to broadcast next network key with status=${enums_1.SLStatus[status]}.`);
+            }
+            // XXX: this will block other requests for a while, but should ensure the key propagates without interference?
+            //      could also stop dispatching entirely and do this outside the queue if necessary/better
+            await (0, utils_1.Wait)(BROADCAST_NETWORK_KEY_SWITCH_WAIT_TIME);
+            status = await this.ezsp.ezspBroadcastNetworkKeySwitch();
+            if (status !== enums_1.SLStatus.OK) {
+                // XXX: Not sure how likely this is, but this is bad, probably should hard fail?
+                throw new Error(`[TRUST CENTER] Failed to broadcast network key switch with status=${enums_1.SLStatus[status]}.`);
+            }
         });
     }
     /**
@@ -1107,16 +990,23 @@ class EmberAdapter extends __1.Adapter {
      * @param status
      */
     async onNcpNeedsResetAndInit(status) {
-        logger_1.logger.error(`!!! NCP FATAL ERROR reason=${enums_3.EzspStatus[status]}. ATTEMPTING RESET... !!!`, NS);
-        try {
-            await this.stop();
-            await (0, utils_1.Wait)(500); // just because
-            await this.start();
-        }
-        catch (err) {
-            logger_1.logger.error(`Failed to reset and init NCP. ${err}`, NS);
+        logger_1.logger.error(`!!! ADAPTER FATAL ERROR reason=${enums_1.EzspStatus[status]}. !!!`, NS);
+        if (this.queue.count() > QUEUE_HIGH_COUNT) {
+            logger_1.logger.info(`Request queue is high (${this.queue.count()}), triggering full restart to prevent stressing the adapter.`, NS);
             this.emit(events_1.Events.disconnected);
         }
+        else {
+            logger_1.logger.info(`Attempting adapter reset...`, NS);
+            try {
+                await this.stop();
+                await (0, utils_1.Wait)(500); // just because
+                await this.start();
+            }
+            catch (err) {
+                logger_1.logger.error(`Failed to reset and init adapter. ${err}`, NS);
+                this.emit(events_1.Events.disconnected);
+            }
+        }
     }
     //---- START Events
     //---- END Events
@@ -1133,8 +1023,8 @@ class EmberAdapter extends __1.Adapter {
      * Check against UNKNOWN_NETWORK_STATE for validity.
      */
     async emberNetworkState() {
-        if (this.networkCache.status === consts_2.UNKNOWN_NETWORK_STATE) {
-            const networkStatus = (await this.ezsp.ezspNetworkState());
+        if (this.networkCache.status === consts_1.UNKNOWN_NETWORK_STATE) {
+            const networkStatus = await this.ezsp.ezspNetworkState();
             this.networkCache.status = networkStatus;
         }
         return this.networkCache.status;
@@ -1146,7 +1036,7 @@ class EmberAdapter extends __1.Adapter {
      */
     async emberGetEui64() {
         if (this.networkCache.eui64 === ZSpec.BLANK_EUI64) {
-            this.networkCache.eui64 = (await this.ezsp.ezspGetEui64());
+            this.networkCache.eui64 = await this.ezsp.ezspGetEui64();
         }
         return this.networkCache.eui64;
     }
@@ -1157,12 +1047,12 @@ class EmberAdapter extends __1.Adapter {
      */
     async emberGetPanId() {
         if (this.networkCache.parameters.panId === ZSpec.INVALID_PAN_ID) {
-            const [status, , parameters] = (await this.ezsp.ezspGetNetworkParameters());
-            if (status === enums_3.EmberStatus.SUCCESS) {
+            const [status, , parameters] = await this.ezsp.ezspGetNetworkParameters();
+            if (status === enums_1.SLStatus.OK) {
                 this.networkCache.parameters = parameters;
             }
             else {
-                logger_1.logger.error(`Failed to get PAN ID (via network parameters) with status=${enums_3.EmberStatus[status]}.`, NS);
+                logger_1.logger.error(`Failed to get PAN ID (via network parameters) with status=${enums_1.SLStatus[status]}.`, NS);
             }
         }
         return this.networkCache.parameters.panId;
@@ -1174,12 +1064,12 @@ class EmberAdapter extends __1.Adapter {
      */
     async emberGetExtendedPanId() {
         if ((0, es6_1.default)(this.networkCache.parameters.extendedPanId, ZSpec.BLANK_EXTENDED_PAN_ID)) {
-            const [status, , parameters] = (await this.ezsp.ezspGetNetworkParameters());
-            if (status === enums_3.EmberStatus.SUCCESS) {
+            const [status, , parameters] = await this.ezsp.ezspGetNetworkParameters();
+            if (status === enums_1.SLStatus.OK) {
                 this.networkCache.parameters = parameters;
             }
             else {
-                logger_1.logger.error(`Failed to get Extended PAN ID (via network parameters) with status=${enums_3.EmberStatus[status]}.`, NS);
+                logger_1.logger.error(`Failed to get Extended PAN ID (via network parameters) with status=${enums_1.SLStatus[status]}.`, NS);
             }
         }
         return this.networkCache.parameters.extendedPanId;
@@ -1190,30 +1080,25 @@ class EmberAdapter extends __1.Adapter {
      * Check against INVALID_RADIO_CHANNEL for validity.
      */
     async emberGetRadioChannel() {
-        if (this.networkCache.parameters.radioChannel === consts_2.INVALID_RADIO_CHANNEL) {
-            const [status, , parameters] = (await this.ezsp.ezspGetNetworkParameters());
-            if (status === enums_3.EmberStatus.SUCCESS) {
+        if (this.networkCache.parameters.radioChannel === consts_1.INVALID_RADIO_CHANNEL) {
+            const [status, , parameters] = await this.ezsp.ezspGetNetworkParameters();
+            if (status === enums_1.SLStatus.OK) {
                 this.networkCache.parameters = parameters;
             }
             else {
-                logger_1.logger.error(`Failed to get radio channel (via network parameters) with status=${enums_3.EmberStatus[status]}.`, NS);
+                logger_1.logger.error(`Failed to get radio channel (via network parameters) with status=${enums_1.SLStatus[status]}.`, NS);
             }
         }
         return this.networkCache.parameters.radioChannel;
     }
     // queued
     async emberStartEnergyScan() {
-        return new Promise((resolve, reject) => {
-            this.requestQueue.enqueue(async () => {
-                const status = (await this.ezsp.ezspStartScan(enums_3.EzspNetworkScanType.ENERGY_SCAN, consts_2.EMBER_ALL_802_15_4_CHANNELS_MASK, ENERGY_SCAN_DURATION));
-                if (status !== enums_3.SLStatus.OK) {
-                    logger_1.logger.error(`Failed energy scan request with status=${enums_3.SLStatus[status]}.`, NS);
-                    return enums_3.EmberStatus.ERR_FATAL;
-                }
-                // TODO: result in logs only atm, since UI doesn't support it
-                resolve();
-                return enums_3.EmberStatus.SUCCESS;
-            }, reject);
+        return this.queue.execute(async () => {
+            const status = await this.ezsp.ezspStartScan(enums_1.EzspNetworkScanType.ENERGY_SCAN, consts_1.EMBER_ALL_802_15_4_CHANNELS_MASK, ENERGY_SCAN_DURATION);
+            if (status !== enums_1.SLStatus.OK) {
+                throw new Error(`Failed energy scan request with status=${enums_1.SLStatus[status]}.`);
+            }
+            // TODO: result in logs only atm, since UI doesn't support it
         });
     }
     //---- END Cache-enabled EZSP wrappers
@@ -1227,35 +1112,40 @@ class EmberAdapter extends __1.Adapter {
      * Does nothing if ncpNeedsResetAndInit == true.
      */
     async emberVersion() {
-        // Note that NCP == Network Co-Processor
-        // the EZSP protocol version that the Host is running, we are the host so we set this value
-        const hostEzspProtocolVer = consts_1.EZSP_PROTOCOL_VERSION;
         // send the Host version number to the NCP.
         // The NCP returns the EZSP version that the NCP is running along with the stackType and stackVersion
-        const [ncpEzspProtocolVer, ncpStackType, ncpStackVer] = (await this.ezsp.ezspVersion(hostEzspProtocolVer));
+        let [ncpEzspProtocolVer, ncpStackType, ncpStackVer] = await this.ezsp.ezspVersion(consts_2.EZSP_PROTOCOL_VERSION);
         // verify that the stack type is what is expected
-        if (ncpStackType !== consts_1.EZSP_STACK_TYPE_MESH) {
+        if (ncpStackType !== consts_2.EZSP_STACK_TYPE_MESH) {
             throw new Error(`Stack type ${ncpStackType} is not expected!`);
         }
-        // verify that the NCP EZSP Protocol version is what is expected
-        if (ncpEzspProtocolVer !== consts_1.EZSP_PROTOCOL_VERSION) {
-            throw new Error(`NCP EZSP protocol version of ${ncpEzspProtocolVer} does not match Host version ${hostEzspProtocolVer}`);
+        if (ncpEzspProtocolVer === consts_2.EZSP_PROTOCOL_VERSION) {
+            logger_1.logger.debug(`Adapter EZSP protocol version (${ncpEzspProtocolVer}) matches Host.`, NS);
+        }
+        else if (ncpEzspProtocolVer < consts_2.EZSP_PROTOCOL_VERSION && ncpEzspProtocolVer >= consts_2.EZSP_MIN_PROTOCOL_VERSION) {
+            [ncpEzspProtocolVer, ncpStackType, ncpStackVer] = await this.ezsp.ezspVersion(ncpEzspProtocolVer);
+            logger_1.logger.info(`Adapter EZSP protocol version (${ncpEzspProtocolVer}) lower than Host. Switched.`, NS);
+        }
+        else {
+            throw new Error(`Adapter EZSP protocol version (${ncpEzspProtocolVer}) is not supported ` +
+                `by Host [${consts_2.EZSP_MIN_PROTOCOL_VERSION}-${consts_2.EZSP_PROTOCOL_VERSION}].`);
         }
-        logger_1.logger.debug(`NCP info: EZSPVersion=${ncpEzspProtocolVer} StackType=${ncpStackType} StackVersion=${ncpStackVer}`, NS);
-        const [status, versionStruct] = (await this.ezsp.ezspGetVersionStruct());
-        if (status !== enums_3.EzspStatus.SUCCESS) {
+        this.ezsp.setProtocolVersion(ncpEzspProtocolVer);
+        logger_1.logger.debug(`Adapter info: EZSPVersion=${ncpEzspProtocolVer} StackType=${ncpStackType} StackVersion=${ncpStackVer}`, NS);
+        const [status, versionStruct] = await this.ezsp.ezspGetVersionStruct();
+        if (status !== enums_1.SLStatus.OK) {
             // Should never happen with support of only EZSP v13+
             throw new Error(`NCP has old-style version number. Not supported.`);
         }
         this.version = {
             ezsp: ncpEzspProtocolVer,
-            revision: `${versionStruct.major}.${versionStruct.minor}.${versionStruct.patch} [${enums_3.EmberVersionType[versionStruct.type]}]`,
+            revision: `${versionStruct.major}.${versionStruct.minor}.${versionStruct.patch} [${enums_1.EmberVersionType[versionStruct.type]}]`,
             ...versionStruct,
         };
-        if (versionStruct.type !== enums_3.EmberVersionType.GA) {
-            logger_1.logger.warning(`NCP is running a non-GA version (${enums_3.EmberVersionType[versionStruct.type]}).`, NS);
+        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.debug(`NCP 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.
@@ -1266,15 +1156,11 @@ class EmberAdapter extends __1.Adapter {
      * @returns
      */
     async emberSetEzspConfigValue(configId, value) {
-        const status = (await this.ezsp.ezspSetConfigurationValue(configId, value));
-        logger_1.logger.debug(`[EzspConfigId] SET "${enums_2.EzspConfigId[configId]}" TO "${value}" with status=${enums_3.EzspStatus[status]}.`, NS);
-        if (status === enums_3.EzspStatus.ERROR_INVALID_ID) {
-            // can be ZLL where not all NCPs need or support it.
-            logger_1.logger.warning(`[EzspConfigId] Unsupported configuration ID ${enums_2.EzspConfigId[configId]} by NCP.`, NS);
-        }
-        else if (status !== enums_3.EzspStatus.SUCCESS) {
-            logger_1.logger.warning(`[EzspConfigId] Failed to SET "${enums_2.EzspConfigId[configId]}" TO "${value}" with status=${enums_3.EzspStatus[status]}. `
-                + `Firmware value will be used instead.`, NS);
+        const status = await this.ezsp.ezspSetConfigurationValue(configId, value);
+        logger_1.logger.debug(`[EzspConfigId] SET "${enums_2.EzspConfigId[configId]}" TO "${value}" with status=${enums_1.SLStatus[status]}.`, NS);
+        if (status !== enums_1.SLStatus.OK) {
+            logger_1.logger.info(`[EzspConfigId] Failed to SET "${enums_2.EzspConfigId[configId]}" TO "${value}" with status=${enums_1.SLStatus[status]}. ` +
+                `Firmware value will be used instead.`, NS);
         }
         return status;
     }
@@ -1286,8 +1172,8 @@ class EmberAdapter extends __1.Adapter {
      * @returns
      */
     async emberSetEzspValue(valueId, valueLength, value) {
-        const status = (await this.ezsp.ezspSetValue(valueId, valueLength, value));
-        logger_1.logger.debug(`[EzspValueId] SET "${enums_2.EzspValueId[valueId]}" TO "${value}" with status=${enums_3.EzspStatus[status]}.`, NS);
+        const status = await this.ezsp.ezspSetValue(valueId, valueLength, value);
+        logger_1.logger.debug(`[EzspValueId] SET "${enums_2.EzspValueId[valueId]}" TO "${value}" with status=${enums_1.SLStatus[status]}.`, NS);
         return status;
     }
     /**
@@ -1297,8 +1183,8 @@ class EmberAdapter extends __1.Adapter {
      * @returns
      */
     async emberSetEzspPolicy(policyId, decisionId) {
-        const status = (await this.ezsp.ezspSetPolicy(policyId, decisionId));
-        logger_1.logger.debug(`[EzspPolicyId] SET "${enums_2.EzspPolicyId[policyId]}" TO "${decisionId}" with status=${enums_3.EzspStatus[status]}.`, NS);
+        const status = await this.ezsp.ezspSetPolicy(policyId, decisionId);
+        logger_1.logger.debug(`[EzspPolicyId] SET "${enums_2.EzspPolicyId[policyId]}" TO "${decisionId}" with status=${enums_1.SLStatus[status]}.`, NS);
         return status;
     }
     /**
@@ -1314,9 +1200,10 @@ class EmberAdapter extends __1.Adapter {
      */
     async aesMmoHash(context, finalize, data) {
         if (data.length > 255) {
-            throw new Error(enums_3.EzspStatus[enums_3.EzspStatus.ERROR_INVALID_CALL]);
+            // will be caught by request queue and rejected internally.
+            throw new ezspError_1.EzspError(enums_1.EzspStatus.ERROR_INVALID_CALL);
         }
-        const [status, reContext] = (await this.ezsp.ezspAesMmoHash(context, finalize, data));
+        const [status, reContext] = await this.ezsp.ezspAesMmoHash(context, finalize, data);
         return [status, reContext];
     }
     /**
@@ -1327,7 +1214,7 @@ class EmberAdapter extends __1.Adapter {
      * @param context EmberAesMmoHashContext*  A pointer to the location of the hash context to update.
      * @param data const uint8_t* A pointer to the location of the data to hash.
      *
-     * @returns An ::EmberStatus value indicating EMBER_SUCCESS if the hash was
+     * @returns An ::SLStatus value indicating EMBER_SUCCESS if the hash was
      *   calculated successfully.  EMBER_INVALID_CALL if the block size is not a
      *   multiple of 16 bytes, and EMBER_INDEX_OUT_OF_RANGE is returned when the
      *   data exceeds the maximum limits of the hash function.
@@ -1347,7 +1234,7 @@ class EmberAdapter extends __1.Adapter {
      * @param context EmberAesMmoHashContext * A pointer to the location of the hash context to finalize.
      * @param data uint8_t * A pointer to the location of data to hash. May be NULL.
      *
-     * @returns An ::EmberStatus value indicating EMBER_SUCCESS if the hash was
+     * @returns An ::SLStatus value indicating EMBER_SUCCESS if the hash was
      *   calculated successfully.  EMBER_INVALID_CALL if the block size is not a
      *   multiple of 16 bytes, and EMBER_INDEX_OUT_OF_RANGE is returned when the
      *   data exceeds the maximum limits of the hash function.
@@ -1362,7 +1249,7 @@ class EmberAdapter extends __1.Adapter {
      *
      * @param data const uint8_t* The data to hash. Expected of valid length (as in, not larger alloc)
      *
-     * @returns An ::EmberStatus value indicating EMBER_SUCCESS if the hash was
+     * @returns An ::SLStatus value indicating EMBER_SUCCESS if the hash was
      *   calculated successfully.  EMBER_INVALID_CALL if the block size is not a
      *   multiple of 16 bytes, and EMBER_INDEX_OUT_OF_RANGE is returned when the
      *   data exceeds the maximum limits of the hash function.
@@ -1370,7 +1257,7 @@ class EmberAdapter extends __1.Adapter {
      */
     async emberAesHashSimple(data) {
         const context = (0, initters_1.aesMmoHashInit)();
-        const [status, reContext] = (await this.emberAesMmoHashFinal(context, data));
+        const [status, reContext] = await this.emberAesMmoHashFinal(context, data);
         return [status, reContext?.result];
     }
     /**
@@ -1387,13 +1274,14 @@ class EmberAdapter extends __1.Adapter {
      * @returns messageTag The tag passed to ezspSend${x} function.
      */
     async emberPermitJoining(duration, broadcastMgmtPermitJoin) {
-        let status = (await this.ezsp.ezspPermitJoining(duration));
+        let status = await this.ezsp.ezspPermitJoining(duration);
         let apsFrame = null;
         let messageTag = null;
         logger_1.logger.debug(`Permit joining for ${duration} sec. status=${[status]}`, NS);
         if (broadcastMgmtPermitJoin) {
             // `authentication`: TC significance always 1 (zb specs)
-            [status, apsFrame, messageTag] = (await this.emberPermitJoiningRequest(enums_1.BroadcastAddress.DEFAULT, duration, 1, DEFAULT_APS_OPTIONS));
+            const zdoPayload = buffaloZdo_1.BuffaloZdo.buildPermitJoining(duration, 1, []);
+            [status, apsFrame, messageTag] = await this.sendZDORequest(ZSpec.BroadcastAddress.DEFAULT, Zdo.ClusterId.PERMIT_JOINING_REQUEST, zdoPayload, DEFAULT_APS_OPTIONS);
         }
         return [status, apsFrame, messageTag];
     }
@@ -1404,92 +1292,17 @@ class EmberAdapter extends __1.Adapter {
      */
     async emberSetJoinPolicy(decision) {
         let policy = enums_2.EzspDecisionBitmask.DEFAULT_CONFIGURATION;
-        if (decision == enums_3.EmberJoinDecision.USE_PRECONFIGURED_KEY) {
-            policy = (enums_2.EzspDecisionBitmask.ALLOW_JOINS | enums_2.EzspDecisionBitmask.ALLOW_UNSECURED_REJOINS);
+        if (decision == enums_1.EmberJoinDecision.USE_PRECONFIGURED_KEY) {
+            policy = enums_2.EzspDecisionBitmask.ALLOW_JOINS | enums_2.EzspDecisionBitmask.ALLOW_UNSECURED_REJOINS;
         }
-        else if (decision == enums_3.EmberJoinDecision.SEND_KEY_IN_THE_CLEAR) {
-            policy = (enums_2.EzspDecisionBitmask.ALLOW_JOINS | enums_2.EzspDecisionBitmask.ALLOW_UNSECURED_REJOINS | enums_2.EzspDecisionBitmask.SEND_KEY_IN_CLEAR);
+        else if (decision == enums_1.EmberJoinDecision.SEND_KEY_IN_THE_CLEAR) {
+            policy = enums_2.EzspDecisionBitmask.ALLOW_JOINS | enums_2.EzspDecisionBitmask.ALLOW_UNSECURED_REJOINS | enums_2.EzspDecisionBitmask.SEND_KEY_IN_CLEAR;
         }
-        else if (decision == enums_3.EmberJoinDecision.ALLOW_REJOINS_ONLY) {
+        else if (decision == enums_1.EmberJoinDecision.ALLOW_REJOINS_ONLY) {
             policy = enums_2.EzspDecisionBitmask.ALLOW_UNSECURED_REJOINS;
         }
         return this.emberSetEzspPolicy(enums_2.EzspPolicyId.TRUST_CENTER_POLICY, policy);
     }
-    /**
-     * Get Source Route Overhead
-     *
-     * Returns the number of bytes needed in a packet for source routing.
-     * Since each hop consumes 2 bytes in the packet, this routine calculates the
-     * total number of bytes needed based on number of hops to reach the destination.
-     *
-     * This function is called by the framework to determine the overhead required
-     * in the network frame for source routing to a particular destination.
-     *
-     * @param destination The node id of the destination  Ver.: always
-     * @returns int8u The number of bytes needed for source routing in a packet.
-     */
-    async emberGetSourceRouteOverhead(destination) {
-        const [status, value] = (await this.ezsp.ezspGetSourceRouteOverhead(destination));
-        if (status === enums_3.EzspStatus.SUCCESS) {
-            return value;
-        }
-        else {
-            logger_1.logger.debug(`Failed to get source route overhead (via extended value), status=${enums_3.EzspStatus[status]}.`, NS);
-        }
-        return 0;
-    }
-    /**
-     * Return the maximum size of the payload that the Application Support sub-layer will accept for
-     * the given message type, destination, and APS frame.
-     *
-     * The size depends on multiple factors, including the security level in use and additional information
-     * added to the message to support the various options.
-     *
-     * @param type The outgoing message type.
-     * @param indexOrDestination uint16_t Depending on the message type, this is either the
-     *  EmberNodeId of the destination, an index into the address table, an index
-     *  into the binding table, the multicast identifier, or a broadcast address.
-     * @param apsFrame EmberApsFrame *The APS frame for the message.
-     * @return uint8_t The maximum APS payload length for the given message.
-     */
-    async maximumApsPayloadLength(type, indexOrDestination, apsFrame) {
-        let destination = consts_2.EMBER_UNKNOWN_NODE_ID;
-        let max = consts_2.MAXIMUM_APS_PAYLOAD_LENGTH; // uint8_t
-        if ((apsFrame.options & enums_3.EmberApsOption.ENCRYPTION) !== 0) {
-            max -= consts_2.APS_ENCRYPTION_OVERHEAD;
-        }
-        if ((apsFrame.options & enums_3.EmberApsOption.SOURCE_EUI64) !== 0) {
-            max -= consts_1.EUI64_SIZE;
-        }
-        if ((apsFrame.options & enums_3.EmberApsOption.DESTINATION_EUI64) !== 0) {
-            max -= consts_1.EUI64_SIZE;
-        }
-        if ((apsFrame.options & enums_3.EmberApsOption.FRAGMENT) !== 0) {
-            max -= consts_2.APS_FRAGMENTATION_OVERHEAD;
-        }
-        switch (type) {
-            case enums_3.EmberOutgoingMessageType.DIRECT:
-                destination = indexOrDestination;
-                break;
-            case enums_3.EmberOutgoingMessageType.VIA_ADDRESS_TABLE:
-                destination = (await this.ezsp.ezspGetAddressTableRemoteNodeId(indexOrDestination));
-                break;
-            case enums_3.EmberOutgoingMessageType.VIA_BINDING:
-                destination = (await this.ezsp.ezspGetBindingRemoteNodeId(indexOrDestination));
-                break;
-            case enums_3.EmberOutgoingMessageType.MULTICAST:
-                // APS multicast messages include the two-byte group id and exclude the one-byte destination endpoint,
-                // for a net loss of an extra byte.
-                max--;
-                break;
-            case enums_3.EmberOutgoingMessageType.BROADCAST:
-                break;
-            default:
-                break;
-        }
-        max -= (await this.emberGetSourceRouteOverhead(destination));
-        return max;
-    }
     //---- END EZSP wrappers
     //---- START Ember ZDO
     /**
@@ -1521,525 +1334,55 @@ class EmberAdapter extends __1.Adapter {
      * @return uint8_t The next device request sequence number
      */
     nextZDORequestSequence() {
-        return (this.zdoRequestSequence = ((++this.zdoRequestSequence) & APPLICATION_ZDO_SEQUENCE_MASK));
+        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
-     * @param length uint8_t
      * @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 sendZDORequestBuffer(destination, clusterId, options) {
-        if (this.zdoRequestBuffalo.getPosition() > consts_1.EZSP_MAX_FRAME_LENGTH) {
-            return [enums_3.EmberStatus.MESSAGE_TOO_LONG, null, null];
+    async sendZDORequest(destination, clusterId, messageContents, options) {
+        if (messageContents.length > consts_2.EZSP_MAX_FRAME_LENGTH) {
+            return [enums_1.SLStatus.MESSAGE_TOO_LONG, null, null];
         }
         const messageTag = this.nextZDORequestSequence();
-        this.zdoRequestBuffalo.setCommandByte(0, messageTag);
+        messageContents[0] = messageTag;
         const apsFrame = {
-            profileId: zdo_1.ZDO_PROFILE_ID,
-            clusterId: clusterId,
-            sourceEndpoint: zdo_1.ZDO_ENDPOINT,
-            destinationEndpoint: zdo_1.ZDO_ENDPOINT,
-            options: options,
+            profileId: Zdo.ZDO_PROFILE_ID,
+            clusterId,
+            sourceEndpoint: Zdo.ZDO_ENDPOINT,
+            destinationEndpoint: Zdo.ZDO_ENDPOINT,
+            options,
             groupId: 0,
             sequence: 0, // set by stack
         };
-        const messageContents = this.zdoRequestBuffalo.getWritten();
-        if (destination === enums_1.BroadcastAddress.DEFAULT || destination === enums_1.BroadcastAddress.RX_ON_WHEN_IDLE
-            || destination === enums_1.BroadcastAddress.SLEEPY) {
-            logger_1.logger.debug(`~~~> [ZDO BROADCAST apsFrame=${JSON.stringify(apsFrame)} messageTag=${messageTag}]`, NS);
-            const [status, apsSequence] = (await this.ezsp.ezspSendBroadcast(destination, apsFrame, this.getZDORequestRadius(), messageTag, messageContents));
+        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, this.getZDORequestRadius(), messageTag, messageContents);
             apsFrame.sequence = apsSequence;
-            logger_1.logger.debug(`~~~> [SENT ZDO type=BROADCAST apsFrame=${JSON.stringify(apsFrame)} messageTag=${messageTag} status=${enums_3.EmberStatus[status]}]`, NS);
+            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 UNICAST apsFrame=${JSON.stringify(apsFrame)} messageTag=${messageTag}]`, NS);
-            const [status, apsSequence] = (await this.ezsp.ezspSendUnicast(enums_3.EmberOutgoingMessageType.DIRECT, destination, apsFrame, messageTag, messageContents));
+            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 apsFrame=${JSON.stringify(apsFrame)} messageTag=${messageTag} status=${enums_3.EmberStatus[status]}]`, NS);
+            logger_1.logger.debug(`~~~> [SENT ZDO type=DIRECT apsSequence=${apsSequence} messageTag=${messageTag} status=${enums_1.SLStatus[status]}`, NS);
             return [status, apsFrame, messageTag];
         }
     }
-    /**
-     * ZDO
-     * Service Discovery Functions
-     * Request the specified node to send a list of its endpoints that
-     * match the specified application profile and, optionally, lists of input
-     * and/or output clusters.
-     * @param target  The node whose matching endpoints are desired. The request can
-     * be sent unicast or broadcast ONLY to the "RX-on-when-idle-address" (0xFFFD)
-     * If sent as a broadcast, any node that has matching endpoints will send a
-     * response.
-     * @param profile uint16_t The application profile to match.
-     * @param inCount uint8_t The number of input clusters. To not match any input
-     * clusters, set this value to 0.
-     * @param outCount uint8_t The number of output clusters. To not match any output
-     * clusters, set this value to 0.
-     * @param inClusters uint16_t * The list of input clusters.
-     * @param outClusters uint16_t * The list of output clusters.
-     * @param options  The options to use when sending the unicast request. See
-     * emberSendUnicast() for a description. This parameter is ignored if the target
-     * is a broadcast address.
-     * @returns An EmberStatus value. EMBER_SUCCESS, MESSAGE_TOO_LONG,
-     * EMBER_NETWORK_DOWN or EMBER_NETWORK_BUSY.
-     */
-    async emberMatchDescriptorsRequest(target, profile, inClusters, outClusters, options) {
-        // 2 bytes for NWK Address + 2 bytes for Profile Id + 1 byte for in Cluster Count
-        // + in times 2 for 2 byte Clusters + out Cluster Count + out times 2 for 2 byte Clusters
-        const length = (zdo_1.ZDO_MESSAGE_OVERHEAD + 2 + 2 + 1 + (inClusters.length * 2) + 1 + (outClusters.length * 2));
-        // sanity check
-        if (length > consts_1.EZSP_MAX_FRAME_LENGTH) {
-            return [enums_3.EmberStatus.MESSAGE_TOO_LONG, null, null];
-        }
-        this.zdoRequestBuffalo.setPosition(zdo_1.ZDO_MESSAGE_OVERHEAD);
-        this.zdoRequestBuffalo.writeUInt16(target);
-        this.zdoRequestBuffalo.writeUInt16(profile);
-        this.zdoRequestBuffalo.writeUInt8(inClusters.length);
-        this.zdoRequestBuffalo.writeListUInt16(inClusters);
-        this.zdoRequestBuffalo.writeUInt8(outClusters.length);
-        this.zdoRequestBuffalo.writeListUInt16(outClusters);
-        logger_1.logger.debug(`~~~> [ZDO MATCH_DESCRIPTORS_REQUEST target=${target} profile=${profile} inClusters=${inClusters} outClusters=${outClusters}]`, NS);
-        return this.sendZDORequestBuffer(target, zdo_1.MATCH_DESCRIPTORS_REQUEST, options);
-    }
-    /**
-     * ZDO
-     * Device Discovery Functions
-     * Request the 16 bit network address of a node whose EUI64 is known.
-     *
-     * @param target           The EUI64 of the node.
-     * @param reportKids       true to request that the target list their children
-     *                         in the response.
-     * @param childStartIndex uint8_t The index of the first child to list in the response.
-     *                         Ignored if @c reportKids is false.
-     *
-     * @return An ::EmberStatus value.
-     * - ::EMBER_SUCCESS - The request was transmitted successfully.
-     * - ::EMBER_NO_BUFFERS - Insufficient message buffers were available to construct the request.
-     * - ::EMBER_NETWORK_DOWN - The node is not part of a network.
-     * - ::EMBER_NETWORK_BUSY - Transmission of the request failed.
-     */
-    async emberNetworkAddressRequest(target, reportKids, childStartIndex) {
-        this.zdoRequestBuffalo.setPosition(zdo_1.ZDO_MESSAGE_OVERHEAD);
-        this.zdoRequestBuffalo.writeIeeeAddr(target);
-        this.zdoRequestBuffalo.writeUInt8(reportKids ? 1 : 0);
-        this.zdoRequestBuffalo.writeUInt8(childStartIndex);
-        logger_1.logger.debug(`~~~> [ZDO NETWORK_ADDRESS_REQUEST target=${target} reportKids=${reportKids} childStartIndex=${childStartIndex}]`, NS);
-        return this.sendZDORequestBuffer(enums_1.BroadcastAddress.RX_ON_WHEN_IDLE, zdo_1.NETWORK_ADDRESS_REQUEST, enums_3.EmberApsOption.SOURCE_EUI64);
-    }
-    /**
-     * ZDO
-     * Device Discovery Functions
-     * @brief Request the EUI64 of a node whose 16 bit network address is known.
-     *
-     * @param target uint16_t The network address of the node.
-     * @param reportKids uint8_t true to request that the target list their children
-     *                         in the response.
-     * @param childStartIndex uint8_t The index of the first child to list in the response.
-     *                         Ignored if reportKids is false.
-     * @param options The options to use when sending the request. See ::emberSendUnicast() for a description.
-     *
-     * @return An ::EmberStatus value.
-     * - ::EMBER_SUCCESS
-     * - ::EMBER_NO_BUFFERS
-     * - ::EMBER_NETWORK_DOWN
-     * - ::EMBER_NETWORK_BUSY
-     */
-    async emberIeeeAddressRequest(target, reportKids, childStartIndex, options) {
-        this.zdoRequestBuffalo.setPosition(zdo_1.ZDO_MESSAGE_OVERHEAD);
-        this.zdoRequestBuffalo.writeUInt16(target);
-        this.zdoRequestBuffalo.writeUInt8(reportKids ? 1 : 0);
-        this.zdoRequestBuffalo.writeUInt8(childStartIndex);
-        logger_1.logger.debug(`~~~> [ZDO IEEE_ADDRESS_REQUEST target=${target} reportKids=${reportKids} childStartIndex=${childStartIndex}]`, NS);
-        return this.sendZDORequestBuffer(target, zdo_1.IEEE_ADDRESS_REQUEST, options);
-    }
-    /**
-     * ZDO
-     * @param discoveryNodeId uint16_t
-     * @param reportKids uint8_t
-     * @param childStartIndex uint8_t
-     * @param options
-     * @param targetNodeIdOfRequest
-     */
-    async emberIeeeAddressRequestToTarget(discoveryNodeId, reportKids, childStartIndex, options, targetNodeIdOfRequest) {
-        this.zdoRequestBuffalo.setPosition(zdo_1.ZDO_MESSAGE_OVERHEAD);
-        this.zdoRequestBuffalo.writeUInt16(discoveryNodeId);
-        this.zdoRequestBuffalo.writeUInt8(reportKids ? 1 : 0);
-        this.zdoRequestBuffalo.writeUInt8(childStartIndex);
-        logger_1.logger.debug(`~~~> [ZDO IEEE_ADDRESS_REQUEST targetNodeIdOfRequest=${targetNodeIdOfRequest} discoveryNodeId=${discoveryNodeId} `
-            + `reportKids=${reportKids} childStartIndex=${childStartIndex}]`, NS);
-        return this.sendZDORequestBuffer(targetNodeIdOfRequest, zdo_1.IEEE_ADDRESS_REQUEST, options);
-    }
-    /**
-     * ZDO
-     *
-     * @param target uint16_t
-     * @param clusterId uint16_t
-     * @param options
-     * @returns
-     */
-    async emberSendZigDevRequestTarget(target, clusterId, options) {
-        this.zdoRequestBuffalo.setPosition(zdo_1.ZDO_MESSAGE_OVERHEAD);
-        this.zdoRequestBuffalo.writeUInt16(target);
-        return this.sendZDORequestBuffer(target, clusterId, options);
-    }
-    /**
-     * ZDO
-     * @brief Request the specified node to send the simple descriptor for
-     * the specified endpoint.
-     * The simple descriptor contains information specific
-     * to a single endpoint. It describes the application profile identifier,
-     * application device identifier, application device version, application flags,
-     * application input clusters and application output clusters. It is defined in
-     * the ZigBee Application Framework Specification.
-     *
-     * @param target uint16_t The node of interest.
-     * @param targetEndpoint uint8_t The endpoint on the target node whose simple
-     * descriptor is desired.
-     * @param options  The options to use when sending the request. See
-     * emberSendUnicast() for a description.
-     *
-     * @return An EmberStatus value. ::EMBER_SUCCESS, ::EMBER_NO_BUFFERS,
-     * ::EMBER_NETWORK_DOWN or ::EMBER_NETWORK_BUSY.
-     */
-    async emberSimpleDescriptorRequest(target, targetEndpoint, options) {
-        this.zdoRequestBuffalo.setPosition(zdo_1.ZDO_MESSAGE_OVERHEAD);
-        this.zdoRequestBuffalo.writeUInt16(target);
-        this.zdoRequestBuffalo.writeUInt8(targetEndpoint);
-        logger_1.logger.debug(`~~~> [ZDO SIMPLE_DESCRIPTOR_REQUEST target=${target} targetEndpoint=${targetEndpoint}]`, NS);
-        return this.sendZDORequestBuffer(target, zdo_1.SIMPLE_DESCRIPTOR_REQUEST, options);
-    }
-    /**
-     * ZDO
-     * Common logic used by `emberBindRequest` & `emberUnbindRequest`.
-     *
-     * @param target
-     * @param bindClusterId
-     * @param source
-     * @param sourceEndpoint
-     * @param clusterId
-     * @param type
-     * @param destination
-     * @param groupAddress
-     * @param destinationEndpoint
-     * @param options
-     *
-     * @returns An ::EmberStatus value.
-     * - ::EMBER_SUCCESS
-     * - ::EMBER_NO_BUFFERS
-     * - ::EMBER_NETWORK_DOWN
-     * - ::EMBER_NETWORK_BUSY
-     * @returns APS frame created for the request
-     * @returns The tag used on the message.
-     */
-    async emberSendZigDevBindRequest(target, bindClusterId, source, sourceEndpoint, clusterId, type, destination, groupAddress, destinationEndpoint, options) {
-        this.zdoRequestBuffalo.setPosition(zdo_1.ZDO_MESSAGE_OVERHEAD);
-        this.zdoRequestBuffalo.writeIeeeAddr(source);
-        this.zdoRequestBuffalo.writeUInt8(sourceEndpoint);
-        this.zdoRequestBuffalo.writeUInt16(clusterId);
-        this.zdoRequestBuffalo.writeUInt8(type);
-        switch (type) {
-            case zdo_1.UNICAST_BINDING:
-                this.zdoRequestBuffalo.writeIeeeAddr(destination);
-                this.zdoRequestBuffalo.writeUInt8(destinationEndpoint);
-                break;
-            case zdo_1.MULTICAST_BINDING:
-                this.zdoRequestBuffalo.writeUInt16(groupAddress);
-                break;
-            default:
-                return [enums_3.EmberStatus.ERR_FATAL, null, null];
-        }
-        return this.sendZDORequestBuffer(target, bindClusterId, options);
-    }
-    /**
-     * ZDO
-     * Send a request to create a binding entry with the specified
-     * contents on the specified node.
-     *
-     * @param target  The node on which the binding will be created.
-     * @param source  The source EUI64 in the binding entry.
-     * @param sourceEndpoint  The source endpoint in the binding entry.
-     * @param clusterId  The cluster ID in the binding entry.
-     * @param type  The type of binding, either ::UNICAST_BINDING,
-     *   ::MULTICAST_BINDING, or ::UNICAST_MANY_TO_ONE_BINDING.
-     *   ::UNICAST_MANY_TO_ONE_BINDING is an Ember-specific extension
-     *   and should be used only when the target is an Ember device.
-     * @param destination  The destination EUI64 in the binding entry for
-     *   ::UNICAST_BINDING or ::UNICAST_MANY_TO_ONE_BINDING.
-     * @param groupAddress  The group address for the ::MULTICAST_BINDING.
-     * @param destinationEndpoint  The destination endpoint in the binding entry for
-     *   the ::UNICAST_BINDING or ::UNICAST_MANY_TO_ONE_BINDING.
-     * @param options  The options to use when sending the request. See
-     * emberSendUnicast() for a description.
-     *
-     * @returns An ::EmberStatus value.
-     * - ::EMBER_SUCCESS
-     * - ::EMBER_NO_BUFFERS
-     * - ::EMBER_NETWORK_DOWN
-     * - ::EMBER_NETWORK_BUSY
-     * @returns APS frame created for the request
-     * @returns The tag used on the message.
-     */
-    async emberBindRequest(target, source, sourceEndpoint, clusterId, type, destination, groupAddress, destinationEndpoint, options) {
-        logger_1.logger.debug(`~~~> [ZDO BIND_REQUEST target=${target} source=${source} sourceEndpoint=${sourceEndpoint} clusterId=${clusterId} type=${type} `
-            + `destination=${destination} groupAddress=${groupAddress} destinationEndpoint=${destinationEndpoint}]`, NS);
-        return this.emberSendZigDevBindRequest(target, zdo_1.BIND_REQUEST, source, sourceEndpoint, clusterId, type, destination, groupAddress, destinationEndpoint, options);
-    }
-    /**
-     * ZDO
-     * Send a request to remove a binding entry with the specified
-     * contents from the specified node.
-     *
-     * @param target          The node on which the binding will be removed.
-     * @param source          The source EUI64 in the binding entry.
-     * @param sourceEndpoint uint8_t The source endpoint in the binding entry.
-     * @param clusterId uint16_t      The cluster ID in the binding entry.
-     * @param type uint8_t           The type of binding, either ::UNICAST_BINDING,
-     *  ::MULTICAST_BINDING, or ::UNICAST_MANY_TO_ONE_BINDING.
-     *  ::UNICAST_MANY_TO_ONE_BINDING is an Ember-specific extension
-     *  and should be used only when the target is an Ember device.
-     * @param destination     The destination EUI64 in the binding entry for the
-     *   ::UNICAST_BINDING or ::UNICAST_MANY_TO_ONE_BINDING.
-     * @param groupAddress    The group address for the ::MULTICAST_BINDING.
-     * @param destinationEndpoint uint8_t The destination endpoint in the binding entry for
-     *   the ::UNICAST_BINDING or ::UNICAST_MANY_TO_ONE_BINDING.
-     * @param options         The options to use when sending the request. See
-     * emberSendUnicast() for a description.
-     *
-     * @returns An ::EmberStatus value.
-     * - ::EMBER_SUCCESS
-     * - ::EMBER_NO_BUFFERS
-     * - ::EMBER_NETWORK_DOWN
-     * - ::EMBER_NETWORK_BUSY
-     * @returns APS frame created for the request
-     * @returns The tag used on the message.
-     */
-    async emberUnbindRequest(target, source, sourceEndpoint, clusterId, type, destination, groupAddress, destinationEndpoint, options) {
-        logger_1.logger.debug(`~~~> [ZDO UNBIND_REQUEST target=${target} source=${source} sourceEndpoint=${sourceEndpoint} clusterId=${clusterId} type=${type} `
-            + `destination=${destination} groupAddress=${groupAddress} destinationEndpoint=${destinationEndpoint}]`, NS);
-        return this.emberSendZigDevBindRequest(target, zdo_1.UNBIND_REQUEST, source, sourceEndpoint, clusterId, type, destination, groupAddress, destinationEndpoint, options);
-    }
-    /**
-     * ZDO
-     * Request the specified node to send a list of its active
-     * endpoints. An active endpoint is one for which a simple descriptor is
-     * available.
-     *
-     * @param target  The node whose active endpoints are desired.
-     * @param options  The options to use when sending the request. See
-     * emberSendUnicast() for a description.
-     *
-     * @return An EmberStatus value. ::EMBER_SUCCESS, ::EMBER_NO_BUFFERS,
-     * ::EMBER_NETWORK_DOWN or ::EMBER_NETWORK_BUSY.
-     */
-    async emberActiveEndpointsRequest(target, options) {
-        logger_1.logger.debug(`~~~> [ZDO ACTIVE_ENDPOINTS_REQUEST target=${target}]`, NS);
-        return this.emberSendZigDevRequestTarget(target, zdo_1.ACTIVE_ENDPOINTS_REQUEST, options);
-    }
-    /**
-     * ZDO
-     * Request the specified node to send its power descriptor.
-     * The power descriptor gives a dynamic indication of the power
-     * status of the node. It describes current power mode,
-     * available power sources, current power source and
-     * current power source level. It is defined in the ZigBee
-     * Application Framework Specification.
-     *
-     * @param target  The node whose power descriptor is desired.
-     * @param options  The options to use when sending the request. See
-     * emberSendUnicast() for a description.
-     *
-     * @return An EmberStatus value. ::EMBER_SUCCESS, ::EMBER_NO_BUFFERS,
-     * ::EMBER_NETWORK_DOWN or ::EMBER_NETWORK_BUSY.
-     */
-    async emberPowerDescriptorRequest(target, options) {
-        logger_1.logger.debug(`~~~> [ZDO POWER_DESCRIPTOR_REQUEST target=${target}]`, NS);
-        return this.emberSendZigDevRequestTarget(target, zdo_1.POWER_DESCRIPTOR_REQUEST, options);
-    }
-    /**
-     * ZDO
-     * Request the specified node to send its node descriptor.
-     * The node descriptor contains information about the capabilities of the ZigBee
-     * node. It describes logical type, APS flags, frequency band, MAC capabilities
-     * flags, manufacturer code and maximum buffer size. It is defined in the ZigBee
-     * Application Framework Specification.
-     *
-     * @param target  The node whose node descriptor is desired.
-     * @param options  The options to use when sending the request. See
-     * emberSendUnicast() for a description.
-     *
-     * @return An ::EmberStatus value. ::EMBER_SUCCESS, ::EMBER_NO_BUFFERS,
-     * ::EMBER_NETWORK_DOWN or ::EMBER_NETWORK_BUSY.
-     */
-    async emberNodeDescriptorRequest(target, options) {
-        logger_1.logger.debug(`~~~> [ZDO NODE_DESCRIPTOR_REQUEST target=${target}]`, NS);
-        return this.emberSendZigDevRequestTarget(target, zdo_1.NODE_DESCRIPTOR_REQUEST, options);
-    }
-    /**
-     * ZDO
-     * Request the specified node to send its LQI (neighbor) table.
-     * The response gives PAN ID, EUI64, node ID and cost for each neighbor. The
-     * EUI64 is only available if security is enabled. The other fields in the
-     * response are set to zero. The response format is defined in the ZigBee Device
-     * Profile Specification.
-     *
-     * @param target  The node whose LQI table is desired.
-     * @param startIndex uint8_t The index of the first neighbor to include in the
-     * response.
-     * @param options  The options to use when sending the request. See
-     * emberSendUnicast() for a description.
-     *
-     * @return An EmberStatus value. ::EMBER_SUCCESS, ::EMBER_NO_BUFFERS,
-     * ::EMBER_NETWORK_DOWN or ::EMBER_NETWORK_BUSY.
-     */
-    async emberLqiTableRequest(target, startIndex, options) {
-        logger_1.logger.debug(`~~~> [ZDO LQI_TABLE_REQUEST target=${target} startIndex=${startIndex}]`, NS);
-        return this.emberTableRequest(zdo_1.LQI_TABLE_REQUEST, target, startIndex, options);
-    }
-    /**
-     * ZDO
-     * Request the specified node to send its routing table.
-     * The response gives destination node ID, status and many-to-one flags,
-     * and the next hop node ID.
-     * The response format is defined in the ZigBee Device
-     * Profile Specification.
-     *
-     * @param target  The node whose routing table is desired.
-     * @param startIndex uint8_t The index of the first route entry to include in the
-     * response.
-     * @param options  The options to use when sending the request. See
-     * emberSendUnicast() for a description.
-     *
-     * @return An EmberStatus value. ::EMBER_SUCCESS, ::EMBER_NO_BUFFERS,
-     * ::EMBER_NETWORK_DOWN or ::EMBER_NETWORK_BUSY.
-     */
-    async emberRoutingTableRequest(target, startIndex, options) {
-        logger_1.logger.debug(`~~~> [ZDO ROUTING_TABLE_REQUEST target=${target} startIndex=${startIndex}]`, NS);
-        return this.emberTableRequest(zdo_1.ROUTING_TABLE_REQUEST, target, startIndex, options);
-    }
-    /**
-     * ZDO
-     * Request the specified node to send its nonvolatile bindings.
-     * The response gives source address, source endpoint, cluster ID, destination
-     * address and destination endpoint for each binding entry. The response format
-     * is defined in the ZigBee Device Profile Specification.
-     * Note that bindings that have the Ember-specific ::UNICAST_MANY_TO_ONE_BINDING
-     * type are reported as having the standard ::UNICAST_BINDING type.
-     *
-     * @param target  The node whose binding table is desired.
-     * @param startIndex uint8_t The index of the first binding entry to include in the
-     * response.
-     * @param options  The options to use when sending the request. See
-     * emberSendUnicast() for a description.
-     *
-     * @return An EmberStatus value. ::EMBER_SUCCESS, ::EMBER_NO_BUFFERS,
-     * ::EMBER_NETWORK_DOWN or ::EMBER_NETWORK_BUSY.
-     */
-    async emberBindingTableRequest(target, startIndex, options) {
-        logger_1.logger.debug(`~~~> [ZDO BINDING_TABLE_REQUEST target=${target} startIndex=${startIndex}]`, NS);
-        return this.emberTableRequest(zdo_1.BINDING_TABLE_REQUEST, target, startIndex, options);
-    }
-    /**
-     * ZDO
-     *
-     * @param clusterId uint16_t
-     * @param target
-     * @param startIndex uint8_t
-     * @param options
-     * @returns
-     */
-    async emberTableRequest(clusterId, target, startIndex, options) {
-        this.zdoRequestBuffalo.setPosition(zdo_1.ZDO_MESSAGE_OVERHEAD);
-        this.zdoRequestBuffalo.writeUInt8(startIndex);
-        return this.sendZDORequestBuffer(target, clusterId, options);
-    }
-    /**
-     * ZDO
-     * Request the specified node to remove the specified device from
-     * the network. The device to be removed must be the node to which the request
-     * is sent or one of its children.
-     *
-     * @param target  The node which will remove the device.
-     * @param deviceAddress  All zeros if the target is to remove itself from
-     *    the network or the EUI64 of a child of the target device to remove
-     *    that child.
-     * @param leaveRequestFlags uint8_t A bitmask of leave options.
-     *   Include ::AND_REJOIN if the target is to rejoin the network immediately after leaving.
-     * @param options  The options to use when sending the request. See
-     * emberSendUnicast() for a description.
-     *
-     * @return An EmberStatus value. ::EMBER_SUCCESS, ::EMBER_NO_BUFFERS,
-     * ::EMBER_NETWORK_DOWN or ::EMBER_NETWORK_BUSY.
-     */
-    async emberLeaveRequest(target, deviceAddress, leaveRequestFlags, options) {
-        this.zdoRequestBuffalo.setPosition(zdo_1.ZDO_MESSAGE_OVERHEAD);
-        this.zdoRequestBuffalo.writeIeeeAddr(deviceAddress);
-        this.zdoRequestBuffalo.writeUInt8(leaveRequestFlags);
-        logger_1.logger.debug(`~~~> [ZDO LEAVE_REQUEST target=${target} deviceAddress=${deviceAddress} leaveRequestFlags=${leaveRequestFlags}]`, NS);
-        return this.sendZDORequestBuffer(target, zdo_1.LEAVE_REQUEST, options);
-    }
-    /**
-     * ZDO
-     * Request the specified node to allow or disallow association.
-     *
-     * @param target  The node which will allow or disallow association. The request
-     * can be broadcast by using a broadcast address (0xFFFC/0xFFFD/0xFFFF). No
-     * response is sent if the request is broadcast.
-     * @param duration uint8_t A value of 0x00 disables joining. A value of 0xFF enables
-     * joining.  Any other value enables joining for that number of seconds.
-     * @param authentication uint8_t Controls Trust Center authentication behavior.
-     * @param options  The options to use when sending the request. See
-     * emberSendUnicast() for a description. This parameter is ignored if the target
-     * is a broadcast address.
-     *
-     * @return An EmberStatus value. ::EMBER_SUCCESS, ::EMBER_NO_BUFFERS,
-     * ::EMBER_NETWORK_DOWN or ::EMBER_NETWORK_BUSY.
-     */
-    async emberPermitJoiningRequest(target, duration, authentication, options) {
-        this.zdoRequestBuffalo.setPosition(zdo_1.ZDO_MESSAGE_OVERHEAD);
-        this.zdoRequestBuffalo.writeUInt8(duration);
-        this.zdoRequestBuffalo.writeUInt8(authentication);
-        logger_1.logger.debug(`~~~> [ZDO PERMIT_JOINING_REQUEST target=${target} duration=${duration} authentication=${authentication}]`, NS);
-        return this.sendZDORequestBuffer(target, zdo_1.PERMIT_JOINING_REQUEST, options);
-    }
-    /**
-     * ZDO
-     *
-     * @see NWK_UPDATE_REQUEST
-     *
-     * @param target
-     * @param scanChannels uint8_t[]
-     * @param duration uint8_t
-     * @param count uint8_t
-     * @param manager
-     */
-    async emberNetworkUpdateRequest(target, scanChannels, duration, count, manager, options) {
-        this.zdoRequestBuffalo.setPosition(zdo_1.ZDO_MESSAGE_OVERHEAD);
-        this.zdoRequestBuffalo.writeUInt32(scanChannels.reduce((a, c) => a + (1 << c), 0)); // to uint32_t
-        this.zdoRequestBuffalo.writeUInt8(duration);
-        if (count != null) {
-            this.zdoRequestBuffalo.writeUInt8(count);
-        }
-        if (manager != null) {
-            this.zdoRequestBuffalo.writeUInt16(manager);
-        }
-        logger_1.logger.debug(`~~~> [ZDO NWK_UPDATE_REQUEST target=${target} scanChannels=${scanChannels} duration=${duration} count=${count} manager=${manager}]`, NS);
-        return this.sendZDORequestBuffer(target, zdo_1.NWK_UPDATE_REQUEST, options);
-    }
-    async emberScanChannelsRequest(target, scanChannels, duration, count, options) {
-        return this.emberNetworkUpdateRequest(target, scanChannels, duration, count, null, options);
-    }
-    async emberChannelChangeRequest(target, channel, options) {
-        return this.emberNetworkUpdateRequest(target, [channel], 0xFE, null, null, options);
-    }
-    async emberSetActiveChannelsAndNwkManagerIdRequest(target, scanChannels, manager, options) {
-        return this.emberNetworkUpdateRequest(target, scanChannels, 0xFF, null, manager, options);
-    }
     //---- END Ember ZDO
     //-- START Adapter implementation
     static async isValidPath(path) {
@@ -2057,7 +1400,7 @@ class EmberAdapter extends __1.Adapter {
     }
     static async autoDetectPath() {
         const paths = await serialPortUtils_1.default.find(autoDetectDefinitions);
-        paths.sort((a, b) => (a < b) ? -1 : 1);
+        paths.sort((a, b) => (a < b ? -1 : 1));
         return paths.length > 0 ? paths[0] : null;
     }
     async start() {
@@ -2067,34 +1410,30 @@ class EmberAdapter extends __1.Adapter {
         return result;
     }
     async stop() {
-        this.requestQueue.stopDispatching();
         await this.ezsp.stop();
         this.initVariables();
         logger_1.logger.info(`======== Ember Adapter Stopped ========`, NS);
     }
     // queued, non-InterPAN
     async getCoordinator() {
-        return new Promise((resolve, reject) => {
-            this.requestQueue.enqueue(async () => {
-                this.checkInterpanLock();
-                // in all likelihood this will be retrieved from cache
-                const ieeeAddr = (await this.emberGetEui64());
-                resolve({
-                    ieeeAddr,
-                    networkAddress: ZSpec.COORDINATOR_ADDRESS,
-                    manufacturerID: DEFAULT_MANUFACTURER_CODE,
-                    endpoints: endpoints_1.FIXED_ENDPOINTS.map((ep) => {
-                        return {
-                            profileID: ep.profileId,
-                            ID: ep.endpoint,
-                            deviceID: ep.deviceId,
-                            inputClusters: ep.inClusterList.slice(), // copy
-                            outputClusters: ep.outClusterList.slice(), // copy
-                        };
-                    }),
-                });
-                return enums_3.EmberStatus.SUCCESS;
-            }, reject);
+        return this.queue.execute(async () => {
+            this.checkInterpanLock();
+            // in all likelihood this will be retrieved from cache
+            const ieeeAddr = await this.emberGetEui64();
+            return {
+                ieeeAddr,
+                networkAddress: ZSpec.COORDINATOR_ADDRESS,
+                manufacturerID: DEFAULT_MANUFACTURER_CODE,
+                endpoints: endpoints_1.FIXED_ENDPOINTS.map((ep) => {
+                    return {
+                        profileID: ep.profileId,
+                        ID: ep.endpoint,
+                        deviceID: ep.deviceId,
+                        inputClusters: ep.inClusterList.slice(), // copy
+                        outputClusters: ep.outClusterList.slice(), // copy
+                    };
+                }),
+            };
         });
     }
     async getCoordinatorVersion() {
@@ -2103,7 +1442,7 @@ class EmberAdapter extends __1.Adapter {
     // queued
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     async reset(type) {
-        return Promise.reject(new Error("Not supported"));
+        return Promise.reject(new Error('Not supported'));
         // NOTE: although this function is legacy atm, a couple of new untested EZSP functions that could also prove useful:
         // this.ezsp.ezspTokenFactoryReset(true/*excludeOutgoingFC*/, true/*excludeBootCounter*/);
         // this.ezsp.ezspResetNode()
@@ -2114,103 +1453,86 @@ class EmberAdapter extends __1.Adapter {
     // queued
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     async backup(ieeeAddressesInDatabase) {
-        return new Promise((resolve, reject) => {
-            this.requestQueue.enqueue(async () => {
-                // grab fresh version here, bypass cache
-                const [netStatus, , netParams] = (await this.ezsp.ezspGetNetworkParameters());
-                if (netStatus !== enums_3.EmberStatus.SUCCESS) {
-                    logger_1.logger.error(`[BACKUP] Failed to get network parameters.`, NS);
-                    return netStatus;
-                }
-                // update cache
-                this.networkCache.parameters = netParams;
-                this.networkCache.eui64 = (await this.ezsp.ezspGetEui64());
-                const [netKeyStatus, netKeyInfo] = (await this.ezsp.ezspGetNetworkKeyInfo());
-                if (netKeyStatus !== enums_3.SLStatus.OK) {
-                    logger_1.logger.error(`[BACKUP] Failed to get network keys info.`, NS);
-                    return ((netKeyStatus === enums_3.SLStatus.BUSY) || (netKeyStatus === enums_3.SLStatus.NOT_READY))
-                        ? enums_3.EmberStatus.NETWORK_BUSY : enums_3.EmberStatus.ERR_FATAL; // allow retry on statuses that should be temporary
-                }
-                if (!netKeyInfo.networkKeySet) {
-                    throw new Error(`[BACKUP] No network key set.`);
-                }
-                let keyList = [];
-                if (this.stackConfig.KEY_TABLE_SIZE > 0) {
-                    keyList = (await this.exportLinkKeys());
-                }
-                // XXX: this only makes sense on stop (if that), not hourly/on start, plus network needs to be at near-standstill @see AN1387
-                // const tokensBuf = (await EmberTokensManager.saveTokens(
-                //     this.ezsp,
-                //     Buffer.from(this.networkCache.eui64.substring(2/*0x*/), 'hex').reverse()
-                // ));
-                let context = (0, initters_1.initSecurityManagerContext)();
-                context.coreKeyType = enums_3.SecManKeyType.TC_LINK;
-                const [tcLinkKey, tclkStatus] = (await this.ezsp.ezspExportKey(context));
-                if (tclkStatus !== enums_3.SLStatus.OK) {
-                    throw new Error(`[BACKUP] Failed to export TC Link Key with status=${enums_3.SLStatus[tclkStatus]}.`);
-                }
-                context = (0, initters_1.initSecurityManagerContext)(); // make sure it's back to zeroes
-                context.coreKeyType = enums_3.SecManKeyType.NETWORK;
-                context.keyIndex = 0;
-                const [networkKey, nkStatus] = (await this.ezsp.ezspExportKey(context));
-                if (nkStatus !== enums_3.SLStatus.OK) {
-                    throw new Error(`[BACKUP] Failed to export Network Key with status=${enums_3.SLStatus[nkStatus]}.`);
-                }
-                const zbChannels = Array.from(Array(consts_2.EMBER_NUM_802_15_4_CHANNELS), (e, i) => i + consts_2.EMBER_MIN_802_15_4_CHANNEL_NUMBER);
-                resolve({
-                    networkOptions: {
-                        panId: netParams.panId, // uint16_t
-                        extendedPanId: Buffer.from(netParams.extendedPanId),
-                        channelList: zbChannels.map((c) => ((2 ** c) & netParams.channels) ? c : null).filter((x) => x),
-                        networkKey: networkKey.contents,
-                        networkKeyDistribute: false,
-                    },
-                    logicalChannel: netParams.radioChannel,
-                    networkKeyInfo: {
-                        sequenceNumber: netKeyInfo.networkKeySequenceNumber,
-                        frameCounter: netKeyInfo.networkKeyFrameCounter,
+        return this.queue.execute(async () => {
+            // grab fresh version here, bypass cache
+            const [netStatus, , netParams] = await this.ezsp.ezspGetNetworkParameters();
+            if (netStatus !== enums_1.SLStatus.OK) {
+                throw new Error(`[BACKUP] Failed to get network parameters with status=${enums_1.SLStatus[netStatus]}.`);
+            }
+            // update cache
+            this.networkCache.parameters = netParams;
+            this.networkCache.eui64 = await this.ezsp.ezspGetEui64();
+            const [netKeyStatus, netKeyInfo] = await this.ezsp.ezspGetNetworkKeyInfo();
+            if (netKeyStatus !== enums_1.SLStatus.OK) {
+                throw new Error(`[BACKUP] Failed to get network keys info with status=${enums_1.SLStatus[netKeyStatus]}.`);
+            }
+            if (!netKeyInfo.networkKeySet) {
+                throw new Error(`[BACKUP] No network key set.`);
+            }
+            const keyList = ALLOW_APP_KEY_REQUESTS ? await this.exportLinkKeys() : [];
+            let context = (0, initters_1.initSecurityManagerContext)();
+            context.coreKeyType = enums_1.SecManKeyType.TC_LINK;
+            const [tclkStatus, tcLinkKey] = await this.ezsp.ezspExportKey(context);
+            if (tclkStatus !== enums_1.SLStatus.OK) {
+                throw new Error(`[BACKUP] Failed to export TC Link Key with status=${enums_1.SLStatus[tclkStatus]}.`);
+            }
+            context = (0, initters_1.initSecurityManagerContext)(); // make sure it's back to zeroes
+            context.coreKeyType = enums_1.SecManKeyType.NETWORK;
+            context.keyIndex = 0;
+            const [nkStatus, networkKey] = await this.ezsp.ezspExportKey(context);
+            if (nkStatus !== enums_1.SLStatus.OK) {
+                throw new Error(`[BACKUP] Failed to export Network Key with status=${enums_1.SLStatus[nkStatus]}.`);
+            }
+            const zbChannels = Array.from(Array(consts_1.EMBER_NUM_802_15_4_CHANNELS), (e, i) => i + consts_1.EMBER_MIN_802_15_4_CHANNEL_NUMBER);
+            return {
+                networkOptions: {
+                    panId: netParams.panId, // uint16_t
+                    extendedPanId: Buffer.from(netParams.extendedPanId),
+                    channelList: zbChannels.map((c) => ((2 ** c) & netParams.channels ? c : null)).filter((x) => x),
+                    networkKey: networkKey.contents,
+                    networkKeyDistribute: false,
+                },
+                logicalChannel: netParams.radioChannel,
+                networkKeyInfo: {
+                    sequenceNumber: netKeyInfo.networkKeySequenceNumber,
+                    frameCounter: netKeyInfo.networkKeyFrameCounter,
+                },
+                securityLevel: consts_1.SECURITY_LEVEL_Z3,
+                networkUpdateId: netParams.nwkUpdateId,
+                coordinatorIeeeAddress: Buffer.from(this.networkCache.eui64.substring(2) /*take out 0x*/, 'hex').reverse(),
+                devices: keyList.map((key) => ({
+                    networkAddress: null, // not used for restore, no reason to make NCP calls for nothing
+                    ieeeAddress: Buffer.from(key.deviceEui64.substring(2) /*take out 0x*/, 'hex').reverse(),
+                    isDirectChild: false, // not used
+                    linkKey: {
+                        key: key.key.contents,
+                        rxCounter: key.incomingFrameCounter,
+                        txCounter: key.outgoingFrameCounter,
                     },
-                    securityLevel: consts_2.SECURITY_LEVEL_Z3,
-                    networkUpdateId: netParams.nwkUpdateId,
-                    coordinatorIeeeAddress: Buffer.from(this.networkCache.eui64.substring(2) /*take out 0x*/, 'hex').reverse(),
-                    devices: keyList.map((key) => ({
-                        networkAddress: null, // not used for restore, no reason to make NCP calls for nothing
-                        ieeeAddress: Buffer.from(key.deviceEui64.substring(2) /*take out 0x*/, 'hex').reverse(),
-                        isDirectChild: false, // not used
-                        linkKey: {
-                            key: key.key.contents,
-                            rxCounter: key.incomingFrameCounter,
-                            txCounter: key.outgoingFrameCounter,
-                        },
-                    })),
-                    ezsp: {
-                        version: this.version.ezsp,
-                        hashed_tclk: tcLinkKey.contents,
-                        // tokens: tokensBuf.toString('hex'),
-                        // altNetworkKey: altNetworkKey.contents,
-                    }
-                });
-                return enums_3.EmberStatus.SUCCESS;
-            }, reject, true);
+                })),
+                ezsp: {
+                    version: this.version.ezsp,
+                    hashed_tclk: tcLinkKey.contents,
+                    // tokens: tokensBuf.toString('hex'),
+                    // altNetworkKey: altNetworkKey.contents,
+                },
+            };
         });
     }
     // queued, non-InterPAN
     async getNetworkParameters() {
-        return new Promise((resolve, reject) => {
-            this.requestQueue.enqueue(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.
-                const channel = (await this.emberGetRadioChannel());
-                const panID = (await this.emberGetPanId());
-                const extendedPanID = (await this.emberGetExtendedPanId());
-                resolve({
-                    panID,
-                    extendedPanID: parseInt(Buffer.from(extendedPanID).toString('hex'), 16),
-                    channel,
-                });
-                return enums_3.EmberStatus.SUCCESS;
-            }, reject);
+        return 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.
+            const channel = await this.emberGetRadioChannel();
+            const panID = await this.emberGetPanId();
+            const extendedPanID = await this.emberGetExtendedPanId();
+            return {
+                panID,
+                extendedPanID: parseInt(Buffer.from(extendedPanID).toString('hex'), 16),
+                channel,
+            };
         });
     }
     async supportsChangeChannel() {
@@ -2218,38 +1540,44 @@ class EmberAdapter extends __1.Adapter {
     }
     // queued
     async changeChannel(newChannel) {
-        return new Promise((resolve, reject) => {
-            this.requestQueue.enqueue(async () => {
-                this.checkInterpanLock();
-                // eslint-disable-next-line @typescript-eslint/no-unused-vars
-                const [status, apsFrame, messageTag] = (await this.emberChannelChangeRequest(enums_1.BroadcastAddress.SLEEPY, newChannel, DEFAULT_APS_OPTIONS));
-                if (status !== enums_3.EmberStatus.SUCCESS) {
-                    logger_1.logger.error(`[ZDO] Failed broadcast channel change to "${newChannel}" with status=${enums_3.EmberStatus[status]}.`, NS);
-                    return status;
-                }
-                await this.oneWaitress.startWaitingForEvent({ eventName: oneWaitress_1.OneWaitressEvents.STACK_STATUS_CHANNEL_CHANGED }, DEFAULT_NETWORK_REQUEST_TIMEOUT * 2, // observed to ~9sec
-                '[ZDO] Change Channel');
-                resolve();
-                return enums_3.EmberStatus.SUCCESS;
-            }, reject);
+        return this.queue.execute(async () => {
+            this.checkInterpanLock();
+            const zdoPayload = buffaloZdo_1.BuffaloZdo.buildChannelChangeRequest(newChannel, null);
+            const [status] = await this.sendZDORequest(ZSpec.BroadcastAddress.SLEEPY, Zdo.ClusterId.NWK_UPDATE_REQUEST, zdoPayload, 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');
+        });
+    }
+    // queued
+    async scanChannels(networkAddress, channels, duration, count) {
+        return this.queue.execute(async () => {
+            this.checkInterpanLock();
+            const zdoPayload = buffaloZdo_1.BuffaloZdo.buildScanChannelsRequest(channels, duration, count);
+            const [status, apsFrame] = await this.sendZDORequest(networkAddress, Zdo.ClusterId.NWK_UPDATE_REQUEST, zdoPayload, DEFAULT_APS_OPTIONS);
+            if (status !== enums_1.SLStatus.OK) {
+                throw new Error(`[ZDO] Failed to scan channels '${channels}' on '${networkAddress} with status=${enums_1.SLStatus[status]}.`);
+            }
+            const result = await this.oneWaitress.startWaitingFor({
+                target: networkAddress,
+                apsFrame,
+                responseClusterId: Zdo.ClusterId.NWK_UPDATE_RESPONSE,
+            }, DEFAULT_ZDO_REQUEST_TIMEOUT + (((2 ** duration + 1) * (16 * 960)) / 1000) * count * channels.length); // time for scan
+            return result;
         });
     }
     // queued
     async setTransmitPower(value) {
         if (typeof value !== 'number') {
-            logger_1.logger.error(`Tried to set transmit power to non-number. Value ${value} of type ${typeof value}.`, NS);
-            return;
+            throw new Error(`Tried to set transmit power to non-number. Value ${value} of type ${typeof value}.`);
         }
-        return new Promise((resolve, reject) => {
-            this.requestQueue.enqueue(async () => {
-                const status = await this.ezsp.ezspSetRadioPower(value);
-                if (status !== enums_3.EmberStatus.SUCCESS) {
-                    logger_1.logger.error(`Failed to set transmit power to ${value} status=${enums_3.EmberStatus[status]}.`, NS);
-                    return status;
-                }
-                resolve();
-                return enums_3.EmberStatus.SUCCESS;
-            }, reject);
+        return 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]}.`);
+            }
         });
     }
     // queued
@@ -2258,47 +1586,41 @@ class EmberAdapter extends __1.Adapter {
             throw new Error(`[ADD INSTALL CODE] Failed for '${ieeeAddress}'; no code given.`);
         }
         // codes with CRC, check CRC before sending to NCP, otherwise let NCP handle
-        if (consts_2.EMBER_INSTALL_CODE_SIZES.indexOf(key.length) !== -1) {
+        if (consts_1.EMBER_INSTALL_CODE_SIZES.indexOf(key.length) !== -1) {
             // Reverse the bits in a byte (uint8_t)
             const reverse = (b) => {
-                return (((b * 0x0802 & 0x22110) | (b * 0x8020 & 0x88440)) * 0x10101 >> 16) & 0xFF;
+                return (((((b * 0x0802) & 0x22110) | ((b * 0x8020) & 0x88440)) * 0x10101) >> 16) & 0xff;
             };
-            let crc = 0xFFFF; // uint16_t
+            let crc = 0xffff; // uint16_t
             // Compute the CRC and verify that it matches.
             // The bit reversals, byte swap, and ones' complement are due to differences between halCommonCrc16 and the Smart Energy version.
-            for (let index = 0; index < (key.length - consts_2.EMBER_INSTALL_CODE_CRC_SIZE); index++) {
+            for (let index = 0; index < key.length - consts_1.EMBER_INSTALL_CODE_CRC_SIZE; index++) {
                 crc = (0, math_1.halCommonCrc16)(reverse(key[index]), crc);
             }
-            crc = (~(0, math_1.highLowToInt)(reverse((0, math_1.lowByte)(crc)), reverse((0, math_1.highByte)(crc)))) & 0xFFFF;
-            if (key[key.length - consts_2.EMBER_INSTALL_CODE_CRC_SIZE] !== (0, math_1.lowByte)(crc)
-                || key[key.length - consts_2.EMBER_INSTALL_CODE_CRC_SIZE + 1] !== (0, math_1.highByte)(crc)) {
+            crc = ~(0, math_1.highLowToInt)(reverse((0, math_1.lowByte)(crc)), reverse((0, math_1.highByte)(crc))) & 0xffff;
+            if (key[key.length - consts_1.EMBER_INSTALL_CODE_CRC_SIZE] !== (0, math_1.lowByte)(crc) ||
+                key[key.length - consts_1.EMBER_INSTALL_CODE_CRC_SIZE + 1] !== (0, math_1.highByte)(crc)) {
                 throw new Error(`[ADD INSTALL CODE] Failed for '${ieeeAddress}'; invalid code CRC.`);
             }
             else {
                 logger_1.logger.debug(`[ADD INSTALL CODE] CRC validated for '${ieeeAddress}'.`, NS);
             }
         }
-        return new Promise((resolve, reject) => {
-            this.requestQueue.enqueue(async () => {
-                // Compute the key from the install code and CRC.
-                const [aesStatus, keyContents] = (await this.emberAesHashSimple(key));
-                if (aesStatus !== enums_3.EmberStatus.SUCCESS) {
-                    logger_1.logger.error(`[ADD INSTALL CODE] Failed AES hash for '${ieeeAddress}' with status=${enums_3.EmberStatus[aesStatus]}.`, NS);
-                    return aesStatus;
-                }
-                // Add the key to the transient key table.
-                // This will be used while the DUT joins.
-                const impStatus = (await this.ezsp.ezspImportTransientKey(ieeeAddress, { contents: keyContents }, enums_3.SecManFlag.NONE));
-                if (impStatus == enums_3.SLStatus.OK) {
-                    logger_1.logger.debug(`[ADD INSTALL CODE] Success for '${ieeeAddress}'.`, NS);
-                }
-                else {
-                    logger_1.logger.error(`[ADD INSTALL CODE] Failed for '${ieeeAddress}' with status=${enums_3.SLStatus[impStatus]}.`, NS);
-                    return enums_3.EmberStatus.ERR_FATAL;
-                }
-                resolve();
-                return enums_3.EmberStatus.SUCCESS;
-            }, reject);
+        return 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) {
+                throw new Error(`[ADD INSTALL CODE] Failed AES hash for '${ieeeAddress}' with status=${enums_1.SLStatus[aesStatus]}.`);
+            }
+            // Add the key to the transient key table.
+            // This will be used while the DUT joins.
+            const impStatus = await this.ezsp.ezspImportTransientKey(ieeeAddress, { contents: keyContents });
+            if (impStatus == enums_1.SLStatus.OK) {
+                logger_1.logger.debug(`[ADD INSTALL CODE] Success for '${ieeeAddress}'.`, NS);
+            }
+            else {
+                throw new Error(`[ADD INSTALL CODE] Failed for '${ieeeAddress}' with status=${enums_1.SLStatus[impStatus]}.`);
+            }
         });
     }
     /** WARNING: Adapter impl. Starts timer immediately upon returning */
@@ -2313,7 +1635,7 @@ class EmberAdapter extends __1.Adapter {
                 sourceEndpoint: sourceEndpointInfo.endpoint,
                 destinationEndpoint: endpoint,
                 groupId: 0,
-                options: enums_3.EmberApsOption.NONE,
+                options: enums_1.EmberApsOption.NONE,
             },
             zclSequence: transactionSequenceNumber,
             commandIdentifier,
@@ -2328,18 +1650,15 @@ class EmberAdapter extends __1.Adapter {
     async permitJoin(seconds, networkAddress) {
         const preJoining = async () => {
             if (seconds) {
-                const plaintextKey = { contents: Buffer.from(consts_2.ZIGBEE_PROFILE_INTEROPERABILITY_LINK_KEY) };
-                const impKeyStatus = (await this.ezsp.ezspImportTransientKey(ZSpec.BLANK_EUI64, plaintextKey, enums_3.SecManFlag.NONE));
-                if (impKeyStatus !== enums_3.SLStatus.OK) {
-                    logger_1.logger.error(`[ZDO] Failed import transient key with status=${enums_3.SLStatus[impKeyStatus]}.`, NS);
-                    return enums_3.EmberStatus.ERR_FATAL;
+                const plaintextKey = { contents: Buffer.from(consts_1.ZIGBEE_PROFILE_INTEROPERABILITY_LINK_KEY) };
+                const impKeyStatus = await this.ezsp.ezspImportTransientKey(ZSpec.BLANK_EUI64, plaintextKey);
+                if (impKeyStatus !== enums_1.SLStatus.OK) {
+                    throw new Error(`[ZDO] Failed import transient key with status=${enums_1.SLStatus[impKeyStatus]}.`);
                 }
-                const setJPstatus = (await this.emberSetJoinPolicy(enums_3.EmberJoinDecision.USE_PRECONFIGURED_KEY));
-                if (setJPstatus !== enums_3.EzspStatus.SUCCESS) {
-                    logger_1.logger.error(`[ZDO] Failed set join policy with status=${enums_3.EzspStatus[setJPstatus]}.`, NS);
-                    return enums_3.EmberStatus.ERR_FATAL;
+                const setJPstatus = await this.emberSetJoinPolicy(enums_1.EmberJoinDecision.USE_PRECONFIGURED_KEY);
+                if (setJPstatus !== enums_1.SLStatus.OK) {
+                    throw new Error(`[ZDO] Failed set join policy with status=${enums_1.SLStatus[setJPstatus]}.`);
                 }
-                return enums_3.EmberStatus.SUCCESS;
             }
             else {
                 if (this.manufacturerCode !== DEFAULT_MANUFACTURER_CODE) {
@@ -2348,308 +1667,243 @@ class EmberAdapter extends __1.Adapter {
                     this.manufacturerCode = DEFAULT_MANUFACTURER_CODE;
                 }
                 await this.ezsp.ezspClearTransientLinkKeys();
-                const setJPstatus = (await this.emberSetJoinPolicy(enums_3.EmberJoinDecision.ALLOW_REJOINS_ONLY));
-                if (setJPstatus !== enums_3.EzspStatus.SUCCESS) {
-                    logger_1.logger.error(`[ZDO] Failed set join policy for with status=${enums_3.EzspStatus[setJPstatus]}.`, NS);
-                    return enums_3.EmberStatus.ERR_FATAL;
+                const setJPstatus = await this.emberSetJoinPolicy(enums_1.EmberJoinDecision.ALLOW_REJOINS_ONLY);
+                if (setJPstatus !== enums_1.SLStatus.OK) {
+                    throw new Error(`[ZDO] Failed set join policy for with status=${enums_1.SLStatus[setJPstatus]}.`);
                 }
-                return enums_3.EmberStatus.SUCCESS;
             }
         };
         if (networkAddress) {
             // specific device that is not `Coordinator`
-            return new Promise((resolve, reject) => {
-                this.requestQueue.enqueue(async () => {
-                    this.checkInterpanLock();
-                    const pjStatus = (await preJoining());
-                    if (pjStatus !== enums_3.EmberStatus.SUCCESS) {
-                        logger_1.logger.error(`[ZDO] Failed pre joining request for "${networkAddress}" with status=${enums_3.EmberStatus[pjStatus]}.`, NS);
-                        return pjStatus;
-                    }
-                    // `authentication`: TC significance always 1 (zb specs)
-                    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-                    const [status, apsFrame, messageTag] = (await this.emberPermitJoiningRequest(networkAddress, seconds, 1, 0));
-                    if (status !== enums_3.EmberStatus.SUCCESS) {
-                        logger_1.logger.error(`[ZDO] Failed permit joining request for "${networkAddress}" with status=${enums_3.EmberStatus[status]}.`, NS);
-                        return status;
-                    }
-                    (await this.oneWaitress.startWaitingFor({
-                        target: networkAddress,
-                        apsFrame,
-                        responseClusterId: zdo_1.PERMIT_JOINING_RESPONSE,
-                    }, DEFAULT_ZDO_REQUEST_TIMEOUT));
-                    resolve();
-                    return enums_3.EmberStatus.SUCCESS;
-                }, reject);
+            return this.queue.execute(async () => {
+                this.checkInterpanLock();
+                await preJoining();
+                // `authentication`: TC significance always 1 (zb specs)
+                const zdoPayload = buffaloZdo_1.BuffaloZdo.buildPermitJoining(seconds, 1, []);
+                const [status, apsFrame] = await this.sendZDORequest(networkAddress, Zdo.ClusterId.PERMIT_JOINING_REQUEST, zdoPayload, 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_ZDO_REQUEST_TIMEOUT);
             });
         }
         else {
             // coordinator-only, or all
-            return new Promise((resolve, reject) => {
-                this.requestQueue.enqueue(async () => {
-                    this.checkInterpanLock();
-                    const pjStatus = (await preJoining());
-                    if (pjStatus !== enums_3.EmberStatus.SUCCESS) {
-                        logger_1.logger.error(`[ZDO] Failed pre joining request for "${networkAddress}" with status=${enums_3.EmberStatus[pjStatus]}.`, NS);
-                        return pjStatus;
-                    }
-                    // local permit join if `Coordinator`-only requested, else local + broadcast
-                    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-                    const [status, apsFrame, messageTag] = (await this.emberPermitJoining(seconds, (networkAddress === ZSpec.COORDINATOR_ADDRESS) ? false : true));
-                    if (status !== enums_3.EmberStatus.SUCCESS) {
-                        logger_1.logger.error(`[ZDO] Failed permit joining request with status=${enums_3.EmberStatus[status]}.`, NS);
-                        return status;
-                    }
-                    // 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)
-                    // }
-                    resolve();
-                    return enums_3.EmberStatus.SUCCESS;
-                }, reject);
+            return 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);
+                if (status !== enums_1.SLStatus.OK) {
+                    throw new Error(`[ZDO] Failed permit joining request with status=${enums_1.SLStatus[status]}.`);
+                }
+                // 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) {
-        const neighbors = [];
-        const request = async (startIndex) => {
-            // eslint-disable-next-line @typescript-eslint/no-unused-vars
-            const [reqStatus, apsFrame, messageTag] = (await this.emberLqiTableRequest(networkAddress, startIndex, DEFAULT_APS_OPTIONS));
-            if (reqStatus !== enums_3.EmberStatus.SUCCESS) {
-                logger_1.logger.error(`[ZDO] Failed LQI request for "${networkAddress}" (index "${startIndex}") with status=${enums_3.EmberStatus[reqStatus]}.`, NS);
-                return [reqStatus, null, null];
-            }
-            const result = (await this.oneWaitress.startWaitingFor({
-                target: networkAddress,
-                apsFrame,
-                responseClusterId: zdo_1.LQI_TABLE_RESPONSE,
-            }, DEFAULT_ZDO_REQUEST_TIMEOUT));
-            for (const entry of result.entryList) {
-                neighbors.push({
-                    ieeeAddr: entry.eui64,
-                    networkAddress: entry.nodeId,
-                    linkquality: entry.lqi,
-                    relationship: entry.relationship,
-                    depth: entry.depth,
-                });
-            }
-            return [enums_3.EmberStatus.SUCCESS, result.neighborTableEntries, result.entryList.length];
-        };
-        return new Promise((resolve, reject) => {
-            this.requestQueue.enqueue(async () => {
-                this.checkInterpanLock();
-                let [status, tableEntries, entryCount] = (await request(0));
-                if (status !== enums_3.EmberStatus.SUCCESS) {
-                    return status;
+        return this.queue.execute(async () => {
+            this.checkInterpanLock();
+            const neighbors = [];
+            const request = async (startIndex) => {
+                const zdoPayload = buffaloZdo_1.BuffaloZdo.buildLqiTableRequest(startIndex);
+                const [status, apsFrame] = await this.sendZDORequest(networkAddress, Zdo.ClusterId.LQI_TABLE_REQUEST, zdoPayload, 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 size = tableEntries;
-                let nextStartIndex = entryCount;
-                while (neighbors.length < size) {
-                    [status, tableEntries, entryCount] = (await request(nextStartIndex));
-                    if (status !== enums_3.EmberStatus.SUCCESS) {
-                        return status;
-                    }
-                    nextStartIndex += entryCount;
+                const result = await this.oneWaitress.startWaitingFor({
+                    target: networkAddress,
+                    apsFrame,
+                    responseClusterId: Zdo.ClusterId.LQI_TABLE_RESPONSE,
+                }, DEFAULT_ZDO_REQUEST_TIMEOUT);
+                for (const entry of result.entryList) {
+                    neighbors.push({
+                        ieeeAddr: entry.eui64,
+                        networkAddress: entry.nwkAddress,
+                        linkquality: entry.lqi,
+                        relationship: entry.relationship,
+                        depth: entry.depth,
+                    });
                 }
-                resolve({ neighbors });
-                return status;
-            }, reject);
+                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 };
         });
     }
     // queued, non-InterPAN
     async routingTable(networkAddress) {
-        const table = [];
-        const request = async (startIndex) => {
-            // eslint-disable-next-line @typescript-eslint/no-unused-vars
-            const [reqStatus, apsFrame, messageTag] = (await this.emberRoutingTableRequest(networkAddress, startIndex, DEFAULT_APS_OPTIONS));
-            if (reqStatus !== enums_3.EmberStatus.SUCCESS) {
-                logger_1.logger.error(`[ZDO] Failed routing table request for "${networkAddress}" (index "${startIndex}") with status=${enums_3.EmberStatus[reqStatus]}.`, NS);
-                return [reqStatus, null, null];
-            }
-            const result = (await this.oneWaitress.startWaitingFor({
-                target: networkAddress,
-                apsFrame,
-                responseClusterId: zdo_1.ROUTING_TABLE_RESPONSE,
-            }, DEFAULT_ZDO_REQUEST_TIMEOUT));
-            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
-                    nextHop: entry.nextHopAddress,
-                });
-            }
-            return [enums_3.EmberStatus.SUCCESS, result.routingTableEntries, result.entryList.length];
-        };
-        return new Promise((resolve, reject) => {
-            this.requestQueue.enqueue(async () => {
-                this.checkInterpanLock();
-                let [status, tableEntries, entryCount] = (await request(0));
-                if (status !== enums_3.EmberStatus.SUCCESS) {
-                    return status;
+        return this.queue.execute(async () => {
+            this.checkInterpanLock();
+            const table = [];
+            const request = async (startIndex) => {
+                const zdoPayload = buffaloZdo_1.BuffaloZdo.buildRoutingTableRequest(startIndex);
+                const [status, apsFrame] = await this.sendZDORequest(networkAddress, Zdo.ClusterId.ROUTING_TABLE_REQUEST, zdoPayload, 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 size = tableEntries;
-                let nextStartIndex = entryCount;
-                while (table.length < size) {
-                    [status, tableEntries, entryCount] = (await request(nextStartIndex));
-                    if (status !== enums_3.EmberStatus.SUCCESS) {
-                        return status;
-                    }
-                    nextStartIndex += entryCount;
+                const result = await this.oneWaitress.startWaitingFor({
+                    target: networkAddress,
+                    apsFrame,
+                    responseClusterId: Zdo.ClusterId.ROUTING_TABLE_RESPONSE,
+                }, DEFAULT_ZDO_REQUEST_TIMEOUT);
+                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
+                        nextHop: entry.nextHopAddress,
+                    });
                 }
-                resolve({ table });
-                return enums_3.EmberStatus.SUCCESS;
-            }, reject);
+                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 };
         });
     }
     // queued, non-InterPAN
     async nodeDescriptor(networkAddress) {
-        return new Promise((resolve, reject) => {
-            this.requestQueue.enqueue(async () => {
-                this.checkInterpanLock();
-                /* eslint-disable @typescript-eslint/no-unused-vars */
-                const [status, apsFrame, messageTag] = (await this.emberNodeDescriptorRequest(networkAddress, DEFAULT_APS_OPTIONS));
-                if (status !== enums_3.EmberStatus.SUCCESS) {
-                    logger_1.logger.error(`[ZDO] Failed node descriptor for "${networkAddress}" with status=${enums_3.EmberStatus[status]}.`, NS);
-                    return status;
-                }
-                const result = (await this.oneWaitress.startWaitingFor({
-                    target: networkAddress,
-                    apsFrame,
-                    responseClusterId: zdo_1.NODE_DESCRIPTOR_RESPONSE,
-                }, DEFAULT_ZDO_REQUEST_TIMEOUT));
-                let type = 'Unknown';
-                switch (result.logicalType) {
-                    case 0x0:
-                        type = 'Coordinator';
-                        break;
-                    case 0x1:
-                        type = 'Router';
-                        break;
-                    case 0x2:
-                        type = 'EndDevice';
-                        break;
-                }
-                // always 0 before rev. 21 where field was added
-                if (result.stackRevision < CURRENT_ZIGBEE_SPEC_REVISION) {
-                    logger_1.logger.warning(`[ZDO] Node descriptor for "${networkAddress}" reports device is only compliant to revision `
-                        + `"${(result.stackRevision < 21) ? 'pre-21' : result.stackRevision}" of the ZigBee specification `
-                        + `(current revision: ${CURRENT_ZIGBEE_SPEC_REVISION}).`, NS);
-                }
-                resolve({ type, manufacturerCode: result.manufacturerCode });
-                return enums_3.EmberStatus.SUCCESS;
-            }, reject);
+        return this.queue.execute(async () => {
+            this.checkInterpanLock();
+            const zdoPayload = buffaloZdo_1.BuffaloZdo.buildNodeDescriptorRequest(networkAddress);
+            const [status, apsFrame] = await this.sendZDORequest(networkAddress, Zdo.ClusterId.NODE_DESCRIPTOR_REQUEST, zdoPayload, DEFAULT_APS_OPTIONS);
+            if (status !== enums_1.SLStatus.OK) {
+                throw new Error(`[ZDO] Failed node descriptor for "${networkAddress}" with status=${enums_1.SLStatus[status]}.`);
+            }
+            const result = await this.oneWaitress.startWaitingFor({
+                target: networkAddress,
+                apsFrame,
+                responseClusterId: Zdo.ClusterId.NODE_DESCRIPTOR_RESPONSE,
+            }, DEFAULT_ZDO_REQUEST_TIMEOUT);
+            let type = 'Unknown';
+            switch (result.logicalType) {
+                case 0x0:
+                    type = 'Coordinator';
+                    break;
+                case 0x1:
+                    type = 'Router';
+                    break;
+                case 0x2:
+                    type = 'EndDevice';
+                    break;
+            }
+            // always 0 before rev. 21 where field was added
+            if (result.serverMask.stackComplianceResivion < CURRENT_ZIGBEE_SPEC_REVISION) {
+                logger_1.logger.warning(`[ZDO] Node descriptor for '${networkAddress}' reports device is only compliant to revision ` +
+                    `'${result.serverMask.stackComplianceResivion < 21 ? 'pre-21' : result.serverMask.stackComplianceResivion}' ` +
+                    `of the ZigBee specification (current revision: ${CURRENT_ZIGBEE_SPEC_REVISION}).`, NS);
+            }
+            return { type, manufacturerCode: result.manufacturerCode };
         });
     }
     // queued, non-InterPAN
     async activeEndpoints(networkAddress) {
-        return new Promise((resolve, reject) => {
-            this.requestQueue.enqueue(async () => {
-                this.checkInterpanLock();
-                // eslint-disable-next-line @typescript-eslint/no-unused-vars
-                const [status, apsFrame, messageTag] = (await this.emberActiveEndpointsRequest(networkAddress, DEFAULT_APS_OPTIONS));
-                if (status !== enums_3.EmberStatus.SUCCESS) {
-                    logger_1.logger.error(`[ZDO] Failed active endpoints request for "${networkAddress}" with status=${enums_3.EmberStatus[status]}.`, NS);
-                    return status;
-                }
-                const result = (await this.oneWaitress.startWaitingFor({
-                    target: networkAddress,
-                    apsFrame,
-                    responseClusterId: zdo_1.ACTIVE_ENDPOINTS_RESPONSE,
-                }, DEFAULT_ZDO_REQUEST_TIMEOUT));
-                resolve({ endpoints: result.endpointList });
-                return enums_3.EmberStatus.SUCCESS;
-            }, reject);
+        return this.queue.execute(async () => {
+            this.checkInterpanLock();
+            const zdoPayload = buffaloZdo_1.BuffaloZdo.buildActiveEndpointsRequest(networkAddress);
+            const [status, apsFrame] = await this.sendZDORequest(networkAddress, Zdo.ClusterId.ACTIVE_ENDPOINTS_REQUEST, zdoPayload, 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_ZDO_REQUEST_TIMEOUT);
+            return { endpoints: result.endpointList };
         });
     }
     // queued, non-InterPAN
     async simpleDescriptor(networkAddress, endpointID) {
-        return new Promise((resolve, reject) => {
-            this.requestQueue.enqueue(async () => {
-                this.checkInterpanLock();
-                // eslint-disable-next-line @typescript-eslint/no-unused-vars
-                const [status, apsFrame, messageTag] = (await this.emberSimpleDescriptorRequest(networkAddress, endpointID, DEFAULT_APS_OPTIONS));
-                if (status !== enums_3.EmberStatus.SUCCESS) {
-                    logger_1.logger.error(`[ZDO] Failed simple descriptor request for "${networkAddress}" endpoint "${endpointID}" `
-                        + `with status=${enums_3.EmberStatus[status]}.`, NS);
-                    return status;
-                }
-                const result = (await this.oneWaitress.startWaitingFor({
-                    target: networkAddress,
-                    apsFrame,
-                    responseClusterId: zdo_1.SIMPLE_DESCRIPTOR_RESPONSE,
-                }, DEFAULT_ZDO_REQUEST_TIMEOUT));
-                resolve({
-                    profileID: result.profileId,
-                    endpointID: result.endpoint,
-                    deviceID: result.deviceId,
-                    inputClusters: result.inClusterList,
-                    outputClusters: result.outClusterList,
-                });
-                return enums_3.EmberStatus.SUCCESS;
-            }, reject);
+        return this.queue.execute(async () => {
+            this.checkInterpanLock();
+            const zdoPayload = buffaloZdo_1.BuffaloZdo.buildSimpleDescriptorRequest(networkAddress, endpointID);
+            const [status, apsFrame] = await this.sendZDORequest(networkAddress, Zdo.ClusterId.SIMPLE_DESCRIPTOR_REQUEST, zdoPayload, 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_ZDO_REQUEST_TIMEOUT);
+            return {
+                profileID: result.profileId,
+                endpointID: result.endpoint,
+                deviceID: result.deviceId,
+                inputClusters: result.inClusterList,
+                outputClusters: result.outClusterList,
+            };
         });
     }
     // queued, non-InterPAN
     async bind(destinationNetworkAddress, sourceIeeeAddress, sourceEndpoint, clusterID, destinationAddressOrGroup, type, destinationEndpoint) {
         if (typeof destinationAddressOrGroup === 'string' && type === 'endpoint') {
             // dest address is EUI64 (str), so type should always be endpoint (unicast)
-            return new Promise((resolve, reject) => {
-                this.requestQueue.enqueue(async () => {
-                    this.checkInterpanLock();
-                    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-                    const [status, apsFrame, messageTag] = (await this.emberBindRequest(destinationNetworkAddress, sourceIeeeAddress, sourceEndpoint, clusterID, zdo_1.UNICAST_BINDING, destinationAddressOrGroup, null, // doesn't matter
-                    destinationEndpoint, DEFAULT_APS_OPTIONS));
-                    if (status !== enums_3.EmberStatus.SUCCESS) {
-                        logger_1.logger.error(`[ZDO] Failed bind request for "${destinationNetworkAddress}" destination "${destinationAddressOrGroup}" `
-                            + `endpoint "${destinationEndpoint}" with status=${enums_3.EmberStatus[status]}.`, NS);
-                        return status;
-                    }
-                    await this.oneWaitress.startWaitingFor({
-                        target: destinationNetworkAddress,
-                        apsFrame,
-                        responseClusterId: zdo_1.BIND_RESPONSE,
-                    }, DEFAULT_ZDO_REQUEST_TIMEOUT);
-                    resolve();
-                    return enums_3.EmberStatus.SUCCESS;
-                }, reject);
+            return this.queue.execute(async () => {
+                this.checkInterpanLock();
+                const zdoPayload = buffaloZdo_1.BuffaloZdo.buildBindRequest(sourceIeeeAddress, sourceEndpoint, clusterID, Zdo.UNICAST_BINDING, destinationAddressOrGroup, undefined, // not used with UNICAST_BINDING
+                destinationEndpoint);
+                const [status, apsFrame] = await this.sendZDORequest(destinationNetworkAddress, Zdo.ClusterId.BIND_REQUEST, zdoPayload, 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_ZDO_REQUEST_TIMEOUT);
             });
         }
         else if (typeof destinationAddressOrGroup === 'number' && type === 'group') {
             // dest is group num, so type should always be group (multicast)
-            return new Promise((resolve, reject) => {
-                this.requestQueue.enqueue(async () => {
-                    this.checkInterpanLock();
-                    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-                    const [status, apsFrame, messageTag] = (await this.emberBindRequest(destinationNetworkAddress, sourceIeeeAddress, sourceEndpoint, clusterID, zdo_1.MULTICAST_BINDING, null, // doesn't matter
-                    destinationAddressOrGroup, destinationEndpoint, // doesn't matter
-                    DEFAULT_APS_OPTIONS));
-                    if (status !== enums_3.EmberStatus.SUCCESS) {
-                        logger_1.logger.error(`[ZDO] Failed bind request for "${destinationNetworkAddress}" group "${destinationAddressOrGroup}" `
-                            + `with status=${enums_3.EmberStatus[status]}.`, NS);
-                        return status;
-                    }
-                    await this.oneWaitress.startWaitingFor({
-                        target: destinationNetworkAddress,
-                        apsFrame,
-                        responseClusterId: zdo_1.BIND_RESPONSE,
-                    }, DEFAULT_ZDO_REQUEST_TIMEOUT);
-                    resolve();
-                    return enums_3.EmberStatus.SUCCESS;
-                }, reject);
+            return this.queue.execute(async () => {
+                this.checkInterpanLock();
+                const zdoPayload = buffaloZdo_1.BuffaloZdo.buildBindRequest(sourceIeeeAddress, sourceEndpoint, clusterID, Zdo.MULTICAST_BINDING, undefined, // not used with MULTICAST_BINDING
+                destinationAddressOrGroup, undefined);
+                const [status, apsFrame] = await this.sendZDORequest(destinationNetworkAddress, Zdo.ClusterId.BIND_REQUEST, zdoPayload, DEFAULT_APS_OPTIONS);
+                if (status !== enums_1.SLStatus.OK) {
+                    throw new Error(`[ZDO] Failed bind request for "${destinationNetworkAddress}" group "${destinationAddressOrGroup}" ` +
+                        `with status=${enums_1.SLStatus[status]}.`);
+                }
+                await this.oneWaitress.startWaitingFor({
+                    target: destinationNetworkAddress,
+                    apsFrame,
+                    responseClusterId: Zdo.ClusterId.BIND_RESPONSE,
+                }, DEFAULT_ZDO_REQUEST_TIMEOUT);
             });
         }
     }
@@ -2657,79 +1911,61 @@ class EmberAdapter extends __1.Adapter {
     async unbind(destinationNetworkAddress, sourceIeeeAddress, sourceEndpoint, clusterID, destinationAddressOrGroup, type, destinationEndpoint) {
         if (typeof destinationAddressOrGroup === 'string' && type === 'endpoint') {
             // dest address is EUI64 (str), so type should always be endpoint (unicast)
-            return new Promise((resolve, reject) => {
-                this.requestQueue.enqueue(async () => {
-                    this.checkInterpanLock();
-                    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-                    const [status, apsFrame, messageTag] = (await this.emberUnbindRequest(destinationNetworkAddress, sourceIeeeAddress, sourceEndpoint, clusterID, zdo_1.UNICAST_BINDING, destinationAddressOrGroup, null, // doesn't matter
-                    destinationEndpoint, DEFAULT_APS_OPTIONS));
-                    if (status !== enums_3.EmberStatus.SUCCESS) {
-                        logger_1.logger.error(`[ZDO] Failed unbind request for "${destinationNetworkAddress}" destination "${destinationAddressOrGroup}" `
-                            + `endpoint "${destinationEndpoint}" with status=${enums_3.EmberStatus[status]}.`, NS);
-                        return status;
-                    }
-                    await this.oneWaitress.startWaitingFor({
-                        target: destinationNetworkAddress,
-                        apsFrame,
-                        responseClusterId: zdo_1.UNBIND_RESPONSE,
-                    }, DEFAULT_ZDO_REQUEST_TIMEOUT);
-                    resolve();
-                    return enums_3.EmberStatus.SUCCESS;
-                }, reject);
+            return this.queue.execute(async () => {
+                this.checkInterpanLock();
+                const zdoPayload = buffaloZdo_1.BuffaloZdo.buildUnbindRequest(sourceIeeeAddress, sourceEndpoint, clusterID, Zdo.UNICAST_BINDING, destinationAddressOrGroup, undefined, // not used with UNICAST_BINDING
+                destinationEndpoint);
+                const [status, apsFrame] = await this.sendZDORequest(destinationNetworkAddress, Zdo.ClusterId.UNBIND_REQUEST, zdoPayload, 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_ZDO_REQUEST_TIMEOUT);
             });
         }
         else if (typeof destinationAddressOrGroup === 'number' && type === 'group') {
             // dest is group num, so type should always be group (multicast)
-            return new Promise((resolve, reject) => {
-                this.requestQueue.enqueue(async () => {
-                    this.checkInterpanLock();
-                    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-                    const [status, apsFrame, messageTag] = (await this.emberUnbindRequest(destinationNetworkAddress, sourceIeeeAddress, sourceEndpoint, clusterID, zdo_1.MULTICAST_BINDING, null, // doesn't matter
-                    destinationAddressOrGroup, destinationEndpoint, // doesn't matter
-                    DEFAULT_APS_OPTIONS));
-                    if (status !== enums_3.EmberStatus.SUCCESS) {
-                        logger_1.logger.error(`[ZDO] Failed unbind request for "${destinationNetworkAddress}" group "${destinationAddressOrGroup}" `
-                            + `with status=${enums_3.EmberStatus[status]}.`, NS);
-                        return status;
-                    }
-                    await this.oneWaitress.startWaitingFor({
-                        target: destinationNetworkAddress,
-                        apsFrame,
-                        responseClusterId: zdo_1.UNBIND_RESPONSE,
-                    }, DEFAULT_ZDO_REQUEST_TIMEOUT);
-                    resolve();
-                    return enums_3.EmberStatus.SUCCESS;
-                }, reject);
-            });
-        }
-    }
-    // queued, non-InterPAN
-    async removeDevice(networkAddress, ieeeAddr) {
-        return new Promise((resolve, reject) => {
-            this.requestQueue.enqueue(async () => {
+            return new Promise(async () => {
                 this.checkInterpanLock();
-                // eslint-disable-next-line @typescript-eslint/no-unused-vars
-                const [status, apsFrame, messageTag] = (await this.emberLeaveRequest(networkAddress, ieeeAddr, enums_3.EmberLeaveRequestFlags.WITHOUT_REJOIN, DEFAULT_APS_OPTIONS));
-                if (status !== enums_3.EmberStatus.SUCCESS) {
-                    logger_1.logger.error(`[ZDO] Failed remove device request for "${networkAddress}" target "${ieeeAddr}" `
-                        + `with status=${enums_3.EmberStatus[status]}.`, NS);
-                    return status;
+                const zdoPayload = buffaloZdo_1.BuffaloZdo.buildUnbindRequest(sourceIeeeAddress, sourceEndpoint, clusterID, Zdo.MULTICAST_BINDING, undefined, // not used with MULTICAST_BINDING
+                destinationAddressOrGroup, undefined);
+                const [status, apsFrame] = await this.sendZDORequest(destinationNetworkAddress, Zdo.ClusterId.UNBIND_REQUEST, zdoPayload, DEFAULT_APS_OPTIONS);
+                if (status !== enums_1.SLStatus.OK) {
+                    throw new Error(`[ZDO] Failed unbind request for "${destinationNetworkAddress}" group "${destinationAddressOrGroup}" ` +
+                        `with status=${enums_1.SLStatus[status]}.`);
                 }
                 await this.oneWaitress.startWaitingFor({
-                    target: networkAddress,
+                    target: destinationNetworkAddress,
                     apsFrame,
-                    responseClusterId: zdo_1.LEAVE_RESPONSE,
+                    responseClusterId: Zdo.ClusterId.UNBIND_RESPONSE,
                 }, DEFAULT_ZDO_REQUEST_TIMEOUT);
-                resolve();
-                return enums_3.EmberStatus.SUCCESS;
-            }, reject);
+            });
+        }
+    }
+    // queued, non-InterPAN
+    async removeDevice(networkAddress, ieeeAddr) {
+        return this.queue.execute(async () => {
+            this.checkInterpanLock();
+            const zdoPayload = buffaloZdo_1.BuffaloZdo.buildLeaveRequest(ieeeAddr, Zdo.LeaveRequestFlags.WITHOUT_REJOIN);
+            const [status, apsFrame] = await this.sendZDORequest(networkAddress, Zdo.ClusterId.LEAVE_REQUEST, zdoPayload, 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_ZDO_REQUEST_TIMEOUT);
         });
     }
     //---- ZCL
     // queued, non-InterPAN
     async sendZclFrameToEndpoint(ieeeAddr, networkAddress, endpoint, zclFrame, timeout, disableResponse, disableRecovery, sourceEndpoint) {
-        const sourceEndpointInfo = typeof sourceEndpoint === 'number' ?
-            endpoints_1.FIXED_ENDPOINTS.find((epi) => (epi.endpoint === sourceEndpoint)) : endpoints_1.FIXED_ENDPOINTS[0];
+        const sourceEndpointInfo = typeof sourceEndpoint === 'number' ? endpoints_1.FIXED_ENDPOINTS.find((epi) => epi.endpoint === sourceEndpoint) : endpoints_1.FIXED_ENDPOINTS[0];
         const command = zclFrame.command;
         let commandResponseId = null;
         if (command.hasOwnProperty('response') && disableResponse === false) {
@@ -2742,54 +1978,65 @@ class EmberAdapter extends __1.Adapter {
             profileId: sourceEndpointInfo.profileId,
             clusterId: zclFrame.cluster.ID,
             sourceEndpoint: sourceEndpointInfo.endpoint,
-            destinationEndpoint: (typeof endpoint === 'number') ? endpoint : endpoints_1.FIXED_ENDPOINTS[0].endpoint,
+            destinationEndpoint: typeof endpoint === 'number' ? endpoint : endpoints_1.FIXED_ENDPOINTS[0].endpoint,
             options: DEFAULT_APS_OPTIONS,
             groupId: 0,
             sequence: 0, // set by stack
         };
         // don't RETRY if no response expected
         if (commandResponseId == null) {
-            apsFrame.options &= ~enums_3.EmberApsOption.RETRY;
+            apsFrame.options &= ~enums_1.EmberApsOption.RETRY;
         }
         const data = zclFrame.toBuffer();
-        return new Promise((resolve, reject) => {
-            this.requestQueue.enqueue(async () => {
-                this.checkInterpanLock();
-                if (CHECK_APS_PAYLOAD_LENGTH) {
-                    const maxPayloadLength = (await this.maximumApsPayloadLength(enums_3.EmberOutgoingMessageType.DIRECT, networkAddress, apsFrame));
-                    if (data.length > maxPayloadLength) {
-                        return enums_3.EmberStatus.MESSAGE_TOO_LONG; // queue will reject
+        return this.queue.execute(async () => {
+            this.checkInterpanLock();
+            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 {
+                    [status] = await this.ezsp.send(enums_1.EmberOutgoingMessageType.DIRECT, networkAddress, apsFrame, data, 0, // alias
+                    0);
+                }
+                catch (error) {
+                    if (error instanceof ezspError_1.EzspError) {
+                        if (error.code === enums_1.EzspStatus.NO_TX_SPACE) {
+                            status === enums_1.SLStatus.BUSY;
+                        }
+                        else if (error.code === enums_1.EzspStatus.NOT_CONNECTED) {
+                            status === enums_1.SLStatus.NETWORK_DOWN;
+                        }
                     }
                 }
-                logger_1.logger.debug(`~~~> [ZCL to=${networkAddress} 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_3.EmberOutgoingMessageType.DIRECT, networkAddress, apsFrame, data, 0, // alias
-                0));
-                if (status !== enums_3.EmberStatus.SUCCESS) {
-                    logger_1.logger.error(`~x~> [ZCL to=${networkAddress}] Failed to send request with status=${enums_3.EmberStatus[status]}.`, NS);
-                    return status; // let queue handle retry based on status
+                // `else if` order matters
+                if (status === enums_1.SLStatus.OK) {
+                    break;
                 }
-                if (commandResponseId != null) {
-                    // NOTE: aps sequence number will have been set by send function
-                    const result = (await this.oneWaitress.startWaitingFor({
-                        target: networkAddress,
-                        apsFrame,
-                        zclSequence: zclFrame.header.transactionSequenceNumber,
-                        commandIdentifier: commandResponseId,
-                    }, timeout || DEFAULT_ZCL_REQUEST_TIMEOUT));
-                    resolve(result);
+                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]}.`);
                 }
-                else {
-                    resolve(null); // don't expect a response
-                    return enums_3.EmberStatus.SUCCESS;
+                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);
                 }
-            }, reject);
+                else if (status === enums_1.SLStatus.NETWORK_DOWN) {
+                    await (0, utils_1.Wait)(QUEUE_NETWORK_DOWN_DEFER_MSEC);
+                }
+            }
+            if (commandResponseId != null) {
+                // NOTE: aps sequence number will have been set by send function
+                const result = await this.oneWaitress.startWaitingFor({
+                    target: networkAddress,
+                    apsFrame,
+                    zclSequence: zclFrame.header.transactionSequenceNumber,
+                    commandIdentifier: commandResponseId,
+                }, timeout || DEFAULT_ZCL_REQUEST_TIMEOUT);
+                return result;
+            }
+            return null;
         });
     }
     // queued, non-InterPAN
     async sendZclFrameToGroup(groupID, zclFrame, sourceEndpoint) {
-        const sourceEndpointInfo = typeof sourceEndpoint === 'number' ?
-            endpoints_1.FIXED_ENDPOINTS.find((epi) => (epi.endpoint === sourceEndpoint)) : endpoints_1.FIXED_ENDPOINTS[0];
+        const sourceEndpointInfo = typeof sourceEndpoint === 'number' ? endpoints_1.FIXED_ENDPOINTS.find((epi) => epi.endpoint === sourceEndpoint) : endpoints_1.FIXED_ENDPOINTS[0];
         const apsFrame = {
             profileId: sourceEndpointInfo.profileId,
             clusterId: zclFrame.cluster.ID,
@@ -2800,65 +2047,44 @@ class EmberAdapter extends __1.Adapter {
             sequence: 0, // set by stack
         };
         const data = zclFrame.toBuffer();
-        return new Promise((resolve, reject) => {
-            this.requestQueue.enqueue(async () => {
-                this.checkInterpanLock();
-                if (CHECK_APS_PAYLOAD_LENGTH) {
-                    const maxPayloadLength = (await this.maximumApsPayloadLength(enums_3.EmberOutgoingMessageType.MULTICAST, groupID, apsFrame));
-                    if (data.length > maxPayloadLength) {
-                        return enums_3.EmberStatus.MESSAGE_TOO_LONG; // queue will reject
-                    }
-                }
-                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_3.EmberOutgoingMessageType.MULTICAST, apsFrame.groupId, // not used for MC
-                apsFrame, data, 0, // alias
-                0));
-                if (status !== enums_3.EmberStatus.SUCCESS) {
-                    logger_1.logger.error(`~x~> [ZCL GROUP] Failed to send with status=${enums_3.EmberStatus[status]}.`, NS);
-                    return status; // let queue handle retry based on status
-                }
-                // NOTE: since ezspMessageSentHandler could take a while here, we don't block, it'll just be logged if the delivery failed
-                resolve();
-                return enums_3.EmberStatus.SUCCESS;
-            }, reject);
+        return this.queue.execute(async () => {
+            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
+            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]}.`);
+            }
+            // 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);
         });
     }
     // queued, non-InterPAN
     async sendZclFrameToAll(endpoint, zclFrame, sourceEndpoint, destination) {
-        const sourceEndpointInfo = typeof sourceEndpoint === 'number' ?
-            endpoints_1.FIXED_ENDPOINTS.find((epi) => (epi.endpoint === sourceEndpoint)) : endpoints_1.FIXED_ENDPOINTS[0];
+        const sourceEndpointInfo = typeof sourceEndpoint === 'number' ? endpoints_1.FIXED_ENDPOINTS.find((epi) => epi.endpoint === sourceEndpoint) : endpoints_1.FIXED_ENDPOINTS[0];
         const apsFrame = {
             profileId: sourceEndpointInfo.profileId,
             clusterId: zclFrame.cluster.ID,
             sourceEndpoint: sourceEndpointInfo.endpoint,
-            destinationEndpoint: (typeof endpoint === 'number') ? endpoint : endpoints_1.FIXED_ENDPOINTS[0].endpoint,
+            destinationEndpoint: typeof endpoint === 'number' ? endpoint : endpoints_1.FIXED_ENDPOINTS[0].endpoint,
             options: DEFAULT_APS_OPTIONS,
             groupId: destination,
             sequence: 0, // set by stack
         };
         const data = zclFrame.toBuffer();
-        return new Promise((resolve, reject) => {
-            this.requestQueue.enqueue(async () => {
-                this.checkInterpanLock();
-                if (CHECK_APS_PAYLOAD_LENGTH) {
-                    const maxPayloadLength = (await this.maximumApsPayloadLength(enums_3.EmberOutgoingMessageType.BROADCAST, destination, apsFrame));
-                    if (data.length > maxPayloadLength) {
-                        return enums_3.EmberStatus.MESSAGE_TOO_LONG; // queue will reject
-                    }
-                }
-                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_3.EmberOutgoingMessageType.BROADCAST, destination, apsFrame, data, 0, // alias
-                0));
-                if (status !== enums_3.EmberStatus.SUCCESS) {
-                    logger_1.logger.error(`~x~> [ZCL BROADCAST] Failed to send with status=${enums_3.EmberStatus[status]}.`, NS);
-                    return status; // let queue handle retry based on status
-                }
-                // NOTE: since ezspMessageSentHandler could take a while here, we don't block, it'll just be logged if the delivery failed
-                resolve();
-                return enums_3.EmberStatus.SUCCESS;
-            }, reject);
+        return this.queue.execute(async () => {
+            this.checkInterpanLock();
+            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);
+            if (status !== enums_1.SLStatus.OK) {
+                throw new Error(`~x~> [ZCL BROADCAST] 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);
         });
     }
     //---- InterPAN for Touchlink
@@ -2870,48 +2096,38 @@ class EmberAdapter extends __1.Adapter {
             logger_1.logger.error(`Tried to set channel InterPAN to non-number. Channel ${channel} of type ${typeof channel}.`, NS);
             return;
         }
-        return new Promise((resolve, reject) => {
-            this.requestQueue.enqueue(async () => {
-                this.interpanLock = true;
-                const status = (await this.ezsp.ezspSetLogicalAndRadioChannel(channel));
-                if (status !== enums_3.EmberStatus.SUCCESS) {
-                    this.interpanLock = false; // XXX: ok?
-                    logger_1.logger.error(`Failed to set InterPAN channel to ${channel} with status=${enums_3.EmberStatus[status]}.`, NS);
-                    return status;
-                }
-                resolve();
-                return status;
-            }, reject);
+        return this.queue.execute(async () => {
+            this.interpanLock = true;
+            const status = await this.ezsp.ezspSetLogicalAndRadioChannel(channel);
+            if (status !== enums_1.SLStatus.OK) {
+                this.interpanLock = false; // XXX: ok?
+                throw new Error(`Failed to set InterPAN channel to ${channel} with status=${enums_1.SLStatus[status]}.`);
+            }
         });
     }
     // queued
     async sendZclFrameInterPANToIeeeAddr(zclFrame, ieeeAddress) {
-        return new Promise((resolve, reject) => {
-            this.requestQueue.enqueue(async () => {
-                const msgBuffalo = new buffalo_1.EzspBuffalo(Buffer.alloc(consts_2.MAXIMUM_INTERPAN_LENGTH));
-                // cache-enabled getters
-                const sourcePanId = (await this.emberGetPanId());
-                const sourceEui64 = (await this.emberGetEui64());
-                msgBuffalo.writeUInt16((consts_2.LONG_DEST_FRAME_CONTROL | consts_2.MAC_ACK_REQUIRED)); // macFrameControl
-                msgBuffalo.writeUInt8(0); // sequence Skip Sequence number, stack sets the sequence number.
-                msgBuffalo.writeUInt16(ZSpec.INVALID_PAN_ID); // destPanId
-                msgBuffalo.writeIeeeAddr(ieeeAddress); // destAddress (longAddress)
-                msgBuffalo.writeUInt16(sourcePanId); // sourcePanId
-                msgBuffalo.writeIeeeAddr(sourceEui64); // sourceAddress
-                msgBuffalo.writeUInt16(consts_2.STUB_NWK_FRAME_CONTROL); // nwkFrameControl
-                msgBuffalo.writeUInt8((enums_3.EmberInterpanMessageType.UNICAST | consts_2.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);
-                const status = (await this.ezsp.ezspSendRawMessage(Buffer.concat([msgBuffalo.getWritten(), zclFrame.toBuffer()])));
-                if (status !== enums_3.EmberStatus.SUCCESS) {
-                    logger_1.logger.error(`~x~> [ZCL TOUCHLINK to=${ieeeAddress}] Failed to send with status=${enums_3.EmberStatus[status]}.`, NS);
-                    return status;
-                }
-                // NOTE: can use ezspRawTransmitCompleteHandler if needed here
-                resolve();
-                return status;
-            }, reject);
+        return 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();
+            const sourceEui64 = await this.emberGetEui64();
+            msgBuffalo.writeUInt16(consts_1.LONG_DEST_FRAME_CONTROL | consts_1.MAC_ACK_REQUIRED); // macFrameControl
+            msgBuffalo.writeUInt8(0); // sequence Skip Sequence number, stack sets the sequence number.
+            msgBuffalo.writeUInt16(ZSpec.INVALID_PAN_ID); // destPanId
+            msgBuffalo.writeIeeeAddr(ieeeAddress); // destAddress (longAddress)
+            msgBuffalo.writeUInt16(sourcePanId); // sourcePanId
+            msgBuffalo.writeIeeeAddr(sourceEui64); // sourceAddress
+            msgBuffalo.writeUInt16(consts_1.STUB_NWK_FRAME_CONTROL); // nwkFrameControl
+            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);
+            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]}.`);
+            }
+            // NOTE: can use ezspRawTransmitCompleteHandler if needed here
         });
     }
     // queued
@@ -2926,60 +2142,51 @@ class EmberAdapter extends __1.Adapter {
             clusterId: zclFrame.cluster.ID,
             sourceEndpoint: 0,
             destinationEndpoint: 0,
-            options: enums_3.EmberApsOption.NONE,
-            groupId: enums_1.BroadcastAddress.SLEEPY,
+            options: enums_1.EmberApsOption.NONE,
+            groupId: ZSpec.BroadcastAddress.SLEEPY,
             sequence: 0, // set by stack
         };
-        return new Promise((resolve, reject) => {
-            this.requestQueue.enqueue(async () => {
-                const msgBuffalo = new buffalo_1.EzspBuffalo(Buffer.alloc(consts_2.MAXIMUM_INTERPAN_LENGTH));
-                // cache-enabled getters
-                const sourcePanId = (await this.emberGetPanId());
-                const sourceEui64 = (await this.emberGetEui64());
-                msgBuffalo.writeUInt16(consts_2.SHORT_DEST_FRAME_CONTROL); // macFrameControl
-                msgBuffalo.writeUInt8(0); // sequence Skip Sequence number, stack sets the sequence number.
-                msgBuffalo.writeUInt16(ZSpec.INVALID_PAN_ID); // destPanId
-                msgBuffalo.writeUInt16(apsFrame.groupId); // destAddress (longAddress)
-                msgBuffalo.writeUInt16(sourcePanId); // sourcePanId
-                msgBuffalo.writeIeeeAddr(sourceEui64); // sourceAddress
-                msgBuffalo.writeUInt16(consts_2.STUB_NWK_FRAME_CONTROL); // nwkFrameControl
-                msgBuffalo.writeUInt8((enums_3.EmberInterpanMessageType.BROADCAST | consts_2.INTERPAN_APS_FRAME_TYPE)); // apsFrameControl
-                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);
-                const status = (await this.ezsp.ezspSendRawMessage(data));
-                if (status !== enums_3.EmberStatus.SUCCESS) {
-                    logger_1.logger.error(`~x~> [ZCL TOUCHLINK BROADCAST] Failed to send with status=${enums_3.EmberStatus[status]}.`, NS);
-                    return status;
-                }
-                // NOTE: can use ezspRawTransmitCompleteHandler if needed here
-                const result = (await this.oneWaitress.startWaitingFor({
-                    target: null,
-                    apsFrame: apsFrame,
-                    zclSequence: zclFrame.header.transactionSequenceNumber,
-                    commandIdentifier: command.response,
-                }, timeout || DEFAULT_ZCL_REQUEST_TIMEOUT * 2)); // XXX: touchlink timeout?
-                resolve(result);
-                return enums_3.EmberStatus.SUCCESS;
-            }, reject);
+        return 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();
+            const sourceEui64 = await this.emberGetEui64();
+            msgBuffalo.writeUInt16(consts_1.SHORT_DEST_FRAME_CONTROL); // macFrameControl
+            msgBuffalo.writeUInt8(0); // sequence Skip Sequence number, stack sets the sequence number.
+            msgBuffalo.writeUInt16(ZSpec.INVALID_PAN_ID); // destPanId
+            msgBuffalo.writeUInt16(apsFrame.groupId); // destAddress (longAddress)
+            msgBuffalo.writeUInt16(sourcePanId); // sourcePanId
+            msgBuffalo.writeIeeeAddr(sourceEui64); // sourceAddress
+            msgBuffalo.writeUInt16(consts_1.STUB_NWK_FRAME_CONTROL); // nwkFrameControl
+            msgBuffalo.writeUInt8(enums_1.EmberInterpanMessageType.BROADCAST | consts_1.INTERPAN_APS_FRAME_TYPE); // apsFrameControl
+            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);
+            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]}.`);
+            }
+            // NOTE: can use ezspRawTransmitCompleteHandler if needed here
+            const result = await this.oneWaitress.startWaitingFor({
+                target: null,
+                apsFrame: apsFrame,
+                zclSequence: zclFrame.header.transactionSequenceNumber,
+                commandIdentifier: command.response,
+            }, timeout || DEFAULT_ZCL_REQUEST_TIMEOUT * 2); // XXX: touchlink timeout?
+            return result;
         });
     }
     // queued
     async restoreChannelInterPAN() {
-        return new Promise((resolve, reject) => {
-            this.requestQueue.enqueue(async () => {
-                const status = (await this.ezsp.ezspSetLogicalAndRadioChannel(this.networkOptions.channelList[0]));
-                if (status !== enums_3.EmberStatus.SUCCESS) {
-                    logger_1.logger.error(`Failed to restore InterPAN channel to ${this.networkOptions.channelList[0]} with status=${enums_3.EmberStatus[status]}.`, NS);
-                    return status;
-                }
-                // let adapter settle down
-                await (0, utils_1.Wait)(3000);
-                this.interpanLock = false;
-                resolve();
-                return status;
-            }, reject);
+        return 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]}.`);
+            }
+            // let adapter settle down
+            await (0, utils_1.Wait)(QUEUE_NETWORK_DOWN_DEFER_MSEC);
+            this.interpanLock = false;
         });
     }
     //-- END Adapter implementation
@@ -2987,7 +2194,7 @@ class EmberAdapter extends __1.Adapter {
         if (this.interpanLock) {
             logger_1.logger.error(`[INTERPAN MODE] Cannot execute non-InterPAN commands.`, NS);
             // will be caught by request queue and rejected internally.
-            throw new Error(enums_3.EzspStatus[enums_3.EzspStatus.ERROR_INVALID_CALL]);
+            throw new ezspError_1.EzspError(enums_1.EzspStatus.ERROR_INVALID_CALL);
         }
     }
 }