zigbee-herdsman 1.0.0 → 1.1.0

package/dist/adapter/deconz/adapter/deconzAdapter.js

@@ -33,6 +33,7 @@ const device_1 = __importDefault(require("../../../controller/model/device"));
 const utils_1 = require("../../../utils");
 const logger_1 = require("../../../utils/logger");
 const Zcl = __importStar(require("../../../zspec/zcl"));
+const Zdo = __importStar(require("../../../zspec/zdo"));
 const adapter_1 = __importDefault(require("../../adapter"));
 const constants_1 = __importDefault(require("../driver/constants"));
 const driver_1 = __importDefault(require("../driver/driver"));
@@ -40,18 +41,17 @@ const frameParser_1 = __importStar(require("../driver/frameParser"));
 const NS = 'zh:deconz';
 class DeconzAdapter extends adapter_1.default {
     driver;
-    queue;
     openRequestsQueue;
     transactionID;
     frameParserEvent = frameParser_1.frameParserEvents;
-    joinPermitted;
     fwVersion;
     waitress;
     TX_OPTIONS = 0x00; // No APS ACKS
+    joinPermitted = false;
     constructor(networkOptions, serialPortOptions, backupPath, adapterOptions) {
         super(networkOptions, serialPortOptions, backupPath, adapterOptions);
         this.hasZdoMessageOverhead = true;
-        const concurrent = this.adapterOptions && this.adapterOptions.concurrent ? this.adapterOptions.concurrent : 2;
+        // const concurrent = this.adapterOptions && this.adapterOptions.concurrent ? this.adapterOptions.concurrent : 2;
         // TODO: https://github.com/Koenkk/zigbee2mqtt/issues/4884#issuecomment-728903121
         const delay = this.adapterOptions && typeof this.adapterOptions.delay === 'number' ? this.adapterOptions.delay : 0;
         this.waitress = new utils_1.Waitress(this.waitressValidator, this.waitressTimeoutFormatter);
@@ -63,10 +63,8 @@ class DeconzAdapter extends adapter_1.default {
         this.driver.on('rxFrame', (frame) => {
             (0, frameParser_1.default)(frame);
         });
-        this.queue = new utils_1.Queue(concurrent);
         this.transactionID = 0;
         this.openRequestsQueue = [];
-        this.joinPermitted = false;
         this.fwVersion = undefined;
         this.frameParserEvent.on('receivedDataPayload', (data) => {
             this.checkReceivedDataPayload(data);
@@ -160,7 +158,7 @@ class DeconzAdapter extends adapter_1.default {
             }
             try {
                 await this.driver.writeParameterRequest(constants_1.default.PARAM.Network.CHANNEL_MASK, setChannelMask);
-                await this.sleep(500);
+                await (0, utils_1.Wait)(500);
                 changed = true;
             }
             catch (error) {
@@ -172,7 +170,7 @@ class DeconzAdapter extends adapter_1.default {
             logger_1.logger.debug('panid in configuration.yaml (' + this.networkOptions.panID + ') differs from current panid (' + panid + '). Changing panid.', NS);
             try {
                 await this.driver.writeParameterRequest(constants_1.default.PARAM.Network.PAN_ID, this.networkOptions.panID);
-                await this.sleep(500);
+                await (0, utils_1.Wait)(500);
                 changed = true;
             }
             catch (error) {
@@ -188,7 +186,7 @@ class DeconzAdapter extends adapter_1.default {
                 '). Changing extended panid.', NS);
             try {
                 await this.driver.writeParameterRequest(constants_1.default.PARAM.Network.APS_EXT_PAN_ID, this.networkOptions.extendedPanID);
-                await this.sleep(500);
+                await (0, utils_1.Wait)(500);
                 changed = true;
             }
             catch (error) {
@@ -200,7 +198,7 @@ class DeconzAdapter extends adapter_1.default {
             logger_1.logger.debug('network key in configuration.yaml (hidden) differs from current network key (' + networkKey + '). Changing network key.', NS);
             try {
                 await this.driver.writeParameterRequest(constants_1.default.PARAM.Network.NETWORK_KEY, this.networkOptions.networkKey);
-                await this.sleep(500);
+                await (0, utils_1.Wait)(500);
                 changed = true;
             }
             catch (error) {
@@ -209,9 +207,9 @@ class DeconzAdapter extends adapter_1.default {
         }
         if (changed) {
             await this.driver.changeNetworkStateRequest(constants_1.default.PARAM.Network.NET_OFFLINE);
-            await this.sleep(2000);
+            await (0, utils_1.Wait)(2000);
             await this.driver.changeNetworkStateRequest(constants_1.default.PARAM.Network.NET_CONNECTED);
-            await this.sleep(2000);
+            await (0, utils_1.Wait)(2000);
         }
         return 'resumed';
     }
@@ -245,39 +243,28 @@ class DeconzAdapter extends adapter_1.default {
         };
     }
     async permitJoin(seconds, networkAddress) {
-        const transactionID = this.nextTransactionID();
-        const request = {};
-        const zdpFrame = [transactionID, seconds, 0]; // tc_significance 1 or 0 ?
-        request.requestId = transactionID;
-        request.destAddrMode = constants_1.default.PARAM.addressMode.NWK_ADDR;
-        request.destAddr16 = networkAddress || 0xfffc;
-        request.destEndpoint = 0;
-        request.profileId = 0;
-        request.clusterId = 0x36; // permit join
-        request.srcEndpoint = 0;
-        request.asduLength = 3;
-        request.asduPayload = zdpFrame;
-        request.txOptions = 0;
-        request.radius = constants_1.default.PARAM.txRadius.DEFAULT_RADIUS;
-        request.timeout = 5;
-        try {
-            await this.driver.enqueueSendDataRequest(request);
-            if (seconds === 0) {
-                this.joinPermitted = false;
+        const clusterId = Zdo.ClusterId.PERMIT_JOINING_REQUEST;
+        if (networkAddress) {
+            // `authentication`: TC significance always 1 (zb specs)
+            const zdoPayload = Zdo.Buffalo.buildRequest(this.hasZdoMessageOverhead, clusterId, seconds, 1, []);
+            const result = await this.sendZdo(__1.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 {
-                this.joinPermitted = true;
-            }
-            await this.driver.writeParameterRequest(constants_1.default.PARAM.Network.PERMIT_JOIN, seconds);
-            logger_1.logger.debug('PERMIT_JOIN - ' + seconds + ' seconds', NS);
         }
-        catch (error) {
-            const msg = 'PERMIT_JOIN FAILED - ' + error;
-            logger_1.logger.debug(msg, NS);
-            // try again
-            await this.permitJoin(seconds, networkAddress);
-            //return Promise.reject(new Error(msg)); // do not reject
+        else {
+            await this.driver.writeParameterRequest(constants_1.default.PARAM.Network.PERMIT_JOIN, seconds);
+            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(__1.ZSpec.BLANK_EUI64, __1.ZSpec.BroadcastAddress.DEFAULT, clusterId, zdoPayload, true);
+            }
         }
+        this.joinPermitted = seconds !== 0;
     }
     async getCoordinatorVersion() {
         // product: number; transportrev: number; majorrel: number; minorrel: number; maintrel: number; revision: string;
@@ -317,334 +304,129 @@ class DeconzAdapter extends adapter_1.default {
         return await Promise.reject(new Error('Reset is not supported'));
     }
     async lqi(networkAddress) {
+        const clusterId = Zdo.ClusterId.LQI_TABLE_REQUEST;
         const neighbors = [];
-        const add = (list) => {
-            for (const entry of list) {
-                const relationByte = entry.readUInt8(18);
-                const extAddr = [];
-                for (let i = 8; i < 16; i++) {
-                    extAddr.push(entry[i]);
-                }
-                neighbors.push({
-                    linkquality: entry.readUInt8(21),
-                    networkAddress: entry.readUInt16LE(16),
-                    ieeeAddr: this.driver.macAddrArrayToString(extAddr),
-                    relationship: (relationByte >> 1) & ((1 << 3) - 1),
-                    depth: entry.readUInt8(20),
-                });
-            }
-        };
         const request = async (startIndex) => {
-            const transactionID = this.nextTransactionID();
-            const req = {};
-            req.requestId = transactionID;
-            req.destAddrMode = constants_1.default.PARAM.addressMode.NWK_ADDR;
-            req.destAddr16 = networkAddress;
-            req.destEndpoint = 0;
-            req.profileId = 0;
-            req.clusterId = 0x31; // mgmt_lqi_request
-            req.srcEndpoint = 0;
-            req.asduLength = 2;
-            req.asduPayload = [transactionID, startIndex];
-            req.txOptions = 0;
-            req.radius = constants_1.default.PARAM.txRadius.DEFAULT_RADIUS;
-            this.driver
-                .enqueueSendDataRequest(req)
-                .then(() => { })
-                .catch(() => { });
-            try {
-                const d = await this.waitForData(networkAddress, 0, 0x8031);
-                const data = d.asduPayload;
-                if (data[1] !== 0) {
-                    // status
-                    throw new Error(`LQI for '${networkAddress}' failed`);
-                }
-                const tableList = [];
-                const response = {
-                    status: data[1],
-                    tableEntrys: data[2],
-                    startIndex: data[3],
-                    tableListCount: data[4],
-                    tableList: tableList,
-                };
-                let tableEntry = [];
-                let counter = 0;
-                for (let i = 5; i < response.tableListCount * 22 + 5; i++) {
-                    // one tableentry = 22 bytes
-                    tableEntry.push(data[i]);
-                    counter++;
-                    if (counter === 22) {
-                        response.tableList.push(Buffer.from(tableEntry));
-                        tableEntry = [];
-                        counter = 0;
-                    }
+            const zdoPayload = Zdo.Buffalo.buildRequest(this.hasZdoMessageOverhead, clusterId, startIndex);
+            const result = await this.sendZdo(__1.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,
+                        relationship: entry.relationship,
+                        depth: entry.depth,
+                    });
                 }
-                logger_1.logger.debug('LQI RESPONSE - addr: 0x' +
-                    networkAddress.toString(16) +
-                    ' status: ' +
-                    response.status +
-                    ' read ' +
-                    (response.tableListCount + response.startIndex) +
-                    '/' +
-                    response.tableEntrys +
-                    ' entrys', NS);
-                return response;
+                return [payload.neighborTableEntries, payload.entryList.length];
             }
-            catch (error) {
-                const msg = 'LQI REQUEST FAILED - addr: 0x' + networkAddress.toString(16) + ' ' + error;
-                logger_1.logger.debug(msg, NS);
-                return await Promise.reject(new Error(msg));
+            else {
+                // TODO: will disappear once moved upstream
+                throw new Zdo.StatusError(result[0]);
             }
         };
-        let response = await request(0);
-        add(response.tableList);
-        let nextStartIndex = response.tableListCount;
-        while (neighbors.length < response.tableEntrys) {
-            response = await request(nextStartIndex);
-            add(response.tableList);
-            nextStartIndex += response.tableListCount;
+        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) {
+        const clusterId = Zdo.ClusterId.ROUTING_TABLE_REQUEST;
         const table = [];
-        const statusLookup = {
-            0: 'ACTIVE',
-            1: 'DISCOVERY_UNDERWAY',
-            2: 'DISCOVERY_FAILED',
-            3: 'INACTIVE',
-        };
-        const add = (list) => {
-            for (const entry of list) {
-                const statusByte = entry.readUInt8(2);
-                const extAddr = [];
-                for (let i = 8; i < 16; i++) {
-                    extAddr.push(entry[i]);
-                }
-                table.push({
-                    destinationAddress: entry.readUInt16LE(0),
-                    status: statusLookup[(statusByte >> 5) & ((1 << 3) - 1)],
-                    nextHop: entry.readUInt16LE(3),
-                });
-            }
-        };
         const request = async (startIndex) => {
-            const transactionID = this.nextTransactionID();
-            const req = {};
-            req.requestId = transactionID;
-            req.destAddrMode = constants_1.default.PARAM.addressMode.NWK_ADDR;
-            req.destAddr16 = networkAddress;
-            req.destEndpoint = 0;
-            req.profileId = 0;
-            req.clusterId = 0x32; // mgmt_rtg_request
-            req.srcEndpoint = 0;
-            req.asduLength = 2;
-            req.asduPayload = [transactionID, startIndex];
-            req.txOptions = 0;
-            req.radius = constants_1.default.PARAM.txRadius.DEFAULT_RADIUS;
-            req.timeout = 30;
-            this.driver
-                .enqueueSendDataRequest(req)
-                .then(() => { })
-                .catch(() => { });
-            try {
-                const d = await this.waitForData(networkAddress, 0, 0x8032);
-                const data = d.asduPayload;
-                if (data[1] !== 0) {
-                    // status
-                    throw new Error(`Routingtables for '${networkAddress}' failed`);
+            const zdoPayload = Zdo.Buffalo.buildRequest(this.hasZdoMessageOverhead, clusterId, startIndex);
+            const result = await this.sendZdo(__1.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,
+                    });
                 }
-                const tableList = [];
-                const response = {
-                    status: data[1],
-                    tableEntrys: data[2],
-                    startIndex: data[3],
-                    tableListCount: data[4],
-                    tableList: tableList,
-                };
-                let tableEntry = [];
-                let counter = 0;
-                for (let i = 5; i < response.tableListCount * 5 + 5; i++) {
-                    // one tableentry = 5 bytes
-                    tableEntry.push(data[i]);
-                    counter++;
-                    if (counter === 5) {
-                        response.tableList.push(Buffer.from(tableEntry));
-                        tableEntry = [];
-                        counter = 0;
-                    }
-                }
-                logger_1.logger.debug('ROUTING_TABLE RESPONSE - addr: 0x' +
-                    networkAddress.toString(16) +
-                    ' status: ' +
-                    response.status +
-                    ' read ' +
-                    (response.tableListCount + response.startIndex) +
-                    '/' +
-                    response.tableEntrys +
-                    ' entrys', NS);
-                return response;
+                return [payload.routingTableEntries, payload.entryList.length];
             }
-            catch (error) {
-                const msg = 'ROUTING_TABLE REQUEST FAILED - addr: 0x' + networkAddress.toString(16) + ' ' + error;
-                logger_1.logger.debug(msg, NS);
-                return await Promise.reject(new Error(msg));
+            else {
+                // TODO: will disappear once moved upstream
+                throw new Zdo.StatusError(result[0]);
             }
         };
-        let response = await request(0);
-        add(response.tableList);
-        let nextStartIndex = response.tableListCount;
-        while (table.length < response.tableEntrys) {
-            response = await request(nextStartIndex);
-            add(response.tableList);
-            nextStartIndex += response.tableListCount;
+        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) {
-        const transactionID = this.nextTransactionID();
-        const nwk1 = networkAddress & 0xff;
-        const nwk2 = (networkAddress >> 8) & 0xff;
-        const request = {};
-        const zdpFrame = [transactionID, nwk1, nwk2];
-        request.requestId = transactionID;
-        request.destAddrMode = constants_1.default.PARAM.addressMode.NWK_ADDR;
-        request.destAddr16 = networkAddress;
-        request.destEndpoint = 0;
-        request.profileId = 0;
-        request.clusterId = 0x02; // node descriptor
-        request.srcEndpoint = 0;
-        request.asduLength = 3;
-        request.asduPayload = zdpFrame;
-        request.txOptions = 0;
-        request.radius = constants_1.default.PARAM.txRadius.DEFAULT_RADIUS;
-        request.timeout = 30;
-        this.driver
-            .enqueueSendDataRequest(request)
-            .then(() => { })
-            .catch(() => { });
-        try {
-            const d = await this.waitForData(networkAddress, 0, 0x8002);
-            const data = d.asduPayload;
-            const buf = Buffer.from(data);
-            const logicaltype = data[4] & 7;
-            const type = logicaltype === 1 ? 'Router' : logicaltype === 2 ? 'EndDevice' : logicaltype === 0 ? 'Coordinator' : 'Unknown';
-            const manufacturer = buf.readUInt16LE(7);
-            logger_1.logger.debug('RECEIVING NODE_DESCRIPTOR - addr: 0x' +
-                networkAddress.toString(16) +
-                ' type: ' +
-                type +
-                ' manufacturer: 0x' +
-                manufacturer.toString(16), NS);
-            return { manufacturerCode: manufacturer, type };
+        const clusterId = Zdo.ClusterId.NODE_DESCRIPTOR_REQUEST;
+        const zdoPayload = Zdo.Buffalo.buildRequest(this.hasZdoMessageOverhead, clusterId, networkAddress);
+        const result = await this.sendZdo(__1.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;
+            }
+            return { type, manufacturerCode: payload.manufacturerCode };
         }
-        catch (error) {
-            const msg = 'RECEIVING NODE_DESCRIPTOR FAILED - addr: 0x' + networkAddress.toString(16) + ' ' + error;
-            logger_1.logger.debug(msg, NS);
-            return await Promise.reject(new Error(msg));
+        else {
+            // TODO: will disappear once moved upstream
+            throw new Zdo.StatusError(result[0]);
         }
     }
     async activeEndpoints(networkAddress) {
-        const transactionID = this.nextTransactionID();
-        const nwk1 = networkAddress & 0xff;
-        const nwk2 = (networkAddress >> 8) & 0xff;
-        const request = {};
-        const zdpFrame = [transactionID, nwk1, nwk2];
-        request.requestId = transactionID;
-        request.destAddrMode = constants_1.default.PARAM.addressMode.NWK_ADDR;
-        request.destAddr16 = networkAddress;
-        request.destEndpoint = 0;
-        request.profileId = 0;
-        request.clusterId = 0x05; // active endpoints
-        request.srcEndpoint = 0;
-        request.asduLength = 3;
-        request.asduPayload = zdpFrame;
-        request.txOptions = 0;
-        request.radius = constants_1.default.PARAM.txRadius.DEFAULT_RADIUS;
-        request.timeout = 30;
-        this.driver
-            .enqueueSendDataRequest(request)
-            .then(() => { })
-            .catch(() => { });
-        try {
-            const d = await this.waitForData(networkAddress, 0, 0x8005);
-            const data = d.asduPayload;
-            const buf = Buffer.from(data);
-            const epCount = buf.readUInt8(4);
-            const epList = [];
-            for (let i = 5; i < epCount + 5; i++) {
-                epList.push(buf.readUInt8(i));
-            }
-            logger_1.logger.debug('ACTIVE_ENDPOINTS - addr: 0x' + networkAddress.toString(16) + ' EP list: ' + epList, NS);
-            return { endpoints: epList };
+        const clusterId = Zdo.ClusterId.ACTIVE_ENDPOINTS_REQUEST;
+        const zdoPayload = Zdo.Buffalo.buildRequest(this.hasZdoMessageOverhead, clusterId, networkAddress);
+        const result = await this.sendZdo(__1.ZSpec.BLANK_EUI64, networkAddress, clusterId, zdoPayload, false);
+        /* istanbul ignore else */
+        if (Zdo.Buffalo.checkStatus(result)) {
+            const payload = result[1];
+            return { endpoints: payload.endpointList };
         }
-        catch (error) {
-            const msg = 'READING ACTIVE_ENDPOINTS FAILED - addr: 0x' + networkAddress.toString(16) + ' ' + error;
-            logger_1.logger.debug(msg, NS);
-            return await Promise.reject(new Error(msg));
+        else {
+            // TODO: will disappear once moved upstream
+            throw new Zdo.StatusError(result[0]);
         }
     }
     async simpleDescriptor(networkAddress, endpointID) {
-        const transactionID = this.nextTransactionID();
-        const nwk1 = networkAddress & 0xff;
-        const nwk2 = (networkAddress >> 8) & 0xff;
-        const request = {};
-        const zdpFrame = [transactionID, nwk1, nwk2, endpointID];
-        request.requestId = transactionID;
-        request.destAddrMode = constants_1.default.PARAM.addressMode.NWK_ADDR;
-        request.destAddr16 = networkAddress;
-        request.destEndpoint = 0;
-        request.profileId = 0;
-        request.clusterId = 0x04; // simple descriptor
-        request.srcEndpoint = 0;
-        request.asduLength = 4;
-        request.asduPayload = zdpFrame;
-        request.txOptions = 0;
-        request.radius = constants_1.default.PARAM.txRadius.DEFAULT_RADIUS;
-        request.timeout = 30;
-        this.driver
-            .enqueueSendDataRequest(request)
-            .then(() => { })
-            .catch(() => { });
-        try {
-            const d = await this.waitForData(networkAddress, 0, 0x8004);
-            const data = d.asduPayload;
-            const buf = Buffer.from(data);
-            const inCount = buf.readUInt8(11);
-            const inClusters = [];
-            let cIndex = 12;
-            for (let i = 0; i < inCount; i++) {
-                inClusters[i] = buf.readUInt16LE(cIndex);
-                cIndex += 2;
-            }
-            const outCount = buf.readUInt8(12 + inCount * 2);
-            const outClusters = [];
-            cIndex = 13 + inCount * 2;
-            for (let l = 0; l < outCount; l++) {
-                outClusters[l] = buf.readUInt16LE(cIndex);
-                cIndex += 2;
-            }
-            const simpleDesc = {
-                profileID: buf.readUInt16LE(6),
-                endpointID: buf.readUInt8(5),
-                deviceID: buf.readUInt16LE(8),
-                inputClusters: inClusters,
-                outputClusters: outClusters,
+        const clusterId = Zdo.ClusterId.SIMPLE_DESCRIPTOR_REQUEST;
+        const zdoPayload = Zdo.Buffalo.buildRequest(this.hasZdoMessageOverhead, clusterId, networkAddress, endpointID);
+        const result = await this.sendZdo(__1.ZSpec.BLANK_EUI64, networkAddress, clusterId, zdoPayload, false);
+        /* istanbul ignore else */
+        if (Zdo.Buffalo.checkStatus(result)) {
+            const payload = result[1];
+            return {
+                profileID: payload.profileId,
+                endpointID: payload.endpoint,
+                deviceID: payload.deviceId,
+                inputClusters: payload.inClusterList,
+                outputClusters: payload.outClusterList,
             };
-            logger_1.logger.debug('RECEIVING SIMPLE_DESCRIPTOR - addr: 0x' +
-                networkAddress.toString(16) +
-                ' EP:' +
-                simpleDesc.endpointID +
-                ' inClusters: ' +
-                inClusters +
-                ' outClusters: ' +
-                outClusters, NS);
-            return simpleDesc;
         }
-        catch (error) {
-            const msg = 'RECEIVING SIMPLE_DESCRIPTOR FAILED - addr: 0x' + networkAddress.toString(16) + ' ' + error;
-            logger_1.logger.debug(msg, NS);
-            return await Promise.reject(new Error(msg));
+        else {
+            // TODO: will disappear once moved upstream
+            throw new Zdo.StatusError(result[0]);
         }
     }
     async checkCoordinatorSimpleDescriptor(skip) {
@@ -720,24 +502,54 @@ class DeconzAdapter extends adapter_1.default {
         const cancel = () => this.waitress.remove(waiter.ID);
         return { promise: waiter.start().promise, cancel };
     }
+    async sendZdo(ieeeAddress, networkAddress, clusterId, payload, disableResponse) {
+        const transactionID = this.nextTransactionID();
+        payload[0] = transactionID;
+        const isNwkAddrRequest = clusterId === Zdo.ClusterId.NETWORK_ADDRESS_REQUEST;
+        const req = {
+            requestId: transactionID,
+            destAddrMode: isNwkAddrRequest ? constants_1.default.PARAM.addressMode.IEEE_ADDR : constants_1.default.PARAM.addressMode.NWK_ADDR,
+            destAddr16: isNwkAddrRequest ? undefined : networkAddress,
+            destAddr64: isNwkAddrRequest ? ieeeAddress : undefined,
+            destEndpoint: Zdo.ZDO_ENDPOINT,
+            profileId: Zdo.ZDO_PROFILE_ID,
+            clusterId,
+            srcEndpoint: Zdo.ZDO_ENDPOINT,
+            asduLength: payload.length,
+            asduPayload: payload,
+            txOptions: 0,
+            radius: constants_1.default.PARAM.txRadius.DEFAULT_RADIUS,
+            timeout: 30,
+        };
+        this.driver
+            .enqueueSendDataRequest(req)
+            .then(() => { })
+            .catch(() => { });
+        if (!disableResponse) {
+            const responseClusterId = Zdo.Utils.getResponseClusterId(clusterId);
+            if (responseClusterId) {
+                const response = await this.waitForData(isNwkAddrRequest ? ieeeAddress : networkAddress, Zdo.ZDO_PROFILE_ID, responseClusterId);
+                return response.zdo;
+            }
+        }
+    }
     async sendZclFrameToEndpoint(ieeeAddr, networkAddress, endpoint, zclFrame, timeout, disableResponse, disableRecovery, sourceEndpoint) {
         const transactionID = this.nextTransactionID();
-        const request = {};
-        const pay = zclFrame.toBuffer();
-        //logger.info("zclFramte.toBuffer:", NS);
-        //logger.info(pay, NS);
-        request.requestId = transactionID;
-        request.destAddrMode = constants_1.default.PARAM.addressMode.NWK_ADDR;
-        request.destAddr16 = networkAddress;
-        request.destEndpoint = endpoint;
-        request.profileId = sourceEndpoint === 242 && endpoint === 242 ? 0xa1e0 : 0x104;
-        request.clusterId = zclFrame.cluster.ID;
-        request.srcEndpoint = sourceEndpoint || 1;
-        request.asduLength = pay.length;
-        request.asduPayload = [...pay];
-        request.txOptions = this.TX_OPTIONS; // 0x00 normal; 0x04 APS ACK
-        request.radius = constants_1.default.PARAM.txRadius.DEFAULT_RADIUS;
-        request.timeout = timeout;
+        const payload = zclFrame.toBuffer();
+        const request = {
+            requestId: transactionID,
+            destAddrMode: constants_1.default.PARAM.addressMode.NWK_ADDR,
+            destAddr16: networkAddress,
+            destEndpoint: endpoint,
+            profileId: sourceEndpoint === 242 && endpoint === 242 ? 0xa1e0 : 0x104,
+            clusterId: zclFrame.cluster.ID,
+            srcEndpoint: sourceEndpoint || 1,
+            asduLength: payload.length,
+            asduPayload: payload,
+            txOptions: this.TX_OPTIONS, // 0x00 normal, 0x04 APS ACK
+            radius: constants_1.default.PARAM.txRadius.DEFAULT_RADIUS,
+            timeout: timeout,
+        };
         const command = zclFrame.command;
         this.driver
             .enqueueSendDataRequest(request)
@@ -763,16 +575,14 @@ class DeconzAdapter extends adapter_1.default {
         try {
             let data = null;
             if ((command.response != undefined && !disableResponse) || !zclFrame.header.frameControl.disableDefaultResponse) {
-                data = await this.waitForData(networkAddress, 0x104, zclFrame.cluster.ID, zclFrame.header.transactionSequenceNumber, request.timeout);
+                data = await this.waitForData(networkAddress, __1.ZSpec.HA_PROFILE_ID, zclFrame.cluster.ID, zclFrame.header.transactionSequenceNumber, request.timeout);
             }
             if (data !== null) {
-                const asdu = data.asduPayload;
-                const buffer = Buffer.from(asdu);
                 const response = {
                     address: data.srcAddr16 ?? `0x${data.srcAddr64}`,
-                    data: buffer,
+                    data: data.asduPayload,
                     clusterID: zclFrame.cluster.ID,
-                    header: Zcl.Header.fromBuffer(buffer),
+                    header: Zcl.Header.fromBuffer(data.asduPayload),
                     endpoint: data.srcEndpoint,
                     linkquality: data.lqi,
                     groupID: data.srcAddrMode === 0x01 ? data.srcAddr16 : 0,
@@ -792,179 +602,75 @@ class DeconzAdapter extends adapter_1.default {
     }
     async sendZclFrameToGroup(groupID, zclFrame) {
         const transactionID = this.nextTransactionID();
-        const request = {};
-        const pay = zclFrame.toBuffer();
-        logger_1.logger.debug('zclFrame to group - zclFrame.payload:', NS);
-        logger_1.logger.debug(zclFrame.payload, NS);
-        //logger.info("zclFramte.toBuffer:", NS);
-        //logger.info(pay, NS);
-        request.requestId = transactionID;
-        request.destAddrMode = constants_1.default.PARAM.addressMode.GROUP_ADDR;
-        request.destAddr16 = groupID;
-        request.profileId = 0x104;
-        request.clusterId = zclFrame.cluster.ID;
-        request.srcEndpoint = 1;
-        request.asduLength = pay.length;
-        request.asduPayload = [...pay];
-        request.txOptions = 0;
-        request.radius = constants_1.default.PARAM.txRadius.UNLIMITED;
+        const payload = zclFrame.toBuffer();
+        logger_1.logger.debug(`zclFrame to group - ${groupID}`, NS);
+        const request = {
+            requestId: transactionID,
+            destAddrMode: constants_1.default.PARAM.addressMode.GROUP_ADDR,
+            destAddr16: groupID,
+            profileId: 0x104,
+            clusterId: zclFrame.cluster.ID,
+            srcEndpoint: 1,
+            asduLength: payload.length,
+            asduPayload: payload,
+            txOptions: 0,
+            radius: constants_1.default.PARAM.txRadius.UNLIMITED,
+        };
         logger_1.logger.debug(`sendZclFrameToGroup - message send`, NS);
         return await this.driver.enqueueSendDataRequest(request);
     }
     async sendZclFrameToAll(endpoint, zclFrame, sourceEndpoint, destination) {
         const transactionID = this.nextTransactionID();
-        const request = {};
-        const pay = zclFrame.toBuffer();
-        logger_1.logger.debug('zclFrame to all - zclFrame.payload:', NS);
-        logger_1.logger.debug(zclFrame.payload, NS);
-        request.requestId = transactionID;
-        request.destAddrMode = constants_1.default.PARAM.addressMode.NWK_ADDR;
-        request.destAddr16 = destination;
-        request.destEndpoint = endpoint;
-        request.profileId = sourceEndpoint === 242 && endpoint === 242 ? 0xa1e0 : 0x104;
-        request.clusterId = zclFrame.cluster.ID;
-        request.srcEndpoint = sourceEndpoint;
-        request.asduLength = pay.length;
-        request.asduPayload = [...pay];
-        request.txOptions = 0;
-        request.radius = constants_1.default.PARAM.txRadius.UNLIMITED;
+        const payload = zclFrame.toBuffer();
+        logger_1.logger.debug(`zclFrame to all - ${endpoint}`, NS);
+        const request = {
+            requestId: transactionID,
+            destAddrMode: constants_1.default.PARAM.addressMode.NWK_ADDR,
+            destAddr16: destination,
+            destEndpoint: endpoint,
+            profileId: sourceEndpoint === 242 && endpoint === 242 ? 0xa1e0 : 0x104,
+            clusterId: zclFrame.cluster.ID,
+            srcEndpoint: sourceEndpoint,
+            asduLength: payload.length,
+            asduPayload: payload,
+            txOptions: 0,
+            radius: constants_1.default.PARAM.txRadius.UNLIMITED,
+        };
         logger_1.logger.debug(`sendZclFrameToAll - message send`, NS);
         return await this.driver.enqueueSendDataRequest(request);
     }
     async bind(destinationNetworkAddress, sourceIeeeAddress, sourceEndpoint, clusterID, destinationAddressOrGroup, type, destinationEndpoint) {
-        const transactionID = this.nextTransactionID();
-        const clid1 = clusterID & 0xff;
-        const clid2 = (clusterID >> 8) & 0xff;
-        const destAddrMode = type === 'group' ? constants_1.default.PARAM.addressMode.GROUP_ADDR : constants_1.default.PARAM.addressMode.IEEE_ADDR;
-        let destArray;
-        if (type === 'endpoint') {
-            (0, assert_1.default)(destinationEndpoint, 'Destination endpoint must be defined when `type === endpoint`');
-            destArray = this.driver.macAddrStringToArray(destinationAddressOrGroup);
-            destArray = destArray.concat([destinationEndpoint]);
-        }
-        else {
-            destArray = [destinationAddressOrGroup, (destinationAddressOrGroup >> 8) & 0xff];
-        }
-        const request = {};
-        const zdpFrame = [transactionID]
-            .concat(this.driver.macAddrStringToArray(sourceIeeeAddress))
-            .concat([sourceEndpoint, clid1, clid2, destAddrMode])
-            .concat(destArray);
-        request.requestId = transactionID;
-        request.destAddrMode = constants_1.default.PARAM.addressMode.NWK_ADDR;
-        request.destAddr16 = destinationNetworkAddress;
-        request.destEndpoint = 0;
-        request.profileId = 0;
-        request.clusterId = 0x21; // bind_request
-        request.srcEndpoint = 0;
-        request.asduLength = zdpFrame.length;
-        request.asduPayload = zdpFrame;
-        request.txOptions = 0x04; // 0x04 use APS ACKS
-        request.radius = constants_1.default.PARAM.txRadius.DEFAULT_RADIUS;
-        request.timeout = 30;
-        this.driver
-            .enqueueSendDataRequest(request)
-            .then(() => { })
-            .catch(() => { });
-        try {
-            const d = await this.waitForData(destinationNetworkAddress, 0, 0x8021);
-            const data = d.asduPayload;
-            logger_1.logger.debug('BIND RESPONSE - addr: 0x' + destinationNetworkAddress.toString(16) + ' status: ' + data[1], NS);
-            if (data[1] !== 0) {
-                throw new Error('status: ' + data[1]);
-            }
-        }
-        catch (error) {
-            logger_1.logger.debug('BIND FAILED - addr: 0x' + destinationNetworkAddress.toString(16) + ' ' + error, NS);
-            throw error;
+        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(__1.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) {
-        const transactionID = this.nextTransactionID();
-        const clid1 = clusterID & 0xff;
-        const clid2 = (clusterID >> 8) & 0xff;
-        const destAddrMode = type === 'group' ? constants_1.default.PARAM.addressMode.GROUP_ADDR : constants_1.default.PARAM.addressMode.IEEE_ADDR;
-        let destArray;
-        if (type === 'endpoint') {
-            (0, assert_1.default)(destinationEndpoint, 'Destination endpoint must be defined when `type === endpoint`');
-            destArray = this.driver.macAddrStringToArray(destinationAddressOrGroup);
-            destArray = destArray.concat([destinationEndpoint]);
-        }
-        else {
-            destArray = [destinationAddressOrGroup, (destinationAddressOrGroup >> 8) & 0xff];
-        }
-        const request = {};
-        const zdpFrame = [transactionID]
-            .concat(this.driver.macAddrStringToArray(sourceIeeeAddress))
-            .concat([sourceEndpoint, clid1, clid2, destAddrMode])
-            .concat(destArray);
-        request.requestId = transactionID;
-        request.destAddrMode = constants_1.default.PARAM.addressMode.NWK_ADDR;
-        request.destAddr16 = destinationNetworkAddress;
-        request.destEndpoint = 0;
-        request.profileId = 0;
-        request.clusterId = 0x22; // unbind_request
-        request.srcEndpoint = 0;
-        request.asduLength = zdpFrame.length;
-        request.asduPayload = zdpFrame;
-        request.txOptions = 0x04; // 0x04 use APS ACKS
-        request.radius = constants_1.default.PARAM.txRadius.DEFAULT_RADIUS;
-        request.timeout = 30;
-        this.driver
-            .enqueueSendDataRequest(request)
-            .then(() => { })
-            .catch(() => { });
-        try {
-            const d = await this.waitForData(destinationNetworkAddress, 0, 0x8022);
-            const data = d.asduPayload;
-            logger_1.logger.debug('UNBIND RESPONSE - addr: 0x' + destinationNetworkAddress.toString(16) + ' status: ' + data[1], NS);
-            if (data[1] !== 0) {
-                throw new Error('status: ' + data[1]);
-            }
-        }
-        catch (error) {
-            logger_1.logger.debug('UNBIND FAILED - addr: 0x' + destinationNetworkAddress.toString(16) + ' ' + error, NS);
-            throw error;
+        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(__1.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 removeDevice(networkAddress, ieeeAddr) {
-        const transactionID = this.nextTransactionID();
-        // const nwk1 = networkAddress & 0xff;
-        // const nwk2 = (networkAddress >> 8) & 0xff;
-        const request = {};
-        //const zdpFrame = [transactionID].concat(this.driver.macAddrStringToArray(ieeeAddr)).concat([0]);
-        const zdpFrame = [transactionID].concat([0, 0, 0, 0, 0, 0, 0, 0]).concat([0]);
-        request.requestId = transactionID;
-        request.destAddrMode = constants_1.default.PARAM.addressMode.NWK_ADDR;
-        request.destAddr16 = networkAddress;
-        request.destEndpoint = 0;
-        request.profileId = 0;
-        request.clusterId = 0x34; // mgmt_leave_request
-        request.srcEndpoint = 0;
-        request.asduLength = 10;
-        request.asduPayload = zdpFrame;
-        request.txOptions = 0;
-        request.radius = constants_1.default.PARAM.txRadius.DEFAULT_RADIUS;
-        this.driver
-            .enqueueSendDataRequest(request)
-            .then(() => { })
-            .catch(() => { });
-        try {
-            const d = await this.waitForData(networkAddress, 0, 0x8034);
-            const data = d.asduPayload;
-            logger_1.logger.debug('REMOVE_DEVICE - addr: 0x' + networkAddress.toString(16) + ' status: ' + data[1], NS);
-            const payload = {
-                networkAddress: networkAddress,
-                ieeeAddr: ieeeAddr,
-            };
-            if (data[1] !== 0) {
-                throw new Error('status: ' + data[1]);
-            }
-            this.emit('deviceLeave', payload);
-        }
-        catch (error) {
-            logger_1.logger.debug('REMOVE_DEVICE FAILED - addr: 0x' + networkAddress.toString(16) + ' ' + error, NS);
-            throw error;
+        const clusterId = Zdo.ClusterId.LEAVE_REQUEST;
+        const zdoPayload = Zdo.Buffalo.buildRequest(this.hasZdoMessageOverhead, clusterId, ieeeAddr, Zdo.LeaveRequestFlags.WITHOUT_REJOIN);
+        const result = await this.sendZdo(__1.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 supportsBackup() {
@@ -1009,9 +715,11 @@ class DeconzAdapter extends adapter_1.default {
     async setChannelInterPAN(channel) {
         throw new Error('not supported');
     }
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     async changeChannel(newChannel) {
-        throw new Error(`Channel change is not supported for 'deconz'`);
+        const clusterId = Zdo.ClusterId.NWK_UPDATE_REQUEST;
+        const zdoPayload = Zdo.Buffalo.buildRequest(this.hasZdoMessageOverhead, clusterId, [newChannel], 0xfe, undefined, undefined, undefined);
+        await this.sendZdo(__1.ZSpec.BLANK_EUI64, __1.ZSpec.BroadcastAddress.SLEEPY, clusterId, zdoPayload, true /* handled below */);
+        await (0, utils_1.Wait)(12000);
     }
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     async setTransmitPower(value) {
@@ -1024,9 +732,6 @@ class DeconzAdapter extends adapter_1.default {
     /**
      * Private methods
      */
-    sleep(ms) {
-        return new Promise((resolve) => setTimeout(resolve, ms));
-    }
     waitForData(addr, profileId, clusterId, transactionSequenceNumber, timeout) {
         return new Promise((resolve, reject) => {
             const ts = Date.now();
@@ -1063,10 +768,10 @@ class DeconzAdapter extends adapter_1.default {
         this.emit('zclPayload', payload);
     }
     checkReceivedDataPayload(resp) {
-        let srcAddr = undefined;
+        let srcAddr;
+        let srcEUI64;
         let header;
-        const payBuf = resp != null ? Buffer.from(resp.asduPayload) : undefined;
-        if (resp != null) {
+        if (resp) {
             if (resp.srcAddr16 != null) {
                 srcAddr = resp.srcAddr16;
             }
@@ -1085,26 +790,38 @@ class DeconzAdapter extends adapter_1.default {
                 // so let's make sure they get the network address
                 resp.srcAddr16 = srcAddr; // TODO: can't be undefined
             }
-            if (resp.profileId != 0x00) {
-                header = Zcl.Header.fromBuffer(payBuf); // valid from check
+            if (resp.profileId === Zdo.ZDO_PROFILE_ID) {
+                if (resp.clusterId === Zdo.ClusterId.NETWORK_ADDRESS_RESPONSE) {
+                    if (Zdo.Buffalo.checkStatus(resp.zdo)) {
+                        srcEUI64 = resp.zdo[1].eui64;
+                    }
+                }
+                else if (resp.clusterId === Zdo.ClusterId.END_DEVICE_ANNOUNCE) {
+                    // XXX: using same response for announce (handled by controller) or joined depending on permit join status?
+                    if (this.joinPermitted === true && Zdo.Buffalo.checkStatus(resp.zdo)) {
+                        const payload = resp.zdo[1];
+                        this.emit('deviceJoined', { networkAddress: payload.nwkAddress, ieeeAddr: payload.eui64 });
+                    }
+                }
+                this.emit('zdoResponse', resp.clusterId, resp.zdo);
+            }
+            else {
+                header = Zcl.Header.fromBuffer(resp.asduPayload);
             }
         }
         let i = this.openRequestsQueue.length;
         while (i--) {
             const req = this.openRequestsQueue[i];
-            if (srcAddr != null && req.addr === srcAddr && req.clusterId === resp?.clusterId && req.profileId === resp?.profileId) {
-                if (header !== undefined && req.transactionSequenceNumber != undefined) {
-                    if (req.transactionSequenceNumber === header.transactionSequenceNumber) {
-                        logger_1.logger.debug('resolve data request with transSeq Nr.: ' + req.transactionSequenceNumber, NS);
-                        this.openRequestsQueue.splice(i, 1);
-                        req.resolve?.(resp);
-                    }
-                }
-                else {
-                    logger_1.logger.debug('resolve data request without a transSeq Nr.', NS);
-                    this.openRequestsQueue.splice(i, 1);
-                    req.resolve?.(resp);
-                }
+            if (resp &&
+                (req.addr === undefined ||
+                    (typeof req.addr === 'number' ? srcAddr !== undefined && req.addr === srcAddr : srcEUI64 && req.addr === srcEUI64)) &&
+                req.clusterId === resp.clusterId &&
+                req.profileId === resp.profileId &&
+                (header === undefined ||
+                    req.transactionSequenceNumber === undefined ||
+                    req.transactionSequenceNumber === header.transactionSequenceNumber)) {
+                this.openRequestsQueue.splice(i, 1);
+                req.resolve(resp);
             }
             const now = Date.now();
             // Default timeout: 60 seconds.
@@ -1113,28 +830,14 @@ class DeconzAdapter extends adapter_1.default {
                 //logger.debug("Timeout for request in openRequestsQueue addr: " + req.addr.toString(16) + " clusterId: " + req.clusterId.toString(16) + " profileId: " + req.profileId.toString(16), NS);
                 //remove from busyQueue
                 this.openRequestsQueue.splice(i, 1);
-                req.reject?.('waiting for response TIMEOUT');
-            }
-        }
-        // check unattended incomming messages
-        if (resp != null && resp.profileId === 0x00 && resp.clusterId === 0x13) {
-            // device Annce
-            const payload = {
-                networkAddress: payBuf.readUInt16LE(1), // valid from check
-                ieeeAddr: this.driver.macAddrArrayToString(resp.asduPayload.slice(3, 11)),
-            };
-            if (this.joinPermitted === true) {
-                this.emit('deviceJoined', payload);
-            }
-            else {
-                this.emit('deviceAnnounce', payload);
+                req.reject(new Error('waiting for response TIMEOUT'));
             }
         }
-        if (resp != null && resp.profileId != 0x00) {
+        if (resp && resp.profileId != Zdo.ZDO_PROFILE_ID) {
             const payload = {
                 clusterID: resp.clusterId,
                 header,
-                data: payBuf, // valid from check
+                data: resp.asduPayload,
                 address: resp.destAddrMode === 0x03 ? `0x${resp.srcAddr64}` : resp.srcAddr16,
                 endpoint: resp.srcEndpoint,
                 linkquality: resp.lqi,