zigbee-herdsman 0.55.5 → 0.56.0

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

@@ -26,23 +26,23 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const adapter_1 = __importDefault(require("../../adapter"));
-const driver_1 = __importDefault(require("../driver/driver"));
-const Zcl = __importStar(require("../../../zspec/zcl"));
-const Events = __importStar(require("../../events"));
-const frameParser_1 = __importDefault(require("../driver/frameParser"));
+/* istanbul ignore file */
+const assert_1 = __importDefault(require("assert"));
+const device_1 = __importDefault(require("../../../controller/model/device"));
 const utils_1 = require("../../../utils");
-const constants_1 = __importDefault(require("../driver/constants"));
 const logger_1 = require("../../../utils/logger");
-const device_1 = __importDefault(require("../../../controller/model/device"));
+const Zcl = __importStar(require("../../../zspec/zcl"));
+const adapter_1 = __importDefault(require("../../adapter"));
+const constants_1 = __importDefault(require("../driver/constants"));
+const driver_1 = __importDefault(require("../driver/driver"));
+const frameParser_1 = __importStar(require("../driver/frameParser"));
 const NS = 'zh:deconz';
-var frameParser = require('../driver/frameParser');
 class DeconzAdapter extends adapter_1.default {
     driver;
     queue;
     openRequestsQueue;
     transactionID;
-    frameParserEvent = frameParser.frameParserEvents;
+    frameParserEvent = frameParser_1.frameParserEvents;
     joinPermitted;
     fwVersion;
     waitress;
@@ -65,19 +65,18 @@ class DeconzAdapter extends adapter_1.default {
         this.transactionID = 0;
         this.openRequestsQueue = [];
         this.joinPermitted = false;
-        this.fwVersion = null;
+        this.fwVersion = undefined;
         this.frameParserEvent.on('receivedDataPayload', (data) => {
             this.checkReceivedDataPayload(data);
         });
         this.frameParserEvent.on('receivedGreenPowerIndication', (data) => {
             this.checkReceivedGreenPowerIndication(data);
         });
-        const that = this;
         setInterval(() => {
-            that.checkReceivedDataPayload(null);
+            this.checkReceivedDataPayload(null);
         }, 1000);
-        setTimeout(() => {
-            that.checkCoordinatorSimpleDescriptor(false);
+        setTimeout(async () => {
+            await this.checkCoordinatorSimpleDescriptor(false);
         }, 3000);
     }
     static async isValidPath(path) {
@@ -90,13 +89,13 @@ class DeconzAdapter extends adapter_1.default {
      * Adapter methods
      */
     async start() {
-        let baudrate = this.serialPortOptions.baudRate || 38400;
+        const baudrate = this.serialPortOptions.baudRate || 38400;
         await this.driver.open(baudrate);
         let changed = false;
-        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);
+        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 (' +
@@ -274,20 +273,20 @@ class DeconzAdapter extends adapter_1.default {
             const msg = 'PERMIT_JOIN FAILED - ' + error;
             logger_1.logger.debug(msg, NS);
             // try again
-            this.permitJoin(seconds, networkAddress);
+            await this.permitJoin(seconds, networkAddress);
             //return Promise.reject(new Error(msg)); // do not reject
         }
     }
     async getCoordinatorVersion() {
         // product: number; transportrev: number; majorrel: number; minorrel: number; maintrel: number; revision: string;
-        if (this.fwVersion != null) {
+        if (this.fwVersion != undefined) {
             return this.fwVersion;
         }
         else {
             try {
                 const fw = await this.driver.readFirmwareVersionRequest();
                 const buf = Buffer.from(fw);
-                let fwString = '0x' + buf.readUInt32LE(0).toString(16);
+                const fwString = '0x' + buf.readUInt32LE(0).toString(16);
                 let type = '';
                 if (fw[1] === 5) {
                     type = 'ConBee/RaspBee';
@@ -303,13 +302,15 @@ class DeconzAdapter extends adapter_1.default {
                 return { type: type, meta: meta };
             }
             catch (error) {
-                logger_1.logger.debug('Get coordinator version Error: ' + error, NS);
+                throw new Error('Get coordinator version Error: ' + error);
             }
         }
     }
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     async addInstallCode(ieeeAddress, key) {
         return Promise.reject(new Error('Add install code is not supported'));
     }
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     async reset(type) {
         return Promise.reject(new Error('Reset is not supported'));
     }
@@ -347,8 +348,8 @@ class DeconzAdapter extends adapter_1.default {
             req.radius = constants_1.default.PARAM.txRadius.DEFAULT_RADIUS;
             this.driver
                 .enqueueSendDataRequest(req)
-                .then((result) => { })
-                .catch((error) => { });
+                .then(() => { })
+                .catch(() => { });
             try {
                 const d = await this.waitForData(networkAddress, 0, 0x8031);
                 const data = d.asduPayload;
@@ -442,8 +443,8 @@ class DeconzAdapter extends adapter_1.default {
             req.timeout = 30;
             this.driver
                 .enqueueSendDataRequest(req)
-                .then((result) => { })
-                .catch((error) => { });
+                .then(() => { })
+                .catch(() => { });
             try {
                 const d = await this.waitForData(networkAddress, 0, 0x8032);
                 const data = d.asduPayload;
@@ -518,8 +519,8 @@ class DeconzAdapter extends adapter_1.default {
         request.timeout = 30;
         this.driver
             .enqueueSendDataRequest(request)
-            .then((result) => { })
-            .catch((error) => { });
+            .then(() => { })
+            .catch(() => { });
         try {
             const d = await this.waitForData(networkAddress, 0, 0x8002);
             const data = d.asduPayload;
@@ -561,8 +562,8 @@ class DeconzAdapter extends adapter_1.default {
         request.timeout = 30;
         this.driver
             .enqueueSendDataRequest(request)
-            .then((result) => { })
-            .catch((error) => { });
+            .then(() => { })
+            .catch(() => { });
         try {
             const d = await this.waitForData(networkAddress, 0, 0x8005);
             const data = d.asduPayload;
@@ -601,8 +602,8 @@ class DeconzAdapter extends adapter_1.default {
         request.timeout = 30;
         this.driver
             .enqueueSendDataRequest(request)
-            .then((result) => { })
-            .catch((error) => { });
+            .then(() => { })
+            .catch(() => { });
         try {
             const d = await this.waitForData(networkAddress, 0, 0x8004);
             const data = d.asduPayload;
@@ -646,14 +647,14 @@ class DeconzAdapter extends adapter_1.default {
     }
     async checkCoordinatorSimpleDescriptor(skip) {
         logger_1.logger.debug('checking coordinator simple descriptor', NS);
-        var simpleDesc = null;
+        let simpleDesc;
         if (skip === false) {
             try {
                 simpleDesc = await this.simpleDescriptor(0x0, 1);
             }
-            catch (error) { }
-            if (simpleDesc === null) {
-                this.checkCoordinatorSimpleDescriptor(false);
+            catch { }
+            if (simpleDesc == undefined) {
+                await this.checkCoordinatorSimpleDescriptor(false);
                 return;
             }
             logger_1.logger.debug('EP: ' + simpleDesc.endpointID, NS);
@@ -695,8 +696,8 @@ class DeconzAdapter extends adapter_1.default {
             await this.driver.writeParameterRequest(constants_1.default.PARAM.STK.Endpoint, sd1);
         }
         catch (error) {
-            logger_1.logger.debug('error setting simple descriptor - try again', NS);
-            this.checkCoordinatorSimpleDescriptor(true);
+            logger_1.logger.debug(`error setting simple descriptor: ${error} - try again`, NS);
+            await this.checkCoordinatorSimpleDescriptor(true);
             return;
         }
         logger_1.logger.debug('success setting simple descriptor', NS);
@@ -718,7 +719,7 @@ class DeconzAdapter extends adapter_1.default {
     async sendZclFrameToEndpoint(ieeeAddr, networkAddress, endpoint, zclFrame, timeout, disableResponse, disableRecovery, sourceEndpoint) {
         const transactionID = this.nextTransactionID();
         const request = {};
-        let pay = zclFrame.toBuffer();
+        const pay = zclFrame.toBuffer();
         //logger.info("zclFramte.toBuffer:", NS);
         //logger.info(pay, NS);
         request.requestId = transactionID;
@@ -736,7 +737,7 @@ class DeconzAdapter extends adapter_1.default {
         const command = zclFrame.command;
         this.driver
             .enqueueSendDataRequest(request)
-            .then((result) => {
+            .then(() => {
             logger_1.logger.debug(`sendZclFrameToEndpoint - message send with transSeq Nr.: ${zclFrame.header.transactionSequenceNumber}`, NS);
             logger_1.logger.debug(command.hasOwnProperty('response') +
                 ', ' +
@@ -745,7 +746,7 @@ class DeconzAdapter extends adapter_1.default {
                 disableResponse +
                 ', ' +
                 request.timeout, NS);
-            if (!command.hasOwnProperty('response') || zclFrame.header.frameControl.disableDefaultResponse || !disableResponse) {
+            if (command.response == undefined || zclFrame.header.frameControl.disableDefaultResponse || !disableResponse) {
                 logger_1.logger.debug(`resolve request (${zclFrame.header.transactionSequenceNumber})`, NS);
                 return Promise.resolve();
             }
@@ -757,20 +758,20 @@ class DeconzAdapter extends adapter_1.default {
         });
         try {
             let data = null;
-            if ((command.hasOwnProperty('response') && !disableResponse) || !zclFrame.header.frameControl.disableDefaultResponse) {
+            if ((command.response != undefined && !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 response = {
-                    address: data.srcAddrMode === 0x02 ? data.srcAddr16 : null,
+                    address: data.srcAddr16 ?? `0x${data.srcAddr64}`,
                     data: buffer,
                     clusterID: zclFrame.cluster.ID,
                     header: Zcl.Header.fromBuffer(buffer),
                     endpoint: data.srcEndpoint,
                     linkquality: data.lqi,
-                    groupID: data.srcAddrMode === 0x01 ? data.srcAddr16 : null,
+                    groupID: data.srcAddrMode === 0x01 ? data.srcAddr16 : 0,
                     wasBroadcast: data.srcAddrMode === 0x01 || data.srcAddrMode === 0xf,
                     destinationEndpoint: data.destEndpoint,
                 };
@@ -779,17 +780,16 @@ class DeconzAdapter extends adapter_1.default {
             }
             else {
                 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}) ${error}`);
         }
     }
     async sendZclFrameToGroup(groupID, zclFrame) {
         const transactionID = this.nextTransactionID();
         const request = {};
-        let pay = zclFrame.toBuffer();
+        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);
@@ -810,13 +810,13 @@ class DeconzAdapter extends adapter_1.default {
         }
         catch (error) {
             //logger.debug(`sendZclFrameToGroup ERROR: ${error}`, NS);
-            throw new Error(error);
+            throw error;
         }
     }
     async sendZclFrameToAll(endpoint, zclFrame, sourceEndpoint, destination) {
         const transactionID = this.nextTransactionID();
         const request = {};
-        let pay = zclFrame.toBuffer();
+        const pay = zclFrame.toBuffer();
         logger_1.logger.debug('zclFrame to all - zclFrame.payload:', NS);
         logger_1.logger.debug(zclFrame.payload, NS);
         request.requestId = transactionID;
@@ -836,7 +836,7 @@ class DeconzAdapter extends adapter_1.default {
         }
         catch (error) {
             //logger.debug(`sendZclFrameToAll ERROR: ${error}`, NS);
-            throw new Error(error);
+            throw error;
         }
     }
     async bind(destinationNetworkAddress, sourceIeeeAddress, sourceEndpoint, clusterID, destinationAddressOrGroup, type, destinationEndpoint) {
@@ -846,6 +846,7 @@ class DeconzAdapter extends adapter_1.default {
         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]);
         }
@@ -871,8 +872,8 @@ class DeconzAdapter extends adapter_1.default {
         request.timeout = 30;
         this.driver
             .enqueueSendDataRequest(request)
-            .then((result) => { })
-            .catch((error) => { });
+            .then(() => { })
+            .catch(() => { });
         try {
             const d = await this.waitForData(destinationNetworkAddress, 0, 0x8021);
             const data = d.asduPayload;
@@ -883,7 +884,7 @@ class DeconzAdapter extends adapter_1.default {
         }
         catch (error) {
             logger_1.logger.debug('BIND FAILED - addr: 0x' + destinationNetworkAddress.toString(16) + ' ' + error, NS);
-            throw new Error(error);
+            throw error;
         }
     }
     async unbind(destinationNetworkAddress, sourceIeeeAddress, sourceEndpoint, clusterID, destinationAddressOrGroup, type, destinationEndpoint) {
@@ -893,6 +894,7 @@ class DeconzAdapter extends adapter_1.default {
         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]);
         }
@@ -918,8 +920,8 @@ class DeconzAdapter extends adapter_1.default {
         request.timeout = 30;
         this.driver
             .enqueueSendDataRequest(request)
-            .then((result) => { })
-            .catch((error) => { });
+            .then(() => { })
+            .catch(() => { });
         try {
             const d = await this.waitForData(destinationNetworkAddress, 0, 0x8022);
             const data = d.asduPayload;
@@ -930,13 +932,13 @@ class DeconzAdapter extends adapter_1.default {
         }
         catch (error) {
             logger_1.logger.debug('UNBIND FAILED - addr: 0x' + destinationNetworkAddress.toString(16) + ' ' + error, NS);
-            throw new Error(error);
+            throw error;
         }
     }
     async removeDevice(networkAddress, ieeeAddr) {
         const transactionID = this.nextTransactionID();
-        const nwk1 = networkAddress & 0xff;
-        const nwk2 = (networkAddress >> 8) & 0xff;
+        // 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]);
@@ -953,8 +955,8 @@ class DeconzAdapter extends adapter_1.default {
         request.radius = constants_1.default.PARAM.txRadius.DEFAULT_RADIUS;
         this.driver
             .enqueueSendDataRequest(request)
-            .then((result) => { })
-            .catch((error) => { });
+            .then(() => { })
+            .catch(() => { });
         try {
             const d = await this.waitForData(networkAddress, 0, 0x8034);
             const data = d.asduPayload;
@@ -966,11 +968,11 @@ class DeconzAdapter extends adapter_1.default {
             if (data[1] !== 0) {
                 throw new Error('status: ' + data[1]);
             }
-            this.emit(Events.Events.deviceLeave, payload);
+            this.emit('deviceLeave', payload);
         }
         catch (error) {
             logger_1.logger.debug('REMOVE_DEVICE FAILED - addr: 0x' + networkAddress.toString(16) + ' ' + error, NS);
-            throw new Error(error);
+            throw error;
         }
     }
     async supportsBackup() {
@@ -981,9 +983,9 @@ class DeconzAdapter extends adapter_1.default {
     }
     async getNetworkParameters() {
         try {
-            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);
+            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);
             return {
                 panID: panid,
                 extendedPanID: expanid,
@@ -999,24 +1001,31 @@ class DeconzAdapter extends adapter_1.default {
     async restoreChannelInterPAN() {
         throw new Error('not supported');
     }
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     async sendZclFrameInterPANToIeeeAddr(zclFrame, ieeeAddr) {
         throw new Error('not supported');
     }
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     async sendZclFrameInterPANBroadcast(zclFrame, timeout) {
         throw new Error('not supported');
     }
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     async sendZclFrameInterPANBroadcastWithResponse(zclFrame, timeout) {
         throw new Error('not supported');
     }
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     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'`);
     }
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     async setTransmitPower(value) {
         throw new Error('not supported');
     }
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     async sendZclFrameInterPANIeeeAddr(zclFrame, ieeeAddr) {
         throw new Error('not supported');
     }
@@ -1029,14 +1038,14 @@ class DeconzAdapter extends adapter_1.default {
     waitForData(addr, profileId, clusterId, transactionSequenceNumber, timeout) {
         return new Promise((resolve, reject) => {
             const ts = Date.now();
-            const commandId = constants_1.default.PARAM.APS.DATA_INDICATION;
+            // const commandId = PARAM.PARAM.APS.DATA_INDICATION;
             const req = { addr, profileId, clusterId, transactionSequenceNumber, resolve, reject, ts, timeout };
             this.openRequestsQueue.push(req);
         });
     }
     checkReceivedGreenPowerIndication(ind) {
         ind.clusterId = 0x21;
-        let gpFrame = [
+        const gpFrame = [
             ind.rspId,
             ind.seqNr,
             ind.id,
@@ -1067,12 +1076,12 @@ class DeconzAdapter extends adapter_1.default {
             destinationEndpoint: 1,
         };
         this.waitress.resolve(payload);
-        this.emit(Events.Events.zclPayload, payload);
+        this.emit('zclPayload', payload);
     }
     checkReceivedDataPayload(resp) {
-        let srcAddr = null;
-        let header = null;
-        const payBuf = resp != null ? Buffer.from(resp.asduPayload) : null;
+        let srcAddr = undefined;
+        let header;
+        const payBuf = resp != null ? Buffer.from(resp.asduPayload) : undefined;
         if (resp != null) {
             if (resp.srcAddr16 != null) {
                 srcAddr = resp.srcAddr16;
@@ -1085,34 +1094,32 @@ class DeconzAdapter extends adapter_1.default {
                 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...
-                    let device = device_1.default.byIeeeAddr('0x' + resp.srcAddr64, false);
-                    if (device != undefined) {
-                        srcAddr = device.networkAddress;
-                    }
+                    srcAddr = device_1.default.byIeeeAddr('0x' + resp.srcAddr64, false)?.networkAddress;
                 }
+                (0, assert_1.default)(srcAddr, 'Failed to find srcAddr of message');
                 // apperantly some functions furhter up in the protocol stack expect this to be set.
                 // so let's make sure they get the network address
-                resp.srcAddr16 = srcAddr;
+                resp.srcAddr16 = srcAddr; // TODO: can't be undefined
             }
             if (resp.profileId != 0x00) {
-                header = Zcl.Header.fromBuffer(payBuf);
+                header = Zcl.Header.fromBuffer(payBuf); // valid from check
             }
         }
         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 !== null && req.transactionSequenceNumber !== null && req.transactionSequenceNumber !== undefined) {
+            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);
+                        req.resolve?.(resp);
                     }
                 }
                 else {
                     logger_1.logger.debug('resolve data request without a transSeq Nr.', NS);
                     this.openRequestsQueue.splice(i, 1);
-                    req.resolve(resp);
+                    req.resolve?.(resp);
                 }
             }
             const now = Date.now();
@@ -1122,37 +1129,37 @@ 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');
+                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),
+                networkAddress: payBuf.readUInt16LE(1), // valid from check
                 ieeeAddr: this.driver.macAddrArrayToString(resp.asduPayload.slice(3, 11)),
             };
             if (this.joinPermitted === true) {
-                this.emit(Events.Events.deviceJoined, payload);
+                this.emit('deviceJoined', payload);
             }
             else {
-                this.emit(Events.Events.deviceAnnounce, payload);
+                this.emit('deviceAnnounce', payload);
             }
         }
         if (resp != null && resp.profileId != 0x00) {
             const payload = {
                 clusterID: resp.clusterId,
                 header,
-                data: payBuf,
-                address: resp.destAddrMode === 0x03 ? resp.srcAddr64 : resp.srcAddr16,
+                data: payBuf, // valid from check
+                address: resp.destAddrMode === 0x03 ? `0x${resp.srcAddr64}` : resp.srcAddr16,
                 endpoint: resp.srcEndpoint,
                 linkquality: resp.lqi,
-                groupID: resp.destAddrMode === 0x01 ? resp.destAddr16 : null,
+                groupID: resp.destAddrMode === 0x01 ? resp.destAddr16 : 0,
                 wasBroadcast: resp.destAddrMode === 0x01 || resp.destAddrMode === 0xf,
                 destinationEndpoint: resp.destEndpoint,
             };
             this.waitress.resolve(payload);
-            this.emit(Events.Events.zclPayload, payload);
+            this.emit('zclPayload', payload);
         }
     }
     nextTransactionID() {
@@ -1168,7 +1175,7 @@ class DeconzAdapter extends adapter_1.default {
             ` - ${matcher.commandIdentifier} after ${timeout}ms`);
     }
     waitressValidator(payload, matcher) {
-        return (payload.header &&
+        return Boolean(payload.header &&
             (!matcher.address || payload.address === matcher.address) &&
             payload.endpoint === matcher.endpoint &&
             (!matcher.transactionSequenceNumber || payload.header.transactionSequenceNumber === matcher.transactionSequenceNumber) &&