zigbee-herdsman 1.0.0 → 1.1.0

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

@@ -37,6 +37,8 @@ const adapter_1 = __importDefault(require("../../adapter"));
 const Constants = __importStar(require("../constants"));
 const unpi_1 = require("../unpi");
 const znp_1 = require("../znp");
+const definition_1 = __importDefault(require("../znp/definition"));
+const utils_2 = require("../znp/utils");
 const manager_1 = require("./manager");
 const tstype_1 = require("./tstype");
 const NS = 'zh:zstack';
@@ -175,14 +177,23 @@ class ZStackAdapter extends adapter_1.default {
         });
     }
     async permitJoin(seconds, networkAddress) {
-        const addrmode = networkAddress === undefined ? 0x0f : 0x02;
-        const dstaddr = networkAddress || 0xfffc;
+        const clusterId = Zdo.ClusterId.PERMIT_JOINING_REQUEST;
+        // `authentication`: TC significance always 1 (zb specs)
+        const zdoPayload = Zdo.Buffalo.buildRequest(this.hasZdoMessageOverhead, clusterId, seconds, 1, []);
+        if (networkAddress === undefined) {
+            await this.sendZdo(ZSpec.BLANK_EUI64, ZSpec.BroadcastAddress.DEFAULT, clusterId, zdoPayload, true);
+        }
+        else {
+            // NOTE: `sendZdo` takes care of adjusting the payload as appropriate based on `networkAddress === 0` or not
+            const result = await this.sendZdo(ZSpec.BLANK_EUI64, networkAddress, clusterId, zdoPayload, false);
+            /* istanbul ignore next */
+            if (!Zdo.Buffalo.checkStatus(result)) {
+                // TODO: will disappear once moved upstream
+                throw new Zdo.StatusError(result[0]);
+            }
+        }
         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');
         });
     }
@@ -231,10 +242,17 @@ class ZStackAdapter extends adapter_1.default {
          * this is currently not handled, the first nwkAddrRsp is taken.
          */
         logger_1.logger.debug(`Request network address of '${ieeeAddr}'`, NS);
-        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.nwkAddress;
+        const clusterId = Zdo.ClusterId.NETWORK_ADDRESS_REQUEST;
+        const zdoPayload = Zdo.Buffalo.buildRequest(this.hasZdoMessageOverhead, clusterId, ieeeAddr, false, 0);
+        const result = await this.sendZdo(ieeeAddr, ZSpec.NULL_NODE_ID, clusterId, zdoPayload, false);
+        /* istanbul ignore else */
+        if (Zdo.Buffalo.checkStatus(result)) {
+            return result[1].nwkAddress;
+        }
+        else {
+            // TODO: will disappear once moved upstream
+            throw new Zdo.StatusError(result[0]);
+        }
     }
     supportsAssocRemove() {
         return this.version.product === tstype_1.ZnpVersion.zStack3x0 && parseInt(this.version.revision) >= 20200805;
@@ -251,67 +269,141 @@ class ZStackAdapter extends adapter_1.default {
         }
     }
     async nodeDescriptor(networkAddress) {
-        return await this.queue.execute(async () => {
-            this.checkInterpanLock();
-            try {
-                const result = await this.nodeDescriptorInternal(networkAddress);
-                return result;
-            }
-            catch (error) {
-                logger_1.logger.debug(`Node descriptor request for '${networkAddress}' failed (${error}), retry`, NS);
-                // Doing a route discovery after simple descriptor request fails makes it succeed sometimes.
-                // https://github.com/Koenkk/zigbee2mqtt/issues/3276
-                await this.discoverRoute(networkAddress);
-                const result = await this.nodeDescriptorInternal(networkAddress);
-                return result;
-            }
-        }, networkAddress);
-    }
-    async nodeDescriptorInternal(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.logicalType;
-        for (const [key, value] of Object.entries(Constants.ZDO.deviceLogicalType)) {
-            if (value === logicalType) {
-                if (key === 'COORDINATOR')
+        const clusterId = Zdo.ClusterId.NODE_DESCRIPTOR_REQUEST;
+        const zdoPayload = Zdo.Buffalo.buildRequest(this.hasZdoMessageOverhead, clusterId, networkAddress);
+        const result = await this.sendZdo(ZSpec.BLANK_EUI64, networkAddress, clusterId, zdoPayload, false);
+        /* istanbul ignore else */
+        if (Zdo.Buffalo.checkStatus(result)) {
+            const payload = result[1];
+            let type = 'Unknown';
+            switch (payload.logicalType) {
+                case 0x0:
                     type = 'Coordinator';
-                else if (key === 'ROUTER')
+                    break;
+                case 0x1:
                     type = 'Router';
-                else if (key === 'ENDDEVICE')
+                    break;
+                case 0x2:
                     type = 'EndDevice';
-                break;
+                    break;
             }
+            return { type, manufacturerCode: payload.manufacturerCode };
+        }
+        else {
+            // TODO: will disappear once moved upstream
+            throw new Zdo.StatusError(result[0]);
         }
-        return { manufacturerCode: descriptor.manufacturerCode, type };
     }
     async activeEndpoints(networkAddress) {
-        return await this.queue.execute(async () => {
-            this.checkInterpanLock();
-            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.endpointList };
-        }, networkAddress);
+        const clusterId = Zdo.ClusterId.ACTIVE_ENDPOINTS_REQUEST;
+        const zdoPayload = Zdo.Buffalo.buildRequest(this.hasZdoMessageOverhead, clusterId, networkAddress);
+        const result = await this.sendZdo(ZSpec.BLANK_EUI64, networkAddress, clusterId, zdoPayload, false);
+        /* istanbul ignore else */
+        if (Zdo.Buffalo.checkStatus(result)) {
+            return { endpoints: result[1].endpointList };
+        }
+        else {
+            // TODO: will disappear once moved upstream
+            throw new Zdo.StatusError(result[0]);
+        }
     }
     async simpleDescriptor(networkAddress, endpointID) {
-        return await this.queue.execute(async () => {
-            this.checkInterpanLock();
-            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();
+        const clusterId = Zdo.ClusterId.SIMPLE_DESCRIPTOR_REQUEST;
+        const zdoPayload = Zdo.Buffalo.buildRequest(this.hasZdoMessageOverhead, clusterId, networkAddress, endpointID);
+        const result = await this.sendZdo(ZSpec.BLANK_EUI64, networkAddress, clusterId, zdoPayload, false);
+        /* istanbul ignore else */
+        if (Zdo.Buffalo.checkStatus(result)) {
+            const payload = result[1];
             return {
-                profileID: descriptor.profileId,
-                endpointID: descriptor.endpoint,
-                deviceID: descriptor.deviceId,
-                inputClusters: descriptor.inClusterList,
-                outputClusters: descriptor.outClusterList,
+                profileID: payload.profileId,
+                endpointID: payload.endpoint,
+                deviceID: payload.deviceId,
+                inputClusters: payload.inClusterList,
+                outputClusters: payload.outClusterList,
             };
-        }, networkAddress);
+        }
+        else {
+            // TODO: will disappear once moved upstream
+            throw new Zdo.StatusError(result[0]);
+        }
+    }
+    async sendZdo(ieeeAddress, networkAddress, clusterId, payload, disableResponse) {
+        return await this.queue.execute(async () => {
+            this.checkInterpanLock();
+            // stack-specific requirements
+            switch (clusterId) {
+                case Zdo.ClusterId.PERMIT_JOINING_REQUEST: {
+                    const finalPayload = Buffer.alloc(payload.length + 3);
+                    finalPayload.writeUInt8(ZSpec.BroadcastAddress[networkAddress] ? AddressMode.ADDR_BROADCAST : AddressMode.ADDR_16BIT, 0);
+                    // zstack uses AddressMode.ADDR_16BIT + ZSpec.BroadcastAddress.DEFAULT to signal "coordinator-only"
+                    finalPayload.writeUInt16LE(networkAddress === 0 ? ZSpec.BroadcastAddress.DEFAULT : networkAddress, 1);
+                    finalPayload.set(payload, 3);
+                    payload = finalPayload;
+                    break;
+                }
+                case Zdo.ClusterId.NWK_UPDATE_REQUEST: {
+                    // extra zeroes for empty nwkManagerAddr if necessary
+                    const zeroes = 9 - payload.length - 1; /* zstack doesn't have nwkUpdateId */
+                    const finalPayload = Buffer.alloc(payload.length + 3 + zeroes);
+                    finalPayload.writeUInt16LE(networkAddress, 0);
+                    finalPayload.writeUInt8(ZSpec.BroadcastAddress[networkAddress] ? AddressMode.ADDR_BROADCAST : AddressMode.ADDR_16BIT, 2);
+                    finalPayload.set(payload, 3);
+                    payload = finalPayload;
+                    break;
+                }
+                case Zdo.ClusterId.BIND_REQUEST:
+                case Zdo.ClusterId.UNBIND_REQUEST: {
+                    // extra zeroes for uint16 (in place of ieee when MULTICAST) and endpoint (not used when MULTICAST)
+                    const zeroes = 21 - payload.length;
+                    const finalPayload = Buffer.alloc(payload.length + 2 + zeroes);
+                    finalPayload.writeUInt16LE(networkAddress, 0);
+                    finalPayload.set(payload, 2);
+                    payload = finalPayload;
+                    break;
+                }
+                case Zdo.ClusterId.NETWORK_ADDRESS_REQUEST:
+                case Zdo.ClusterId.IEEE_ADDRESS_REQUEST: {
+                    // no modification necessary
+                    break;
+                }
+                default: {
+                    const finalPayload = Buffer.alloc(payload.length + 2);
+                    finalPayload.writeUInt16LE(networkAddress, 0);
+                    finalPayload.set(payload, 2);
+                    payload = finalPayload;
+                    break;
+                }
+            }
+            let waiter;
+            if (!disableResponse) {
+                const responseClusterId = Zdo.Utils.getResponseClusterId(clusterId);
+                /* istanbul ignore else */
+                if (responseClusterId) {
+                    const cmd = definition_1.default[Subsystem.ZDO].find((c) => (0, utils_2.isMtCmdAreqZdo)(c) && c.zdoClusterId === responseClusterId);
+                    (0, assert_1.default)(cmd, `Response for ZDO cluster ID '${responseClusterId}' not supported.`);
+                    waiter = this.znp.waitFor(unpi_1.Constants.Type.AREQ, Subsystem.ZDO, cmd.name, responseClusterId === Zdo.ClusterId.NETWORK_ADDRESS_RESPONSE ? ieeeAddress : networkAddress, undefined, undefined);
+                }
+            }
+            try {
+                await this.znp.requestZdo(clusterId, payload, waiter?.ID);
+            }
+            catch (error) {
+                if (clusterId === Zdo.ClusterId.NODE_DESCRIPTOR_REQUEST) {
+                    // Discover route when node descriptor request fails
+                    // https://github.com/Koenkk/zigbee2mqtt/issues/3276
+                    logger_1.logger.debug(`Discover route to '${networkAddress}' because node descriptor request failed`, NS);
+                    await this.discoverRoute(networkAddress);
+                    await this.znp.requestZdo(clusterId, payload, waiter?.ID);
+                }
+                else {
+                    throw error;
+                }
+            }
+            if (waiter) {
+                const response = await waiter.start().promise;
+                return response.payload.zdo;
+            }
+        }, networkAddress /* TODO: replace with ieeeAddress once zdo moved upstream */);
     }
     async sendZclFrameToEndpoint(ieeeAddr, networkAddress, endpoint, zclFrame, timeout, disableResponse, disableRecovery, sourceEndpoint) {
         return await this.queue.execute(async () => {
@@ -498,68 +590,70 @@ class ZStackAdapter extends adapter_1.default {
         });
     }
     async lqi(networkAddress) {
-        return await this.queue.execute(async () => {
-            this.checkInterpanLock();
-            const neighbors = [];
-            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;
-            };
-            const add = (list) => {
-                for (const entry of list) {
+        const clusterId = Zdo.ClusterId.LQI_TABLE_REQUEST;
+        const neighbors = [];
+        const request = async (startIndex) => {
+            const zdoPayload = Zdo.Buffalo.buildRequest(this.hasZdoMessageOverhead, clusterId, startIndex);
+            const result = await this.sendZdo(ZSpec.BLANK_EUI64, networkAddress, clusterId, zdoPayload, false);
+            /* istanbul ignore else */
+            if (Zdo.Buffalo.checkStatus(result)) {
+                const payload = result[1];
+                for (const entry of payload.entryList) {
                     neighbors.push({
-                        linkquality: entry.lqi,
-                        networkAddress: entry.nwkAddress,
                         ieeeAddr: entry.eui64,
+                        networkAddress: entry.nwkAddress,
+                        linkquality: entry.lqi,
                         relationship: entry.relationship,
                         depth: entry.depth,
                     });
                 }
-            };
-            let response = await request(0);
-            add(response.entryList);
-            const size = response.neighborTableEntries;
-            let nextStartIndex = response.entryList.length;
-            while (neighbors.length < size) {
-                response = await request(nextStartIndex);
-                add(response.entryList);
-                nextStartIndex += response.entryList.length;
-            }
-            return { neighbors };
-        }, networkAddress);
+                return [payload.neighborTableEntries, payload.entryList.length];
+            }
+            else {
+                // TODO: will disappear once moved upstream
+                throw new Zdo.StatusError(result[0]);
+            }
+        };
+        let [tableEntries, entryCount] = await request(0);
+        const size = tableEntries;
+        let nextStartIndex = entryCount;
+        while (neighbors.length < size) {
+            [tableEntries, entryCount] = await request(nextStartIndex);
+            nextStartIndex += entryCount;
+        }
+        return { neighbors };
     }
     async routingTable(networkAddress) {
-        return await this.queue.execute(async () => {
-            this.checkInterpanLock();
-            const table = [];
-            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;
-            };
-            const add = (list) => {
-                for (const entry of list) {
+        const clusterId = Zdo.ClusterId.ROUTING_TABLE_REQUEST;
+        const table = [];
+        const request = async (startIndex) => {
+            const zdoPayload = Zdo.Buffalo.buildRequest(this.hasZdoMessageOverhead, clusterId, startIndex);
+            const result = await this.sendZdo(ZSpec.BLANK_EUI64, networkAddress, clusterId, zdoPayload, false);
+            /* istanbul ignore else */
+            if (Zdo.Buffalo.checkStatus(result)) {
+                const payload = result[1];
+                for (const entry of payload.entryList) {
                     table.push({
                         destinationAddress: entry.destinationAddress,
                         status: entry.status,
                         nextHop: entry.nextHopAddress,
                     });
                 }
-            };
-            let response = await request(0);
-            add(response.entryList);
-            const size = response.routingTableEntries;
-            let nextStartIndex = response.entryList.length;
-            while (table.length < size) {
-                response = await request(nextStartIndex);
-                add(response.entryList);
-                nextStartIndex += response.entryList.length;
-            }
-            return { table };
-        }, networkAddress);
+                return [payload.routingTableEntries, payload.entryList.length];
+            }
+            else {
+                // TODO: will disappear once moved upstream
+                throw new Zdo.StatusError(result[0]);
+            }
+        };
+        let [tableEntries, entryCount] = await request(0);
+        const size = tableEntries;
+        let nextStartIndex = entryCount;
+        while (table.length < size) {
+            [tableEntries, entryCount] = await request(nextStartIndex);
+            nextStartIndex += entryCount;
+        }
+        return { table };
     }
     async addInstallCode(ieeeAddress, key) {
         (0, assert_1.default)(this.version.product !== tstype_1.ZnpVersion.zStack12, 'Install code is not supported for ZStack 1.2 adapter');
@@ -567,40 +661,38 @@ class ZStackAdapter extends adapter_1.default {
         await this.znp.request(Subsystem.APP_CNF, 'bdbAddInstallCode', payload);
     }
     async bind(destinationNetworkAddress, sourceIeeeAddress, sourceEndpoint, clusterID, destinationAddressOrGroup, type, destinationEndpoint) {
-        await this.bindInternal('bind', destinationNetworkAddress, sourceIeeeAddress, sourceEndpoint, clusterID, destinationAddressOrGroup, type, destinationEndpoint);
+        const clusterId = Zdo.ClusterId.BIND_REQUEST;
+        const zdoPayload = Zdo.Buffalo.buildRequest(this.hasZdoMessageOverhead, clusterId, sourceIeeeAddress, sourceEndpoint, clusterID, type === 'group' ? Zdo.MULTICAST_BINDING : Zdo.UNICAST_BINDING, destinationAddressOrGroup, // not used with MULTICAST_BINDING
+        destinationAddressOrGroup, // not used with UNICAST_BINDING
+        destinationEndpoint ?? 0);
+        const result = await this.sendZdo(ZSpec.BLANK_EUI64, destinationNetworkAddress, clusterId, zdoPayload, false);
+        /* istanbul ignore next */
+        if (!Zdo.Buffalo.checkStatus(result)) {
+            // TODO: will disappear once moved upstream
+            throw new Zdo.StatusError(result[0]);
+        }
     }
     async unbind(destinationNetworkAddress, sourceIeeeAddress, sourceEndpoint, clusterID, destinationAddressOrGroup, type, destinationEndpoint) {
-        await this.bindInternal('unbind', destinationNetworkAddress, sourceIeeeAddress, sourceEndpoint, clusterID, destinationAddressOrGroup, type, destinationEndpoint);
-    }
-    async bindInternal(bindType, destinationNetworkAddress, sourceIeeeAddress, sourceEndpoint, clusterID, destinationAddressOrGroup, targetType, destinationEndpoint) {
-        return await this.queue.execute(async () => {
-            this.checkInterpanLock();
-            const response = this.waitForAreqZdo(`${bindType}Rsp`, { srcaddr: destinationNetworkAddress });
-            const payload = {
-                dstaddr: destinationNetworkAddress,
-                srcaddr: sourceIeeeAddress,
-                srcendpoint: sourceEndpoint,
-                clusterid: clusterID,
-                dstaddrmode: targetType === 'group' ? AddressMode.ADDR_GROUP : AddressMode.ADDR_64BIT,
-                dstaddress: this.toAddressString(destinationAddressOrGroup),
-                dstendpoint: targetType === 'group' ? 0xff : destinationEndpoint,
-            };
-            await this.znp.request(Subsystem.ZDO, `${bindType}Req`, payload, response.ID);
-            await response.start();
-        }, destinationNetworkAddress);
+        const clusterId = Zdo.ClusterId.UNBIND_REQUEST;
+        const zdoPayload = Zdo.Buffalo.buildRequest(this.hasZdoMessageOverhead, clusterId, sourceIeeeAddress, sourceEndpoint, clusterID, type === 'group' ? Zdo.MULTICAST_BINDING : Zdo.UNICAST_BINDING, destinationAddressOrGroup, // not used with MULTICAST_BINDING
+        destinationAddressOrGroup, // not used with UNICAST_BINDING
+        destinationEndpoint ?? 0);
+        const result = await this.sendZdo(ZSpec.BLANK_EUI64, destinationNetworkAddress, clusterId, zdoPayload, false);
+        /* istanbul ignore next */
+        if (!Zdo.Buffalo.checkStatus(result)) {
+            // TODO: will disappear once moved upstream
+            throw new Zdo.StatusError(result[0]);
+        }
     }
-    removeDevice(networkAddress, ieeeAddr) {
-        return this.queue.execute(async () => {
-            this.checkInterpanLock();
-            const response = this.waitForAreqZdo('mgmtLeaveRsp', { srcaddr: networkAddress });
-            const payload = {
-                dstaddr: networkAddress,
-                deviceaddress: ieeeAddr,
-                removechildrenRejoin: 0,
-            };
-            await this.znp.request(Subsystem.ZDO, 'mgmtLeaveReq', payload, response.ID);
-            await response.start();
-        }, networkAddress);
+    async removeDevice(networkAddress, ieeeAddr) {
+        const clusterId = Zdo.ClusterId.LEAVE_REQUEST;
+        const zdoPayload = Zdo.Buffalo.buildRequest(this.hasZdoMessageOverhead, clusterId, ieeeAddr, Zdo.LeaveRequestFlags.WITHOUT_REJOIN);
+        const result = await this.sendZdo(ZSpec.BLANK_EUI64, networkAddress, clusterId, zdoPayload, false);
+        /* istanbul ignore next */
+        if (!Zdo.Buffalo.checkStatus(result)) {
+            // TODO: will disappear once moved upstream
+            throw new Zdo.StatusError(result[0]);
+        }
     }
     /**
      * Event handlers
@@ -615,6 +707,9 @@ class ZStackAdapter extends adapter_1.default {
             return;
         }
         if (object.subsystem === Subsystem.ZDO) {
+            if ((0, utils_2.isMtCmdAreqZdo)(object.command)) {
+                this.emit('zdoResponse', object.command.zdoClusterId, object.payload.zdo);
+            }
             if (object.command.name === 'tcDeviceInd') {
                 const payload = {
                     networkAddress: object.payload.nwkaddr,
@@ -623,15 +718,16 @@ class ZStackAdapter extends adapter_1.default {
                 this.emit('deviceJoined', payload);
             }
             else if (object.command.name === 'endDeviceAnnceInd') {
-                const zdoResult = object.parseZdoPayload();
+                // TODO: better way???
                 /* istanbul ignore else */
-                if (Zdo.Buffalo.checkStatus(zdoResult)) {
+                if (Zdo.Buffalo.checkStatus(object.payload.zdo)) {
+                    const zdoPayload = object.payload.zdo[1];
                     const payload = {
-                        networkAddress: zdoResult[1].nwkAddress,
-                        ieeeAddr: zdoResult[1].eui64,
+                        networkAddress: zdoPayload.nwkAddress,
+                        ieeeAddr: zdoPayload.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;
+                    const isEndDevice = zdoPayload.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
@@ -649,18 +745,6 @@ class ZStackAdapter extends adapter_1.default {
                         (0, assert_1.default)(debouncer);
                         debouncer();
                     }
-                    this.emit('deviceAnnounce', 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.name === 'concentratorIndCb') {
@@ -674,11 +758,15 @@ class ZStackAdapter extends adapter_1.default {
                 // mappings.
                 // https://e2e.ti.com/cfs-file/__key/communityserver-discussions-components-files/158/4403.zstacktask.c
                 // https://github.com/Koenkk/zigbee-herdsman/issues/74
-                const payload = {
-                    networkAddress: object.payload.srcaddr,
-                    ieeeAddr: object.payload.extaddr,
-                };
-                this.emit('networkAddress', payload);
+                this.emit('zdoResponse', Zdo.ClusterId.NETWORK_ADDRESS_RESPONSE, [
+                    Zdo.Status.SUCCESS,
+                    {
+                        eui64: object.payload.extaddr,
+                        nwkAddress: object.payload.srcaddr,
+                        startIndex: 0,
+                        assocDevList: [],
+                    },
+                ]);
             }
             else {
                 /* istanbul ignore else */
@@ -774,46 +862,17 @@ class ZStackAdapter extends adapter_1.default {
         });
     }
     async changeChannel(newChannel) {
-        return await this.queue.execute(async () => {
-            this.checkInterpanLock();
-            const payload = {
-                dstaddr: 0xffff, // broadcast with sleepy
-                dstaddrmode: AddressMode.ADDR_BROADCAST,
-                channelmask: [newChannel].reduce((a, c) => a + (1 << c), 0),
-                scanduration: 0xfe, // change channel
-                scancount: 0,
-                nwkmanageraddr: 0,
-            };
-            await this.znp.request(Subsystem.ZDO, 'mgmtNwkUpdateReq', payload);
-            // wait for the broadcast to propagate and the adapter to actually change
-            await (0, utils_1.Wait)(10000);
-        });
+        const clusterId = Zdo.ClusterId.NWK_UPDATE_REQUEST;
+        const zdoPayload = Zdo.Buffalo.buildRequest(this.hasZdoMessageOverhead, clusterId, [newChannel], 0xfe, 0, undefined, 0);
+        await this.sendZdo(ZSpec.BLANK_EUI64, ZSpec.BroadcastAddress.SLEEPY, clusterId, zdoPayload, true /* handled below */);
+        // wait for the broadcast to propagate and the adapter to actually change
+        await (0, utils_1.Wait)(10000);
     }
     async setTransmitPower(value) {
         return await this.queue.execute(async () => {
             await this.znp.request(Subsystem.SYS, 'stackTune', { operation: 0, value });
         });
     }
-    waitForAreqZdo(command, payload) {
-        const result = this.znp.waitFor(unpi_1.Constants.Type.AREQ, Subsystem.ZDO, command, payload);
-        const start = () => {
-            const startResult = result.start();
-            return new Promise((resolve, reject) => {
-                startResult.promise
-                    .then((response) => {
-                    const [status, payload] = response.parseZdoPayload();
-                    if (status === Zdo.Status.SUCCESS) {
-                        resolve(payload);
-                    }
-                    else {
-                        reject(new Zdo.StatusError(status));
-                    }
-                })
-                    .catch(reject);
-            });
-        };
-        return { start, ID: result.ID };
-    }
     waitForInternal(networkAddress, endpoint, frameType, direction, transactionSequenceNumber, clusterID, commandIdentifier, timeout) {
         const payload = {
             address: networkAddress,
@@ -837,7 +896,7 @@ class ZStackAdapter extends adapter_1.default {
      */
     async dataRequest(destinationAddress, destinationEndpoint, sourceEndpoint, clusterID, radius, data, timeout) {
         const transactionID = this.nextTransactionID();
-        const response = this.znp.waitFor(Type.AREQ, Subsystem.AF, 'dataConfirm', { transid: transactionID }, timeout);
+        const response = this.znp.waitFor(Type.AREQ, Subsystem.AF, 'dataConfirm', undefined, transactionID, undefined, timeout);
         await this.znp.request(Subsystem.AF, 'dataRequest', {
             dstaddr: destinationAddress,
             destendpoint: destinationEndpoint,
@@ -861,7 +920,9 @@ class ZStackAdapter extends adapter_1.default {
     }
     async dataRequestExtended(addressMode, destinationAddressOrGroupID, destinationEndpoint, panID, sourceEndpoint, clusterID, radius, data, timeout, confirmation, attemptsLeft = 5) {
         const transactionID = this.nextTransactionID();
-        const response = confirmation ? this.znp.waitFor(Type.AREQ, Subsystem.AF, 'dataConfirm', { transid: transactionID }, timeout) : undefined;
+        const response = confirmation
+            ? this.znp.waitFor(Type.AREQ, Subsystem.AF, 'dataConfirm', undefined, transactionID, undefined, timeout)
+            : undefined;
         await this.znp.request(Subsystem.AF, 'dataRequestExt', {
             dstaddrmode: addressMode,
             dstaddr: this.toAddressString(destinationAddressOrGroupID),