zigbee-herdsman 1.0.0 → 1.1.0

package/dist/adapter/ezsp/adapter/ezspAdapter.js

@@ -30,7 +30,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const assert_1 = __importDefault(require("assert"));
 const utils_1 = require("../../../utils");
 const logger_1 = require("../../../utils/logger");
+const ZSpec = __importStar(require("../../../zspec"));
 const Zcl = __importStar(require("../../../zspec/zcl"));
+const Zdo = __importStar(require("../../../zspec/zdo"));
 const adapter_1 = __importDefault(require("../../adapter"));
 const serialPortUtils_1 = __importDefault(require("../../serialPortUtils"));
 const socketPortUtils_1 = __importDefault(require("../../socketPortUtils"));
@@ -47,7 +49,6 @@ class EZSPAdapter extends adapter_1.default {
     interpanLock;
     queue;
     closing;
-    deprecatedTimer;
     constructor(networkOptions, serialPortOptions, backupPath, adapterOptions) {
         super(networkOptions, serialPortOptions, backupPath, adapterOptions);
         this.hasZdoMessageOverhead = true;
@@ -65,18 +66,12 @@ class EZSPAdapter extends adapter_1.default {
     }
     async processMessage(frame) {
         logger_1.logger.debug(() => `processMessage: ${JSON.stringify(frame)}`, NS);
-        if (frame.apsFrame.profileId == 0) {
-            if (frame.apsFrame.clusterId == types_1.EmberZDOCmd.Device_annce && frame.apsFrame.destinationEndpoint == 0) {
-                let nwk, rst, ieee;
-                // eslint-disable-next-line prefer-const
-                [nwk, rst] = types_1.uint16_t.deserialize(types_1.uint16_t, frame.message.subarray(1));
-                [ieee, rst] = types_1.EmberEUI64.deserialize(types_1.EmberEUI64, rst);
-                ieee = new types_1.EmberEUI64(ieee);
-                logger_1.logger.debug(`ZDO Device announce: ${nwk}, ${ieee.toString()}`, NS);
-                this.driver.handleNodeJoined(nwk, ieee);
+        if (frame.apsFrame.profileId == Zdo.ZDO_PROFILE_ID) {
+            if (frame.apsFrame.clusterId >= 0x8000 /* response only */) {
+                this.emit('zdoResponse', frame.apsFrame.clusterId, frame.zdoResponse);
             }
         }
-        else if (frame.apsFrame.profileId == 260 || frame.apsFrame.profileId == 0xffff) {
+        else if (frame.apsFrame.profileId == ZSpec.HA_PROFILE_ID || frame.apsFrame.profileId == 0xffff) {
             const payload = {
                 clusterID: frame.apsFrame.clusterId,
                 header: Zcl.Header.fromBuffer(frame.message),
@@ -91,7 +86,7 @@ class EZSPAdapter extends adapter_1.default {
             this.waitress.resolve(payload);
             this.emit('zclPayload', payload);
         }
-        else if (frame.apsFrame.profileId == 0xc05e && frame.senderEui64) {
+        else if (frame.apsFrame.profileId == ZSpec.TOUCHLINK_PROFILE_ID && frame.senderEui64) {
             // ZLL Frame
             const payload = {
                 clusterID: frame.apsFrame.clusterId,
@@ -107,12 +102,12 @@ class EZSPAdapter extends adapter_1.default {
             this.waitress.resolve(payload);
             this.emit('zclPayload', payload);
         }
-        else if (frame.apsFrame.profileId == 0xa1e0) {
+        else if (frame.apsFrame.profileId == ZSpec.GP_PROFILE_ID) {
             // GP Frame
             // Only handle when clusterId == 33 (greenPower), some devices send messages with this profileId
             // while the cluster is not greenPower
             // https://github.com/Koenkk/zigbee2mqtt/issues/20838
-            if (frame.apsFrame.clusterId === 33) {
+            if (frame.apsFrame.clusterId === Zcl.Clusters.greenPower.ID) {
                 const payload = {
                     header: Zcl.Header.fromBuffer(frame.message),
                     clusterID: frame.apsFrame.clusterId,
@@ -132,47 +127,29 @@ class EZSPAdapter extends adapter_1.default {
             }
         }
     }
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    async handleDeviceJoin(arr) {
-        const [nwk, ieee] = arr;
-        logger_1.logger.debug(`Device join request received: ${nwk} ${ieee.toString('hex')}`, NS);
-        const payload = {
+    async handleDeviceJoin(nwk, ieee) {
+        logger_1.logger.debug(() => `Device join request received: ${nwk} ${ieee.toString()}`, NS);
+        this.emit('deviceJoined', {
             networkAddress: nwk,
-            ieeeAddr: `0x${ieee.toString('hex')}`,
-        };
-        if (nwk == 0) {
-            await this.nodeDescriptor(nwk);
-        }
-        else {
-            this.emit('deviceJoined', payload);
-        }
+            ieeeAddr: `0x${ieee.toString()}`,
+        });
     }
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    handleDeviceLeft(arr) {
-        const [nwk, ieee] = arr;
-        logger_1.logger.debug(`Device left network request received: ${nwk} ${ieee}`, NS);
-        const payload = {
+    handleDeviceLeft(nwk, ieee) {
+        logger_1.logger.debug(() => `Device left network request received: ${nwk} ${ieee.toString()}`, NS);
+        this.emit('deviceLeave', {
             networkAddress: nwk,
-            ieeeAddr: `0x${ieee.toString('hex')}`,
-        };
-        this.emit('deviceLeave', payload);
+            ieeeAddr: `0x${ieee.toString()}`,
+        });
     }
     /**
      * Adapter methods
      */
     async start() {
-        const logEzspDeprecated = () => {
-            const message = `Deprecated driver 'ezsp' currently in use, 'ember' will become the officially supported EmberZNet ` +
-                `driver in next release. If using Zigbee2MQTT see https://github.com/Koenkk/zigbee2mqtt/discussions/21462`;
-            logger_1.logger.warning(message, NS);
-        };
-        logEzspDeprecated();
-        this.deprecatedTimer = setInterval(logEzspDeprecated, 60 * 60 * 1000); // Every 60 mins
+        logger_1.logger.warning(`'ezsp' driver is deprecated and will only remain to provide support for older firmware (pre 7.4.x). Migration to 'ember' is recommended. If using Zigbee2MQTT see https://github.com/Koenkk/zigbee2mqtt/discussions/21462`, NS);
         return await this.driver.startup();
     }
     async stop() {
         this.closing = true;
-        clearInterval(this.deprecatedTimer);
         await this.driver.stop();
     }
     async onDriverClose() {
@@ -202,27 +179,20 @@ class EZSPAdapter extends adapter_1.default {
     async getCoordinator() {
         return await this.queue.execute(async () => {
             this.checkInterpanLock();
-            const networkAddress = 0x0000;
-            const message = await this.driver.zdoRequest(networkAddress, types_1.EmberZDOCmd.Active_EP_req, types_1.EmberZDOCmd.Active_EP_rsp, {
-                dstaddr: networkAddress,
-            });
-            const activeEndpoints = message.activeeplist;
+            const message = await this.activeEndpoints(ZSpec.COORDINATOR_ADDRESS);
             const endpoints = [];
-            for (const endpoint of activeEndpoints) {
-                const descriptor = await this.driver.zdoRequest(networkAddress, types_1.EmberZDOCmd.Simple_Desc_req, types_1.EmberZDOCmd.Simple_Desc_rsp, {
-                    dstaddr: networkAddress,
-                    targetEp: endpoint,
-                });
+            for (const endpoint of message.endpoints) {
+                const descriptor = await this.simpleDescriptor(ZSpec.COORDINATOR_ADDRESS, endpoint);
                 endpoints.push({
-                    profileID: descriptor.descriptor.profileid,
-                    ID: descriptor.descriptor.endpoint,
-                    deviceID: descriptor.descriptor.deviceid,
-                    inputClusters: descriptor.descriptor.inclusterlist,
-                    outputClusters: descriptor.descriptor.outclusterlist,
+                    profileID: descriptor.profileID,
+                    ID: descriptor.endpointID,
+                    deviceID: descriptor.deviceID,
+                    inputClusters: descriptor.inputClusters,
+                    outputClusters: descriptor.outputClusters,
                 });
             }
             return {
-                networkAddress: networkAddress,
+                networkAddress: ZSpec.COORDINATOR_ADDRESS,
                 manufacturerID: 0,
                 ieeeAddr: `0x${this.driver.ieee.toString()}`,
                 endpoints,
@@ -230,20 +200,42 @@ class EZSPAdapter extends adapter_1.default {
         });
     }
     async permitJoin(seconds, networkAddress) {
-        if (this.driver.ezsp.isInitialized()) {
-            return await this.queue.execute(async () => {
+        if (!this.driver.ezsp.isInitialized()) {
+            return;
+        }
+        const clusterId = Zdo.ClusterId.PERMIT_JOINING_REQUEST;
+        if (networkAddress) {
+            // specific device that is not `Coordinator`
+            await this.queue.execute(async () => {
                 this.checkInterpanLock();
                 await this.driver.preJoining(seconds);
-                if (networkAddress) {
-                    const result = await this.driver.zdoRequest(networkAddress, types_1.EmberZDOCmd.Mgmt_Permit_Joining_req, types_1.EmberZDOCmd.Mgmt_Permit_Joining_rsp, { duration: seconds, tcSignificant: false });
-                    if (result.status !== types_1.EmberStatus.SUCCESS) {
-                        throw new Error(`permitJoin for '${networkAddress}' failed`);
-                    }
-                }
-                else {
-                    await this.driver.permitJoining(seconds);
-                }
             });
+            // `authentication`: TC significance always 1 (zb specs)
+            const zdoPayload = Zdo.Buffalo.buildRequest(this.hasZdoMessageOverhead, clusterId, seconds, 1, []);
+            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]);
+            }
+        }
+        else {
+            // coordinator-only (0), or all
+            await this.queue.execute(async () => {
+                this.checkInterpanLock();
+                await this.driver.preJoining(seconds);
+            });
+            const result = await this.driver.permitJoining(seconds);
+            if (result.status !== types_1.EmberStatus.SUCCESS) {
+                throw new Error(`[ZDO] Failed coordinator permit joining request with status=${result.status}.`);
+            }
+            logger_1.logger.debug(`Permit joining on coordinator for ${seconds} sec.`, NS);
+            // broadcast permit joining ZDO
+            if (networkAddress === undefined) {
+                // `authentication`: TC significance always 1 (zb specs)
+                const zdoPayload = Zdo.Buffalo.buildRequest(this.hasZdoMessageOverhead, clusterId, seconds, 1, []);
+                await this.sendZdo(ZSpec.BLANK_EUI64, ZSpec.BroadcastAddress.DEFAULT, clusterId, zdoPayload, true);
+            }
         }
     }
     async getCoordinatorVersion() {
@@ -260,127 +252,169 @@ class EZSPAdapter extends adapter_1.default {
         return await Promise.reject(new Error('Not supported'));
     }
     async lqi(networkAddress) {
-        return await this.queue.execute(async () => {
-            this.checkInterpanLock();
-            const neighbors = [];
-            const request = async (startIndex) => {
-                const result = await this.driver.zdoRequest(networkAddress, types_1.EmberZDOCmd.Mgmt_Lqi_req, types_1.EmberZDOCmd.Mgmt_Lqi_rsp, {
-                    startindex: startIndex,
-                });
-                if (result.status !== types_1.EmberStatus.SUCCESS) {
-                    throw new Error(`LQI for '${networkAddress}' failed with with status code ${result.status}`);
-                }
-                return result;
-            };
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any
-            const add = (list) => {
-                for (const entry of list) {
-                    this.driver.setNode(entry.nodeid, entry.ieee);
+        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({
+                        ieeeAddr: entry.eui64,
+                        networkAddress: entry.nwkAddress,
                         linkquality: entry.lqi,
-                        networkAddress: entry.nodeid,
-                        ieeeAddr: `0x${new types_1.EmberEUI64(entry.ieee).toString()}`,
-                        relationship: (entry.packed >> 4) & 0x7,
+                        relationship: entry.relationship,
                         depth: entry.depth,
                     });
                 }
-            };
-            let response = await request(0);
-            add(response.neighborlqilist.neighbors);
-            const size = response.neighborlqilist.entries;
-            let nextStartIndex = response.neighborlqilist.neighbors.length;
-            while (neighbors.length < size) {
-                response = await request(nextStartIndex);
-                add(response.neighborlqilist.neighbors);
-                nextStartIndex += response.neighborlqilist.neighbors.length;
+                return [payload.neighborTableEntries, payload.entryList.length];
             }
-            return { neighbors };
-        }, networkAddress);
+            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 result = await this.driver.zdoRequest(networkAddress, types_1.EmberZDOCmd.Mgmt_Rtg_req, types_1.EmberZDOCmd.Mgmt_Rtg_rsp, {
-                    startindex: startIndex,
-                });
-                if (result.status !== types_1.EmberStatus.SUCCESS) {
-                    throw new Error(`Routing table for '${networkAddress}' failed with status code ${result.status}`);
-                }
-                return result;
-            };
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any
-            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.destination,
+                        destinationAddress: entry.destinationAddress,
                         status: entry.status,
-                        nextHop: entry.nexthop,
+                        nextHop: entry.nextHopAddress,
                     });
                 }
-            };
-            let response = await request(0);
-            add(response.routingtablelist.table);
-            const size = response.routingtablelist.entries;
-            let nextStartIndex = response.routingtablelist.table.length;
-            while (table.length < size) {
-                response = await request(nextStartIndex);
-                add(response.routingtablelist.table);
-                nextStartIndex += response.routingtablelist.table.length;
+                return [payload.routingTableEntries, payload.entryList.length];
             }
-            return { table };
-        }, networkAddress);
+            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 nodeDescriptor(networkAddress) {
-        return await this.queue.execute(async () => {
-            this.checkInterpanLock();
-            try {
-                logger_1.logger.debug(`Requesting 'Node Descriptor' for '${networkAddress}'`, NS);
-                const result = await this.nodeDescriptorInternal(networkAddress);
-                return result;
-            }
-            catch (error) {
-                logger_1.logger.debug(`Node descriptor request for '${networkAddress}' failed (${error}), retry`, NS);
-                throw error;
+        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';
+                    break;
+                case 0x1:
+                    type = 'Router';
+                    break;
+                case 0x2:
+                    type = 'EndDevice';
+                    break;
             }
-        });
-    }
-    async nodeDescriptorInternal(networkAddress) {
-        const descriptor = await this.driver.zdoRequest(networkAddress, types_1.EmberZDOCmd.Node_Desc_req, types_1.EmberZDOCmd.Node_Desc_rsp, {
-            dstaddr: networkAddress,
-        });
-        const logicaltype = descriptor.descriptor.byte1 & 0x07;
-        return {
-            manufacturerCode: descriptor.descriptor.manufacturer_code,
-            type: logicaltype == 0 ? 'Coordinator' : logicaltype == 1 ? 'Router' : 'EndDevice',
-        };
+            return { type, manufacturerCode: payload.manufacturerCode };
+        }
+        else {
+            // TODO: will disappear once moved upstream
+            throw new Zdo.StatusError(result[0]);
+        }
     }
     async activeEndpoints(networkAddress) {
-        logger_1.logger.debug(`Requesting 'Active endpoints' for '${networkAddress}'`, NS);
-        return await this.queue.execute(async () => {
-            const endpoints = await this.driver.zdoRequest(networkAddress, types_1.EmberZDOCmd.Active_EP_req, types_1.EmberZDOCmd.Active_EP_rsp, {
-                dstaddr: networkAddress,
-            });
-            return { endpoints: [...endpoints.activeeplist] };
-        }, 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)) {
+            const payload = result[1];
+            return { endpoints: payload.endpointList };
+        }
+        else {
+            // TODO: will disappear once moved upstream
+            throw new Zdo.StatusError(result[0]);
+        }
     }
     async simpleDescriptor(networkAddress, endpointID) {
-        logger_1.logger.debug(`Requesting 'Simple Descriptor' for '${networkAddress}' endpoint ${endpointID}`, NS);
-        return await this.queue.execute(async () => {
-            this.checkInterpanLock();
-            const descriptor = await this.driver.zdoRequest(networkAddress, types_1.EmberZDOCmd.Simple_Desc_req, types_1.EmberZDOCmd.Simple_Desc_rsp, {
-                dstaddr: networkAddress,
-                targetEp: endpointID,
-            });
+        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.descriptor.profileid,
-                endpointID: descriptor.descriptor.endpoint,
-                deviceID: descriptor.descriptor.deviceid,
-                inputClusters: descriptor.descriptor.inclusterlist,
-                outputClusters: descriptor.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();
+            const clusterName = Zdo.ClusterId[clusterId];
+            const frame = this.driver.makeApsFrame(clusterId, disableResponse);
+            payload[0] = frame.sequence;
+            let waiter;
+            let responseClusterId;
+            if (!disableResponse) {
+                responseClusterId = Zdo.Utils.getResponseClusterId(clusterId);
+                if (responseClusterId) {
+                    waiter = this.driver.waitFor(responseClusterId === Zdo.ClusterId.NETWORK_ADDRESS_RESPONSE ? ieeeAddress : networkAddress, responseClusterId, frame.sequence);
+                }
+            }
+            if (ZSpec.Utils.isBroadcastAddress(networkAddress)) {
+                logger_1.logger.debug(() => `~~~> [ZDO ${clusterName} BROADCAST to=${networkAddress} payload=${payload.toString('hex')}]`, NS);
+                const req = await this.driver.brequest(networkAddress, frame, payload);
+                logger_1.logger.debug(`~~~> [SENT ZDO BROADCAST]`, NS);
+                if (!req) {
+                    waiter?.cancel();
+                    throw new Error(`~x~> [ZDO ${clusterName} BROADCAST to=${networkAddress}] Failed to send request.`);
+                }
+            }
+            else {
+                logger_1.logger.debug(() => `~~~> [ZDO ${clusterName} UNICAST to=${ieeeAddress}:${networkAddress} payload=${payload.toString('hex')}]`, NS);
+                const req = await this.driver.request(networkAddress, frame, payload);
+                logger_1.logger.debug(`~~~> [SENT ZDO UNICAST]`, NS);
+                if (!req) {
+                    waiter?.cancel();
+                    throw new Error(`~x~> [ZDO ${clusterName} UNICAST to=${ieeeAddress}:${networkAddress}] Failed to send request.`);
+                }
+            }
+            if (waiter && responseClusterId !== undefined) {
+                const response = await waiter.start().promise;
+                logger_1.logger.debug(() => `<~~ [ZDO ${Zdo.ClusterId[responseClusterId]} ${JSON.stringify(response.zdoResponse)}]`, NS);
+                return response.zdoResponse;
+            }
+        }, 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 () => {
@@ -403,7 +437,7 @@ class EZSPAdapter extends adapter_1.default {
             response = this.waitForInternal(networkAddress, endpoint, zclFrame.header.transactionSequenceNumber, zclFrame.cluster.ID, Zcl.Foundation.defaultRsp.ID, timeout);
         }
         const frame = this.driver.makeApsFrame(zclFrame.cluster.ID, disableResponse || zclFrame.header.frameControl.disableDefaultResponse);
-        frame.profileId = 0x0104;
+        frame.profileId = ZSpec.HA_PROFILE_ID;
         frame.sourceEndpoint = sourceEndpoint || 0x01;
         frame.destinationEndpoint = endpoint;
         frame.groupId = 0;
@@ -435,7 +469,7 @@ class EZSPAdapter extends adapter_1.default {
         return await this.queue.execute(async () => {
             this.checkInterpanLock();
             const frame = this.driver.makeApsFrame(zclFrame.cluster.ID, false);
-            frame.profileId = 0x0104;
+            frame.profileId = ZSpec.HA_PROFILE_ID;
             frame.sourceEndpoint = 0x01;
             frame.destinationEndpoint = 0x01;
             frame.groupId = groupID;
@@ -452,10 +486,12 @@ class EZSPAdapter extends adapter_1.default {
         return await this.queue.execute(async () => {
             this.checkInterpanLock();
             const frame = this.driver.makeApsFrame(zclFrame.cluster.ID, false);
-            frame.profileId = sourceEndpoint === 242 && endpoint === 242 ? 0xa1e0 : 0x0104;
+            frame.profileId = sourceEndpoint === ZSpec.GP_ENDPOINT && endpoint === ZSpec.GP_ENDPOINT ? ZSpec.GP_PROFILE_ID : ZSpec.HA_PROFILE_ID;
             frame.sourceEndpoint = sourceEndpoint;
             frame.destinationEndpoint = endpoint;
             frame.groupId = destination;
+            // XXX: should be:
+            // await this.driver.brequest(destination, frame, zclFrame.toBuffer())
             await this.driver.mrequest(frame, zclFrame.toBuffer());
             /**
              * As a broadcast command is not confirmed and thus immidiately returns
@@ -466,73 +502,38 @@ class EZSPAdapter extends adapter_1.default {
         });
     }
     async bind(destinationNetworkAddress, sourceIeeeAddress, sourceEndpoint, clusterID, destinationAddressOrGroup, type, destinationEndpoint) {
-        return await this.queue.execute(async () => {
-            this.checkInterpanLock();
-            const ieee = new types_1.EmberEUI64(sourceIeeeAddress);
-            let destAddr;
-            if (type === 'group') {
-                // 0x01 = 16-bit group address for DstAddr and DstEndpoint not present
-                destAddr = {
-                    addrmode: 0x01,
-                    nwk: destinationAddressOrGroup,
-                };
-            }
-            else {
-                // 0x03 = 64-bit extended address for DstAddr and DstEndpoint present
-                destAddr = {
-                    addrmode: 0x03,
-                    ieee: new types_1.EmberEUI64(destinationAddressOrGroup),
-                    endpoint: destinationEndpoint,
-                };
-                this.driver.setNode(destinationNetworkAddress, destAddr.ieee);
-            }
-            await this.driver.zdoRequest(destinationNetworkAddress, types_1.EmberZDOCmd.Bind_req, types_1.EmberZDOCmd.Bind_rsp, {
-                sourceEui: ieee,
-                sourceEp: sourceEndpoint,
-                clusterId: clusterID,
-                destAddr: destAddr,
-            });
-        }, destinationNetworkAddress);
+        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) {
-        return await this.queue.execute(async () => {
-            this.checkInterpanLock();
-            const ieee = new types_1.EmberEUI64(sourceIeeeAddress);
-            let destAddr;
-            if (type === 'group') {
-                // 0x01 = 16-bit group address for DstAddr and DstEndpoint not present
-                destAddr = {
-                    addrmode: 0x01,
-                    nwk: destinationAddressOrGroup,
-                };
-            }
-            else {
-                // 0x03 = 64-bit extended address for DstAddr and DstEndpoint present
-                destAddr = {
-                    addrmode: 0x03,
-                    ieee: new types_1.EmberEUI64(destinationAddressOrGroup),
-                    endpoint: destinationEndpoint,
-                };
-                this.driver.setNode(destinationNetworkAddress, destAddr.ieee);
-            }
-            await this.driver.zdoRequest(destinationNetworkAddress, types_1.EmberZDOCmd.Unbind_req, types_1.EmberZDOCmd.Unbind_rsp, {
-                sourceEui: ieee,
-                sourceEp: sourceEndpoint,
-                clusterId: clusterID,
-                destAddr: destAddr,
-            });
-        }, 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 ieee = new types_1.EmberEUI64(ieeeAddr);
-            this.driver.setNode(networkAddress, ieee);
-            await this.driver.zdoRequest(networkAddress, types_1.EmberZDOCmd.Mgmt_Leave_req, types_1.EmberZDOCmd.Mgmt_Leave_rsp, {
-                destAddr: ieee,
-                removechildrenRejoin: 0x00,
-            });
-        }, 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]);
+        }
     }
     async getNetworkParameters() {
         return {
@@ -606,9 +607,11 @@ class EZSPAdapter extends adapter_1.default {
             return await response.start().promise;
         });
     }
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     async changeChannel(newChannel) {
-        throw new Error(`Channel change is not supported for 'ezsp'`);
+        const clusterId = Zdo.ClusterId.NWK_UPDATE_REQUEST;
+        const zdoPayload = Zdo.Buffalo.buildRequest(this.hasZdoMessageOverhead, clusterId, [newChannel], 0xfe, undefined, undefined, undefined);
+        await this.sendZdo(ZSpec.BLANK_EUI64, ZSpec.BroadcastAddress.SLEEPY, clusterId, zdoPayload, true /* handled below */);
+        await (0, utils_1.Wait)(12000);
     }
     async setTransmitPower(value) {
         logger_1.logger.debug(`setTransmitPower to ${value}`, NS);