fix: merge cleanup

Author: Nerivec

src/controller/model/device.ts

@@ -365,7 +365,7 @@ export class Device extends Entity<ControllerEventMap> {
             return;
         }
 
-        const {header, command, cluster, payload} = frame;
+        const {header, command, cluster} = frame;
         let sendDefaultResponse = !header.frameControl.disableDefaultResponse && !dataPayload.wasBroadcast && command.response === undefined;
         let defaultResponseStatus = defaultResponse ?? Zcl.Status.SUCCESS;
 
@@ -379,25 +379,22 @@ export class Device extends Entity<ControllerEventMap> {
                         break;
                     }
 
-                    const attributes: {[s: string]: KeyValue} = {
-                        ...endpoint.clusters,
-                    };
-
-                    if (dataPayload.clusterID === GEN_TIME_CLUSTER_ID) {
-                        attributes.genTime = {
-                            attributes: timeService.getTimeClusterAttributes(),
-                        };
-                    }
+                    const endpointCache: Clusters[string] =
+                        dataPayload.clusterID === GEN_TIME_CLUSTER_ID
+                            ? {
+                                  attributes: timeService.getTimeClusterAttributes(),
+                              }
+                            : endpoint.clusters[frame.cluster.name];
 
-                    if (cluster.name in attributes) {
+                    if (endpointCache) {
                         const response: KeyValue = {};
 
-                        for (const entry of payload) {
+                        for (const entry of frame.payload) {
                             // TODO: this.manufacturerID or frame.header.manufacturerCode
                             const name = Zcl.Utils.getClusterAttribute(cluster, entry.attrId, this.manufacturerID)?.name;
 
-                            if (name && name in attributes[cluster.name].attributes) {
-                                response[name] = attributes[cluster.name].attributes[name];
+                            if (name && name in endpointCache.attributes) {
+                                response[name] = endpointCache.attributes[name];
                             }
                         }