zigbee-herdsman 0.42.1 → 0.42.2

package/dist/adapter/ezsp/adapter/ezspAdapter.d.ts

@@ -33,7 +33,7 @@ declare class EZSPAdapter extends Adapter {
     private nodeDescriptorInternal;
     activeEndpoints(networkAddress: number): Promise<ActiveEndpoints>;
     simpleDescriptor(networkAddress: number, endpointID: number): Promise<SimpleDescriptor>;
-    sendZclFrameToEndpoint(ieeeAddr: string, networkAddress: number, endpoint: number, zclFrame: ZclFrame, timeout: number, disableResponse: boolean, disableRecovery: boolean, sourceEndpoint?: number): Promise<Events.ZclDataPayload>;
+    sendZclFrameToEndpoint(ieeeAddr: string, networkAddress: number, endpoint: number, zclFrame: ZclFrame, timeout: number, disableResponse: boolean, disableRecovery: boolean, sourceEndpoint?: number): Promise<Events.ZclPayload>;
     private sendZclFrameToEndpointInternal;
     sendZclFrameToGroup(groupID: number, zclFrame: ZclFrame): Promise<void>;
     sendZclFrameToAll(endpoint: number, zclFrame: ZclFrame, sourceEndpoint: number): Promise<void>;
@@ -46,14 +46,14 @@ declare class EZSPAdapter extends Adapter {
     restoreChannelInterPAN(): Promise<void>;
     private checkInterpanLock;
     sendZclFrameInterPANToIeeeAddr(zclFrame: ZclFrame, ieeeAddr: string): Promise<void>;
-    sendZclFrameInterPANBroadcast(zclFrame: ZclFrame, timeout: number): Promise<Events.ZclDataPayload>;
+    sendZclFrameInterPANBroadcast(zclFrame: ZclFrame, timeout: number): Promise<Events.ZclPayload>;
     supportsChangeChannel(): Promise<boolean>;
     changeChannel(newChannel: number): Promise<void>;
     setTransmitPower(value: number): Promise<void>;
     setChannelInterPAN(channel: number): Promise<void>;
     private waitForInternal;
     waitFor(networkAddress: number, endpoint: number, frameType: FrameType, direction: Direction, transactionSequenceNumber: number, clusterID: number, commandIdentifier: number, timeout: number): {
-        promise: Promise<Events.ZclDataPayload>;
+        promise: Promise<Events.ZclPayload>;
         cancel: () => void;
     };
     private waitressTimeoutFormatter;

package/dist/adapter/ezsp/adapter/ezspAdapter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ezspAdapter.d.ts","sourceRoot":"","sources":["../../../../src/adapter/ezsp/adapter/ezspAdapter.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ezspAdapter.d.ts","sourceRoot":"","sources":["../../../../src/adapter/ezsp/adapter/ezspAdapter.ts"],"names":[],"mappings":"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"}

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

@@ -75,36 +75,25 @@ class EZSPAdapter extends adapter_1.default {
             }
         }
         else if (frame.apsFrame.profileId == 260 || frame.apsFrame.profileId == 0xFFFF) {
-            try {
-                const payload = {
-                    frame: zcl_1.ZclFrame.fromBuffer(frame.apsFrame.clusterId, frame.message),
-                    address: frame.sender,
-                    endpoint: frame.apsFrame.sourceEndpoint,
-                    linkquality: frame.lqi,
-                    groupID: frame.apsFrame.groupId,
-                    wasBroadcast: false, // TODO
-                    destinationEndpoint: frame.apsFrame.destinationEndpoint,
-                };
-                this.waitress.resolve(payload);
-                this.emit(Events.Events.zclData, payload);
-            }
-            catch (error) {
-                const payload = {
-                    clusterID: frame.apsFrame.clusterId,
-                    data: frame.message,
-                    address: frame.sender,
-                    endpoint: frame.apsFrame.sourceEndpoint,
-                    linkquality: frame.lqi,
-                    groupID: frame.apsFrame.groupId,
-                    wasBroadcast: false, // TODO
-                    destinationEndpoint: frame.apsFrame.destinationEndpoint,
-                };
-                this.emit(Events.Events.rawData, payload);
-            }
+            const payload = {
+                clusterID: frame.apsFrame.clusterId,
+                header: zcl_1.ZclHeader.fromBuffer(frame.message),
+                data: frame.message,
+                address: frame.sender,
+                endpoint: frame.apsFrame.sourceEndpoint,
+                linkquality: frame.lqi,
+                groupID: frame.apsFrame.groupId,
+                wasBroadcast: false, // TODO
+                destinationEndpoint: frame.apsFrame.destinationEndpoint,
+            };
+            this.waitress.resolve(payload);
+            this.emit(Events.Events.zclPayload, payload);
         }
         else if (frame.apsFrame.profileId == 0xc05e && frame.senderEui64) { // ZLL Frame
             const payload = {
-                frame: zcl_1.ZclFrame.fromBuffer(frame.apsFrame.clusterId, frame.message),
+                clusterID: frame.apsFrame.clusterId,
+                header: zcl_1.ZclHeader.fromBuffer(frame.message),
+                data: frame.message,
                 address: `0x${frame.senderEui64.toString()}`,
                 endpoint: 0xFE,
                 linkquality: frame.lqi,
@@ -113,16 +102,17 @@ class EZSPAdapter extends adapter_1.default {
                 destinationEndpoint: null,
             };
             this.waitress.resolve(payload);
-            this.emit(Events.Events.zclData, payload);
+            this.emit(Events.Events.zclPayload, payload);
         }
         else if (frame.apsFrame.profileId == 0xA1E0) { // GP Frame
             // Only handle when clusterId == 33 (greenPower), some devices send messages with this profileId
             // while the cluster is not greenPower
             // https://github.com/Koenkk/zigbee2mqtt/issues/20838
             if (frame.apsFrame.clusterId === 33) {
-                const zclFrame = zcl_1.ZclFrame.create(zcl_1.FrameType.SPECIFIC, zcl_1.Direction.CLIENT_TO_SERVER, true, null, frame.apsFrame.sequence, (frame.messageType == 0xE0) ? 'commissioningNotification' : 'notification', frame.apsFrame.clusterId, frame.message);
                 const payload = {
-                    frame: zclFrame,
+                    header: zcl_1.ZclHeader.fromBuffer(frame.message),
+                    clusterID: frame.apsFrame.clusterId,
+                    data: frame.message,
                     address: frame.sender,
                     endpoint: frame.apsFrame.sourceEndpoint,
                     linkquality: frame.lqi,
@@ -131,7 +121,7 @@ class EZSPAdapter extends adapter_1.default {
                     destinationEndpoint: frame.apsFrame.sourceEndpoint,
                 };
                 this.waitress.resolve(payload);
-                this.emit(Events.Events.zclData, payload);
+                this.emit(Events.Events.zclPayload, payload);
             }
             else {
                 logger_1.logger.debug(`Ignoring GP frame because clusterId is not greenPower`, NS);
@@ -378,14 +368,14 @@ class EZSPAdapter extends adapter_1.default {
         logger_1.logger.debug(`sendZclFrameToEndpointInternal ${ieeeAddr}:${networkAddress}/${endpoint} `
             + `(${responseAttempt},${dataRequestAttempt},${this.queue.count()}), timeout=${timeout}`, NS);
         let response = null;
-        const command = zclFrame.getCommand();
+        const command = zclFrame.command;
         if (command.hasOwnProperty('response') && disableResponse === false) {
-            response = this.waitForInternal(networkAddress, endpoint, zclFrame.Header.transactionSequenceNumber, zclFrame.Cluster.ID, command.response, timeout);
+            response = this.waitForInternal(networkAddress, endpoint, zclFrame.header.transactionSequenceNumber, zclFrame.cluster.ID, command.response, timeout);
         }
-        else if (!zclFrame.Header.frameControl.disableDefaultResponse) {
-            response = this.waitForInternal(networkAddress, endpoint, zclFrame.Header.transactionSequenceNumber, zclFrame.Cluster.ID, zcl_1.Foundation.defaultRsp.ID, timeout);
+        else if (!zclFrame.header.frameControl.disableDefaultResponse) {
+            response = this.waitForInternal(networkAddress, endpoint, zclFrame.header.transactionSequenceNumber, zclFrame.cluster.ID, zcl_1.Foundation.defaultRsp.ID, timeout);
         }
-        const frame = this.driver.makeApsFrame(zclFrame.Cluster.ID, disableResponse || zclFrame.Header.frameControl.disableDefaultResponse);
+        const frame = this.driver.makeApsFrame(zclFrame.cluster.ID, disableResponse || zclFrame.header.frameControl.disableDefaultResponse);
         frame.profileId = 0x0104;
         frame.sourceEndpoint = sourceEndpoint || 0x01;
         frame.destinationEndpoint = endpoint;
@@ -420,7 +410,7 @@ class EZSPAdapter extends adapter_1.default {
     async sendZclFrameToGroup(groupID, zclFrame) {
         return this.queue.execute(async () => {
             this.checkInterpanLock();
-            const frame = this.driver.makeApsFrame(zclFrame.Cluster.ID, false);
+            const frame = this.driver.makeApsFrame(zclFrame.cluster.ID, false);
             frame.profileId = 0x0104;
             frame.sourceEndpoint = 0x01;
             frame.destinationEndpoint = 0x01;
@@ -437,7 +427,7 @@ class EZSPAdapter extends adapter_1.default {
     async sendZclFrameToAll(endpoint, zclFrame, sourceEndpoint) {
         return this.queue.execute(async () => {
             this.checkInterpanLock();
-            const frame = this.driver.makeApsFrame(zclFrame.Cluster.ID, false);
+            const frame = this.driver.makeApsFrame(zclFrame.cluster.ID, false);
             frame.profileId = sourceEndpoint === 242 && endpoint === 242 ? 0xA1E0 : 0x0104;
             frame.sourceEndpoint = sourceEndpoint;
             frame.destinationEndpoint = endpoint;
@@ -548,7 +538,7 @@ class EZSPAdapter extends adapter_1.default {
                 frame.sourceAddress = this.driver.ieee;
                 frame.nwkFrameControl = 0x000b;
                 frame.appFrameControl = 0x03;
-                frame.clusterId = zclFrame.Cluster.ID;
+                frame.clusterId = zclFrame.cluster.ID;
                 frame.profileId = 0xc05e;
                 await this.driver.ieeerawrequest(frame, zclFrame.toBuffer());
             }
@@ -560,11 +550,11 @@ class EZSPAdapter extends adapter_1.default {
     async sendZclFrameInterPANBroadcast(zclFrame, timeout) {
         return this.queue.execute(async () => {
             logger_1.logger.debug(`sendZclFrameInterPANBroadcast`, NS);
-            const command = zclFrame.getCommand();
+            const command = zclFrame.command;
             if (!command.hasOwnProperty('response')) {
                 throw new Error(`Command '${command.name}' has no response, cannot wait for response`);
             }
-            const response = this.waitForInternal(null, 0xFE, null, zclFrame.Cluster.ID, command.response, timeout);
+            const response = this.waitForInternal(null, 0xFE, null, zclFrame.cluster.ID, command.response, timeout);
             try {
                 const frame = this.driver.makeEmberRawFrame();
                 frame.ieeeFrameControl = 0xc801;
@@ -574,7 +564,7 @@ class EZSPAdapter extends adapter_1.default {
                 frame.ieeeAddress = this.driver.ieee;
                 frame.nwkFrameControl = 0x000b;
                 frame.appFrameControl = 0x0b;
-                frame.clusterId = zclFrame.Cluster.ID;
+                frame.clusterId = zclFrame.cluster.ID;
                 frame.profileId = 0xc05e;
                 await this.driver.rawrequest(frame, zclFrame.toBuffer());
             }
@@ -623,12 +613,12 @@ class EZSPAdapter 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.commandIdentifier === payload.frame.Header.commandIdentifier;
+            (!matcher.transactionSequenceNumber || payload.header.transactionSequenceNumber === matcher.transactionSequenceNumber) &&
+            payload.clusterID === matcher.clusterID &&
+            matcher.commandIdentifier === payload.header.commandIdentifier;
     }
 }
 exports.default = EZSPAdapter;

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

@@ -1 +1 @@
-{"version":3,"file":"ezspAdapter.js","sourceRoot":"","sources":["../../../../src/adapter/ezsp/adapter/ezspAdapter.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ezspAdapter.js","sourceRoot":"","sources":["../../../../src/adapter/ezsp/adapter/ezspAdapter.ts"],"names":[],"mappings":"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"}

package/dist/adapter/z-stack/adapter/zStackAdapter.d.ts

@@ -38,7 +38,7 @@ declare class ZStackAdapter extends Adapter {
     private nodeDescriptorInternal;
     activeEndpoints(networkAddress: number): Promise<ActiveEndpoints>;
     simpleDescriptor(networkAddress: number, endpointID: number): Promise<SimpleDescriptor>;
-    sendZclFrameToEndpoint(ieeeAddr: string, networkAddress: number, endpoint: number, zclFrame: ZclFrame, timeout: number, disableResponse: boolean, disableRecovery: boolean, sourceEndpoint?: number): Promise<Events.ZclDataPayload>;
+    sendZclFrameToEndpoint(ieeeAddr: string, networkAddress: number, endpoint: number, zclFrame: ZclFrame, timeout: number, disableResponse: boolean, disableRecovery: boolean, sourceEndpoint?: number): Promise<Events.ZclPayload>;
     private sendZclFrameToEndpointInternal;
     sendZclFrameToGroup(groupID: number, zclFrame: ZclFrame, sourceEndpoint?: number): Promise<void>;
     sendZclFrameToAll(endpoint: number, zclFrame: ZclFrame, sourceEndpoint: number): Promise<void>;
@@ -58,14 +58,14 @@ declare class ZStackAdapter extends Adapter {
     backup(ieeeAddressesInDatabase: string[]): Promise<Models.Backup>;
     setChannelInterPAN(channel: number): Promise<void>;
     sendZclFrameInterPANToIeeeAddr(zclFrame: ZclFrame, ieeeAddr: string): Promise<void>;
-    sendZclFrameInterPANBroadcast(zclFrame: ZclFrame, timeout: number): Promise<Events.ZclDataPayload>;
+    sendZclFrameInterPANBroadcast(zclFrame: ZclFrame, timeout: number): Promise<Events.ZclPayload>;
     restoreChannelInterPAN(): Promise<void>;
     supportsChangeChannel(): Promise<boolean>;
     changeChannel(newChannel: number): Promise<void>;
     setTransmitPower(value: number): Promise<void>;
     private waitForInternal;
     waitFor(networkAddress: number, endpoint: number, frameType: FrameType, direction: Direction, transactionSequenceNumber: number, clusterID: number, commandIdentifier: number, timeout: number): {
-        promise: Promise<Events.ZclDataPayload>;
+        promise: Promise<Events.ZclPayload>;
         cancel: () => void;
     };
     /**

package/dist/adapter/z-stack/adapter/zStackAdapter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"zStackAdapter.d.ts","sourceRoot":"","sources":["../../../../src/adapter/z-stack/adapter/zStackAdapter.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"zStackAdapter.d.ts","sourceRoot":"","sources":["../../../../src/adapter/z-stack/adapter/zStackAdapter.ts"],"names":[],"mappings":"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"}

package/dist/adapter/z-stack/adapter/zStackAdapter.js

@@ -316,14 +316,14 @@ class ZStackAdapter extends adapter_1.default {
         logger_1.logger.debug(`sendZclFrameToEndpointInternal ${ieeeAddr}:${networkAddress}/${endpoint} `
             + `(${responseAttempt},${dataRequestAttempt},${this.queue.count()})`, NS);
         let response = null;
-        const command = zclFrame.getCommand();
+        const command = zclFrame.command;
         if (command.hasOwnProperty('response') && disableResponse === false) {
-            response = this.waitForInternal(networkAddress, endpoint, zclFrame.Header.frameControl.frameType, zcl_1.Direction.SERVER_TO_CLIENT, zclFrame.Header.transactionSequenceNumber, zclFrame.Cluster.ID, command.response, timeout);
+            response = this.waitForInternal(networkAddress, endpoint, zclFrame.header.frameControl.frameType, zcl_1.Direction.SERVER_TO_CLIENT, zclFrame.header.transactionSequenceNumber, zclFrame.cluster.ID, command.response, timeout);
         }
-        else if (!zclFrame.Header.frameControl.disableDefaultResponse) {
-            response = this.waitForInternal(networkAddress, endpoint, zcl_1.FrameType.GLOBAL, zcl_1.Direction.SERVER_TO_CLIENT, zclFrame.Header.transactionSequenceNumber, zclFrame.Cluster.ID, zcl_1.Foundation.defaultRsp.ID, timeout);
+        else if (!zclFrame.header.frameControl.disableDefaultResponse) {
+            response = this.waitForInternal(networkAddress, endpoint, zcl_1.FrameType.GLOBAL, zcl_1.Direction.SERVER_TO_CLIENT, zclFrame.header.transactionSequenceNumber, zclFrame.cluster.ID, zcl_1.Foundation.defaultRsp.ID, timeout);
         }
-        const dataConfirmResult = await this.dataRequest(networkAddress, endpoint, sourceEndpoint, zclFrame.Cluster.ID, Constants.AF.DEFAULT_RADIUS, zclFrame.toBuffer(), timeout);
+        const dataConfirmResult = await this.dataRequest(networkAddress, endpoint, sourceEndpoint, zclFrame.cluster.ID, Constants.AF.DEFAULT_RADIUS, zclFrame.toBuffer(), timeout);
         if (dataConfirmResult !== ZnpCommandStatus.SUCCESS) {
             // In case dataConfirm timesout (= null) or gives an error, try to recover
             logger_1.logger.debug(`Data confirm error (${ieeeAddr}:${networkAddress},${dataConfirmResult},${dataRequestAttempt})`, NS);
@@ -454,7 +454,7 @@ class ZStackAdapter extends adapter_1.default {
     async sendZclFrameToGroup(groupID, zclFrame, sourceEndpoint) {
         return this.queue.execute(async () => {
             this.checkInterpanLock();
-            await this.dataRequestExtended(AddressMode.ADDR_GROUP, groupID, 0xFF, 0, sourceEndpoint || 1, zclFrame.Cluster.ID, Constants.AF.DEFAULT_RADIUS, zclFrame.toBuffer(), 3000, true);
+            await this.dataRequestExtended(AddressMode.ADDR_GROUP, groupID, 0xFF, 0, sourceEndpoint || 1, zclFrame.cluster.ID, Constants.AF.DEFAULT_RADIUS, zclFrame.toBuffer(), 3000, true);
             /**
              * As a group command is not confirmed and thus immidiately returns
              * (contrary to network address requests) we will give the
@@ -466,7 +466,7 @@ class ZStackAdapter extends adapter_1.default {
     async sendZclFrameToAll(endpoint, zclFrame, sourceEndpoint) {
         return this.queue.execute(async () => {
             this.checkInterpanLock();
-            await this.dataRequestExtended(AddressMode.ADDR_16BIT, 0xFFFD, endpoint, 0, sourceEndpoint, zclFrame.Cluster.ID, Constants.AF.DEFAULT_RADIUS, zclFrame.toBuffer(), 3000, false, 0);
+            await this.dataRequestExtended(AddressMode.ADDR_16BIT, 0xFFFD, endpoint, 0, sourceEndpoint, zclFrame.cluster.ID, Constants.AF.DEFAULT_RADIUS, zclFrame.toBuffer(), 3000, false, 0);
             /**
              * As a broadcast command is not confirmed and thus immidiately returns
              * (contrary to network address requests) we will give the
@@ -693,32 +693,19 @@ class ZStackAdapter extends adapter_1.default {
             if (object.subsystem === Subsystem.AF) {
                 /* istanbul ignore else */
                 if (object.command === 'incomingMsg' || object.command === 'incomingMsgExt') {
-                    try {
-                        const payload = {
-                            frame: zcl_1.ZclFrame.fromBuffer(object.payload.clusterid, object.payload.data),
-                            address: object.payload.srcaddr,
-                            endpoint: object.payload.srcendpoint,
-                            linkquality: object.payload.linkquality,
-                            groupID: object.payload.groupid,
-                            wasBroadcast: object.payload.wasbroadcast === 1,
-                            destinationEndpoint: object.payload.dstendpoint,
-                        };
-                        this.waitress.resolve(payload);
-                        this.emit(Events.Events.zclData, payload);
-                    }
-                    catch (error) {
-                        const payload = {
-                            clusterID: object.payload.clusterid,
-                            data: object.payload.data,
-                            address: object.payload.srcaddr,
-                            endpoint: object.payload.srcendpoint,
-                            linkquality: object.payload.linkquality,
-                            groupID: object.payload.groupid,
-                            wasBroadcast: object.payload.wasbroadcast === 1,
-                            destinationEndpoint: object.payload.dstendpoint,
-                        };
-                        this.emit(Events.Events.rawData, payload);
-                    }
+                    const payload = {
+                        clusterID: object.payload.clusterid,
+                        data: object.payload.data,
+                        header: zcl_1.ZclHeader.fromBuffer(object.payload.data),
+                        address: object.payload.srcaddr,
+                        endpoint: object.payload.srcendpoint,
+                        linkquality: object.payload.linkquality,
+                        groupID: object.payload.groupid,
+                        wasBroadcast: object.payload.wasbroadcast === 1,
+                        destinationEndpoint: object.payload.dstendpoint,
+                    };
+                    this.waitress.resolve(payload);
+                    this.emit(Events.Events.zclPayload, payload);
                 }
             }
         }
@@ -749,18 +736,18 @@ class ZStackAdapter extends adapter_1.default {
     }
     async sendZclFrameInterPANToIeeeAddr(zclFrame, ieeeAddr) {
         return this.queue.execute(async () => {
-            await this.dataRequestExtended(AddressMode.ADDR_64BIT, ieeeAddr, 0xFE, 0xFFFF, 12, zclFrame.Cluster.ID, 30, zclFrame.toBuffer(), 10000, false);
+            await this.dataRequestExtended(AddressMode.ADDR_64BIT, ieeeAddr, 0xFE, 0xFFFF, 12, zclFrame.cluster.ID, 30, zclFrame.toBuffer(), 10000, false);
         });
     }
     async sendZclFrameInterPANBroadcast(zclFrame, timeout) {
         return this.queue.execute(async () => {
-            const command = zclFrame.getCommand();
+            const command = zclFrame.command;
             if (!command.hasOwnProperty('response')) {
                 throw new Error(`Command '${command.name}' has no response, cannot wait for response`);
             }
-            const response = this.waitForInternal(null, 0xFE, zclFrame.Header.frameControl.frameType, zcl_1.Direction.SERVER_TO_CLIENT, null, zclFrame.Cluster.ID, command.response, timeout);
+            const response = this.waitForInternal(null, 0xFE, zclFrame.header.frameControl.frameType, zcl_1.Direction.SERVER_TO_CLIENT, null, zclFrame.cluster.ID, command.response, timeout);
             try {
-                await this.dataRequestExtended(AddressMode.ADDR_16BIT, 0xFFFF, 0xFE, 0xFFFF, 12, zclFrame.Cluster.ID, 30, zclFrame.toBuffer(), 10000, false);
+                await this.dataRequestExtended(AddressMode.ADDR_16BIT, 0xFFFF, 0xFE, 0xFFFF, 12, zclFrame.cluster.ID, 30, zclFrame.toBuffer(), 10000, false);
             }
             catch (error) {
                 response.cancel();
@@ -904,14 +891,14 @@ class ZStackAdapter 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;
     }
     checkInterpanLock() {
         if (this.interpanLock) {