zigbee-herdsman 0.57.2 → 0.57.4

package/dist/adapter/z-stack/adapter/zStackAdapter.js

@@ -30,8 +30,9 @@ const assert_1 = __importDefault(require("assert"));
 const debounce_1 = __importDefault(require("debounce"));
 const utils_1 = require("../../../utils");
 const logger_1 = require("../../../utils/logger");
+const ZSpec = __importStar(require("../../../zspec"));
 const Zcl = __importStar(require("../../../zspec/zcl"));
-const zdo_1 = require("../../../zspec/zdo");
+const Zdo = __importStar(require("../../../zspec/zdo"));
 const adapter_1 = __importDefault(require("../../adapter"));
 const Constants = __importStar(require("../constants"));
 const unpi_1 = require("../unpi");
@@ -77,6 +78,7 @@ class ZStackAdapter extends adapter_1.default {
     waitress;
     constructor(networkOptions, serialPortOptions, backupPath, adapterOptions) {
         super(networkOptions, serialPortOptions, backupPath, adapterOptions);
+        this.hasZdoMessageOverhead = false;
         this.znp = new znp_1.Znp(this.serialPortOptions.path, this.serialPortOptions.baudRate, this.serialPortOptions.rtscts);
         this.transactionID = 0;
         this.deviceAnnounceRouteDiscoveryDebouncers = new Map();
@@ -120,10 +122,10 @@ class ZStackAdapter extends adapter_1.default {
         logger_1.logger.debug(`Adapter concurrent: ${concurrent}`, NS);
         this.queue = new utils_1.Queue(concurrent);
         logger_1.logger.debug(`Detected znp version '${tstype_1.ZnpVersion[this.version.product]}' (${JSON.stringify(this.version)})`, NS);
-        this.adapterManager = new manager_1.ZnpAdapterManager(this.znp, {
+        this.adapterManager = new manager_1.ZnpAdapterManager(this, this.znp, {
             backupPath: this.backupPath,
             version: this.version.product,
-            greenPowerGroup: this.greenPowerGroup,
+            greenPowerGroup: ZSpec.GP_GROUP_ID,
             networkOptions: this.networkOptions,
             adapterOptions: this.adapterOptions,
         });
@@ -136,36 +138,32 @@ class ZStackAdapter extends adapter_1.default {
         if (this.adapterOptions.transmitPower != null) {
             await this.setTransmitPower(this.adapterOptions.transmitPower);
         }
-        return startResult;
+        return await startResult;
     }
     async stop() {
         this.closing = true;
         await this.znp.close();
     }
     static async isValidPath(path) {
-        return znp_1.Znp.isValidPath(path);
+        return await znp_1.Znp.isValidPath(path);
     }
     static async autoDetectPath() {
-        return znp_1.Znp.autoDetectPath();
+        return await znp_1.Znp.autoDetectPath();
     }
     async getCoordinator() {
-        return this.queue.execute(async () => {
+        return await this.queue.execute(async () => {
             this.checkInterpanLock();
-            const activeEpRsp = this.waitForAreqZdo('activeEpRsp');
-            await this.znp.request(Subsystem.ZDO, 'activeEpReq', { dstaddr: 0, nwkaddrofinterest: 0 }, activeEpRsp.ID);
-            const activeEp = await activeEpRsp.start();
+            const activeEp = await this.activeEndpoints(0);
             const deviceInfo = await this.znp.requestWithReply(Subsystem.UTIL, 'getDeviceInfo', {});
             const endpoints = [];
-            for (const endpoint of activeEp.payload.activeeplist) {
-                const simpleDescRsp = this.waitForAreqZdo('simpleDescRsp', { endpoint });
-                await this.znp.request(Subsystem.ZDO, 'simpleDescReq', { dstaddr: 0, nwkaddrofinterest: 0, endpoint }, simpleDescRsp.ID);
-                const simpleDesc = await simpleDescRsp.start();
+            for (const endpoint of activeEp.endpoints) {
+                const simpleDesc = await this.simpleDescriptor(0, endpoint);
                 endpoints.push({
-                    ID: simpleDesc.payload.endpoint,
-                    profileID: simpleDesc.payload.profileid,
-                    deviceID: simpleDesc.payload.deviceid,
-                    inputClusters: simpleDesc.payload.inclusterlist,
-                    outputClusters: simpleDesc.payload.outclusterlist,
+                    ID: simpleDesc.endpointID,
+                    deviceID: simpleDesc.deviceID,
+                    profileID: simpleDesc.profileID,
+                    inputClusters: simpleDesc.inputClusters,
+                    outputClusters: simpleDesc.outputClusters,
                 });
             }
             return {
@@ -182,7 +180,9 @@ class ZStackAdapter extends adapter_1.default {
         await this.queue.execute(async () => {
             this.checkInterpanLock();
             const payload = { addrmode, dstaddr, duration: seconds, tcsignificance: 0 };
+            const permitJoinRsp = this.waitForAreqZdo('mgmtPermitJoinRsp');
             await this.znp.request(Subsystem.ZDO, 'mgmtPermitJoinReq', payload);
+            await permitJoinRsp.start();
             await this.setLED(seconds == 0 ? 'off' : 'on');
         });
     }
@@ -234,7 +234,7 @@ class ZStackAdapter extends adapter_1.default {
         const response = this.waitForAreqZdo('nwkAddrRsp', { ieeeaddr: ieeeAddr });
         await this.znp.request(Subsystem.ZDO, 'nwkAddrReq', { ieeeaddr: ieeeAddr, reqtype: 0, startindex: 0 });
         const result = await response.start();
-        return result.payload.nwkaddr;
+        return result.nwkAddress;
     }
     supportsAssocRemove() {
         return this.version.product === tstype_1.ZnpVersion.zStack3x0 && parseInt(this.version.revision) >= 20200805;
@@ -251,7 +251,7 @@ class ZStackAdapter extends adapter_1.default {
         }
     }
     async nodeDescriptor(networkAddress) {
-        return this.queue.execute(async () => {
+        return await this.queue.execute(async () => {
             this.checkInterpanLock();
             try {
                 const result = await this.nodeDescriptorInternal(networkAddress);
@@ -268,12 +268,12 @@ class ZStackAdapter extends adapter_1.default {
         }, networkAddress);
     }
     async nodeDescriptorInternal(networkAddress) {
-        const response = this.waitForAreqZdo('nodeDescRsp', { nwkaddr: networkAddress });
+        const response = this.waitForAreqZdo('nodeDescRsp', { srcaddr: networkAddress });
         const payload = { dstaddr: networkAddress, nwkaddrofinterest: networkAddress };
         await this.znp.request(Subsystem.ZDO, 'nodeDescReq', payload, response.ID);
         const descriptor = await response.start();
         let type = 'Unknown';
-        const logicalType = descriptor.payload.logicaltype_cmplxdescavai_userdescavai & 0x07;
+        const logicalType = descriptor.logicalType;
         for (const [key, value] of Object.entries(Constants.ZDO.deviceLogicalType)) {
             if (value === logicalType) {
                 if (key === 'COORDINATOR')
@@ -285,39 +285,38 @@ class ZStackAdapter extends adapter_1.default {
                 break;
             }
         }
-        return { manufacturerCode: descriptor.payload.manufacturercode, type };
+        return { manufacturerCode: descriptor.manufacturerCode, type };
     }
     async activeEndpoints(networkAddress) {
-        return this.queue.execute(async () => {
+        return await this.queue.execute(async () => {
             this.checkInterpanLock();
-            const response = this.waitForAreqZdo('activeEpRsp', { nwkaddr: networkAddress });
+            const response = this.waitForAreqZdo('activeEpRsp', { srcaddr: networkAddress });
             const payload = { dstaddr: networkAddress, nwkaddrofinterest: networkAddress };
             await this.znp.request(Subsystem.ZDO, 'activeEpReq', payload, response.ID);
             const activeEp = await response.start();
-            return { endpoints: activeEp.payload.activeeplist };
+            return { endpoints: activeEp.endpointList };
         }, networkAddress);
     }
     async simpleDescriptor(networkAddress, endpointID) {
-        return this.queue.execute(async () => {
+        return await this.queue.execute(async () => {
             this.checkInterpanLock();
-            const responsePayload = { nwkaddr: networkAddress, endpoint: endpointID };
-            const response = this.waitForAreqZdo('simpleDescRsp', responsePayload);
+            const response = this.waitForAreqZdo('simpleDescRsp', { srcaddr: networkAddress });
             const payload = { dstaddr: networkAddress, nwkaddrofinterest: networkAddress, endpoint: endpointID };
             await this.znp.request(Subsystem.ZDO, 'simpleDescReq', payload, response.ID);
             const descriptor = await response.start();
             return {
-                profileID: descriptor.payload.profileid,
-                endpointID: descriptor.payload.endpoint,
-                deviceID: descriptor.payload.deviceid,
-                inputClusters: descriptor.payload.inclusterlist,
-                outputClusters: descriptor.payload.outclusterlist,
+                profileID: descriptor.profileId,
+                endpointID: descriptor.endpoint,
+                deviceID: descriptor.deviceId,
+                inputClusters: descriptor.inClusterList,
+                outputClusters: descriptor.outClusterList,
             };
         }, networkAddress);
     }
     async sendZclFrameToEndpoint(ieeeAddr, networkAddress, endpoint, zclFrame, timeout, disableResponse, disableRecovery, sourceEndpoint) {
-        return this.queue.execute(async () => {
+        return await this.queue.execute(async () => {
             this.checkInterpanLock();
-            return this.sendZclFrameToEndpointInternal(ieeeAddr, networkAddress, endpoint, sourceEndpoint || 1, zclFrame, timeout, disableResponse, disableRecovery, 0, 0, false, false, false, undefined);
+            return await this.sendZclFrameToEndpointInternal(ieeeAddr, networkAddress, endpoint, sourceEndpoint || 1, zclFrame, timeout, disableResponse, disableRecovery, 0, 0, false, false, false, undefined);
         }, networkAddress);
     }
     async sendZclFrameToEndpointInternal(ieeeAddr, networkAddress, endpoint, sourceEndpoint, zclFrame, timeout, disableResponse, disableRecovery, responseAttempt, dataRequestAttempt, checkedNetworkAddress, discoveredRoute, assocRemove, assocRestore) {
@@ -371,7 +370,7 @@ class ZStackAdapter extends adapter_1.default {
                  * wait some time and retry.
                  */
                 await (0, utils_1.Wait)(2000);
-                return this.sendZclFrameToEndpointInternal(ieeeAddr, networkAddress, endpoint, sourceEndpoint, zclFrame, timeout, disableResponse, disableRecovery, responseAttempt, dataRequestAttempt + 1, checkedNetworkAddress, discoveredRoute, assocRemove, assocRestore);
+                return await this.sendZclFrameToEndpointInternal(ieeeAddr, networkAddress, endpoint, sourceEndpoint, zclFrame, timeout, disableResponse, disableRecovery, responseAttempt, dataRequestAttempt + 1, checkedNetworkAddress, discoveredRoute, assocRemove, assocRestore);
             }
             else {
                 let doAssocRemove = false;
@@ -433,7 +432,7 @@ class ZStackAdapter extends adapter_1.default {
                     logger_1.logger.debug('Wait 2000ms', NS);
                     await (0, utils_1.Wait)(2000);
                 }
-                return this.sendZclFrameToEndpointInternal(ieeeAddr, networkAddress, endpoint, sourceEndpoint, zclFrame, timeout, disableResponse, disableRecovery, responseAttempt, dataRequestAttempt + 1, checkedNetworkAddress, discoveredRoute, assocRemove, assocRestore);
+                return await this.sendZclFrameToEndpointInternal(ieeeAddr, networkAddress, endpoint, sourceEndpoint, zclFrame, timeout, disableResponse, disableRecovery, responseAttempt, dataRequestAttempt + 1, checkedNetworkAddress, discoveredRoute, assocRemove, assocRestore);
             }
         }
         if (response !== null) {
@@ -466,7 +465,7 @@ class ZStackAdapter extends adapter_1.default {
                     }
                     // No response could be of invalid route, e.g. when message is send to wrong parent of end device.
                     await this.discoverRoute(networkAddress);
-                    return this.sendZclFrameToEndpointInternal(ieeeAddr, networkAddress, endpoint, sourceEndpoint, zclFrame, timeout, disableResponse, disableRecovery, responseAttempt + 1, dataRequestAttempt, checkedNetworkAddress, discoveredRoute, assocRemove, assocRestore);
+                    return await this.sendZclFrameToEndpointInternal(ieeeAddr, networkAddress, endpoint, sourceEndpoint, zclFrame, timeout, disableResponse, disableRecovery, responseAttempt + 1, dataRequestAttempt, checkedNetworkAddress, discoveredRoute, assocRemove, assocRestore);
                 }
                 else {
                     throw error;
@@ -475,7 +474,7 @@ class ZStackAdapter extends adapter_1.default {
         }
     }
     async sendZclFrameToGroup(groupID, zclFrame, sourceEndpoint) {
-        return this.queue.execute(async () => {
+        return await this.queue.execute(async () => {
             this.checkInterpanLock();
             await this.dataRequestExtended(AddressMode.ADDR_GROUP, groupID, 0xff, 0, sourceEndpoint || 1, zclFrame.cluster.ID, Constants.AF.DEFAULT_RADIUS, zclFrame.toBuffer(), 3000, true);
             /**
@@ -487,7 +486,7 @@ class ZStackAdapter extends adapter_1.default {
         });
     }
     async sendZclFrameToAll(endpoint, zclFrame, sourceEndpoint, destination) {
-        return this.queue.execute(async () => {
+        return await this.queue.execute(async () => {
             this.checkInterpanLock();
             await this.dataRequestExtended(AddressMode.ADDR_16BIT, destination, endpoint, 0, sourceEndpoint, zclFrame.cluster.ID, Constants.AF.DEFAULT_RADIUS, zclFrame.toBuffer(), 3000, false, 0);
             /**
@@ -499,69 +498,65 @@ class ZStackAdapter extends adapter_1.default {
         });
     }
     async lqi(networkAddress) {
-        return this.queue.execute(async () => {
+        return await this.queue.execute(async () => {
             this.checkInterpanLock();
             const neighbors = [];
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any
             const request = async (startIndex) => {
                 const response = this.waitForAreqZdo('mgmtLqiRsp', { srcaddr: networkAddress });
                 await this.znp.request(Subsystem.ZDO, 'mgmtLqiReq', { dstaddr: networkAddress, startindex: startIndex }, response.ID);
                 const result = await response.start();
                 return result;
             };
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any
             const add = (list) => {
                 for (const entry of list) {
                     neighbors.push({
                         linkquality: entry.lqi,
-                        networkAddress: entry.nwkAddr,
-                        ieeeAddr: entry.extAddr,
+                        networkAddress: entry.nwkAddress,
+                        ieeeAddr: entry.eui64,
                         relationship: entry.relationship,
                         depth: entry.depth,
                     });
                 }
             };
             let response = await request(0);
-            add(response.payload.neighborlqilist);
-            const size = response.payload.neighbortableentries;
-            let nextStartIndex = response.payload.neighborlqilist.length;
+            add(response.entryList);
+            const size = response.neighborTableEntries;
+            let nextStartIndex = response.entryList.length;
             while (neighbors.length < size) {
                 response = await request(nextStartIndex);
-                add(response.payload.neighborlqilist);
-                nextStartIndex += response.payload.neighborlqilist.length;
+                add(response.entryList);
+                nextStartIndex += response.entryList.length;
             }
             return { neighbors };
         }, networkAddress);
     }
     async routingTable(networkAddress) {
-        return this.queue.execute(async () => {
+        return await this.queue.execute(async () => {
             this.checkInterpanLock();
             const table = [];
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any
             const request = async (startIndex) => {
                 const response = this.waitForAreqZdo('mgmtRtgRsp', { srcaddr: networkAddress });
                 await this.znp.request(Subsystem.ZDO, 'mgmtRtgReq', { dstaddr: networkAddress, startindex: startIndex }, response.ID);
                 const result = await response.start();
                 return result;
             };
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any
             const add = (list) => {
                 for (const entry of list) {
                     table.push({
-                        destinationAddress: entry.destNwkAddr,
-                        status: entry.routeStatus,
-                        nextHop: entry.nextHopNwkAddr,
+                        destinationAddress: entry.destinationAddress,
+                        status: entry.status,
+                        nextHop: entry.nextHopAddress,
                     });
                 }
             };
             let response = await request(0);
-            add(response.payload.routingtablelist);
-            const size = response.payload.routingtableentries;
-            let nextStartIndex = response.payload.routingtablelist.length;
+            add(response.entryList);
+            const size = response.routingTableEntries;
+            let nextStartIndex = response.entryList.length;
             while (table.length < size) {
                 response = await request(nextStartIndex);
-                add(response.payload.routingtablelist);
-                nextStartIndex += response.payload.routingtablelist.length;
+                add(response.entryList);
+                nextStartIndex += response.entryList.length;
             }
             return { table };
         }, networkAddress);
@@ -578,7 +573,7 @@ class ZStackAdapter extends adapter_1.default {
         await this.bindInternal('unbind', destinationNetworkAddress, sourceIeeeAddress, sourceEndpoint, clusterID, destinationAddressOrGroup, type, destinationEndpoint);
     }
     async bindInternal(bindType, destinationNetworkAddress, sourceIeeeAddress, sourceEndpoint, clusterID, destinationAddressOrGroup, targetType, destinationEndpoint) {
-        return this.queue.execute(async () => {
+        return await this.queue.execute(async () => {
             this.checkInterpanLock();
             const response = this.waitForAreqZdo(`${bindType}Rsp`, { srcaddr: destinationNetworkAddress });
             const payload = {
@@ -620,47 +615,55 @@ class ZStackAdapter extends adapter_1.default {
             return;
         }
         if (object.subsystem === Subsystem.ZDO) {
-            if (object.command === 'tcDeviceInd') {
+            if (object.command.name === 'tcDeviceInd') {
                 const payload = {
                     networkAddress: object.payload.nwkaddr,
                     ieeeAddr: object.payload.extaddr,
                 };
                 this.emit('deviceJoined', payload);
             }
-            else if (object.command === 'endDeviceAnnceInd') {
-                const payload = {
-                    networkAddress: object.payload.nwkaddr,
-                    ieeeAddr: object.payload.ieeeaddr,
-                };
-                // Only discover routes to end devices, if bit 1 of capabilities === 0 it's an end device.
-                const isEndDevice = (object.payload.capabilities & (1 << 1)) === 0;
-                if (isEndDevice) {
-                    if (!this.deviceAnnounceRouteDiscoveryDebouncers.has(payload.networkAddress)) {
-                        // If a device announces multiple times in a very short time, it makes no sense
-                        // to rediscover the route every time.
-                        const debouncer = (0, debounce_1.default)(() => {
-                            // eslint-disable-next-line @typescript-eslint/no-floating-promises
-                            this.queue.execute(async () => {
-                                /* istanbul ignore next */
-                                this.discoverRoute(payload.networkAddress, false).catch(() => { });
-                            }, payload.networkAddress);
-                        }, 60 * 1000, { immediate: true });
-                        this.deviceAnnounceRouteDiscoveryDebouncers.set(payload.networkAddress, debouncer);
+            else if (object.command.name === 'endDeviceAnnceInd') {
+                const zdoResult = object.parseZdoPayload();
+                /* istanbul ignore else */
+                if (Zdo.Buffalo.checkStatus(zdoResult)) {
+                    const payload = {
+                        networkAddress: zdoResult[1].nwkAddress,
+                        ieeeAddr: zdoResult[1].eui64,
+                    };
+                    // Only discover routes to end devices, if bit 1 of capabilities === 0 it's an end device.
+                    const isEndDevice = zdoResult[1].capabilities.deviceType === 0;
+                    if (isEndDevice) {
+                        if (!this.deviceAnnounceRouteDiscoveryDebouncers.has(payload.networkAddress)) {
+                            // If a device announces multiple times in a very short time, it makes no sense
+                            // to rediscover the route every time.
+                            const debouncer = (0, debounce_1.default)(() => {
+                                // eslint-disable-next-line @typescript-eslint/no-floating-promises
+                                this.queue.execute(async () => {
+                                    /* istanbul ignore next */
+                                    this.discoverRoute(payload.networkAddress, false).catch(() => { });
+                                }, payload.networkAddress);
+                            }, 60 * 1000, { immediate: true });
+                            this.deviceAnnounceRouteDiscoveryDebouncers.set(payload.networkAddress, debouncer);
+                        }
+                        const debouncer = this.deviceAnnounceRouteDiscoveryDebouncers.get(payload.networkAddress);
+                        (0, assert_1.default)(debouncer);
+                        debouncer();
                     }
-                    const debouncer = this.deviceAnnounceRouteDiscoveryDebouncers.get(payload.networkAddress);
-                    (0, assert_1.default)(debouncer);
-                    debouncer();
+                    this.emit('deviceAnnounce', payload);
                 }
-                this.emit('deviceAnnounce', payload);
             }
-            else if (object.command === 'nwkAddrRsp') {
-                const payload = {
-                    networkAddress: object.payload.nwkaddr,
-                    ieeeAddr: object.payload.ieeeaddr,
-                };
-                this.emit('networkAddress', payload);
+            else if (object.command.name === 'nwkAddrRsp') {
+                const zdoResult = object.parseZdoPayload();
+                /* istanbul ignore else */
+                if (Zdo.Buffalo.checkStatus(zdoResult)) {
+                    const payload = {
+                        networkAddress: zdoResult[1].nwkAddress,
+                        ieeeAddr: zdoResult[1].eui64,
+                    };
+                    this.emit('networkAddress', payload);
+                }
             }
-            else if (object.command === 'concentratorIndCb') {
+            else if (object.command.name === 'concentratorIndCb') {
                 // Some routers may change short addresses and the announcement
                 // is missed by the coordinator. This can happen when there are
                 // power outages or other interruptions in service. They may
@@ -679,7 +682,7 @@ class ZStackAdapter extends adapter_1.default {
             }
             else {
                 /* istanbul ignore else */
-                if (object.command === 'leaveInd') {
+                if (object.command.name === 'leaveInd') {
                     if (object.payload.rejoin) {
                         logger_1.logger.debug(`Device leave: Got leave indication with rejoin=true, nothing to do`, NS);
                     }
@@ -697,7 +700,7 @@ class ZStackAdapter extends adapter_1.default {
             /* istanbul ignore else */
             if (object.subsystem === Subsystem.AF) {
                 /* istanbul ignore else */
-                if (object.command === 'incomingMsg' || object.command === 'incomingMsgExt') {
+                if (object.command.name === 'incomingMsg' || object.command.name === 'incomingMsgExt') {
                     const payload = {
                         clusterID: object.payload.clusterid,
                         data: object.payload.data,
@@ -727,10 +730,10 @@ class ZStackAdapter extends adapter_1.default {
         return true;
     }
     async backup(ieeeAddressesInDatabase) {
-        return this.adapterManager.backup.createBackup(ieeeAddressesInDatabase);
+        return await this.adapterManager.backup.createBackup(ieeeAddressesInDatabase);
     }
     async setChannelInterPAN(channel) {
-        return this.queue.execute(async () => {
+        return await this.queue.execute(async () => {
             this.interpanLock = true;
             await this.znp.request(Subsystem.AF, 'interPanCtl', { cmd: 1, data: [channel] });
             if (!this.interpanEndpointRegistered) {
@@ -741,12 +744,12 @@ class ZStackAdapter extends adapter_1.default {
         });
     }
     async sendZclFrameInterPANToIeeeAddr(zclFrame, ieeeAddr) {
-        return this.queue.execute(async () => {
+        return await this.queue.execute(async () => {
             await this.dataRequestExtended(AddressMode.ADDR_64BIT, ieeeAddr, 0xfe, 0xffff, 12, zclFrame.cluster.ID, 30, zclFrame.toBuffer(), 10000, false);
         });
     }
     async sendZclFrameInterPANBroadcast(zclFrame, timeout) {
-        return this.queue.execute(async () => {
+        return await this.queue.execute(async () => {
             const command = zclFrame.command;
             if (command.response == undefined) {
                 throw new Error(`Command '${command.name}' has no response, cannot wait for response`);
@@ -759,11 +762,11 @@ class ZStackAdapter extends adapter_1.default {
                 response.cancel();
                 throw error;
             }
-            return response.start().promise;
+            return await response.start().promise;
         });
     }
     async restoreChannelInterPAN() {
-        return this.queue.execute(async () => {
+        return await this.queue.execute(async () => {
             await this.znp.request(Subsystem.AF, 'interPanCtl', { cmd: 0, data: [] });
             // Give adapter some time to restore, otherwise stuff crashes
             await (0, utils_1.Wait)(3000);
@@ -771,7 +774,7 @@ class ZStackAdapter extends adapter_1.default {
         });
     }
     async changeChannel(newChannel) {
-        return this.queue.execute(async () => {
+        return await this.queue.execute(async () => {
             this.checkInterpanLock();
             const payload = {
                 dstaddr: 0xffff, // broadcast with sleepy
@@ -787,7 +790,7 @@ class ZStackAdapter extends adapter_1.default {
         });
     }
     async setTransmitPower(value) {
-        return this.queue.execute(async () => {
+        return await this.queue.execute(async () => {
             await this.znp.request(Subsystem.SYS, 'stackTune', { operation: 0, value });
         });
     }
@@ -798,14 +801,12 @@ class ZStackAdapter extends adapter_1.default {
             return new Promise((resolve, reject) => {
                 startResult.promise
                     .then((response) => {
-                    // Even though according to the Z-Stack docs the status is `0` or `1`, the actual code
-                    // shows it sets the `zstack_ZdpStatus` which contains the ZDO status.
-                    const code = response.payload.status;
-                    if (code !== zdo_1.Status.SUCCESS) {
-                        reject(new Error(`ZDO error: ${command.replace('Rsp', '')} failed with status '${zdo_1.Status[code]}' (${code})`));
+                    const [status, payload] = response.parseZdoPayload();
+                    if (status === Zdo.Status.SUCCESS) {
+                        resolve(payload);
                     }
                     else {
-                        resolve(response);
+                        reject(new Zdo.StatusError(status));
                     }
                 })
                     .catch(reject);
@@ -886,7 +887,7 @@ class ZStackAdapter extends adapter_1.default {
                      * Retry this command once after a cooling down period.
                      */
                     await (0, utils_1.Wait)(2000);
-                    return this.dataRequestExtended(addressMode, destinationAddressOrGroupID, destinationEndpoint, panID, sourceEndpoint, clusterID, radius, data, timeout, confirmation, attemptsLeft - 1);
+                    return await this.dataRequestExtended(addressMode, destinationAddressOrGroupID, destinationEndpoint, panID, sourceEndpoint, clusterID, radius, data, timeout, confirmation, attemptsLeft - 1);
                 }
                 else {
                     throw new DataConfirmError(dataConfirm.payload.status);