zigbee-herdsman 5.0.3 → 6.0.0

package/test/controller.test.ts

@@ -2456,77 +2456,8 @@ describe("Controller", () => {
         const expected = {
             cluster: "msOccupancySensing",
             type: "attributeReport",
-            device: {
-                ID: 2,
-                _events: {},
-                _eventsCount: 0,
-                _ieeeAddr: "0x129",
-                _pendingRequestTimeout: 0,
-                _networkAddress: 129,
-                _lastSeen: Date.now(),
-                _linkquality: 50,
-                _skipDefaultResponse: false,
-                _customClusters: {},
-                _endpoints: [
-                    {
-                        ID: 1,
-                        _events: {},
-                        _eventsCount: 0,
-                        inputClusters: [0, 1],
-                        outputClusters: [2],
-                        pendingRequests: {id: 1, deviceIeeeAddress: "0x129", sendInProgress: false},
-                        _binds: [],
-                        _configuredReportings: [],
-                        meta: {},
-                        deviceNetworkAddress: 129,
-                        deviceIeeeAddress: "0x129",
-                        deviceID: 5,
-                        profileID: 99,
-                        clusters: {
-                            msOccupancySensing: {
-                                attributes: {
-                                    occupancy: 1,
-                                },
-                            },
-                        },
-                    },
-                ],
-                _type: "Router",
-                _manufacturerID: 1212,
-                _manufacturerName: "KoenAndCo",
-                meta: {},
-                _powerSource: "Mains (single phase)",
-                _modelID: "myModelID",
-                _applicationVersion: 2,
-                _stackVersion: 101,
-                _zclVersion: 1,
-                _hardwareVersion: 3,
-                _dateCode: "201901",
-                _softwareBuildID: "1.01",
-                _interviewState: InterviewState.Successful,
-            },
-            endpoint: {
-                ID: 1,
-                _events: {},
-                _eventsCount: 0,
-                deviceID: 5,
-                inputClusters: [0, 1],
-                outputClusters: [2],
-                pendingRequests: {id: 1, deviceIeeeAddress: "0x129", sendInProgress: false},
-                deviceNetworkAddress: 129,
-                deviceIeeeAddress: "0x129",
-                _binds: [],
-                _configuredReportings: [],
-                profileID: 99,
-                meta: {},
-                clusters: {
-                    msOccupancySensing: {
-                        attributes: {
-                            occupancy: 1,
-                        },
-                    },
-                },
-            },
+            device: expect.any(Device),
+            endpoint: expect.any(Endpoint),
             data: {
                 occupancy: 1,
             },
@@ -2541,9 +2472,11 @@ describe("Controller", () => {
                     frameType: 0,
                     manufacturerSpecific: false,
                 },
+                manufacturerCode: undefined,
+                rawData: expect.any(Buffer),
             },
         };
-        expect(deepClone(events.message[0])).toStrictEqual(expected);
+        expect(events.message[0]).toStrictEqual(expected);
         expect(controller.getDeviceByIeeeAddr("0x129")!.linkquality).toEqual(50);
     });
 
@@ -2571,74 +2504,16 @@ describe("Controller", () => {
         const expected = {
             cluster: "genAlarms",
             type: "raw",
-            device: {
-                ID: 2,
-                _events: {},
-                _eventsCount: 0,
-                _pendingRequestTimeout: 0,
-                _ieeeAddr: "0x129",
-                _networkAddress: 129,
-                _lastSeen: Date.now(),
-                _linkquality: 50,
-                _skipDefaultResponse: false,
-                _customClusters: {},
-                _endpoints: [
-                    {
-                        ID: 1,
-                        _events: {},
-                        _eventsCount: 0,
-                        clusters: {},
-                        inputClusters: [0, 1],
-                        outputClusters: [2],
-                        pendingRequests: {id: 1, deviceIeeeAddress: "0x129", sendInProgress: false},
-                        deviceNetworkAddress: 129,
-                        deviceIeeeAddress: "0x129",
-                        _binds: [],
-                        _configuredReportings: [],
-                        meta: {},
-                        deviceID: 5,
-                        profileID: 99,
-                    },
-                ],
-                _type: "Router",
-                _manufacturerID: 1212,
-                _manufacturerName: "KoenAndCo",
-                meta: {},
-                _powerSource: "Mains (single phase)",
-                _modelID: "myModelID",
-                _applicationVersion: 2,
-                _stackVersion: 101,
-                _zclVersion: 1,
-                _hardwareVersion: 3,
-                _dateCode: "201901",
-                _softwareBuildID: "1.01",
-                _interviewState: InterviewState.Successful,
-            },
-            endpoint: {
-                _events: {},
-                _eventsCount: 0,
-                clusters: {},
-                ID: 1,
-                deviceID: 5,
-                inputClusters: [0, 1],
-                outputClusters: [2],
-                pendingRequests: {id: 1, deviceIeeeAddress: "0x129", sendInProgress: false},
-                deviceNetworkAddress: 129,
-                deviceIeeeAddress: "0x129",
-                _binds: [],
-                _configuredReportings: [],
-                profileID: 99,
-                meta: {},
-            },
-            data: {
-                data: [0, 1],
-                type: "Buffer",
-            },
+            device: expect.any(Device),
+            endpoint: expect.any(Endpoint),
+            data: Buffer.from([0, 1]),
             linkquality: 50,
             groupID: 1,
-            meta: {},
+            meta: {
+                rawData: expect.any(Buffer),
+            },
         };
-        expect(deepClone(events.message[0])).toStrictEqual(expected);
+        expect(events.message[0]).toStrictEqual(expected);
     });
 
     it("Receive raw data from unknown cluster", async () => {
@@ -2658,74 +2533,16 @@ describe("Controller", () => {
         const expected = {
             cluster: 99999999,
             type: "raw",
-            device: {
-                ID: 2,
-                _ieeeAddr: "0x129",
-                _pendingRequestTimeout: 0,
-                _networkAddress: 129,
-                _lastSeen: Date.now(),
-                _linkquality: 50,
-                _skipDefaultResponse: false,
-                _customClusters: {},
-                _endpoints: [
-                    {
-                        ID: 1,
-                        _events: {},
-                        _eventsCount: 0,
-                        clusters: {},
-                        inputClusters: [0, 1],
-                        outputClusters: [2],
-                        pendingRequests: {id: 1, deviceIeeeAddress: "0x129", sendInProgress: false},
-                        deviceNetworkAddress: 129,
-                        deviceIeeeAddress: "0x129",
-                        _binds: [],
-                        _configuredReportings: [],
-                        meta: {},
-                        deviceID: 5,
-                        profileID: 99,
-                    },
-                ],
-                _events: {},
-                _eventsCount: 0,
-                _type: "Router",
-                _manufacturerID: 1212,
-                _manufacturerName: "KoenAndCo",
-                meta: {},
-                _powerSource: "Mains (single phase)",
-                _modelID: "myModelID",
-                _applicationVersion: 2,
-                _stackVersion: 101,
-                _zclVersion: 1,
-                _hardwareVersion: 3,
-                _dateCode: "201901",
-                _softwareBuildID: "1.01",
-                _interviewState: InterviewState.Successful,
-            },
-            endpoint: {
-                _events: {},
-                _eventsCount: 0,
-                clusters: {},
-                ID: 1,
-                deviceID: 5,
-                inputClusters: [0, 1],
-                outputClusters: [2],
-                pendingRequests: {id: 1, deviceIeeeAddress: "0x129", sendInProgress: false},
-                deviceNetworkAddress: 129,
-                deviceIeeeAddress: "0x129",
-                _binds: [],
-                _configuredReportings: [],
-                profileID: 99,
-                meta: {},
-            },
-            data: {
-                data: [0, 1, 2, 3],
-                type: "Buffer",
-            },
+            device: expect.any(Device),
+            endpoint: expect.any(Endpoint),
+            data: Buffer.from([0, 1, 2, 3]),
             linkquality: 50,
             groupID: 1,
-            meta: {},
+            meta: {
+                rawData: Buffer.from([0, 1, 2, 3]),
+            },
         };
-        expect(deepClone(events.message[0])).toStrictEqual(expected);
+        expect(events.message[0]).toStrictEqual(expected);
     });
 
     it("Receive zclData from unkonwn device shouldnt emit anything", async () => {
@@ -2767,90 +2584,9 @@ describe("Controller", () => {
         const expected = {
             cluster: "genBasic",
             type: "readResponse",
-            device: {
-                ID: 2,
-                _events: {},
-                _eventsCount: 0,
-                _ieeeAddr: "0x129",
-                _lastSeen: Date.now(),
-                _pendingRequestTimeout: 0,
-                _linkquality: 52,
-                _skipDefaultResponse: false,
-                _networkAddress: 129,
-                _customClusters: {},
-                _endpoints: [
-                    {
-                        clusters: {},
-                        ID: 1,
-                        _events: {},
-                        _eventsCount: 0,
-                        inputClusters: [0, 1],
-                        outputClusters: [2],
-                        pendingRequests: {id: 1, deviceIeeeAddress: "0x129", sendInProgress: false},
-                        deviceNetworkAddress: 129,
-                        deviceIeeeAddress: "0x129",
-                        _binds: [],
-                        _configuredReportings: [],
-                        deviceID: 5,
-                        profileID: 99,
-                        meta: {},
-                    },
-                    {
-                        ID: 3,
-                        _events: {},
-                        _eventsCount: 0,
-                        clusters: {
-                            genBasic: {
-                                attributes: {
-                                    appVersion: 3,
-                                },
-                            },
-                        },
-                        inputClusters: [],
-                        outputClusters: [],
-                        pendingRequests: {id: 3, deviceIeeeAddress: "0x129", sendInProgress: false},
-                        deviceNetworkAddress: 129,
-                        deviceIeeeAddress: "0x129",
-                        _binds: [],
-                        _configuredReportings: [],
-                        meta: {},
-                    },
-                ],
-                _type: "Router",
-                _manufacturerID: 1212,
-                _manufacturerName: "KoenAndCo",
-                meta: {},
-                _powerSource: "Mains (single phase)",
-                _modelID: "myModelID",
-                _applicationVersion: 3,
-                _stackVersion: 101,
-                _zclVersion: 1,
-                _hardwareVersion: 3,
-                _dateCode: "201901",
-                _softwareBuildID: "1.01",
-                _interviewState: InterviewState.Successful,
-                _lastDefaultResponseSequenceNumber: 1,
-            },
-            endpoint: {
-                ID: 3,
-                _events: {},
-                _eventsCount: 0,
-                inputClusters: [],
-                outputClusters: [],
-                pendingRequests: {id: 3, deviceIeeeAddress: "0x129", sendInProgress: false},
-                meta: {},
-                deviceNetworkAddress: 129,
-                deviceIeeeAddress: "0x129",
-                _binds: [],
-                _configuredReportings: [],
-                clusters: {
-                    genBasic: {
-                        attributes: {
-                            appVersion: 3,
-                        },
-                    },
-                },
-            },
+            device: expect.any(Device),
+            endpoint: expect.any(Endpoint),
+            groupID: undefined,
             data: {
                 appVersion: 3,
             },
@@ -2864,9 +2600,11 @@ describe("Controller", () => {
                     frameType: 0,
                     manufacturerSpecific: false,
                 },
+                manufacturerCode: undefined,
+                rawData: expect.any(Buffer),
             },
         };
-        expect(deepClone(events.message[0])).toStrictEqual(expected);
+        expect(events.message[0]).toStrictEqual(expected);
         expect(controller.getDeviceByIeeeAddr("0x129")!.endpoints.length).toBe(2);
     });
 
@@ -2890,66 +2628,8 @@ describe("Controller", () => {
         const expected = {
             cluster: "genScenes",
             type: "commandTradfriArrowSingle",
-            device: {
-                ID: 2,
-                _events: {},
-                _eventsCount: 0,
-                _pendingRequestTimeout: 0,
-                _lastSeen: Date.now(),
-                _linkquality: 19,
-                _skipDefaultResponse: false,
-                _ieeeAddr: "0x129",
-                _networkAddress: 129,
-                _customClusters: {},
-                _endpoints: [
-                    {
-                        ID: 1,
-                        _events: {},
-                        _eventsCount: 0,
-                        clusters: {},
-                        inputClusters: [0, 1],
-                        outputClusters: [2],
-                        pendingRequests: {id: 1, deviceIeeeAddress: "0x129", sendInProgress: false},
-                        deviceNetworkAddress: 129,
-                        deviceIeeeAddress: "0x129",
-                        _binds: [],
-                        _configuredReportings: [],
-                        meta: {},
-                        deviceID: 5,
-                        profileID: 99,
-                    },
-                ],
-                _type: "Router",
-                _manufacturerID: 1212,
-                _manufacturerName: "KoenAndCo",
-                meta: {},
-                _powerSource: "Mains (single phase)",
-                _modelID: "myModelID",
-                _applicationVersion: 2,
-                _stackVersion: 101,
-                _zclVersion: 1,
-                _hardwareVersion: 3,
-                _dateCode: "201901",
-                _softwareBuildID: "1.01",
-                _interviewState: InterviewState.Successful,
-                _lastDefaultResponseSequenceNumber: 29,
-            },
-            endpoint: {
-                _events: {},
-                _eventsCount: 0,
-                ID: 1,
-                clusters: {},
-                inputClusters: [0, 1],
-                outputClusters: [2],
-                pendingRequests: {id: 1, deviceIeeeAddress: "0x129", sendInProgress: false},
-                deviceNetworkAddress: 129,
-                deviceIeeeAddress: "0x129",
-                _binds: [],
-                _configuredReportings: [],
-                deviceID: 5,
-                profileID: 99,
-                meta: {},
-            },
+            device: expect.any(Device),
+            endpoint: expect.any(Endpoint),
             data: {
                 value: 256,
                 value2: 13,
@@ -2966,9 +2646,10 @@ describe("Controller", () => {
                     frameType: 1,
                     manufacturerSpecific: true,
                 },
+                rawData: expect.any(Buffer),
             },
         };
-        expect(deepClone(events.message[0])).toStrictEqual(expected);
+        expect(events.message[0]).toStrictEqual(expected);
     });
 
     it("Receive cluster command from unknown cluster", async () => {
@@ -3282,16 +2963,10 @@ describe("Controller", () => {
             },
             payload: [{attrId: 28, attrData: 3, dataType: 48, status: 0}],
             cluster: null,
-            command: {
+            command: expect.objectContaining({
                 ID: 1,
                 name: "readRsp",
-                parameters: [
-                    {name: "attrId", type: 33},
-                    {name: "status", type: 32},
-                    {name: "dataType", type: 32, conditions: [{type: "statusEquals", value: 0}]},
-                    {name: "attrData", type: 1000, conditions: [{type: "statusEquals", value: 0}]},
-                ],
-            },
+            }),
         });
     });
 
@@ -3549,97 +3224,8 @@ describe("Controller", () => {
         const expected = {
             cluster: "genBasic",
             type: "attributeReport",
-            device: {
-                _events: {},
-                _eventsCount: 0,
-                _lastSeen: Date.now(),
-                _linkquality: 50,
-                _skipDefaultResponse: false,
-                ID: 2,
-                _ieeeAddr: "0x129",
-                _networkAddress: 129,
-                _customClusters: {},
-                _endpoints: [
-                    {
-                        _events: {},
-                        _eventsCount: 0,
-                        ID: 1,
-                        clusters: {
-                            genBasic: {
-                                attributes: {
-                                    "65281": {
-                                        "1": 3285,
-                                        "10": 0,
-                                        "100": 0,
-                                        "3": 33,
-                                        "4": 5032,
-                                        "5": 43,
-                                        "6": 327680,
-                                        "8": 516,
-                                    },
-                                    modelId: "lumi.sensor_wleak.aq1",
-                                },
-                            },
-                        },
-                        inputClusters: [0, 1],
-                        outputClusters: [2],
-                        pendingRequests: {id: 1, deviceIeeeAddress: "0x129", sendInProgress: false},
-                        deviceNetworkAddress: 129,
-                        deviceIeeeAddress: "0x129",
-                        _binds: [],
-                        _configuredReportings: [],
-                        meta: {},
-                        deviceID: 5,
-                        profileID: 99,
-                    },
-                ],
-                _type: "Router",
-                _manufacturerID: 1212,
-                _manufacturerName: "KoenAndCo",
-                meta: {},
-                _powerSource: "Mains (single phase)",
-                _modelID: "lumi.sensor_wleak.aq1",
-                _applicationVersion: 2,
-                _stackVersion: 101,
-                _zclVersion: 1,
-                _hardwareVersion: 3,
-                _dateCode: "201901",
-                _pendingRequestTimeout: 0,
-                _softwareBuildID: "1.01",
-                _interviewState: InterviewState.Successful,
-            },
-            endpoint: {
-                _events: {},
-                _eventsCount: 0,
-                ID: 1,
-                deviceID: 5,
-                inputClusters: [0, 1],
-                outputClusters: [2],
-                pendingRequests: {id: 1, deviceIeeeAddress: "0x129", sendInProgress: false},
-                deviceNetworkAddress: 129,
-                deviceIeeeAddress: "0x129",
-                _binds: [],
-                _configuredReportings: [],
-                profileID: 99,
-                meta: {},
-                clusters: {
-                    genBasic: {
-                        attributes: {
-                            "65281": {
-                                "1": 3285,
-                                "10": 0,
-                                "100": 0,
-                                "3": 33,
-                                "4": 5032,
-                                "5": 43,
-                                "6": 327680,
-                                "8": 516,
-                            },
-                            modelId: "lumi.sensor_wleak.aq1",
-                        },
-                    },
-                },
-            },
+            device: expect.any(Device),
+            endpoint: expect.any(Endpoint),
             data: {
                 "65281": {
                     "1": 3285,
@@ -3665,9 +3251,10 @@ describe("Controller", () => {
                     frameType: 0,
                     manufacturerSpecific: true,
                 },
+                rawData: null,
             },
         };
-        expect(deepClone(events.message[0])).toStrictEqual(expected);
+        expect(events.message[0]).toStrictEqual(expected);
     });
 
     it("Should allow to specify custom attributes for existing cluster", async () => {
@@ -4813,14 +4400,10 @@ describe("Controller", () => {
             },
             payload: {payloadType: 0, queryJitter: 1},
             cluster: expect.objectContaining({name: "genOta"}),
-            command: {
+            command: expect.objectContaining({
                 ID: 0,
-                parameters: [
-                    {name: "payloadType", type: 32},
-                    {name: "queryJitter", type: 32},
-                ],
                 name: "imageNotify",
-            },
+            }),
         };
         expect(deepClone(mocksendZclFrameToEndpoint.mock.calls[0][3])).toStrictEqual(expected);
         expect(mocksendZclFrameToEndpoint.mock.calls[0][4]).toBe(10000);
@@ -6002,65 +5585,8 @@ describe("Controller", () => {
 
         const expected = {
             type: "read",
-            device: {
-                ID: 2,
-                _applicationVersion: 2,
-                _dateCode: "201901",
-                _pendingRequestTimeout: 0,
-                _customClusters: {},
-                _endpoints: [
-                    {
-                        deviceID: 5,
-                        inputClusters: [0, 1],
-                        outputClusters: [2],
-                        pendingRequests: {id: 1, deviceIeeeAddress: "0x129", sendInProgress: false},
-                        profileID: 99,
-                        ID: 1,
-                        clusters: {},
-                        deviceIeeeAddress: "0x129",
-                        deviceNetworkAddress: 129,
-                        _binds: [],
-                        _configuredReportings: [],
-                        _events: {},
-                        _eventsCount: 0,
-                        meta: {},
-                    },
-                ],
-                _hardwareVersion: 3,
-                _events: {},
-                _eventsCount: 0,
-                _ieeeAddr: "0x129",
-                _interviewState: InterviewState.Successful,
-                _lastSeen: Date.now(),
-                _linkquality: 19,
-                _skipDefaultResponse: false,
-                _manufacturerID: 1212,
-                _manufacturerName: "KoenAndCo",
-                _modelID: "myModelID",
-                _networkAddress: 129,
-                _powerSource: "Mains (single phase)",
-                _softwareBuildID: "1.01",
-                _stackVersion: 101,
-                _type: "Router",
-                _zclVersion: 1,
-                meta: {},
-            },
-            endpoint: {
-                deviceID: 5,
-                inputClusters: [0, 1],
-                outputClusters: [2],
-                pendingRequests: {id: 1, deviceIeeeAddress: "0x129", sendInProgress: false},
-                profileID: 99,
-                ID: 1,
-                clusters: {},
-                deviceIeeeAddress: "0x129",
-                deviceNetworkAddress: 129,
-                _binds: [],
-                _configuredReportings: [],
-                _events: {},
-                _eventsCount: 0,
-                meta: {},
-            },
+            device: expect.any(Device),
+            endpoint: expect.any(Endpoint),
             data: ["mainsVoltage", 9999],
             linkquality: 19,
             groupID: 10,
@@ -6074,11 +5600,13 @@ describe("Controller", () => {
                     frameType: 0,
                     manufacturerSpecific: false,
                 },
+                manufacturerCode: undefined,
+                rawData: expect.any(Buffer),
             },
         };
 
         expect(events.message.length).toBe(1);
-        expect(deepClone(events.message[0])).toStrictEqual(expected);
+        expect(events.message[0]).toStrictEqual(expected);
     });
 
     it("Emit write from device", async () => {
@@ -6099,65 +5627,8 @@ describe("Controller", () => {
 
         const expected = {
             type: "write",
-            device: {
-                ID: 2,
-                _events: {},
-                _eventsCount: 0,
-                _applicationVersion: 2,
-                _dateCode: "201901",
-                _pendingRequestTimeout: 0,
-                _customClusters: {},
-                _endpoints: [
-                    {
-                        meta: {},
-                        deviceID: 5,
-                        _events: {},
-                        _eventsCount: 0,
-                        inputClusters: [0, 1],
-                        outputClusters: [2],
-                        pendingRequests: {id: 1, deviceIeeeAddress: "0x129", sendInProgress: false},
-                        profileID: 99,
-                        ID: 1,
-                        clusters: {},
-                        deviceIeeeAddress: "0x129",
-                        deviceNetworkAddress: 129,
-                        _binds: [],
-                        _configuredReportings: [],
-                    },
-                ],
-                _hardwareVersion: 3,
-                _ieeeAddr: "0x129",
-                _interviewState: InterviewState.Successful,
-                _lastSeen: Date.now(),
-                _linkquality: 19,
-                _skipDefaultResponse: false,
-                _manufacturerID: 1212,
-                _manufacturerName: "KoenAndCo",
-                _modelID: "myModelID",
-                _networkAddress: 129,
-                _powerSource: "Mains (single phase)",
-                _softwareBuildID: "1.01",
-                _stackVersion: 101,
-                _type: "Router",
-                _zclVersion: 1,
-                meta: {},
-            },
-            endpoint: {
-                _events: {},
-                _eventsCount: 0,
-                deviceID: 5,
-                inputClusters: [0, 1],
-                outputClusters: [2],
-                pendingRequests: {id: 1, deviceIeeeAddress: "0x129", sendInProgress: false},
-                profileID: 99,
-                ID: 1,
-                clusters: {},
-                deviceIeeeAddress: "0x129",
-                deviceNetworkAddress: 129,
-                _binds: [],
-                _configuredReportings: [],
-                meta: {},
-            },
+            device: expect.any(Device),
+            endpoint: expect.any(Endpoint),
             data: {
                 "16389": 3,
             },
@@ -6173,11 +5644,13 @@ describe("Controller", () => {
                     frameType: 0,
                     manufacturerSpecific: false,
                 },
+                manufacturerCode: undefined,
+                rawData: expect.any(Buffer),
             },
         };
 
         expect(events.message.length).toBe(1);
-        expect(deepClone(events.message[0])).toStrictEqual(expected);
+        expect(events.message[0]).toStrictEqual(expected);
     });
 
     it("Endpoint command error", async () => {
@@ -6401,13 +5874,13 @@ describe("Controller", () => {
         mocksendZclFrameToEndpoint.mockRejectedValueOnce(new Error("timeout occurred"));
         let error;
         try {
-            await endpoint.readResponse("genOnOff", 1, [{onOff: 1}]);
+            await endpoint.readResponse("genOnOff", 1, {onOff: 1});
         } catch (e) {
             error = e;
         }
         expect(error).toStrictEqual(
             new Error(
-                `ZCL command 0x129/1 genOnOff.readRsp([{"onOff":1}], {"timeout":10000,"disableResponse":false,"disableRecovery":false,"disableDefaultResponse":true,"direction":1,"reservedBits":0,"transactionSequenceNumber":1,"writeUndiv":false}) failed (timeout occurred)`,
+                `ZCL command 0x129/1 genOnOff.readRsp({"onOff":1}, {"timeout":10000,"disableResponse":false,"disableRecovery":false,"disableDefaultResponse":true,"direction":1,"reservedBits":0,"transactionSequenceNumber":1,"writeUndiv":false}) failed (timeout occurred)`,
             ),
         );
     });
@@ -6681,53 +6154,8 @@ describe("Controller", () => {
         expect(events.message.length).toBe(1);
         const expected = {
             type: "commandNotification",
-            device: {
-                ID: 2,
-                _events: {},
-                _eventsCount: 0,
-                _pendingRequestTimeout: 0,
-                _customClusters: {},
-                _endpoints: [
-                    {
-                        inputClusters: [],
-                        meta: {},
-                        outputClusters: [],
-                        pendingRequests: {id: ZSpec.GP_ENDPOINT, deviceIeeeAddress: "0x000000000046f4fe", sendInProgress: false},
-                        ID: ZSpec.GP_ENDPOINT,
-                        _events: {},
-                        _eventsCount: 0,
-                        clusters: {},
-                        deviceIeeeAddress: "0x000000000046f4fe",
-                        deviceNetworkAddress: 0xf4fe,
-                        _binds: [],
-                        _configuredReportings: [],
-                    },
-                ],
-                _ieeeAddr: "0x000000000046f4fe",
-                _interviewState: InterviewState.Successful,
-                _lastSeen: Date.now(),
-                _linkquality: 50,
-                _skipDefaultResponse: false,
-                _modelID: "GreenPower_2",
-                _networkAddress: 0xf4fe,
-                _type: "GreenPower",
-                meta: {},
-                _gpSecurityKey: [0xf1, 0xec, 0x92, 0xab, 0xff, 0x8f, 0x13, 0x63, 0xe1, 0x46, 0xbe, 0xb5, 0x18, 0xc9, 0x0c, 0xab],
-            },
-            endpoint: {
-                inputClusters: [],
-                meta: {},
-                outputClusters: [],
-                pendingRequests: {id: ZSpec.GP_ENDPOINT, deviceIeeeAddress: "0x000000000046f4fe", sendInProgress: false},
-                ID: ZSpec.GP_ENDPOINT,
-                _events: {},
-                _eventsCount: 0,
-                clusters: {},
-                deviceIeeeAddress: "0x000000000046f4fe",
-                deviceNetworkAddress: 0xf4fe,
-                _binds: [],
-                _configuredReportings: [],
-            },
+            device: expect.any(Device),
+            endpoint: expect.any(Endpoint),
             data: {options: 0, srcID: 0x46f4fe, frameCounter: 228, commandID: 34, payloadSize: 255, commandFrame: {}},
             linkquality: 50,
             groupID: 1,
@@ -6735,9 +6163,11 @@ describe("Controller", () => {
             meta: {
                 zclTransactionSequenceNumber: 10,
                 frameControl: {reservedBits: 0, frameType: 1, direction: 0, disableDefaultResponse: true, manufacturerSpecific: false},
+                manufacturerCode: undefined,
+                rawData: expect.any(Buffer),
             },
         };
-        expect(deepClone(events.message[0])).toStrictEqual(expected);
+        expect(events.message[0]).toStrictEqual(expected);
 
         const identifyUnknownDeviceSpy = vi.spyOn(controller, "identifyUnknownDevice");
 
@@ -7320,53 +6750,8 @@ describe("Controller", () => {
         expect(events.message.length).toBe(1);
         const expected = {
             type: "commandNotification",
-            device: {
-                _events: {},
-                _eventsCount: 0,
-                ID: 3,
-                _type: "GreenPower",
-                _ieeeAddr: "0x00000000017171f8",
-                _networkAddress: 29176,
-                _customClusters: {},
-                _endpoints: [
-                    {
-                        _events: {},
-                        _eventsCount: 0,
-                        ID: ZSpec.GP_ENDPOINT,
-                        inputClusters: [],
-                        outputClusters: [],
-                        deviceNetworkAddress: 29176,
-                        deviceIeeeAddress: "0x00000000017171f8",
-                        clusters: {},
-                        _binds: [],
-                        _configuredReportings: [],
-                        meta: {},
-                        pendingRequests: {sendInProgress: false, id: ZSpec.GP_ENDPOINT, deviceIeeeAddress: "0x00000000017171f8"},
-                    },
-                ],
-                _modelID: "GreenPower_2",
-                _interviewState: InterviewState.Successful,
-                _skipDefaultResponse: false,
-                meta: {},
-                _gpSecurityKey: [0x21, 0x7f, 0x8c, 0xb2, 0x90, 0xd9, 0x90, 0x14, 0x15, 0xd0, 0x5c, 0xb1, 0x64, 0x7c, 0x44, 0x6c],
-                _lastSeen: Date.now(),
-                _pendingRequestTimeout: 0,
-                _linkquality: 50,
-            },
-            endpoint: {
-                _events: {},
-                _eventsCount: 0,
-                ID: ZSpec.GP_ENDPOINT,
-                inputClusters: [],
-                outputClusters: [],
-                deviceNetworkAddress: 29176,
-                deviceIeeeAddress: "0x00000000017171f8",
-                clusters: {},
-                _binds: [],
-                _configuredReportings: [],
-                meta: {},
-                pendingRequests: {sendInProgress: false, id: ZSpec.GP_ENDPOINT, deviceIeeeAddress: "0x00000000017171f8"},
-            },
+            device: expect.any(Device),
+            endpoint: expect.any(Endpoint),
             data: {
                 options: 21640,
                 srcID: 24211960,
@@ -7383,9 +6768,11 @@ describe("Controller", () => {
             meta: {
                 zclTransactionSequenceNumber: 10,
                 frameControl: {reservedBits: 0, frameType: 1, direction: 0, disableDefaultResponse: true, manufacturerSpecific: false},
+                manufacturerCode: undefined,
+                rawData: expect.any(Buffer),
             },
         };
-        expect(deepClone(events.message[0])).toStrictEqual(expected);
+        expect(events.message[0]).toStrictEqual(expected);
 
         // Remove green power device from network
         const removeCommand = {
@@ -8109,135 +7496,8 @@ describe("Controller", () => {
 
         const expected = {
             type: "read",
-            device: {
-                ID: 3,
-                _applicationVersion: 2,
-                _dateCode: "201901",
-                _pendingRequestTimeout: 0,
-                _customClusters: {},
-                _endpoints: [
-                    {
-                        deviceID: 5,
-                        inputClusters: [0, 1, 2],
-                        outputClusters: [2],
-                        profileID: 99,
-                        ID: 1,
-                        clusters: {},
-                        deviceIeeeAddress: "0x171",
-                        deviceNetworkAddress: 171,
-                        _binds: [],
-                        _configuredReportings: [],
-                        _events: {},
-                        _eventsCount: 0,
-                        meta: {},
-                        pendingRequests: {id: 1, deviceIeeeAddress: "0x171", sendInProgress: false},
-                    },
-                    {
-                        inputClusters: [],
-                        outputClusters: [],
-                        ID: 2,
-                        clusters: {},
-                        deviceIeeeAddress: "0x171",
-                        deviceNetworkAddress: 171,
-                        _binds: [],
-                        _configuredReportings: [],
-                        _events: {},
-                        _eventsCount: 0,
-                        meta: {},
-                        pendingRequests: {id: 2, deviceIeeeAddress: "0x171", sendInProgress: false},
-                    },
-                    {
-                        inputClusters: [],
-                        outputClusters: [],
-                        ID: 3,
-                        clusters: {},
-                        deviceIeeeAddress: "0x171",
-                        deviceNetworkAddress: 171,
-                        _binds: [],
-                        _configuredReportings: [],
-                        _events: {},
-                        _eventsCount: 0,
-                        meta: {},
-                        pendingRequests: {id: 3, deviceIeeeAddress: "0x171", sendInProgress: false},
-                    },
-                    {
-                        inputClusters: [],
-                        outputClusters: [],
-                        ID: 4,
-                        clusters: {},
-                        deviceIeeeAddress: "0x171",
-                        deviceNetworkAddress: 171,
-                        _binds: [],
-                        _configuredReportings: [],
-                        _events: {},
-                        _eventsCount: 0,
-                        meta: {},
-                        pendingRequests: {id: 4, deviceIeeeAddress: "0x171", sendInProgress: false},
-                    },
-                    {
-                        inputClusters: [],
-                        outputClusters: [],
-                        ID: 5,
-                        clusters: {},
-                        deviceIeeeAddress: "0x171",
-                        deviceNetworkAddress: 171,
-                        _binds: [],
-                        _configuredReportings: [],
-                        _events: {},
-                        _eventsCount: 0,
-                        meta: {},
-                        pendingRequests: {id: 5, deviceIeeeAddress: "0x171", sendInProgress: false},
-                    },
-                    {
-                        inputClusters: [],
-                        outputClusters: [],
-                        ID: 6,
-                        clusters: {},
-                        deviceIeeeAddress: "0x171",
-                        deviceNetworkAddress: 171,
-                        _binds: [],
-                        _configuredReportings: [],
-                        _events: {},
-                        _eventsCount: 0,
-                        meta: {},
-                        pendingRequests: {id: 6, deviceIeeeAddress: "0x171", sendInProgress: false},
-                    },
-                ],
-                _events: {},
-                _eventsCount: 0,
-                _hardwareVersion: 3,
-                _ieeeAddr: "0x171",
-                _interviewState: InterviewState.Successful,
-                _lastSeen: Date.now(),
-                _manufacturerID: 1212,
-                _manufacturerName: "Xioami",
-                _modelID: "lumi.remote.b286opcn01",
-                _networkAddress: 171,
-                _powerSource: "Mains (single phase)",
-                _softwareBuildID: "1.01",
-                _stackVersion: 101,
-                _type: "EndDevice",
-                _zclVersion: 1,
-                _linkquality: 19,
-                _skipDefaultResponse: false,
-                meta: {},
-            },
-            endpoint: {
-                deviceID: 5,
-                inputClusters: [0, 1, 2],
-                outputClusters: [2],
-                profileID: 99,
-                ID: 1,
-                clusters: {},
-                deviceIeeeAddress: "0x171",
-                deviceNetworkAddress: 171,
-                _binds: [],
-                _configuredReportings: [],
-                _events: {},
-                _eventsCount: 0,
-                meta: {},
-                pendingRequests: {id: 1, deviceIeeeAddress: "0x171", sendInProgress: false},
-            },
+            device: expect.objectContaining({_ieeeAddr: "0x171"}),
+            endpoint: expect.objectContaining({deviceIeeeAddress: "0x171"}),
             data: ["mainsVoltage", 9999],
             linkquality: 19,
             groupID: 171,
@@ -8245,10 +7505,12 @@ describe("Controller", () => {
             meta: {
                 zclTransactionSequenceNumber: 40,
                 frameControl: {reservedBits: 0, frameType: 0, direction: 0, disableDefaultResponse: true, manufacturerSpecific: false},
+                manufacturerCode: undefined,
+                rawData: expect.any(Buffer),
             },
         };
         expect(events.message.length).toBe(1);
-        expect(deepClone(events.message[0])).toStrictEqual(expected);
+        expect(events.message[0]).toStrictEqual(expected);
     });
 
     it("Shouldnt throw error on coordinatorCheck when adapter doesnt support backups", async () => {
@@ -9212,7 +8474,7 @@ describe("Controller", () => {
             type: "commandIndividualLedEffect",
             data: {
                 color: 0,
-                duration: 255,
+                duration: null,
                 effect: 1,
                 led: 5,
                 level: 100,