zigbee-herdsman 0.55.0 → 0.55.1

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

@@ -26,8 +26,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.EmberAdapter = void 0;
-/* istanbul ignore file */
+exports.EmberAdapter = exports.DEFAULT_APS_OPTIONS = exports.DEFAULT_STACK_CONFIG = void 0;
 const crypto_1 = require("crypto");
 const es6_1 = __importDefault(require("fast-deep-equal/es6"));
 const fs_1 = require("fs");
@@ -93,10 +92,10 @@ const autoDetectDefinitions = [
  * messages with non-conflicting sequence numbers.
  */
 const APPLICATION_ZDO_SEQUENCE_MASK = 0x7f;
+/* Default radius used for broadcast ZDO requests. uint8_t */
+const ZDO_REQUEST_RADIUS = 0xff;
 /** 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. */
 const BACKUP_OLDEST_SUPPORTED_EZSP_VERSION = 12;
 /**
@@ -116,7 +115,7 @@ const QUEUE_NETWORK_DOWN_DEFER_MSEC = 1500;
  * https://github.com/NabuCasa/silabs-firmware/wiki/Zigbee-EmberZNet-NCP-firmware-configuration#skyconnect
  * https://github.com/SiliconLabs/UnifySDK/blob/main/applications/zigbeed/project_files/zigbeed.slcp
  */
-const DEFAULT_STACK_CONFIG = {
+exports.DEFAULT_STACK_CONFIG = {
     CONCENTRATOR_RAM_TYPE: 'high',
     CONCENTRATOR_MIN_TIME: 5, // zigpc: 10
     CONCENTRATOR_MAX_TIME: 60, // zigpc: 60
@@ -140,11 +139,9 @@ const TRUST_CENTER_ADDRESS_CACHE_SIZE = 2;
  *
  * 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_1.EmberApsOption.RETRY | enums_1.EmberApsOption.ENABLE_ROUTE_DISCOVERY | enums_1.EmberApsOption.ENABLE_ADDRESS_DISCOVERY;
+exports.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. */
-const DEFAULT_ZCL_REQUEST_TIMEOUT = 15000; //msec
 /** Time for a network-related request to get a response (usually via event). */
 const DEFAULT_NETWORK_REQUEST_TIMEOUT = 10000; // nothing on the network to bother requests, should be much faster than this
 /** Time between watchdog counters reading/clearing */
@@ -177,8 +174,6 @@ class EmberAdapter extends __1.Adapter {
     watchdogCountersHandle;
     /** Sequence number used for ZDO requests. static uint8_t  */
     zdoRequestSequence;
-    /** Default radius used for broadcast ZDO requests. uint8_t */
-    zdoRequestRadius;
     interpanLock;
     /**
      * Cached network params to avoid NCP calls. Prevents frequent EZSP transactions.
@@ -189,9 +184,7 @@ 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;
-        logger_1.logger.debug(`Using delay=${delay}.`, NS);
-        this.queue = new utils_1.Queue(typeof this.adapterOptions.concurrent === 'number' ? Math.min(Math.max(this.adapterOptions.concurrent, 1), 32) : 16);
+        this.queue = new utils_1.Queue(this.adapterOptions.concurrent || 16); // ORed to avoid 0 (not checked in settings/queue constructor)
         this.oneWaitress = new oneWaitress_1.EmberOneWaitress();
         this.ezsp = new ezsp_1.Ezsp(serialPortOptions);
         this.ezsp.on(ezsp_1.EzspEvents.ZDO_RESPONSE, this.onZDOResponse.bind(this));
@@ -208,46 +201,46 @@ class EmberAdapter extends __1.Adapter {
         try {
             const customConfig = JSON.parse((0, fs_1.readFileSync)(configPath, 'utf8'));
             // set any undefined config to default
-            const config = { ...DEFAULT_STACK_CONFIG, ...customConfig };
+            const config = { ...exports.DEFAULT_STACK_CONFIG, ...customConfig };
             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;
+                config.CONCENTRATOR_RAM_TYPE = exports.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) {
-                config.CONCENTRATOR_MIN_TIME = DEFAULT_STACK_CONFIG.CONCENTRATOR_MIN_TIME;
+                config.CONCENTRATOR_MIN_TIME = exports.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) {
-                config.CONCENTRATOR_MAX_TIME = DEFAULT_STACK_CONFIG.CONCENTRATOR_MAX_TIME;
+                config.CONCENTRATOR_MAX_TIME = exports.DEFAULT_STACK_CONFIG.CONCENTRATOR_MAX_TIME;
                 logger_1.logger.error(`[STACK CONFIG] Invalid CONCENTRATOR_MAX_TIME, using default.`, NS);
             }
             if (!inRange(config.CONCENTRATOR_ROUTE_ERROR_THRESHOLD, 1, 100)) {
-                config.CONCENTRATOR_ROUTE_ERROR_THRESHOLD = DEFAULT_STACK_CONFIG.CONCENTRATOR_ROUTE_ERROR_THRESHOLD;
+                config.CONCENTRATOR_ROUTE_ERROR_THRESHOLD = exports.DEFAULT_STACK_CONFIG.CONCENTRATOR_ROUTE_ERROR_THRESHOLD;
                 logger_1.logger.error(`[STACK CONFIG] Invalid CONCENTRATOR_ROUTE_ERROR_THRESHOLD, using default.`, NS);
             }
             if (!inRange(config.CONCENTRATOR_DELIVERY_FAILURE_THRESHOLD, 1, 100)) {
-                config.CONCENTRATOR_DELIVERY_FAILURE_THRESHOLD = DEFAULT_STACK_CONFIG.CONCENTRATOR_DELIVERY_FAILURE_THRESHOLD;
+                config.CONCENTRATOR_DELIVERY_FAILURE_THRESHOLD = exports.DEFAULT_STACK_CONFIG.CONCENTRATOR_DELIVERY_FAILURE_THRESHOLD;
                 logger_1.logger.error(`[STACK CONFIG] Invalid CONCENTRATOR_DELIVERY_FAILURE_THRESHOLD, using default.`, NS);
             }
             if (!inRange(config.CONCENTRATOR_MAX_HOPS, 0, 30)) {
-                config.CONCENTRATOR_MAX_HOPS = DEFAULT_STACK_CONFIG.CONCENTRATOR_MAX_HOPS;
+                config.CONCENTRATOR_MAX_HOPS = exports.DEFAULT_STACK_CONFIG.CONCENTRATOR_MAX_HOPS;
                 logger_1.logger.error(`[STACK CONFIG] Invalid CONCENTRATOR_MAX_HOPS, using default.`, NS);
             }
             if (!inRange(config.MAX_END_DEVICE_CHILDREN, 6, 64)) {
-                config.MAX_END_DEVICE_CHILDREN = DEFAULT_STACK_CONFIG.MAX_END_DEVICE_CHILDREN;
+                config.MAX_END_DEVICE_CHILDREN = exports.DEFAULT_STACK_CONFIG.MAX_END_DEVICE_CHILDREN;
                 logger_1.logger.error(`[STACK CONFIG] Invalid MAX_END_DEVICE_CHILDREN, using default.`, NS);
             }
             if (!inRange(config.TRANSIENT_DEVICE_TIMEOUT, 0, 65535)) {
-                config.TRANSIENT_DEVICE_TIMEOUT = DEFAULT_STACK_CONFIG.TRANSIENT_DEVICE_TIMEOUT;
+                config.TRANSIENT_DEVICE_TIMEOUT = exports.DEFAULT_STACK_CONFIG.TRANSIENT_DEVICE_TIMEOUT;
                 logger_1.logger.error(`[STACK CONFIG] Invalid TRANSIENT_DEVICE_TIMEOUT, using default.`, NS);
             }
             if (!inRange(config.END_DEVICE_POLL_TIMEOUT, 0, 14)) {
-                config.END_DEVICE_POLL_TIMEOUT = DEFAULT_STACK_CONFIG.END_DEVICE_POLL_TIMEOUT;
+                config.END_DEVICE_POLL_TIMEOUT = exports.DEFAULT_STACK_CONFIG.END_DEVICE_POLL_TIMEOUT;
                 logger_1.logger.error(`[STACK CONFIG] Invalid END_DEVICE_POLL_TIMEOUT, using default.`, NS);
             }
             if (!inRange(config.TRANSIENT_KEY_TIMEOUT_S, 0, 65535)) {
-                config.TRANSIENT_KEY_TIMEOUT_S = DEFAULT_STACK_CONFIG.TRANSIENT_KEY_TIMEOUT_S;
+                config.TRANSIENT_KEY_TIMEOUT_S = exports.DEFAULT_STACK_CONFIG.TRANSIENT_KEY_TIMEOUT_S;
                 logger_1.logger.error(`[STACK CONFIG] Invalid TRANSIENT_KEY_TIMEOUT_S, using default.`, NS);
             }
             logger_1.logger.info(`Using stack config ${JSON.stringify(config)}.`, NS);
@@ -255,7 +248,7 @@ class EmberAdapter extends __1.Adapter {
         }
         catch { }
         logger_1.logger.info(`Using default stack config.`, NS);
-        return DEFAULT_STACK_CONFIG;
+        return exports.DEFAULT_STACK_CONFIG;
     }
     /**
      * Emitted from @see Ezsp.ezspStackStatusHandler
@@ -309,53 +302,57 @@ class EmberAdapter extends __1.Adapter {
      * @param status
      */
     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_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_1.EmberOutgoingMessageType[type]} failed for "${indexOrDestination}" ` +
-                        `[apsFrame=${JSON.stringify(apsFrame)} messageTag=${messageTag}]`, NS);
-                    break;
-                }
-                default: {
-                    // reject any waitress early (don't wait for timeout if we know we're gonna get there eventually)
-                    this.oneWaitress.deliveryFailedFor(indexOrDestination, apsFrame);
-                    break;
+        switch (status) {
+            case enums_1.SLStatus.ZIGBEE_DELIVERY_FAILED: {
+                // no ACK was received from the destination
+                switch (type) {
+                    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_1.EmberOutgoingMessageType[type]} failed for '${indexOrDestination}' [apsFrame=${JSON.stringify(apsFrame)} messageTag=${messageTag}]`, NS);
+                        break;
+                    }
+                    default: {
+                        // reject any waitress early (don't wait for timeout if we know we're gonna get there eventually)
+                        this.oneWaitress.deliveryFailedFor(indexOrDestination, apsFrame);
+                        break;
+                    }
                 }
+                break;
             }
-        }
-        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 = {
-                    multicastId: apsFrame.groupId,
-                    endpoint: endpoints_1.FIXED_ENDPOINTS[0].endpoint,
-                    networkIndex: endpoints_1.FIXED_ENDPOINTS[0].networkIndex,
-                };
-                // set immediately to avoid potential race
-                this.multicastTable.push(multicastEntry.multicastId);
-                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);
-                    });
-                }
-                catch (error) {
-                    // remove to allow retry on next occurrence
-                    this.multicastTable.splice(tableIdx, 1);
-                    throw error;
+            case enums_1.SLStatus.OK: {
+                /* istanbul ignore else */
+                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 = {
+                        multicastId: apsFrame.groupId,
+                        endpoint: endpoints_1.FIXED_ENDPOINTS[0].endpoint,
+                        networkIndex: endpoints_1.FIXED_ENDPOINTS[0].networkIndex,
+                    };
+                    // set immediately to avoid potential race
+                    this.multicastTable.push(multicastEntry.multicastId);
+                    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);
+                        });
+                    }
+                    catch (error) {
+                        // remove to allow retry on next occurrence
+                        this.multicastTable.splice(tableIdx, 1);
+                        logger_1.logger.error(error, NS);
+                    }
                 }
+                break;
             }
         }
         // shouldn't be any other status
@@ -423,16 +420,17 @@ class EmberAdapter extends __1.Adapter {
      * @param messageContents
      */
     async onTouchlinkMessage(sourcePanId, sourceAddress, groupId, lastHopLqi, messageContents) {
+        const endpoint = endpoints_1.FIXED_ENDPOINTS[0].endpoint;
         const payload = {
             clusterID: Zcl.Clusters.touchlink.ID,
             data: messageContents,
             header: Zcl.Header.fromBuffer(messageContents),
             address: sourceAddress,
-            endpoint: 1, // arbitrary since not sent over-the-air
+            endpoint: endpoint, // arbitrary since not sent over-the-air
             linkquality: lastHopLqi,
             groupID: groupId,
             wasBroadcast: true, // XXX: since always sent broadcast atm...
-            destinationEndpoint: endpoints_1.FIXED_ENDPOINTS[0].endpoint,
+            destinationEndpoint: endpoint,
         };
         this.oneWaitress.resolveZCL(payload);
         this.emit(events_1.Events.zclPayload, payload);
@@ -538,7 +536,6 @@ class EmberAdapter extends __1.Adapter {
         clearInterval(this.watchdogCountersHandle);
         this.queue.clear();
         this.zdoRequestSequence = 0; // start at 1
-        this.zdoRequestRadius = 255;
         this.interpanLock = false;
         this.networkCache = (0, initters_1.initNetworkCache)();
         this.manufacturerCode = DEFAULT_MANUFACTURER_CODE; // will be set in NCP in initEzsp
@@ -590,7 +587,6 @@ class EmberAdapter extends __1.Adapter {
             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);
@@ -623,10 +619,6 @@ class EmberAdapter extends __1.Adapter {
      */
     async registerFixedEndpoints() {
         for (const ep of endpoints_1.FIXED_ENDPOINTS) {
-            if (ep.networkIndex !== 0x00) {
-                logger_1.logger.debug(`Multi-network not currently supported. Skipping endpoint ${JSON.stringify(ep)}.`, NS);
-                continue;
-            }
             const [epStatus] = await this.ezsp.ezspGetEndpointFlags(ep.endpoint);
             // endpoint not already registered
             if (epStatus !== enums_1.SLStatus.OK) {
@@ -638,11 +630,11 @@ class EmberAdapter extends __1.Adapter {
                     logger_1.logger.debug(`Registered endpoint '${ep.endpoint}'.`, NS);
                 }
                 else {
-                    throw new Error(`Failed to register endpoint "${ep.endpoint}" with status=${enums_1.SLStatus[status]}.`);
+                    throw new Error(`Failed to register endpoint '${ep.endpoint}' with status=${enums_1.SLStatus[status]}.`);
                 }
             }
             else {
-                logger_1.logger.debug(`Endpoint "${ep.endpoint}" already registered.`, NS);
+                logger_1.logger.debug(`Endpoint '${ep.endpoint}' already registered.`, NS);
             }
             for (const multicastId of ep.multicastIds) {
                 const multicastEntry = {
@@ -652,7 +644,7 @@ class EmberAdapter extends __1.Adapter {
                 };
                 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]}.`);
+                    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);
@@ -668,14 +660,13 @@ class EmberAdapter extends __1.Adapter {
         {
             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]}.`);
+                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]}.`);
             }
+            /* istanbul ignore next */
             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]}.`);
+                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_1.EmberJoinDecision.USE_PRECONFIGURED_KEY);
             if (status !== enums_1.SLStatus.OK) {
@@ -707,7 +698,7 @@ class EmberAdapter extends __1.Adapter {
                 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]}.`);
+                    throw new Error(`[INIT TC] Failed to export Network Key with status=${enums_1.SLStatus[nkStatus]}.`);
                 }
                 // config doesn't match adapter anymore
                 if (!networkKey.contents.equals(configNetworkKey)) {
@@ -757,6 +748,7 @@ class EmberAdapter extends __1.Adapter {
         switch (action) {
             case NetworkInitAction.FORM_BACKUP: {
                 logger_1.logger.info(`[INIT TC] Forming from backup.`, NS);
+                /* istanbul ignore next */
                 const keyList = backup.devices.map((device) => {
                     const octets = Array.from(device.ieeeAddress.reverse());
                     return {
@@ -782,9 +774,6 @@ class EmberAdapter extends __1.Adapter {
                 logger_1.logger.info(`[INIT TC] Adapter network matches config.`, NS);
                 break;
             }
-            default: {
-                throw new Error(`[INIT TC] Invalid action "${NetworkInitAction[action]}" for final stage.`);
-            }
         }
         // 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) {
@@ -909,6 +898,7 @@ class EmberAdapter extends __1.Adapter {
             [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
+            /* istanbul ignore else */
             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.
@@ -937,6 +927,7 @@ class EmberAdapter extends __1.Adapter {
      * @param backupData
      */
     async importLinkKeys(backupData) {
+        /* istanbul ignore else */
         if (!backupData?.length) {
             return;
         }
@@ -947,7 +938,7 @@ class EmberAdapter extends __1.Adapter {
         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();
+        const networkStatus = await this.ezsp.ezspNetworkState();
         if (networkStatus !== enums_1.EmberNetworkStatus.NO_NETWORK) {
             throw new Error(`[BACKUP] Cannot import TC data while network is up, networkStatus=${enums_1.EmberNetworkStatus[networkStatus]}.`);
         }
@@ -959,8 +950,7 @@ class EmberAdapter extends __1.Adapter {
                     ? 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]}`);
+                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);
@@ -1021,24 +1011,13 @@ class EmberAdapter extends __1.Adapter {
     clearNetworkCache() {
         this.networkCache = (0, initters_1.initNetworkCache)();
     }
-    /**
-     * Return the current network state.
-     * This call caches the results on the host to prevent frequent EZSP transactions.
-     * Check against UNKNOWN_NETWORK_STATE for validity.
-     */
-    async emberNetworkState() {
-        if (this.networkCache.status === consts_1.UNKNOWN_NETWORK_STATE) {
-            const networkStatus = await this.ezsp.ezspNetworkState();
-            this.networkCache.status = networkStatus;
-        }
-        return this.networkCache.status;
-    }
     /**
      * Return the EUI 64 of the local node
      * This call caches the results on the host to prevent frequent EZSP transactions.
      * Check against BLANK_EUI64 for validity.
      */
     async emberGetEui64() {
+        /* istanbul ignore else */
         if (this.networkCache.eui64 === ZSpec.BLANK_EUI64) {
             this.networkCache.eui64 = await this.ezsp.ezspGetEui64();
         }
@@ -1050,13 +1029,14 @@ class EmberAdapter extends __1.Adapter {
      * Check against INVALID_PAN_ID for validity.
      */
     async emberGetPanId() {
+        /* istanbul ignore else */
         if (this.networkCache.parameters.panId === ZSpec.INVALID_PAN_ID) {
             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_1.SLStatus[status]}.`, NS);
+                throw new Error(`Failed to get PAN ID (via network parameters) with status=${enums_1.SLStatus[status]}.`);
             }
         }
         return this.networkCache.parameters.panId;
@@ -1067,13 +1047,14 @@ class EmberAdapter extends __1.Adapter {
      * Check against BLANK_EXTENDED_PAN_ID for validity.
      */
     async emberGetExtendedPanId() {
+        /* istanbul ignore else */
         if ((0, es6_1.default)(this.networkCache.parameters.extendedPanId, ZSpec.BLANK_EXTENDED_PAN_ID)) {
             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_1.SLStatus[status]}.`, NS);
+                throw new Error(`Failed to get Extended PAN ID (via network parameters) with status=${enums_1.SLStatus[status]}.`);
             }
         }
         return this.networkCache.parameters.extendedPanId;
@@ -1084,27 +1065,18 @@ class EmberAdapter extends __1.Adapter {
      * Check against INVALID_RADIO_CHANNEL for validity.
      */
     async emberGetRadioChannel() {
+        /* istanbul ignore else */
         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_1.SLStatus[status]}.`, NS);
+                throw new Error(`Failed to get radio channel (via network parameters) with status=${enums_1.SLStatus[status]}.`);
             }
         }
         return this.networkCache.parameters.radioChannel;
     }
-    // queued
-    async emberStartEnergyScan() {
-        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
     //---- START EZSP wrappers
     /**
@@ -1131,8 +1103,7 @@ class EmberAdapter extends __1.Adapter {
             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}].`);
+            throw new Error(`Adapter EZSP protocol version (${ncpEzspProtocolVer}) is not supported by Host [${consts_2.EZSP_MIN_PROTOCOL_VERSION}-${consts_2.EZSP_PROTOCOL_VERSION}].`);
         }
         this.ezsp.setProtocolVersion(ncpEzspProtocolVer);
         logger_1.logger.debug(`Adapter info: EZSPVersion=${ncpEzspProtocolVer} StackType=${ncpStackType} StackVersion=${ncpStackVer}`, NS);
@@ -1161,10 +1132,9 @@ class EmberAdapter extends __1.Adapter {
      */
     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_1.SLStatus[status]}.`, NS);
+        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);
+            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;
     }
@@ -1177,7 +1147,7 @@ class EmberAdapter extends __1.Adapter {
      */
     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_1.SLStatus[status]}.`, NS);
+        logger_1.logger.debug(`[EzspValueId] SET '${enums_2.EzspValueId[valueId]}' TO '${value}' with status=${enums_1.SLStatus[status]}.`, NS);
         return status;
     }
     /**
@@ -1188,65 +1158,9 @@ class EmberAdapter extends __1.Adapter {
      */
     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_1.SLStatus[status]}.`, NS);
+        logger_1.logger.debug(`[EzspPolicyId] SET '${enums_2.EzspPolicyId[policyId]}' TO '${decisionId}' with status=${enums_1.SLStatus[status]}.`, NS);
         return status;
     }
-    /**
-     * Here we convert the normal Ember AES hash call to the specialized EZSP call.
-     * This came about because we cannot pass a block of data that is
-     * both input and output into EZSP. The block must be broken up into two
-     * elements. We unify the two pieces here to make it invisible to the users.
-     * @param context EmberAesMmoHashContext *
-     * @param finalize
-     * @param data uint8_t * Expected of valid length (as in, not larger alloc)
-     * @returns status
-     * @returns result context or null
-     */
-    async aesMmoHash(context, finalize, data) {
-        if (data.length > 255) {
-            // 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);
-        return [status, reContext];
-    }
-    /**
-     *  This routine processes the passed chunk of data and updates
-     *  the hash calculation based on it.  The data passed in MUST
-     *  have a length that is a multiple of 16.
-     *
-     * @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 ::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.
-     * @returns result context or null
-     */
-    async emberAesMmoHashUpdate(context, data) {
-        return this.aesMmoHash(context, false /*finalize?*/, data);
-    }
-    /**
-     *  This routine processes the passed chunk of data (if non-NULL)
-     *  and update the hash context that is passed in.  In then performs
-     *  the final calculations on the hash and returns the final answer
-     *  in the result parameter of the ::EmberAesMmoHashContext structure.
-     *  The length of the data passed in may be any value, it does not have
-     *  to be a multiple of 16.
-     *
-     * @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 ::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.
-     * @returns result context or null
-     */
-    async emberAesMmoHashFinal(context, data) {
-        return this.aesMmoHash(context, true /*finalize?*/, data);
-    }
     /**
      *  This is a convenience method when the hash data is less than 255
      *  bytes. It inits, updates, and finalizes the hash in one function call.
@@ -1261,7 +1175,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.ezsp.ezspAesMmoHash(context, true, data);
         return [status, reContext?.result];
     }
     /**
@@ -1285,7 +1199,7 @@ class EmberAdapter extends __1.Adapter {
         if (broadcastMgmtPermitJoin) {
             // `authentication`: TC significance always 1 (zb specs)
             const zdoPayload = buffaloZdo_1.BuffaloZdo.buildPermitJoining(duration, 1, []);
-            [status, apsFrame, messageTag] = await this.sendZDORequest(ZSpec.BroadcastAddress.DEFAULT, Zdo.ClusterId.PERMIT_JOINING_REQUEST, zdoPayload, DEFAULT_APS_OPTIONS);
+            [status, apsFrame, messageTag] = await this.sendZDORequest(ZSpec.BroadcastAddress.DEFAULT, Zdo.ClusterId.PERMIT_JOINING_REQUEST, zdoPayload, exports.DEFAULT_APS_OPTIONS);
         }
         return [status, apsFrame, messageTag];
     }
@@ -1296,37 +1210,24 @@ class EmberAdapter extends __1.Adapter {
      */
     async emberSetJoinPolicy(decision) {
         let policy = enums_2.EzspDecisionBitmask.DEFAULT_CONFIGURATION;
-        if (decision == enums_1.EmberJoinDecision.USE_PRECONFIGURED_KEY) {
-            policy = enums_2.EzspDecisionBitmask.ALLOW_JOINS | enums_2.EzspDecisionBitmask.ALLOW_UNSECURED_REJOINS;
-        }
-        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_1.EmberJoinDecision.ALLOW_REJOINS_ONLY) {
-            policy = enums_2.EzspDecisionBitmask.ALLOW_UNSECURED_REJOINS;
+        switch (decision) {
+            case enums_1.EmberJoinDecision.USE_PRECONFIGURED_KEY: {
+                policy = enums_2.EzspDecisionBitmask.ALLOW_JOINS | enums_2.EzspDecisionBitmask.ALLOW_UNSECURED_REJOINS;
+                break;
+            }
+            case enums_1.EmberJoinDecision.ALLOW_REJOINS_ONLY: {
+                policy = enums_2.EzspDecisionBitmask.ALLOW_UNSECURED_REJOINS;
+                break;
+            }
+            /*case EmberJoinDecision.SEND_KEY_IN_THE_CLEAR: {
+                policy = EzspDecisionBitmask.ALLOW_JOINS | EzspDecisionBitmask.ALLOW_UNSECURED_REJOINS | EzspDecisionBitmask.SEND_KEY_IN_CLEAR;
+                break;
+            }*/
         }
         return this.emberSetEzspPolicy(enums_2.EzspPolicyId.TRUST_CENTER_POLICY, policy);
     }
     //---- END EZSP wrappers
     //---- START Ember ZDO
-    /**
-     * ZDO
-     * Change the default radius for broadcast ZDO requests
-     *
-     * @param radius uint8_t The radius to be used for future ZDO request broadcasts.
-     */
-    setZDORequestRadius(radius) {
-        this.zdoRequestRadius = radius;
-    }
-    /**
-     * ZDO
-     * Retrieve the default radius for broadcast ZDO requests
-     *
-     * @return uint8_t The radius to be used for future ZDO request broadcasts.
-     */
-    getZDORequestRadius() {
-        return this.zdoRequestRadius;
-    }
     /**
      * ZDO
      * Get the next device request sequence number.
@@ -1352,9 +1253,6 @@ class EmberAdapter extends __1.Adapter {
      * @returns messageTag The tag passed to ezspSend${x} function.
      */
     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();
         messageContents[0] = messageTag;
         const apsFrame = {
@@ -1369,18 +1267,16 @@ class EmberAdapter extends __1.Adapter {
         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);
+            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, ZDO_REQUEST_RADIUS, messageTag, messageContents);
             apsFrame.sequence = apsSequence;
             logger_1.logger.debug(`~~~> [SENT ZDO type=BROADCAST apsSequence=${apsSequence} messageTag=${messageTag} status=${enums_1.SLStatus[status]}`, NS);
             return [status, apsFrame, messageTag];
         }
         else {
-            logger_1.logger.debug(`~~~> [ZDO ${Zdo.ClusterId[clusterId]} UNICAST to=${destination} messageTag=${messageTag} ` +
-                `messageContents=${messageContents.toString('hex')}]`, NS);
+            logger_1.logger.debug(`~~~> [ZDO ${Zdo.ClusterId[clusterId]} UNICAST to=${destination} messageTag=${messageTag} messageContents=${messageContents.toString('hex')}]`, NS);
             const [status, apsSequence] = await this.ezsp.ezspSendUnicast(enums_1.EmberOutgoingMessageType.DIRECT, destination, apsFrame, messageTag, messageContents);
             apsFrame.sequence = apsSequence;
             logger_1.logger.debug(`~~~> [SENT ZDO type=DIRECT apsSequence=${apsSequence} messageTag=${messageTag} status=${enums_1.SLStatus[status]}`, NS);
@@ -1389,6 +1285,7 @@ class EmberAdapter extends __1.Adapter {
     }
     //---- END Ember ZDO
     //-- START Adapter implementation
+    /* istanbul ignore next */
     static async isValidPath(path) {
         // For TCP paths we cannot get device information, therefore we cannot validate it.
         if (socketPortUtils_1.default.isTcpPath(path)) {
@@ -1402,6 +1299,7 @@ class EmberAdapter extends __1.Adapter {
             return false;
         }
     }
+    /* istanbul ignore next */
     static async autoDetectPath() {
         const paths = await serialPortUtils_1.default.find(autoDetectDefinitions);
         paths.sort((a, b) => (a < b ? -1 : 1));
@@ -1444,9 +1342,8 @@ class EmberAdapter extends __1.Adapter {
         return { type: `EmberZNet`, meta: this.version };
     }
     // queued
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     async reset(type) {
-        return Promise.reject(new Error('Not supported'));
+        throw new Error(`Not supported '${type}'.`);
         // 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()
@@ -1473,6 +1370,7 @@ class EmberAdapter extends __1.Adapter {
             if (!netKeyInfo.networkKeySet) {
                 throw new Error(`[BACKUP] No network key set.`);
             }
+            /* istanbul ignore next */
             const keyList = ALLOW_APP_KEY_REQUESTS ? await this.exportLinkKeys() : [];
             let context = (0, initters_1.initSecurityManagerContext)();
             context.coreKeyType = enums_1.SecManKeyType.TC_LINK;
@@ -1492,7 +1390,9 @@ class EmberAdapter extends __1.Adapter {
                 networkOptions: {
                     panId: netParams.panId, // uint16_t
                     extendedPanId: Buffer.from(netParams.extendedPanId),
-                    channelList: zbChannels.map((c) => ((2 ** c) & netParams.channels ? c : null)).filter((x) => x),
+                    channelList: zbChannels
+                        .map(/* istanbul ignore next */ (c) => ((2 ** c) & netParams.channels ? c : null))
+                        .filter((x) => x),
                     networkKey: networkKey.contents,
                     networkKeyDistribute: false,
                 },
@@ -1504,7 +1404,8 @@ class EmberAdapter extends __1.Adapter {
                 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) => ({
+                devices: keyList.map(
+                /* istanbul ignore next */ (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
@@ -1544,36 +1445,16 @@ class EmberAdapter extends __1.Adapter {
         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);
+            const [status] = await this.sendZDORequest(ZSpec.BroadcastAddress.SLEEPY, Zdo.ClusterId.NWK_UPDATE_REQUEST, zdoPayload, exports.DEFAULT_APS_OPTIONS);
             if (status !== enums_1.SLStatus.OK) {
-                throw new Error(`[ZDO] Failed broadcast channel change to "${newChannel}" with status=${enums_1.SLStatus[status]}.`);
+                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') {
-            throw new Error(`Tried to set transmit power to non-number. Value ${value} of type ${typeof value}.`);
-        }
         return this.queue.execute(async () => {
             const status = await this.ezsp.ezspSetRadioPower(value);
             if (status !== enums_1.SLStatus.OK) {
@@ -1583,9 +1464,6 @@ class EmberAdapter extends __1.Adapter {
     }
     // queued
     async addInstallCode(ieeeAddress, key) {
-        if (!key) {
-            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_1.EMBER_INSTALL_CODE_SIZES.indexOf(key.length) !== -1) {
             // Reverse the bits in a byte (uint8_t)
@@ -1640,7 +1518,7 @@ class EmberAdapter extends __1.Adapter {
             },
             zclSequence: transactionSequenceNumber,
             commandIdentifier,
-        }, timeout || DEFAULT_ZCL_REQUEST_TIMEOUT * 3); // XXX: since this is used by OTA...
+        }, timeout);
         return {
             cancel: () => this.oneWaitress.remove(waiter.id),
             promise: waiter.start().promise,
@@ -1670,7 +1548,7 @@ class EmberAdapter extends __1.Adapter {
                 await this.ezsp.ezspClearTransientLinkKeys();
                 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]}.`);
+                    throw new Error(`[ZDO] Failed set join policy with status=${enums_1.SLStatus[setJPstatus]}.`);
                 }
             }
         };
@@ -1681,9 +1559,9 @@ class EmberAdapter extends __1.Adapter {
                 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);
+                const [status, apsFrame] = await this.sendZDORequest(networkAddress, Zdo.ClusterId.PERMIT_JOINING_REQUEST, zdoPayload, exports.DEFAULT_APS_OPTIONS);
                 if (status !== enums_1.SLStatus.OK) {
-                    throw new Error(`[ZDO] Failed permit joining request for "${networkAddress}" with status=${enums_1.SLStatus[status]}.`);
+                    throw new Error(`[ZDO] Failed permit joining request for '${networkAddress}' with status=${enums_1.SLStatus[status]}.`);
                 }
                 await this.oneWaitress.startWaitingFor({
                     target: networkAddress,
@@ -1729,9 +1607,9 @@ class EmberAdapter extends __1.Adapter {
             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);
+                const [status, apsFrame] = await this.sendZDORequest(networkAddress, Zdo.ClusterId.LQI_TABLE_REQUEST, zdoPayload, exports.DEFAULT_APS_OPTIONS);
                 if (status !== enums_1.SLStatus.OK) {
-                    throw new Error(`[ZDO] Failed LQI request for "${networkAddress}" (index "${startIndex}") with status=${enums_1.SLStatus[status]}.`);
+                    throw new Error(`[ZDO] Failed LQI request for '${networkAddress}' (index '${startIndex}') with status=${enums_1.SLStatus[status]}.`);
                 }
                 const result = await this.oneWaitress.startWaitingFor({
                     target: networkAddress,
@@ -1766,9 +1644,9 @@ class EmberAdapter extends __1.Adapter {
             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);
+                const [status, apsFrame] = await this.sendZDORequest(networkAddress, Zdo.ClusterId.ROUTING_TABLE_REQUEST, zdoPayload, exports.DEFAULT_APS_OPTIONS);
                 if (status !== enums_1.SLStatus.OK) {
-                    throw new Error(`[ZDO] Failed routing table request for "${networkAddress}" (index "${startIndex}") with status=${enums_1.SLStatus[status]}.`);
+                    throw new Error(`[ZDO] Failed routing table request for '${networkAddress}' (index '${startIndex}') with status=${enums_1.SLStatus[status]}.`);
                 }
                 const result = await this.oneWaitress.startWaitingFor({
                     target: networkAddress,
@@ -1799,9 +1677,9 @@ class EmberAdapter extends __1.Adapter {
         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);
+            const [status, apsFrame] = await this.sendZDORequest(networkAddress, Zdo.ClusterId.NODE_DESCRIPTOR_REQUEST, zdoPayload, exports.DEFAULT_APS_OPTIONS);
             if (status !== enums_1.SLStatus.OK) {
-                throw new Error(`[ZDO] Failed node descriptor for "${networkAddress}" with status=${enums_1.SLStatus[status]}.`);
+                throw new Error(`[ZDO] Failed node descriptor request for '${networkAddress}' with status=${enums_1.SLStatus[status]}.`);
             }
             const result = await this.oneWaitress.startWaitingFor({
                 target: networkAddress,
@@ -1820,11 +1698,11 @@ class EmberAdapter extends __1.Adapter {
                     type = 'EndDevice';
                     break;
             }
-            // always 0 before rev. 21 where field was added
+            /* istanbul ignore else */
             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);
+                // always 0 before rev. 21 where field was added
+                const rev = result.serverMask.stackComplianceResivion < 21 ? 'pre-21' : result.serverMask.stackComplianceResivion;
+                logger_1.logger.warning(`[ZDO] Device '${networkAddress}' is only compliant to revision '${rev}' of the ZigBee specification (current revision: ${CURRENT_ZIGBEE_SPEC_REVISION}).`, NS);
             }
             return { type, manufacturerCode: result.manufacturerCode };
         }, networkAddress);
@@ -1834,9 +1712,9 @@ class EmberAdapter extends __1.Adapter {
         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);
+            const [status, apsFrame] = await this.sendZDORequest(networkAddress, Zdo.ClusterId.ACTIVE_ENDPOINTS_REQUEST, zdoPayload, exports.DEFAULT_APS_OPTIONS);
             if (status !== enums_1.SLStatus.OK) {
-                throw new Error(`[ZDO] Failed active endpoints request for "${networkAddress}" with status=${enums_1.SLStatus[status]}.`);
+                throw new Error(`[ZDO] Failed active endpoints request for '${networkAddress}' with status=${enums_1.SLStatus[status]}.`);
             }
             const result = await this.oneWaitress.startWaitingFor({
                 target: networkAddress,
@@ -1851,9 +1729,9 @@ class EmberAdapter extends __1.Adapter {
         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);
+            const [status, apsFrame] = await this.sendZDORequest(networkAddress, Zdo.ClusterId.SIMPLE_DESCRIPTOR_REQUEST, zdoPayload, exports.DEFAULT_APS_OPTIONS);
             if (status !== enums_1.SLStatus.OK) {
-                throw new Error(`[ZDO] Failed simple descriptor request for "${networkAddress}" endpoint "${endpointID}" ` + `with status=${enums_1.SLStatus[status]}.`);
+                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,
@@ -1871,90 +1749,49 @@ class EmberAdapter extends __1.Adapter {
     }
     // 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 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);
-            }, destinationNetworkAddress);
-        }
-        else if (typeof destinationAddressOrGroup === 'number' && type === 'group') {
-            // dest is group num, so type should always be group (multicast)
-            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);
-            }, destinationNetworkAddress);
-        }
+        return this.queue.execute(async () => {
+            this.checkInterpanLock();
+            const zdoPayload = buffaloZdo_1.BuffaloZdo.buildBindRequest(sourceIeeeAddress, sourceEndpoint, clusterID, type === 'group' ? Zdo.MULTICAST_BINDING : Zdo.UNICAST_BINDING, destinationAddressOrGroup, // not used with MULTICAST_BINDING
+            destinationAddressOrGroup, // not used with UNICAST_BINDING
+            destinationEndpoint);
+            console.log(zdoPayload);
+            const [status, apsFrame] = await this.sendZDORequest(destinationNetworkAddress, Zdo.ClusterId.BIND_REQUEST, zdoPayload, exports.DEFAULT_APS_OPTIONS);
+            if (status !== enums_1.SLStatus.OK) {
+                throw new Error(`[ZDO] Failed bind request for '${destinationNetworkAddress}' destination '${destinationAddressOrGroup}' endpoint '${destinationEndpoint}' with status=${enums_1.SLStatus[status]}.`);
+            }
+            await this.oneWaitress.startWaitingFor({
+                target: destinationNetworkAddress,
+                apsFrame,
+                responseClusterId: Zdo.ClusterId.BIND_RESPONSE,
+            }, DEFAULT_ZDO_REQUEST_TIMEOUT);
+        }, destinationNetworkAddress);
     }
     // queued, non-InterPAN
     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 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);
-            }, destinationNetworkAddress);
-        }
-        else if (typeof destinationAddressOrGroup === 'number' && type === 'group') {
-            // dest is group num, so type should always be group (multicast)
-            return this.queue.execute(async () => {
-                this.checkInterpanLock();
-                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: destinationNetworkAddress,
-                    apsFrame,
-                    responseClusterId: Zdo.ClusterId.UNBIND_RESPONSE,
-                }, DEFAULT_ZDO_REQUEST_TIMEOUT);
-            }, destinationNetworkAddress);
-        }
+        return this.queue.execute(async () => {
+            this.checkInterpanLock();
+            const zdoPayload = buffaloZdo_1.BuffaloZdo.buildUnbindRequest(sourceIeeeAddress, sourceEndpoint, clusterID, type === 'group' ? Zdo.MULTICAST_BINDING : Zdo.UNICAST_BINDING, destinationAddressOrGroup, // not used with MULTICAST_BINDING
+            destinationAddressOrGroup, // not used with UNICAST_BINDING
+            destinationEndpoint);
+            const [status, apsFrame] = await this.sendZDORequest(destinationNetworkAddress, Zdo.ClusterId.UNBIND_REQUEST, zdoPayload, exports.DEFAULT_APS_OPTIONS);
+            if (status !== enums_1.SLStatus.OK) {
+                throw new Error(`[ZDO] Failed unbind request for '${destinationNetworkAddress}' destination '${destinationAddressOrGroup}' endpoint '${destinationEndpoint}' with status=${enums_1.SLStatus[status]}.`);
+            }
+            await this.oneWaitress.startWaitingFor({
+                target: destinationNetworkAddress,
+                apsFrame,
+                responseClusterId: Zdo.ClusterId.UNBIND_RESPONSE,
+            }, DEFAULT_ZDO_REQUEST_TIMEOUT);
+        }, destinationNetworkAddress);
     }
     // 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);
+            const [status, apsFrame] = await this.sendZDORequest(networkAddress, Zdo.ClusterId.LEAVE_REQUEST, zdoPayload, exports.DEFAULT_APS_OPTIONS);
             if (status !== enums_1.SLStatus.OK) {
-                throw new Error(`[ZDO] Failed remove device request for "${networkAddress}" target "${ieeeAddr}" ` + `with status=${enums_1.SLStatus[status]}.`);
+                throw new Error(`[ZDO] Failed remove device request for '${networkAddress}' target '${ieeeAddr}' with status=${enums_1.SLStatus[status]}.`);
             }
             await this.oneWaitress.startWaitingFor({
                 target: networkAddress,
@@ -1966,10 +1803,10 @@ class EmberAdapter extends __1.Adapter {
     //---- 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 = (sourceEndpoint && 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) {
+        if (command.response !== undefined && disableResponse === false) {
             commandResponseId = command.response;
         }
         else if (!zclFrame.header.frameControl.disableDefaultResponse) {
@@ -1978,9 +1815,9 @@ class EmberAdapter extends __1.Adapter {
         const apsFrame = {
             profileId: sourceEndpointInfo.profileId,
             clusterId: zclFrame.cluster.ID,
-            sourceEndpoint: sourceEndpointInfo.endpoint,
-            destinationEndpoint: typeof endpoint === 'number' ? endpoint : endpoints_1.FIXED_ENDPOINTS[0].endpoint,
-            options: DEFAULT_APS_OPTIONS,
+            sourceEndpoint: sourceEndpoint || endpoints_1.FIXED_ENDPOINTS[0].endpoint,
+            destinationEndpoint: endpoint,
+            options: exports.DEFAULT_APS_OPTIONS,
             groupId: 0,
             sequence: 0, // set by stack
         };
@@ -1999,12 +1836,17 @@ class EmberAdapter extends __1.Adapter {
                     0);
                 }
                 catch (error) {
+                    /* istanbul ignore else */
                     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;
+                        switch (error.code) {
+                            case enums_1.EzspStatus.NO_TX_SPACE: {
+                                status = enums_1.SLStatus.BUSY;
+                                break;
+                            }
+                            case enums_1.EzspStatus.NOT_CONNECTED: {
+                                status = enums_1.SLStatus.NETWORK_DOWN;
+                                break;
+                            }
                         }
                     }
                 }
@@ -2021,6 +1863,10 @@ class EmberAdapter extends __1.Adapter {
                 else if (status === enums_1.SLStatus.NETWORK_DOWN) {
                     await (0, utils_1.Wait)(QUEUE_NETWORK_DOWN_DEFER_MSEC);
                 }
+                else {
+                    throw new Error(`~x~> [ZCL to=${networkAddress}] Failed to send request with status=${enums_1.SLStatus[status]}.`);
+                }
+                logger_1.logger.debug(`~x~> [ZCL to=${networkAddress}] Failed to send request attempt ${i}/${QUEUE_MAX_SEND_ATTEMPTS} with status=${enums_1.SLStatus[status]}.`, NS);
             }
             if (commandResponseId != null) {
                 // NOTE: aps sequence number will have been set by send function
@@ -2029,7 +1875,7 @@ class EmberAdapter extends __1.Adapter {
                     apsFrame,
                     zclSequence: zclFrame.header.transactionSequenceNumber,
                     commandIdentifier: commandResponseId,
-                }, timeout || DEFAULT_ZCL_REQUEST_TIMEOUT);
+                }, timeout);
                 return result;
             }
             return null;
@@ -2037,13 +1883,13 @@ class EmberAdapter extends __1.Adapter {
     }
     // 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 = (sourceEndpoint && 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: endpoints_1.FIXED_ENDPOINTS[0].endpoint,
-            options: DEFAULT_APS_OPTIONS,
+            sourceEndpoint: sourceEndpoint || endpoints_1.FIXED_ENDPOINTS[0].endpoint,
+            destinationEndpoint: 0xff,
+            options: exports.DEFAULT_APS_OPTIONS,
             groupId: groupID,
             sequence: 0, // set by stack
         };
@@ -2064,13 +1910,13 @@ class EmberAdapter extends __1.Adapter {
     }
     // 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 = 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,
-            options: DEFAULT_APS_OPTIONS,
+            sourceEndpoint,
+            destinationEndpoint: endpoint,
+            options: exports.DEFAULT_APS_OPTIONS,
             groupId: destination,
             sequence: 0, // set by stack
         };
@@ -2093,16 +1939,12 @@ class EmberAdapter extends __1.Adapter {
     // TODO: check all this touchlink/interpan stuff
     // queued
     async setChannelInterPAN(channel) {
-        if (typeof channel !== 'number') {
-            logger_1.logger.error(`Tried to set channel InterPAN to non-number. Channel ${channel} of type ${typeof channel}.`, NS);
-            return;
-        }
         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]}.`);
+                throw new Error(`Failed to set InterPAN channel to '${channel}' with status=${enums_1.SLStatus[status]}.`);
             }
         });
     }
@@ -2134,15 +1976,16 @@ class EmberAdapter extends __1.Adapter {
     // queued
     async sendZclFrameInterPANBroadcast(zclFrame, timeout) {
         const command = zclFrame.command;
-        if (!command.hasOwnProperty('response')) {
+        if (command.response === undefined) {
             throw new Error(`Command '${command.name}' has no response, cannot wait for response.`);
         }
+        const endpoint = endpoints_1.FIXED_ENDPOINTS[0].endpoint;
         // just for waitress
         const apsFrame = {
             profileId: ZSpec.TOUCHLINK_PROFILE_ID,
             clusterId: zclFrame.cluster.ID,
-            sourceEndpoint: 0,
-            destinationEndpoint: 0,
+            sourceEndpoint: endpoint, // arbitrary since not sent over-the-air
+            destinationEndpoint: endpoint,
             options: enums_1.EmberApsOption.NONE,
             groupId: ZSpec.BroadcastAddress.SLEEPY,
             sequence: 0, // set by stack
@@ -2174,7 +2017,7 @@ class EmberAdapter extends __1.Adapter {
                 apsFrame: apsFrame,
                 zclSequence: zclFrame.header.transactionSequenceNumber,
                 commandIdentifier: command.response,
-            }, timeout || DEFAULT_ZCL_REQUEST_TIMEOUT * 2); // XXX: touchlink timeout?
+            }, timeout);
             return result;
         });
     }
@@ -2183,7 +2026,7 @@ class EmberAdapter extends __1.Adapter {
         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]}.`);
+                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);
@@ -2193,9 +2036,7 @@ class EmberAdapter extends __1.Adapter {
     //-- END Adapter implementation
     checkInterpanLock() {
         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 ezspError_1.EzspError(enums_1.EzspStatus.ERROR_INVALID_CALL);
+            throw new Error(`[INTERPAN MODE] Cannot execute non-InterPAN commands.`);
         }
     }
 }