@willieee802/zigbee-herdsman 0.34.3 → 0.48.1

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

@@ -26,15 +26,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const debug_1 = __importDefault(require("debug"));
 const adapter_1 = __importDefault(require("../../adapter"));
-const debug = (0, debug_1.default)("zigbee-herdsman:deconz:adapter");
 const driver_1 = __importDefault(require("../driver/driver"));
-const zcl_1 = require("../../../zcl");
+const Zcl = __importStar(require("../../../zspec/zcl"));
 const Events = __importStar(require("../../events"));
 const frameParser_1 = __importDefault(require("../driver/frameParser"));
 const utils_1 = require("../../../utils");
 const constants_1 = __importDefault(require("../driver/constants"));
+const logger_1 = require("../../../utils/logger");
+const NS = 'zh:deconz';
 var frameParser = require('../driver/frameParser');
 ;
 class DeconzAdapter extends adapter_1.default {
@@ -47,8 +47,8 @@ class DeconzAdapter extends adapter_1.default {
     fwVersion;
     waitress;
     TX_OPTIONS = 0x00; // No APS ACKS
-    constructor(networkOptions, serialPortOptions, backupPath, adapterOptions, logger) {
-        super(networkOptions, serialPortOptions, backupPath, adapterOptions, logger);
+    constructor(networkOptions, serialPortOptions, backupPath, adapterOptions) {
+        super(networkOptions, serialPortOptions, backupPath, adapterOptions);
         const concurrent = this.adapterOptions && this.adapterOptions.concurrent ?
             this.adapterOptions.concurrent : 2;
         // TODO: https://github.com/Koenkk/zigbee2mqtt/issues/4884#issuecomment-728903121
@@ -137,12 +137,12 @@ class DeconzAdapter extends adapter_1.default {
             else {
                 this.joinPermitted = true;
             }
-            this.driver.writeParameterRequest(constants_1.default.PARAM.Network.PERMIT_JOIN, seconds);
-            debug("PERMIT_JOIN - " + seconds + " seconds");
+            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;
-            debug(msg);
+            logger_1.logger.debug(msg, NS);
             // try again
             this.permitJoin(seconds, networkAddress);
             //return Promise.reject(new Error(msg)); // do not reject
@@ -173,7 +173,7 @@ class DeconzAdapter extends adapter_1.default {
                 return { type: type, meta: meta };
             }
             catch (error) {
-                debug("Get coordinator version Error: " + error);
+                logger_1.logger.debug("Get coordinator version Error: " + error, NS);
             }
         }
     }
@@ -243,12 +243,12 @@ class DeconzAdapter extends adapter_1.default {
                         counter = 0;
                     }
                 }
-                debug("LQI RESPONSE - addr: 0x" + networkAddress.toString(16) + " status: " + response.status + " read " + (response.tableListCount + response.startIndex) + "/" + response.tableEntrys + " entrys");
+                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;
             }
             catch (error) {
                 const msg = "LQI REQUEST FAILED - addr: 0x" + networkAddress.toString(16) + " " + error;
-                debug(msg);
+                logger_1.logger.debug(msg, NS);
                 return Promise.reject(new Error(msg));
             }
         };
@@ -327,12 +327,12 @@ class DeconzAdapter extends adapter_1.default {
                         counter = 0;
                     }
                 }
-                debug("ROUTING_TABLE RESPONSE - addr: 0x" + networkAddress.toString(16) + " status: " + response.status + " read " + (response.tableListCount + response.startIndex) + "/" + response.tableEntrys + " entrys");
+                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;
             }
             catch (error) {
                 const msg = "ROUTING_TABLE REQUEST FAILED - addr: 0x" + networkAddress.toString(16) + " " + error;
-                debug(msg);
+                logger_1.logger.debug(msg, NS);
                 return Promise.reject(new Error(msg));
             }
         };
@@ -374,12 +374,12 @@ class DeconzAdapter extends adapter_1.default {
             const logicaltype = (data[4] & 7);
             const type = (logicaltype === 1) ? 'Router' : (logicaltype === 2) ? 'EndDevice' : (logicaltype === 0) ? 'Coordinator' : 'Unknown';
             const manufacturer = buf.readUInt16LE(7);
-            debug("RECEIVING NODE_DESCRIPTOR - addr: 0x" + networkAddress.toString(16) + " type: " + type + " manufacturer: 0x" + manufacturer.toString(16));
+            logger_1.logger.debug("RECEIVING NODE_DESCRIPTOR - addr: 0x" + networkAddress.toString(16) + " type: " + type + " manufacturer: 0x" + manufacturer.toString(16), NS);
             return { manufacturerCode: manufacturer, type };
         }
         catch (error) {
             const msg = "RECEIVING NODE_DESCRIPTOR FAILED - addr: 0x" + networkAddress.toString(16) + " " + error;
-            debug(msg);
+            logger_1.logger.debug(msg, NS);
             return Promise.reject(new Error(msg));
         }
     }
@@ -413,12 +413,12 @@ class DeconzAdapter extends adapter_1.default {
             for (let i = 5; i < (epCount + 5); i++) {
                 epList.push(buf.readUInt8(i));
             }
-            debug("ACTIVE_ENDPOINTS - addr: 0x" + networkAddress.toString(16) + " EP list: " + epList);
+            logger_1.logger.debug("ACTIVE_ENDPOINTS - addr: 0x" + networkAddress.toString(16) + " EP list: " + epList, NS);
             return { endpoints: epList };
         }
         catch (error) {
             const msg = "READING ACTIVE_ENDPOINTS FAILED - addr: 0x" + networkAddress.toString(16) + " " + error;
-            debug(msg);
+            logger_1.logger.debug(msg, NS);
             return Promise.reject(new Error(msg));
         }
     }
@@ -468,17 +468,17 @@ class DeconzAdapter extends adapter_1.default {
                 inputClusters: inClusters,
                 outputClusters: outClusters
             };
-            debug("RECEIVING SIMPLE_DESCRIPTOR - addr: 0x" + networkAddress.toString(16) + " EP:" + simpleDesc.endpointID + " inClusters: " + inClusters + " outClusters: " + outClusters);
+            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;
-            debug(msg);
+            logger_1.logger.debug(msg, NS);
             return Promise.reject(new Error(msg));
         }
     }
     async checkCoordinatorSimpleDescriptor(skip) {
-        debug("checking coordinator simple descriptor");
+        logger_1.logger.debug("checking coordinator simple descriptor", NS);
         var simpleDesc = null;
         if (skip === false) {
             try {
@@ -490,14 +490,14 @@ class DeconzAdapter extends adapter_1.default {
                 this.checkCoordinatorSimpleDescriptor(false);
                 return;
             }
-            debug("EP: " + simpleDesc.endpointID);
-            debug("profile ID: " + simpleDesc.profileID);
-            debug("device ID: " + simpleDesc.deviceID);
+            logger_1.logger.debug("EP: " + simpleDesc.endpointID, NS);
+            logger_1.logger.debug("profile ID: " + simpleDesc.profileID, NS);
+            logger_1.logger.debug("device ID: " + simpleDesc.deviceID, NS);
             for (let i = 0; i < simpleDesc.inputClusters.length; i++) {
-                debug("input cluster: 0x" + simpleDesc.inputClusters[i].toString(16));
+                logger_1.logger.debug("input cluster: 0x" + simpleDesc.inputClusters[i].toString(16), NS);
             }
             for (let o = 0; o < simpleDesc.outputClusters.length; o++) {
-                debug("output cluster: 0x" + simpleDesc.outputClusters[o].toString(16));
+                logger_1.logger.debug("output cluster: 0x" + simpleDesc.outputClusters[o].toString(16), NS);
             }
             let ok = true;
             if (simpleDesc.endpointID === 0x1) {
@@ -505,7 +505,7 @@ class DeconzAdapter extends adapter_1.default {
                     !simpleDesc.inputClusters.includes(0x19) || !simpleDesc.inputClusters.includes(0x0501) ||
                     !simpleDesc.outputClusters.includes(0x01) || !simpleDesc.outputClusters.includes(0x20) || !simpleDesc.outputClusters.includes(0x500) ||
                     !simpleDesc.outputClusters.includes(0x502)) {
-                    debug("missing cluster");
+                    logger_1.logger.debug("missing cluster", NS);
                     ok = false;
                 }
                 if (ok === true) {
@@ -513,18 +513,18 @@ class DeconzAdapter extends adapter_1.default {
                 }
             }
         }
-        debug("setting new simple descriptor");
+        logger_1.logger.debug("setting new simple descriptor", NS);
         try { //[ 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);
         }
         catch (error) {
-            debug("error setting simple descriptor - try again");
+            logger_1.logger.debug("error setting simple descriptor - try again", NS);
             this.checkCoordinatorSimpleDescriptor(true);
             return;
         }
-        debug("success setting simple descriptor");
+        logger_1.logger.debug("success setting simple descriptor", NS);
     }
     waitFor(networkAddress, endpoint, frameType, direction, transactionSequenceNumber, clusterID, commandIdentifier, timeout) {
         const payload = {
@@ -539,115 +539,116 @@ class DeconzAdapter extends adapter_1.default {
         const transactionID = this.nextTransactionID();
         const request = {};
         let pay = zclFrame.toBuffer();
-        //console.log("zclFramte.toBuffer:");
-        //console.log(pay);
+        //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.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 command = zclFrame.getCommand();
+        const command = zclFrame.command;
         this.driver.enqueueSendDataRequest(request)
             .then(result => {
-            debug(`sendZclFrameToEndpoint - message send with transSeq Nr.: ${zclFrame.Header.transactionSequenceNumber}`);
-            debug(command.hasOwnProperty('response') + ", " + zclFrame.Header.frameControl.disableDefaultResponse + ", " + disableResponse + ", " + request.timeout);
-            if (!command.hasOwnProperty('response') || zclFrame.Header.frameControl.disableDefaultResponse || !disableResponse) {
-                debug(`resolve request (${zclFrame.Header.transactionSequenceNumber})`);
+            logger_1.logger.debug(`sendZclFrameToEndpoint - message send with transSeq Nr.: ${zclFrame.header.transactionSequenceNumber}`, NS);
+            logger_1.logger.debug(command.hasOwnProperty('response') + ", " + zclFrame.header.frameControl.disableDefaultResponse + ", " + disableResponse + ", " + request.timeout, NS);
+            if (!command.hasOwnProperty('response') || zclFrame.header.frameControl.disableDefaultResponse || !disableResponse) {
+                logger_1.logger.debug(`resolve request (${zclFrame.header.transactionSequenceNumber})`, NS);
                 return Promise.resolve();
             }
         })
             .catch(error => {
-            debug(`sendZclFrameToEndpoint ERROR (${zclFrame.Header.transactionSequenceNumber})`);
-            debug(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));
         });
         try {
             let data = null;
-            if ((command.hasOwnProperty('response') && !disableResponse) || !zclFrame.Header.frameControl.disableDefaultResponse) {
-                data = await this.waitForData(networkAddress, 0x104, zclFrame.Cluster.ID, zclFrame.Header.transactionSequenceNumber, request.timeout);
+            if ((command.hasOwnProperty('response') && !disableResponse) || !zclFrame.header.frameControl.disableDefaultResponse) {
+                data = await this.waitForData(networkAddress, 0x104, zclFrame.cluster.ID, zclFrame.header.transactionSequenceNumber, request.timeout);
             }
             if (data !== null) {
                 const asdu = data.asduPayload;
                 const buffer = Buffer.from(asdu);
-                const frame = zcl_1.ZclFrame.fromBuffer(zclFrame.Cluster.ID, buffer);
                 const response = {
                     address: (data.srcAddrMode === 0x02) ? data.srcAddr16 : null,
-                    frame: frame,
+                    data: buffer,
+                    clusterID: zclFrame.cluster.ID,
+                    header: Zcl.Header.fromBuffer(buffer),
                     endpoint: data.srcEndpoint,
                     linkquality: data.lqi,
                     groupID: (data.srcAddrMode === 0x01) ? data.srcAddr16 : null,
                     wasBroadcast: data.srcAddrMode === 0x01 || data.srcAddrMode === 0xF,
                     destinationEndpoint: data.destEndpoint,
                 };
-                debug(`response received (${zclFrame.Header.transactionSequenceNumber})`);
+                logger_1.logger.debug(`response received (${zclFrame.header.transactionSequenceNumber})`, NS);
                 return response;
             }
             else {
-                debug(`no response expected (${zclFrame.Header.transactionSequenceNumber})`);
+                logger_1.logger.debug(`no response expected (${zclFrame.header.transactionSequenceNumber})`, NS);
                 return null;
             }
         }
         catch (error) {
-            throw new Error(`no response received (${zclFrame.Header.transactionSequenceNumber})`);
+            throw new Error(`no response received (${zclFrame.header.transactionSequenceNumber})`);
         }
     }
     async sendZclFrameToGroup(groupID, zclFrame) {
         const transactionID = this.nextTransactionID();
         const request = {};
         let pay = zclFrame.toBuffer();
-        debug("zclFrame to group - zclFrame.payload:");
-        debug(zclFrame.Payload);
-        //console.log("zclFramte.toBuffer:");
-        //console.log(pay);
+        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.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;
         try {
-            debug(`sendZclFrameToGroup - message send`);
+            logger_1.logger.debug(`sendZclFrameToGroup - message send`, NS);
             return this.driver.enqueueSendDataRequest(request);
         }
         catch (error) {
-            //debug(`sendZclFrameToGroup ERROR: ${error}`);
+            //logger.debug(`sendZclFrameToGroup ERROR: ${error}`, NS);
             throw new Error(error);
         }
     }
-    async sendZclFrameToAll(endpoint, zclFrame, sourceEndpoint) {
+    async sendZclFrameToAll(endpoint, zclFrame, sourceEndpoint, destination) {
         const transactionID = this.nextTransactionID();
         const request = {};
         let pay = zclFrame.toBuffer();
-        debug("zclFrame to all - zclFrame.payload:");
-        debug(zclFrame.Payload);
+        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 = 0xFFFD;
+        request.destAddr16 = destination;
         request.destEndpoint = endpoint;
         request.profileId = sourceEndpoint === 242 && endpoint === 242 ? 0xa1e0 : 0x104;
-        request.clusterId = zclFrame.Cluster.ID;
+        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;
         try {
-            debug(`sendZclFrameToAll - message send`);
+            logger_1.logger.debug(`sendZclFrameToAll - message send`, NS);
             return this.driver.enqueueSendDataRequest(request);
         }
         catch (error) {
-            //debug(`sendZclFrameToAll ERROR: ${error}`);
+            //logger.debug(`sendZclFrameToAll ERROR: ${error}`, NS);
             throw new Error(error);
         }
     }
@@ -684,13 +685,13 @@ class DeconzAdapter extends adapter_1.default {
         try {
             const d = await this.waitForData(destinationNetworkAddress, 0, 0x8021);
             const data = d.asduPayload;
-            debug("BIND RESPONSE - addr: 0x" + destinationNetworkAddress.toString(16) + " status: " + data[1]);
+            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) {
-            debug("BIND FAILED - addr: 0x" + destinationNetworkAddress.toString(16) + " " + error);
+            logger_1.logger.debug("BIND FAILED - addr: 0x" + destinationNetworkAddress.toString(16) + " " + error, NS);
             throw new Error(error);
         }
     }
@@ -727,13 +728,13 @@ class DeconzAdapter extends adapter_1.default {
         try {
             const d = await this.waitForData(destinationNetworkAddress, 0, 0x8022);
             const data = d.asduPayload;
-            debug("UNBIND RESPONSE - addr: 0x" + destinationNetworkAddress.toString(16) + " status: " + data[1]);
+            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) {
-            debug("UNBIND FAILED - addr: 0x" + destinationNetworkAddress.toString(16) + " " + error);
+            logger_1.logger.debug("UNBIND FAILED - addr: 0x" + destinationNetworkAddress.toString(16) + " " + error, NS);
             throw new Error(error);
         }
     }
@@ -761,7 +762,7 @@ class DeconzAdapter extends adapter_1.default {
         try {
             const d = await this.waitForData(networkAddress, 0, 0x8034);
             const data = d.asduPayload;
-            debug("REMOVE_DEVICE - addr: 0x" + networkAddress.toString(16) + " status: " + data[1]);
+            logger_1.logger.debug("REMOVE_DEVICE - addr: 0x" + networkAddress.toString(16) + " status: " + data[1], NS);
             const payload = {
                 networkAddress: networkAddress,
                 ieeeAddr: ieeeAddr,
@@ -772,7 +773,7 @@ class DeconzAdapter extends adapter_1.default {
             this.emit(Events.Events.deviceLeave, payload);
         }
         catch (error) {
-            debug("REMOVE_DEVICE FAILED - addr: 0x" + networkAddress.toString(16) + " " + error);
+            logger_1.logger.debug("REMOVE_DEVICE FAILED - addr: 0x" + networkAddress.toString(16) + " " + error, NS);
             throw new Error(error);
         }
     }
@@ -791,7 +792,7 @@ class DeconzAdapter extends adapter_1.default {
             let networkKey = await this.driver.readParameterRequest(constants_1.default.PARAM.Network.NETWORK_KEY);
             // check current channel against configuration.yaml
             if (this.networkOptions.channelList[0] !== channel) {
-                debug("Channel in configuration.yaml (" + this.networkOptions.channelList[0] + ") differs from current channel (" + channel + "). Changing 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:
@@ -851,43 +852,43 @@ class DeconzAdapter extends adapter_1.default {
                     changed = true;
                 }
                 catch (error) {
-                    debug("Could not set channel: " + error);
+                    logger_1.logger.debug("Could not set channel: " + error, NS);
                 }
             }
             // check current panid against configuration.yaml
             if (this.networkOptions.panID !== panid) {
-                debug("panid in configuration.yaml (" + this.networkOptions.panID + ") differs from current panid (" + panid + "). Changing 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 this.sleep(500);
                     changed = true;
                 }
                 catch (error) {
-                    debug("Could not set panid: " + error);
+                    logger_1.logger.debug("Could not set panid: " + error, NS);
                 }
             }
             // check current extended_panid against configuration.yaml
             if (this.driver.generalArrayToString(this.networkOptions.extendedPanID, 8) !== expanid) {
-                debug("extended panid in configuration.yaml (" + this.driver.macAddrArrayToString(this.networkOptions.extendedPanID) + ") differs from current extended panid (" + expanid + "). Changing extended panid.");
+                logger_1.logger.debug("extended panid in configuration.yaml (" + this.driver.macAddrArrayToString(this.networkOptions.extendedPanID) + ") differs from current extended panid (" + expanid + "). 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);
                     changed = true;
                 }
                 catch (error) {
-                    debug("Could not set extended panid: " + error);
+                    logger_1.logger.debug("Could not set extended panid: " + error, NS);
                 }
             }
             // check current network key against configuration.yaml
             if (this.driver.generalArrayToString(this.networkOptions.networkKey, 16) !== networkKey) {
-                debug("network key in configuration.yaml (hidden) differs from current network key (" + networkKey + "). Changing network key.");
+                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);
                     changed = true;
                 }
                 catch (error) {
-                    debug("Could not set network key: " + error);
+                    logger_1.logger.debug("Could not set network key: " + error, NS);
                 }
             }
             if (changed) {
@@ -895,10 +896,10 @@ class DeconzAdapter extends adapter_1.default {
                 await this.sleep(2000);
                 await this.driver.changeNetworkStateRequest(constants_1.default.PARAM.Network.NET_CONNECTED);
                 await this.sleep(2000);
-                let panid = await this.driver.readParameterRequest(constants_1.default.PARAM.Network.PAN_ID);
-                let expanid = await this.driver.readParameterRequest(constants_1.default.PARAM.Network.APS_EXT_PAN_ID);
-                let channel = await this.driver.readParameterRequest(constants_1.default.PARAM.Network.CHANNEL);
-                let networkKey = await this.driver.readParameterRequest(constants_1.default.PARAM.Network.NETWORK_KEY);
+                panid = await this.driver.readParameterRequest(constants_1.default.PARAM.Network.PAN_ID);
+                expanid = await this.driver.readParameterRequest(constants_1.default.PARAM.Network.APS_EXT_PAN_ID);
+                channel = await this.driver.readParameterRequest(constants_1.default.PARAM.Network.CHANNEL);
+                networkKey = await this.driver.readParameterRequest(constants_1.default.PARAM.Network.NETWORK_KEY);
             }
             return {
                 panID: panid,
@@ -908,7 +909,7 @@ class DeconzAdapter extends adapter_1.default {
         }
         catch (error) {
             const msg = "get network parameters Error:" + error;
-            debug(msg);
+            logger_1.logger.debug(msg, NS);
             return Promise.reject(new Error(msg));
         }
     }
@@ -927,6 +928,12 @@ class DeconzAdapter extends adapter_1.default {
     async setChannelInterPAN(channel) {
         throw new Error("not supported");
     }
+    async supportsChangeChannel() {
+        return false;
+    }
+    async changeChannel(newChannel) {
+        throw new Error("not supported");
+    }
     async setTransmitPower(value) {
         throw new Error("not supported");
     }
@@ -957,7 +964,9 @@ class DeconzAdapter extends adapter_1.default {
             ind.commandId, ind.commandFrameSize].concat(ind.commandFrame);
         const payBuf = Buffer.from(gpFrame);
         const payload = {
-            frame: zcl_1.ZclFrame.fromBuffer(ind.clusterId, payBuf),
+            header: Zcl.Header.fromBuffer(payBuf),
+            data: payBuf,
+            clusterID: ind.clusterId,
             address: ind.srcId,
             endpoint: 242, // GP endpoint
             linkquality: 127,
@@ -966,20 +975,16 @@ class DeconzAdapter extends adapter_1.default {
             destinationEndpoint: 1,
         };
         this.waitress.resolve(payload);
-        this.emit(Events.Events.zclData, payload);
+        this.emit(Events.Events.zclPayload, payload);
     }
     checkReceivedDataPayload(resp) {
         let srcAddr = null;
-        let frame = null;
+        let header = null;
+        const payBuf = resp != null ? Buffer.from(resp.asduPayload) : null;
         if (resp != null) {
             srcAddr = (resp.srcAddr16 != null) ? resp.srcAddr16 : resp.srcAddr64;
             if (resp.profileId != 0x00) {
-                try {
-                    frame = zcl_1.ZclFrame.fromBuffer(resp.clusterId, Buffer.from(resp.asduPayload));
-                }
-                catch (error) {
-                    debug("could not parse zclFrame: " + error);
-                }
+                header = Zcl.Header.fromBuffer(payBuf);
             }
         }
         let i = this.openRequestsQueue.length;
@@ -987,15 +992,15 @@ class DeconzAdapter extends adapter_1.default {
             const req = this.openRequestsQueue[i];
             if (srcAddr != null && req.addr === srcAddr && req.clusterId === resp.clusterId &&
                 req.profileId === resp.profileId) {
-                if (frame !== null && req.transactionSequenceNumber !== null && req.transactionSequenceNumber !== undefined) {
-                    if (req.transactionSequenceNumber === frame.Header.transactionSequenceNumber) {
-                        debug("resolve data request with transSeq Nr.: " + req.transactionSequenceNumber);
+                if (header !== null && req.transactionSequenceNumber !== null && 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 {
-                    debug("resolve data request without a transSeq Nr.");
+                    logger_1.logger.debug("resolve data request without a transSeq Nr.", NS);
                     this.openRequestsQueue.splice(i, 1);
                     req.resolve(resp);
                 }
@@ -1004,7 +1009,7 @@ class DeconzAdapter extends adapter_1.default {
             // Default timeout: 60 seconds.
             // Comparison is negated to prevent orphans when invalid timeout is entered (resulting in NaN).
             if (!((now - req.ts) <= (req.timeout ?? 60000))) {
-                //debug("Timeout for request in openRequestsQueue addr: " + req.addr.toString(16) + " clusterId: " + req.clusterId.toString(16) + " profileId: " + req.profileId.toString(16));
+                //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");
@@ -1013,7 +1018,6 @@ class DeconzAdapter extends adapter_1.default {
         // check unattended incomming messages
         if (resp != null && resp.profileId === 0x00 && resp.clusterId === 0x13) {
             // device Annce
-            const payBuf = Buffer.from(resp.asduPayload);
             const payload = {
                 networkAddress: payBuf.readUInt16LE(1),
                 ieeeAddr: this.driver.macAddrArrayToString(resp.asduPayload.slice(3, 11)),
@@ -1026,33 +1030,19 @@ class DeconzAdapter extends adapter_1.default {
             }
         }
         if (resp != null && resp.profileId != 0x00) {
-            const payBuf = Buffer.from(resp.asduPayload);
-            try {
-                const payload = {
-                    frame: zcl_1.ZclFrame.fromBuffer(resp.clusterId, payBuf),
-                    address: (resp.destAddrMode === 0x03) ? resp.srcAddr64 : resp.srcAddr16,
-                    endpoint: resp.srcEndpoint,
-                    linkquality: resp.lqi,
-                    groupID: (resp.destAddrMode === 0x01) ? resp.destAddr16 : null,
-                    wasBroadcast: resp.destAddrMode === 0x01 || resp.destAddrMode === 0xF,
-                    destinationEndpoint: resp.destEndpoint,
-                };
-                this.waitress.resolve(payload);
-                this.emit(Events.Events.zclData, payload);
-            }
-            catch (error) {
-                const payload = {
-                    clusterID: resp.clusterId,
-                    data: payBuf,
-                    address: (resp.destAddrMode === 0x03) ? resp.srcAddr64 : resp.srcAddr16,
-                    endpoint: resp.srcEndpoint,
-                    linkquality: resp.lqi,
-                    groupID: (resp.destAddrMode === 0x01) ? resp.destAddr16 : null,
-                    wasBroadcast: resp.destAddrMode === 0x01 || resp.destAddrMode === 0xF,
-                    destinationEndpoint: resp.destEndpoint,
-                };
-                this.emit(Events.Events.rawData, payload);
-            }
+            const payload = {
+                clusterID: resp.clusterId,
+                header,
+                data: payBuf,
+                address: (resp.destAddrMode === 0x03) ? resp.srcAddr64 : resp.srcAddr16,
+                endpoint: resp.srcEndpoint,
+                linkquality: resp.lqi,
+                groupID: (resp.destAddrMode === 0x01) ? resp.destAddr16 : null,
+                wasBroadcast: resp.destAddrMode === 0x01 || resp.destAddrMode === 0xF,
+                destinationEndpoint: resp.destEndpoint,
+            };
+            this.waitress.resolve(payload);
+            this.emit(Events.Events.zclPayload, payload);
         }
     }
     nextTransactionID() {
@@ -1068,14 +1058,14 @@ class DeconzAdapter extends adapter_1.default {
             ` - ${matcher.commandIdentifier} after ${timeout}ms`;
     }
     waitressValidator(payload, matcher) {
-        const transactionSequenceNumber = payload.frame.Header.transactionSequenceNumber;
-        return (!matcher.address || payload.address === matcher.address) &&
+        return payload.header &&
+            (!matcher.address || payload.address === matcher.address) &&
             payload.endpoint === matcher.endpoint &&
-            (!matcher.transactionSequenceNumber || transactionSequenceNumber === matcher.transactionSequenceNumber) &&
-            payload.frame.Cluster.ID === matcher.clusterID &&
-            matcher.frameType === payload.frame.Header.frameControl.frameType &&
-            matcher.commandIdentifier === payload.frame.Header.commandIdentifier &&
-            matcher.direction === payload.frame.Header.frameControl.direction;
+            (!matcher.transactionSequenceNumber || payload.header.transactionSequenceNumber === matcher.transactionSequenceNumber) &&
+            payload.clusterID === matcher.clusterID &&
+            matcher.frameType === payload.header.frameControl.frameType &&
+            matcher.commandIdentifier === payload.header.commandIdentifier &&
+            matcher.direction === payload.header.frameControl.direction;
     }
 }
 exports.default = DeconzAdapter;