zigbee-herdsman 4.1.2 → 4.2.0

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

@@ -38,193 +38,96 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DeconzAdapter = void 0;
-const device_1 = __importDefault(require("../../../controller/model/device"));
+//import Device from "../../../controller/model/device";
+const node_fs_1 = require("node:fs");
+const node_path_1 = require("node:path");
 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 constants_1 = __importDefault(require("../driver/constants"));
+const constants_1 = __importStar(require("../driver/constants"));
 const driver_1 = __importDefault(require("../driver/driver"));
 const frameParser_1 = __importStar(require("../driver/frameParser"));
 const NS = "zh:deconz";
 class DeconzAdapter extends adapter_1.default {
     driver;
     openRequestsQueue;
-    transactionID;
     frameParserEvent = frameParser_1.frameParserEvents;
     fwVersion;
     waitress;
-    txOptions;
     joinPermitted = false;
     constructor(networkOptions, serialPortOptions, backupPath, adapterOptions) {
         super(networkOptions, serialPortOptions, backupPath, adapterOptions);
         this.hasZdoMessageOverhead = true;
         this.manufacturerID = Zcl.ManufacturerCode.DRESDEN_ELEKTRONIK_INGENIEURTECHNIK_GMBH;
-        // 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);
-        // biome-ignore lint/style/noNonNullAssertion: ignored using `--suppress`
-        this.driver = new driver_1.default(serialPortOptions.path);
-        this.driver.setDelay(delay);
-        this.txOptions = delay >= 200 ? 0x04 /* activate APS ACKs */ : 0x00 /* no APS ACKs */;
-        this.driver.on("rxFrame", (frame) => {
-            (0, frameParser_1.default)(frame);
-        });
-        this.transactionID = 0;
+        const firmwareLog = [];
+        if (backupPath) {
+            // optional: get extra logs from the firmware (debug builds)
+            const dirPath = (0, node_path_1.dirname)(backupPath);
+            const configPath = `${dirPath}/deconz_options.json`;
+            if ((0, node_fs_1.existsSync)(configPath)) {
+                try {
+                    const data = JSON.parse((0, node_fs_1.readFileSync)(configPath).toString());
+                    const log = data.firmware_log || [];
+                    if (Array.isArray(log)) {
+                        for (const level of log) {
+                            if (level === "APS" || level === "APS_L2") {
+                                firmwareLog.push(level);
+                            }
+                        }
+                    }
+                }
+                catch (_err) { }
+            }
+        }
+        this.driver = new driver_1.default(serialPortOptions, networkOptions, this.getStoredBackup(), firmwareLog);
+        this.driver.on("rxFrame", (frame) => (0, frameParser_1.default)(frame));
         this.openRequestsQueue = [];
         this.fwVersion = undefined;
-        this.frameParserEvent.on("receivedDataPayload", (data) => {
-            this.checkReceivedDataPayload(data);
-        });
-        this.frameParserEvent.on("receivedGreenPowerIndication", (data) => {
-            this.checkReceivedGreenPowerIndication(data);
-        });
+        this.frameParserEvent.on("receivedDataPayload", (data) => this.checkReceivedDataPayload(data));
+        this.frameParserEvent.on("receivedGreenPowerIndication", (data) => this.checkReceivedGreenPowerIndication(data));
         setInterval(() => {
-            this.checkReceivedDataPayload(null);
+            this.checkWaitForDataRequestTimeouts();
         }, 1000);
     }
     /**
      * Adapter methods
      */
     async start() {
-        const baudrate = this.serialPortOptions.baudRate || 38400;
-        await this.driver.open(baudrate);
-        let changed = false;
-        const panid = await this.driver.readParameterRequest(constants_1.default.PARAM.Network.PAN_ID);
-        const expanid = await this.driver.readParameterRequest(constants_1.default.PARAM.Network.APS_EXT_PAN_ID);
-        const channel = await this.driver.readParameterRequest(constants_1.default.PARAM.Network.CHANNEL);
-        const networkKey = await this.driver.readParameterRequest(constants_1.default.PARAM.Network.NETWORK_KEY);
-        // check current channel against configuration.yaml
-        if (this.networkOptions.channelList[0] !== channel) {
-            logger_1.logger.debug(`Channel in configuration.yaml (${this.networkOptions.channelList[0]}) differs from current channel (${channel}). Changing channel.`, NS);
-            let setChannelMask = 0;
-            switch (this.networkOptions.channelList[0]) {
-                case 11:
-                    setChannelMask = 0x800;
-                    break;
-                case 12:
-                    setChannelMask = 0x1000;
-                    break;
-                case 13:
-                    setChannelMask = 0x2000;
-                    break;
-                case 14:
-                    setChannelMask = 0x4000;
-                    break;
-                case 15:
-                    setChannelMask = 0x8000;
-                    break;
-                case 16:
-                    setChannelMask = 0x10000;
-                    break;
-                case 17:
-                    setChannelMask = 0x20000;
-                    break;
-                case 18:
-                    setChannelMask = 0x40000;
-                    break;
-                case 19:
-                    setChannelMask = 0x80000;
-                    break;
-                case 20:
-                    setChannelMask = 0x100000;
-                    break;
-                case 21:
-                    setChannelMask = 0x200000;
-                    break;
-                case 22:
-                    setChannelMask = 0x400000;
-                    break;
-                case 23:
-                    setChannelMask = 0x800000;
-                    break;
-                case 24:
-                    setChannelMask = 0x1000000;
-                    break;
-                case 25:
-                    setChannelMask = 0x2000000;
-                    break;
-                case 26:
-                    setChannelMask = 0x4000000;
-                    break;
-                default:
-                    break;
-            }
-            try {
-                await this.driver.writeParameterRequest(constants_1.default.PARAM.Network.CHANNEL_MASK, setChannelMask);
-                await (0, utils_1.wait)(500);
-                changed = true;
-            }
-            catch (error) {
-                logger_1.logger.debug(`Could not set channel: ${error}`, NS);
-            }
-        }
-        // check current panid against configuration.yaml
-        if (this.networkOptions.panID !== panid) {
-            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 (0, utils_1.wait)(500);
-                changed = true;
-            }
-            catch (error) {
-                logger_1.logger.debug(`Could not set panid: ${error}`, NS);
-            }
-        }
-        // check current extended_panid against configuration.yaml
-        // biome-ignore lint/style/noNonNullAssertion: ignored using `--suppress`
-        if (this.driver.generalArrayToString(this.networkOptions.extendedPanID, 8) !== expanid) {
-            logger_1.logger.debug(`extended panid in configuration.yaml (${
-            // biome-ignore lint/style/noNonNullAssertion: ignored using `--suppress`
-            this.driver.macAddrArrayToString(this.networkOptions.extendedPanID)}) differs from current extended panid (${expanid}). Changing extended panid.`, NS);
-            try {
-                // biome-ignore lint/style/noNonNullAssertion: ignored using `--suppress`
-                await this.driver.writeParameterRequest(constants_1.default.PARAM.Network.APS_EXT_PAN_ID, this.networkOptions.extendedPanID);
-                await (0, utils_1.wait)(500);
-                changed = true;
-            }
-            catch (error) {
-                logger_1.logger.debug(`Could not set extended panid: ${error}`, NS);
-            }
-        }
-        // check current network key against configuration.yaml
-        // biome-ignore lint/style/noNonNullAssertion: ignored using `--suppress`
-        if (this.driver.generalArrayToString(this.networkOptions.networkKey, 16) !== networkKey) {
-            logger_1.logger.debug(`network key in configuration.yaml (hidden) differs from current network key (${networkKey}). Changing network key.`, NS);
-            try {
-                // biome-ignore lint/style/noNonNullAssertion: ignored using `--suppress`
-                await this.driver.writeParameterRequest(constants_1.default.PARAM.Network.NETWORK_KEY, this.networkOptions.networkKey);
-                await (0, utils_1.wait)(500);
-                changed = true;
-            }
-            catch (error) {
-                logger_1.logger.debug(`Could not set network key: ${error}`, NS);
-            }
-        }
-        if (changed) {
-            await this.driver.changeNetworkStateRequest(constants_1.default.PARAM.Network.NET_OFFLINE);
-            await (0, utils_1.wait)(2000);
-            await this.driver.changeNetworkStateRequest(constants_1.default.PARAM.Network.NET_CONNECTED);
-            await (0, utils_1.wait)(2000);
-        }
-        // write endpoints
-        //[ sd1   ep    proId       devId       vers  #inCl iCl1        iCl2        iCl3        iCl4        iCl5        #outC oCl1        oCl2        oCl3        oCl4      ]
-        const sd = [
-            0x00, 0x01, 0x04, 0x01, 0x05, 0x00, 0x01, 0x05, 0x00, 0x00, 0x00, 0x06, 0x0a, 0x00, 0x19, 0x00, 0x01, 0x05, 0x04, 0x01, 0x00, 0x20, 0x00,
-            0x00, 0x05, 0x02, 0x05,
-        ];
-        const sd1 = sd.reverse();
-        await this.driver.writeParameterRequest(constants_1.default.PARAM.STK.Endpoint, sd1);
-        return "resumed";
+        // wait here until driver is connected and has queried all firmware parameters
+        return new Promise((resolve, reject) => {
+            const start = Date.now();
+            const iv = setInterval(() => {
+                if (this.driver.started()) {
+                    clearInterval(iv);
+                    if (this.driver.restoredFromBackup) {
+                        resolve("restored");
+                    }
+                    else {
+                        resolve("resumed");
+                    }
+                    return;
+                }
+                if (20000 < Date.now() - start) {
+                    clearInterval(iv);
+                    reject("failed to start adapter connection to firmware");
+                    return;
+                }
+            }, 50);
+        });
     }
     async stop() {
         await this.driver.close();
     }
-    async getCoordinatorIEEE() {
-        return (await this.driver.readParameterRequest(constants_1.default.PARAM.Network.MAC));
+    getCoordinatorIEEE() {
+        logger_1.logger.debug("-------- z2m:getCoordinatorIEEE() ----------------", NS);
+        if (this.driver.paramMacAddress === 0n) {
+            return Promise.reject(new Error("Failed to query coordinator MAC address"));
+        }
+        return Promise.resolve(`0x${this.driver.paramMacAddress.toString(16).padStart(16, "0")}`);
     }
     async permitJoin(seconds, networkAddress) {
         const clusterId = Zdo.ClusterId.PERMIT_JOINING_REQUEST;
@@ -238,7 +141,7 @@ class DeconzAdapter extends adapter_1.default {
             }
         }
         else {
-            await this.driver.writeParameterRequest(constants_1.default.PARAM.Network.PERMIT_JOIN, seconds);
+            await this.driver.writeParameterRequest(constants_1.ParamId.STK_PERMIT_JOIN, seconds);
             logger_1.logger.debug(`Permit joining on coordinator for ${seconds} sec.`, NS);
             // broadcast permit joining ZDO
             if (networkAddress === undefined) {
@@ -249,32 +152,33 @@ class DeconzAdapter extends adapter_1.default {
         }
         this.joinPermitted = seconds !== 0;
     }
-    async getCoordinatorVersion() {
+    getCoordinatorVersion() {
+        logger_1.logger.debug("-------- z2m:getCoordinatorVersion() ----------------", NS);
         // product: number; transportrev: number; majorrel: number; minorrel: number; maintrel: number; revision: string;
-        if (this.fwVersion !== undefined) {
-            return this.fwVersion;
+        const fw = this.driver.paramFirmwareVersion;
+        if (fw === 0) {
+            return Promise.reject(new Error("Failed to query coordinator firmware version"));
         }
-        try {
-            const fw = await this.driver.readFirmwareVersionRequest();
-            const buf = Buffer.from(fw);
-            const fwString = `0x${buf.readUInt32LE(0).toString(16)}`;
-            let type = "";
-            if (fw[1] === 5) {
-                type = "ConBee/RaspBee";
-            }
-            else if (fw[1] === 7) {
-                type = "ConBee2/RaspBee2";
-            }
-            else {
-                type = "ConBee3";
-            }
-            const meta = { transportrev: 0, product: 0, majorrel: fw[3], minorrel: fw[2], maintrel: 0, revision: fwString };
-            this.fwVersion = { type: type, meta: meta };
-            return { type: type, meta: meta };
+        const fwString = `0x${fw.toString(16).padStart(8, "0")}`;
+        logger_1.logger.debug(`Firmware version: ${fwString}`, NS);
+        let type = "Unknown";
+        const platform = (fw >> 8) & 0xff;
+        if (platform === 5) {
+            type = "ConBee/RaspBee";
         }
-        catch (error) {
-            throw new Error(`Get coordinator version Error: ${error}`);
+        else if (platform === 7) {
+            type = "ConBee2/RaspBee2";
         }
+        else if (platform === 9) {
+            type = "ConBee3";
+        }
+        // 0x26780700 -> 2.6.78.7.00
+        const major = (fw >> 28) & 0xf;
+        const minor = (fw >> 24) & 0xf;
+        const patch = (fw >> 16) & 0xff;
+        const meta = { transportrev: 0, product: 0, majorrel: major, minorrel: minor, maintrel: patch, revision: fwString };
+        this.fwVersion = { type: type, meta: meta };
+        return Promise.resolve({ type: type, meta: meta });
     }
     async addInstallCode(ieeeAddress, key, hashed) {
         await this.driver.writeLinkKey(ieeeAddress, hashed ? key : ZSpec.Utils.aes128MmoHash(key));
@@ -292,6 +196,7 @@ class DeconzAdapter extends adapter_1.default {
             direction,
             transactionSequenceNumber,
         };
+        logger_1.logger.debug(`waitFor() called ${JSON.stringify(payload)}`, NS);
         const waiter = this.waitress.waitFor(payload, timeout);
         const cancel = () => this.waitress.remove(waiter.ID);
         return { promise: waiter.start().promise, cancel };
@@ -299,11 +204,15 @@ class DeconzAdapter extends adapter_1.default {
     async sendZdo(ieeeAddress, networkAddress, clusterId, payload, disableResponse) {
         const transactionID = this.nextTransactionID();
         payload[0] = transactionID;
+        let txOptions = 0;
+        if (networkAddress < constants_1.NwkBroadcastAddress.BroadcastLowPowerRouters) {
+            txOptions = 0x4; // enable APS ACKs for unicast addresses
+        }
         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,
+            destAddrMode: constants_1.ApsAddressMode.Nwk,
+            destAddr16: networkAddress,
             destAddr64: isNwkAddrRequest ? ieeeAddress : undefined,
             destEndpoint: Zdo.ZDO_ENDPOINT,
             profileId: Zdo.ZDO_PROFILE_ID,
@@ -311,45 +220,67 @@ class DeconzAdapter extends adapter_1.default {
             srcEndpoint: Zdo.ZDO_ENDPOINT,
             asduLength: payload.length,
             asduPayload: payload,
-            txOptions: 0,
+            txOptions,
             radius: constants_1.default.PARAM.txRadius.DEFAULT_RADIUS,
-            timeout: 30,
+            timeout: 10000,
         };
-        this.driver
-            .enqueueSendDataRequest(req)
-            .then(() => { })
-            .catch(() => { });
+        const responseClusterId = Zdo.Utils.getResponseClusterId(clusterId);
+        const confirm = this.driver.enqueueApsDataRequest(req);
+        let indication;
         if (!disableResponse) {
-            const responseClusterId = Zdo.Utils.getResponseClusterId(clusterId);
             if (responseClusterId) {
-                try {
-                    const response = await this.waitForData(isNwkAddrRequest ? ieeeAddress : networkAddress, Zdo.ZDO_PROFILE_ID, responseClusterId);
-                    // biome-ignore lint/style/noNonNullAssertion: ignored using `--suppress`
-                    return response.zdo;
+                indication = this.waitForData(isNwkAddrRequest ? ieeeAddress : networkAddress, Zdo.ZDO_PROFILE_ID, responseClusterId, transactionID, req.timeout);
+            }
+        }
+        try {
+            await confirm;
+        }
+        catch (err) {
+            // no need to wait for indication, remove waiter from queue
+            if (indication) {
+                const i = this.openRequestsQueue.findIndex((x) => x.clusterId === responseClusterId && x.transactionSequenceNumber === transactionID);
+                if (i !== -1) {
+                    this.openRequestsQueue.splice(i, 1);
                 }
-                catch (error) {
-                    if (responseClusterId === Zdo.ClusterId.ACTIVE_ENDPOINTS_RESPONSE && networkAddress === 0) {
-                        logger_1.logger.warning("Failed to determine active endpoints of coordinator, falling back to [1]", NS);
-                        // Some Conbee adapaters don't provide a response to an active endpoint request of the coordinator, always return
-                        // an endpoint here. Before an active endpoint request was done to determine the endpoints, they were hardcoded:
-                        // https://github.com/Koenkk/zigbee-herdsman/blob/d855b3bf85a066cb7c325fe3ef0006873c735add/src/adapter/deconz/adapter/deconzAdapter.ts#L105
-                        const response = [
-                            Zdo.Status.SUCCESS,
-                            { endpointList: [1], nwkAddress: 0 },
-                        ];
-                        return response;
-                    }
-                    throw error;
+            }
+            throw new Error(`failed to send ZDO request seq: (${transactionID}) ${err}`);
+        }
+        if (indication) {
+            try {
+                const data = await indication;
+                // biome-ignore lint/style/noNonNullAssertion: ignored using `--suppress`
+                return data.zdo;
+            }
+            catch (error) {
+                if (responseClusterId === Zdo.ClusterId.ACTIVE_ENDPOINTS_RESPONSE && networkAddress === 0) {
+                    // TODO(mpi): Check following statement on older firmware versions.
+                    // If it is true we can always query firmware parameters for endpoints.
+                    logger_1.logger.warning("Failed to determine active endpoints of coordinator, falling back to [1]", NS);
+                    // Some Conbee adapaters don't provide a response to an active endpoint request of the coordinator, always return
+                    // an endpoint here. Before an active endpoint request was done to determine the endpoints, they were hardcoded:
+                    // https://github.com/Koenkk/zigbee-herdsman/blob/d855b3bf85a066cb7c325fe3ef0006873c735add/src/adapter/deconz/adapter/deconzAdapter.ts#L105
+                    const response = [
+                        Zdo.Status.SUCCESS,
+                        { endpointList: [1], nwkAddress: 0 },
+                    ];
+                    return response;
                 }
+                throw error;
             }
         }
     }
-    async sendZclFrameToEndpoint(_ieeeAddr, networkAddress, endpoint, zclFrame, timeout, disableResponse, _disableRecovery, sourceEndpoint) {
+    async sendZclFrameToEndpoint(_ieeeAddr, networkAddress, endpoint, zclFrame, timeout, disableResponse, 
+    // TODO(mpi): in ember driver this means keep going enqueue request to firmware (up to 3 times).
+    // In our case this a little different: The firmware may reject the requests because no free APS slots are available,
+    // this is the only case where "recovery" makes sense. Other cases mean the request will never succeed (network offline, invalid request, ...).
+    _disableRecovery, sourceEndpoint) {
         const transactionID = this.nextTransactionID();
         const payload = zclFrame.toBuffer();
+        // TODO(mpi): Enable APS ACKs for tricky devices, maintain a list of those, or keep at least a few slots free for non APS ACK requests.
+        const txOptions = 0x4; // 0x00 normal, 0x04 APS ACK
         const request = {
             requestId: transactionID,
-            destAddrMode: constants_1.default.PARAM.addressMode.NWK_ADDR,
+            destAddrMode: constants_1.ApsAddressMode.Nwk,
             destAddr16: networkAddress,
             destEndpoint: endpoint,
             profileId: sourceEndpoint === 242 && endpoint === 242 ? 0xa1e0 : 0x104,
@@ -357,54 +288,89 @@ class DeconzAdapter extends adapter_1.default {
             srcEndpoint: sourceEndpoint || 1,
             asduLength: payload.length,
             asduPayload: payload,
-            txOptions: this.txOptions, // 0x00 normal, 0x04 APS ACK
+            // TODO(mpi): This must not be a global option.
+            // Since z2m doesn't provide it, ideally the driver figures this out on its own.
+            // deCONZ keeps an error count for each device, if devices work fine without APS ACKs don't use them.
+            // But if errors occur enable them..
+            //
+            // ember driver enables ACKs based on 'commandResponseId' which imho doesn't make sense at all:
+            //
+            //      don't RETRY if no response expected
+            //      if (commandResponseId === undefined)
+            //         apsFrame.options &= ~EmberApsOption.RETRY;
+            //
+            txOptions,
             radius: constants_1.default.PARAM.txRadius.DEFAULT_RADIUS,
+            // TODO(mpi): We could treat _disableRecovery = true, to retry if enqueue (valid) requests or APS-confirms fail within timeout period?
             timeout: timeout,
         };
+        if (timeout < 1000) {
+            throw new Error("Unexpected small timeout");
+        }
         const command = zclFrame.command;
-        this.driver
-            .enqueueSendDataRequest(request)
-            .then(() => {
-            logger_1.logger.debug(`sendZclFrameToEndpoint - message send with transSeq Nr.: ${zclFrame.header.transactionSequenceNumber}`, NS);
-            logger_1.logger.debug(`${command.response !== undefined}, ${zclFrame.header.frameControl.disableDefaultResponse}, ${disableResponse}, ${request.timeout}`, NS);
-            if (command.response === undefined || zclFrame.header.frameControl.disableDefaultResponse || !disableResponse) {
-                logger_1.logger.debug(`resolve request (${zclFrame.header.transactionSequenceNumber})`, NS);
-                return Promise.resolve();
-            }
-        })
-            .catch((error) => {
-            logger_1.logger.debug(`sendZclFrameToEndpoint ERROR (${zclFrame.header.transactionSequenceNumber})`, NS);
-            logger_1.logger.debug(error, NS);
-            //return Promise.reject(new Error("sendZclFrameToEndpoint ERROR " + error));
-        });
+        // NOTE(mpi): 'disableResponse' is not working as expected?
+        // For now use the same logic as Ember adapter since 'disableResponse === false' alone isn't correct in some cases.
+        //
+        // E.g. when replying to an Query Next Image Request the following parameters where passed from z2m:
+        //     { command.response: undefined, zcl.disableDefaultResponse: true, z2m.disableResponse: false }
+        // This resulted in waiting for a response which never arrives and a timeout error thrown.
+        let needWaitResponse = false;
+        if (command.response !== undefined && disableResponse === false) {
+            needWaitResponse = true;
+        }
+        else if (!zclFrame.header.frameControl.disableDefaultResponse) {
+            needWaitResponse = true;
+        }
+        const confirm = this.driver.enqueueApsDataRequest(request);
+        logger_1.logger.debug(`ZCL request sent with transactionSequenceNumber.: ${zclFrame.header.transactionSequenceNumber}`, NS);
+        logger_1.logger.debug(`command.response: ${command.response}, zcl.disableDefaultResponse: ${zclFrame.header.frameControl.disableDefaultResponse}, z2m.disableResponse: ${disableResponse}, request.timeout: ${request.timeout}`, NS);
+        let indication;
+        if (needWaitResponse) {
+            indication = this.waitForData(networkAddress, ZSpec.HA_PROFILE_ID, zclFrame.cluster.ID, zclFrame.header.transactionSequenceNumber, request.timeout);
+        }
         try {
-            let data = null;
-            if ((command.response !== undefined && !disableResponse) || !zclFrame.header.frameControl.disableDefaultResponse) {
-                data = await this.waitForData(networkAddress, ZSpec.HA_PROFILE_ID, zclFrame.cluster.ID, zclFrame.header.transactionSequenceNumber, request.timeout);
+            await confirm;
+        }
+        catch (err) {
+            // no need to wait for indication, remove waiter from queue
+            if (indication) {
+                const i = this.openRequestsQueue.findIndex((x) => x.clusterId === zclFrame.cluster.ID && x.transactionSequenceNumber === zclFrame.header.transactionSequenceNumber);
+                if (i !== -1) {
+                    this.openRequestsQueue.splice(i, 1);
+                }
             }
-            if (data !== null) {
+            throw new Error(`failed to send ZCL request (${zclFrame.header.transactionSequenceNumber}) ${err}`);
+        }
+        if (indication) {
+            try {
+                const data = await indication;
+                // TODO(mpi): This is nuts. Need to make sure that srcAddr16 is always valid.
+                let addr;
+                if (data.srcAddr16 !== undefined)
+                    addr = data.srcAddr16;
+                else if (data.srcAddr64 !== undefined)
+                    addr = `0x${data.srcAddr64}`;
+                else
+                    throw new Error("Unexpected waitForData() didn't contain valid address");
+                const groupId = 0;
+                const wasBroadCast = false;
                 const response = {
-                    address: data.srcAddr16 ??
-                        `0x${
-                        // biome-ignore lint/style/noNonNullAssertion: ignored using `--suppress`
-                        data.srcAddr64}`,
+                    address: addr,
                     data: data.asduPayload,
                     clusterID: zclFrame.cluster.ID,
                     header: Zcl.Header.fromBuffer(data.asduPayload),
                     endpoint: data.srcEndpoint,
                     linkquality: data.lqi,
-                    // biome-ignore lint/style/noNonNullAssertion: ignored using `--suppress`
-                    groupID: data.srcAddrMode === 0x01 ? data.srcAddr16 : 0,
-                    wasBroadcast: data.srcAddrMode === 0x01 || data.srcAddrMode === 0xf,
+                    groupID: groupId,
+                    wasBroadcast: wasBroadCast,
                     destinationEndpoint: data.destEndpoint,
                 };
-                logger_1.logger.debug(`response received (${zclFrame.header.transactionSequenceNumber})`, NS);
+                logger_1.logger.debug(`Response received transactionSequenceNumber: ${zclFrame.header.transactionSequenceNumber}`, NS);
                 return response;
             }
-            logger_1.logger.debug(`no response expected (${zclFrame.header.transactionSequenceNumber})`, NS);
-        }
-        catch (error) {
-            throw new Error(`no response received (${zclFrame.header.transactionSequenceNumber}) ${error}`);
+            catch (err) {
+                throw new Error(`No ZCL response received for (${zclFrame.header.transactionSequenceNumber}) ${err}`);
+            }
         }
     }
     async sendZclFrameToGroup(groupID, zclFrame) {
@@ -413,7 +379,7 @@ class DeconzAdapter extends adapter_1.default {
         logger_1.logger.debug(`zclFrame to group - ${groupID}`, NS);
         const request = {
             requestId: transactionID,
-            destAddrMode: constants_1.default.PARAM.addressMode.GROUP_ADDR,
+            destAddrMode: constants_1.ApsAddressMode.Group,
             destAddr16: groupID,
             profileId: 0x104,
             clusterId: zclFrame.cluster.ID,
@@ -422,9 +388,10 @@ class DeconzAdapter extends adapter_1.default {
             asduPayload: payload,
             txOptions: 0,
             radius: constants_1.default.PARAM.txRadius.UNLIMITED,
+            timeout: constants_1.default.PARAM.APS.MAX_SEND_TIMEOUT,
         };
         logger_1.logger.debug("sendZclFrameToGroup - message send", NS);
-        return await this.driver.enqueueSendDataRequest(request);
+        return await this.driver.enqueueApsDataRequest(request);
     }
     async sendZclFrameToAll(endpoint, zclFrame, sourceEndpoint, destination) {
         const transactionID = this.nextTransactionID();
@@ -432,7 +399,7 @@ class DeconzAdapter extends adapter_1.default {
         logger_1.logger.debug(`zclFrame to all - ${endpoint}`, NS);
         const request = {
             requestId: transactionID,
-            destAddrMode: constants_1.default.PARAM.addressMode.NWK_ADDR,
+            destAddrMode: constants_1.ApsAddressMode.Nwk,
             destAddr16: destination,
             destEndpoint: endpoint,
             profileId: sourceEndpoint === 242 && endpoint === 242 ? 0xa1e0 : 0x104,
@@ -442,36 +409,87 @@ class DeconzAdapter extends adapter_1.default {
             asduPayload: payload,
             txOptions: 0,
             radius: constants_1.default.PARAM.txRadius.UNLIMITED,
+            timeout: constants_1.default.PARAM.APS.MAX_SEND_TIMEOUT,
         };
         logger_1.logger.debug("sendZclFrameToAll - message send", NS);
-        return await this.driver.enqueueSendDataRequest(request);
+        return await this.driver.enqueueApsDataRequest(request);
     }
     async supportsBackup() {
-        return await Promise.resolve(false);
+        return await Promise.resolve(true);
     }
-    async backup() {
-        return await Promise.reject(new Error("This adapter does not support backup"));
-    }
-    async getNetworkParameters() {
+    /**
+     * Loads currently stored backup and returns it in internal backup model.
+     */
+    getStoredBackup() {
+        if (!(0, node_fs_1.existsSync)(this.backupPath)) {
+            return undefined;
+        }
+        let data;
         try {
-            const panid = await this.driver.readParameterRequest(constants_1.default.PARAM.Network.PAN_ID);
-            const expanid = await this.driver.readParameterRequest(constants_1.default.PARAM.Network.APS_EXT_PAN_ID);
-            const channel = await this.driver.readParameterRequest(constants_1.default.PARAM.Network.CHANNEL);
-            // For some reason, reading NWK_UPDATE_ID always returns `null` (tested with `0x26780700` on Conbee II)
-            // 0x24 was taken from https://github.com/zigpy/zigpy-deconz/blob/70910bc6a63e607332b4f12754ba470651eb878c/zigpy_deconz/api.py#L152
-            // const nwkUpdateId = await this.driver.readParameterRequest(0x24 /*PARAM.PARAM.Network.NWK_UPDATE_ID*/);
-            return {
-                panID: panid,
-                extendedPanID: expanid, // read as `0x...`
-                channel: channel,
-                nwkUpdateID: 0,
-            };
+            data = JSON.parse((0, node_fs_1.readFileSync)(this.backupPath).toString());
         }
         catch (error) {
-            const msg = `get network parameters Error:${error}`;
-            logger_1.logger.debug(msg, NS);
-            return await Promise.reject(new Error(msg));
+            throw new Error(`[BACKUP] Coordinator backup is corrupted. (${error.stack})`);
+        }
+        if (data.metadata?.format === "zigpy/open-coordinator-backup" && data.metadata?.version) {
+            if (data.metadata?.version !== 1) {
+                throw new Error(`[BACKUP] Unsupported open coordinator backup version (version=${data.metadata?.version}).`);
+            }
+            // if (data.metadata.internal.ezspVersion < BACKUP_OLDEST_SUPPORTED_EZSP_VERSION) {
+            //     renameSync(this.backupPath, `${this.backupPath}.old`);
+            //     logger.warning("[BACKUP] Current backup file is from an unsupported EZSP version. Renaming and ignoring.", NS);
+            //     return undefined;
+            // }
+            return utils_1.BackupUtils.fromUnifiedBackup(data);
         }
+        throw new Error("[BACKUP] Unknown backup format.");
+    }
+    async backup() {
+        if (!this.driver.started()) {
+            throw new Error("Can't create backup while driver isn't connected");
+        }
+        // NOTE(mpi): The U64 values are put as big endian format into the buffer, same as string (0x001234...)
+        const extendedPanId = Buffer.alloc(8);
+        extendedPanId.writeBigUint64BE(this.driver.paramApsUseExtPanid);
+        const channelList = [this.driver.paramCurrentChannel]; // Utils.unpackChannelList(nib.channelList)
+        const networkKey = this.driver.paramNwkKey;
+        const coordinatorIeeeAddress = Buffer.alloc(8);
+        coordinatorIeeeAddress.writeBigUint64BE(this.driver.paramMacAddress);
+        /* return backup structure */
+        const backup = {
+            networkOptions: {
+                panId: this.driver.paramNwkPanid,
+                extendedPanId,
+                channelList,
+                networkKey,
+                networkKeyDistribute: false,
+            },
+            logicalChannel: this.driver.paramCurrentChannel,
+            networkKeyInfo: {
+                sequenceNumber: 0, // TODO(mpi): on newer firmware versions we can read it
+                frameCounter: this.driver.paramFrameCounter,
+            },
+            securityLevel: 0x05, // AES-CCM-32 (fixed)
+            networkUpdateId: this.driver.paramNwkUpdateId,
+            coordinatorIeeeAddress,
+            devices: [], // TODO(mpi): we currently don't have this, but it will be added once install codes get a proper interface
+        };
+        return await Promise.resolve(backup);
+    }
+    getNetworkParameters() {
+        // TODO(mpi): This works with 0x26780700, needs more investigation with older firmware versions.
+        const panID = this.driver.paramNwkPanid;
+        const extendedPanID = this.driver.paramApsUseExtPanid;
+        const channel = this.driver.paramCurrentChannel;
+        const nwkUpdateID = this.driver.paramNwkUpdateId;
+        if (channel === 0 || extendedPanID === 0n) {
+            return Promise.reject(new Error("Failed to query network parameters"));
+        }
+        // TODO(mpi): check this statement, this should work
+        // For some reason, reading NWK_UPDATE_ID always returns `null` (tested with `0x26780700` on Conbee II)
+        // 0x24 was taken from https://github.com/zigpy/zigpy-deconz/blob/70910bc6a63e607332b4f12754ba470651eb878c/zigpy_deconz/api.py#L152
+        // const nwkUpdateId = await this.driver.readParameterRequest(0x24 /*PARAM.PARAM.Network.NWK_UPDATE_ID*/);
+        return Promise.resolve({ panID, extendedPanID: `0x${extendedPanID.toString(16).padStart(16, "0")}`, channel, nwkUpdateID });
     }
     async restoreChannelInterPAN() {
         await Promise.reject(new Error("not supported"));
@@ -497,7 +515,9 @@ class DeconzAdapter extends adapter_1.default {
     waitForData(addr, profileId, clusterId, transactionSequenceNumber, timeout) {
         return new Promise((resolve, reject) => {
             const ts = Date.now();
-            // const commandId = PARAM.PARAM.APS.DATA_INDICATION;
+            if (!timeout) {
+                timeout = 60000;
+            }
             const req = { addr, profileId, clusterId, transactionSequenceNumber, resolve, reject, ts, timeout };
             this.openRequestsQueue.push(req);
         });
@@ -529,95 +549,125 @@ class DeconzAdapter extends adapter_1.default {
         this.waitress.resolve(payload);
         this.emit("zclPayload", payload);
     }
+    checkWaitForDataRequestTimeouts() {
+        if (this.openRequestsQueue.length === 0) {
+            return;
+        }
+        const now = Date.now();
+        const req = this.openRequestsQueue[0];
+        if (req.timeout < now - req.ts) {
+            this.openRequestsQueue.shift();
+            logger_1.logger.debug(`Timeout for request in openRequestsQueue addr: ${req.addr}, clusterId: ${req.clusterId.toString(16)}, profileId: ${req.profileId.toString(16)}, seq: ${req.transactionSequenceNumber}`, NS);
+            req.reject(new Error("waiting for response TIMEOUT"));
+        }
+    }
     checkReceivedDataPayload(resp) {
-        let srcAddr;
-        let srcEUI64;
+        //let srcAddr: number | undefined;
+        //let srcEUI64: string | undefined;
         let header;
-        if (resp) {
-            if (resp.srcAddr16 != null) {
-                srcAddr = resp.srcAddr16;
-            }
-            else {
-                // For some devices srcAddr64 is reported by ConBee 3, even if the frame contains both
-                // srcAddr16 and srcAddr64. This happens even if the request was sent to a short address.
-                // At least some parts, e.g. the while loop below, only work with srcAddr16 (i.e. the network
-                // address) being set. So we try to look up the network address in the list of know devices.
-                if (resp.srcAddr64 != null) {
-                    logger_1.logger.debug(`Try to find network address of ${resp.srcAddr64}`, NS);
-                    // Note: Device expects addresses with a 0x prefix...
-                    srcAddr = device_1.default.byIeeeAddr(`0x${resp.srcAddr64}`, false)?.networkAddress;
-                    // apperantly some functions furhter up in the protocol stack expect this to be set.
-                    // so let's make sure they get the network address
-                    // Note: srcAddr16 can be undefined after this and this is intended behavior
-                    // there are zigbee frames which do not contain a 16 bit address, e.g. during joining.
-                    // So any code that relies on srcAddr16 must handle this in some way.
-                    resp.srcAddr16 = srcAddr;
-                }
-            }
-            if (resp.profileId === Zdo.ZDO_PROFILE_ID) {
+        //srcAddr = resp.srcAddr16;
+        // TODO(mpi): The following shouldn't be needed anymore.
+        // if (resp.srcAddr16 != null) {
+        //
+        // } else {
+        //     // For some devices srcAddr64 is reported by ConBee 3, even if the frame contains both
+        //     // srcAddr16 and srcAddr64. This happens even if the request was sent to a short address.
+        //     // At least some parts, e.g. the while loop below, only work with srcAddr16 (i.e. the network
+        //     // address) being set. So we try to look up the network address in the list of know devices.
+        //     if (resp.srcAddr64 != null) {
+        //         logger.debug(`Try to find network address of ${resp.srcAddr64}`, NS);
+        //         // Note: Device expects addresses with a 0x prefix...
+        //         srcAddr = Device.byIeeeAddr(`0x${resp.srcAddr64}`, false)?.networkAddress;
+        //         // apperantly some functions furhter up in the protocol stack expect this to be set.
+        //         // so let's make sure they get the network address
+        //         // Note: srcAddr16 can be undefined after this and this is intended behavior
+        //         // there are zigbee frames which do not contain a 16 bit address, e.g. during joining.
+        //         // So any code that relies on srcAddr16 must handle this in some way.
+        //         resp.srcAddr16 = srcAddr;
+        //     }
+        // }
+        //
+        // ---------------------------------------------------------------------
+        // if (resp.srcAddr16) { // temp test
+        //     const dev = Device.byNetworkAddress(resp.srcAddr16);
+        //
+        //     if (dev) {
+        //         logger.debug(`APS-DATA.indication from ${dev.ieeeAddr}, ${dev.modelID} ${dev.manufacturerID}`, NS);
+        //     }
+        // }
+        if (resp.profileId === Zdo.ZDO_PROFILE_ID) {
+            if (resp.zdo) {
                 if (resp.clusterId === Zdo.ClusterId.NETWORK_ADDRESS_RESPONSE) {
-                    // biome-ignore lint/style/noNonNullAssertion: ignored using `--suppress`
-                    if (Zdo.Buffalo.checkStatus(resp.zdo)) {
-                        // biome-ignore lint/style/noNonNullAssertion: ignored using `--suppress`
-                        srcEUI64 = resp.zdo[1].eui64;
-                    }
+                    // if (Zdo.Buffalo.checkStatus<Zdo.ClusterId.NETWORK_ADDRESS_RESPONSE>(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?
-                    // biome-ignore lint/style/noNonNullAssertion: ignored using `--suppress`
+                    // TODO(mpi): Clarify with core devs, I don't think the adapter should do this?!
                     if (this.joinPermitted === true && Zdo.Buffalo.checkStatus(resp.zdo)) {
                         const payload = resp.zdo[1];
                         this.emit("deviceJoined", { networkAddress: payload.nwkAddress, ieeeAddr: payload.eui64 });
                     }
                 }
-                // biome-ignore lint/style/noNonNullAssertion: ignored using `--suppress`
+                // TODO(mpi) it seems that the controller is only interested in NWK, IEEE and DeviceAnnounce command
+                // So maybe we should filter here?
                 this.emit("zdoResponse", resp.clusterId, resp.zdo);
             }
-            else {
-                header = Zcl.Header.fromBuffer(resp.asduPayload);
+        }
+        else {
+            header = Zcl.Header.fromBuffer(resp.asduPayload);
+            if (!header) {
+                logger_1.logger.debug("Failed tp parse ZCL header of non ZDO command", NS);
             }
         }
         let i = this.openRequestsQueue.length;
         while (i--) {
             const req = this.openRequestsQueue[i];
-            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);
+            if (req.profileId !== resp.profileId) {
+                continue;
             }
-            const now = Date.now();
-            // Default timeout: 60 seconds.
-            // Comparison is negated to prevent orphans when invalid timeout is entered (resulting in NaN).
-            // biome-ignore lint/style/noNonNullAssertion: ignored using `--suppress`
-            if (!(now - req.ts <= (req.timeout ?? 60000))) {
-                //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(new Error("waiting for response TIMEOUT"));
+            if (req.profileId === Zdo.ZDO_PROFILE_ID) {
+                if (req.clusterId !== resp.clusterId) {
+                    continue;
+                }
+                if (req.transactionSequenceNumber !== resp.asduPayload[0]) {
+                    continue; // ZDP sequence number in first byte
+                }
+            }
+            else if (header) {
+                if (header.transactionSequenceNumber !== req.transactionSequenceNumber) {
+                    continue;
+                }
+                if (req.clusterId !== resp.clusterId) {
+                    continue;
+                }
             }
+            else {
+                continue; // We should always have a valid transactionId (ZDO and ZCL)
+            }
+            this.openRequestsQueue.splice(i, 1);
+            req.resolve(resp);
         }
-        if (resp && resp.profileId !== Zdo.ZDO_PROFILE_ID) {
+        if (resp.profileId !== Zdo.ZDO_PROFILE_ID) {
+            let groupID = 0;
+            let wasBroadCast = false;
+            if (resp.destAddrMode === constants_1.ApsAddressMode.Group) {
+                groupID = resp.destAddr16;
+                wasBroadCast = true;
+            }
+            else if (resp.destAddrMode === constants_1.ApsAddressMode.Nwk && resp.destAddr16 >= constants_1.NwkBroadcastAddress.BroadcastLowPowerRouters) {
+                wasBroadCast = true;
+            }
             const payload = {
                 clusterID: resp.clusterId,
                 header,
                 data: resp.asduPayload,
-                address: resp.srcAddrMode === 0x03
-                    ? `0x${
-                    // biome-ignore lint/style/noNonNullAssertion: ignored using `--suppress`
-                    resp.srcAddr64}`
-                    : // biome-ignore lint/style/noNonNullAssertion: ignored using `--suppress`
-                        resp.srcAddr16,
+                address: resp.srcAddr16,
                 endpoint: resp.srcEndpoint,
                 linkquality: resp.lqi,
-                // biome-ignore lint/style/noNonNullAssertion: ignored using `--suppress`
-                groupID: resp.destAddrMode === 0x01 ? resp.destAddr16 : 0,
-                wasBroadcast: resp.destAddrMode === 0x01 || resp.destAddrMode === 0xf,
+                groupID: groupID,
+                wasBroadcast: wasBroadCast,
                 destinationEndpoint: resp.destEndpoint,
             };
             this.waitress.resolve(payload);
@@ -625,11 +675,7 @@ class DeconzAdapter extends adapter_1.default {
         }
     }
     nextTransactionID() {
-        this.transactionID++;
-        if (this.transactionID > 255) {
-            this.transactionID = 1;
-        }
-        return this.transactionID;
+        return this.driver.nextTransactionID();
     }
     waitressTimeoutFormatter(matcher, timeout) {
         return (`Timeout - ${matcher.address} - ${matcher.endpoint}` +