@willieee802/zigbee-herdsman 0.49.3 → 0.50.0

package/src/adapter/zoh/adapter/zohAdapter.ts

@@ -15,7 +15,7 @@ import * as ZSpec from "../../../zspec";
 import * as Zcl from "../../../zspec/zcl";
 import * as Zdo from "../../../zspec/zdo";
 import type * as ZdoTypes from "../../../zspec/zdo/definition/tstypes";
-import {Adapter} from "../../adapter";
+import {Adapter, type ClusterWaitressMatcher, type ZclWaitressPayload} from "../../adapter";
 import type {ZclPayload} from "../../events";
 import {SerialPort} from "../../serialPort";
 import type * as TsType from "../../tstype";
@@ -24,16 +24,8 @@ import {bigUInt64ToHexBE} from "./utils";
 
 const NS = "zh:zoh";
 
-interface WaitressMatcher {
-    sender: number | string;
-    clusterId: number;
-    endpoint?: number;
-    commandId?: number;
-    transactionSequenceNumber?: number;
-}
-
 type ZdoResponse = {
-    sender: number | string;
+    address: number | string;
     clusterId: number;
     response: ZdoTypes.GenericZdoResponse;
     seqNum: number;
@@ -79,8 +71,8 @@ export class ZoHAdapter extends Adapter {
     public readonly stackConfig: StackConfig;
     public readonly driver: OTRCPDriver;
     private readonly queue: Queue;
-    private readonly zclWaitress: Waitress<ZclPayload, WaitressMatcher>;
-    private readonly zdoWaitress: Waitress<ZdoResponse, WaitressMatcher>;
+    private readonly zclWaitress: Waitress<ZclWaitressPayload, ClusterWaitressMatcher>;
+    private readonly zdoWaitress: Waitress<ZdoResponse, ClusterWaitressMatcher>;
 
     constructor(
         networkOptions: TsType.NetworkOptions,
@@ -145,8 +137,8 @@ export class ZoHAdapter extends Adapter {
             dirname(this.backupPath),
         );
         this.queue = new Queue(this.adapterOptions.concurrent || /* v8 ignore next */ 8); // ORed to avoid 0 (not checked in settings/queue constructor)
-        this.zclWaitress = new Waitress(this.zclWaitressValidator, this.waitressTimeoutFormatter);
-        this.zdoWaitress = new Waitress(this.zdoWaitressValidator, this.waitressTimeoutFormatter);
+        this.zclWaitress = new Waitress(Adapter.zclWaitressValidator, Adapter.clusterWaitressTimeoutFormatter);
+        this.zdoWaitress = new Waitress(this.zdoWaitressValidator, Adapter.clusterWaitressTimeoutFormatter);
 
         this.interpanLock = false;
     }
@@ -235,7 +227,7 @@ export class ZoHAdapter extends Adapter {
 
             return await new Promise((resolve, reject): void => {
                 const openError = async (err: Error): Promise<void> => {
-                    await this.stop();
+                    await this.closePort();
 
                     reject(err);
                 };
@@ -312,7 +304,7 @@ export class ZoHAdapter extends Adapter {
                 await wait(150);
             }
         } catch (error) {
-            await this.stop();
+            await this.closePort();
 
             throw error;
         }
@@ -461,18 +453,13 @@ export class ZoHAdapter extends Adapter {
         _frameType: Zcl.FrameType,
         _direction: Zcl.Direction,
         transactionSequenceNumber: number | undefined,
-        clusterID: number,
-        commandIdentifier: number,
+        clusterId: number,
+        commandId: number,
+        defaultRspCommandId: number | undefined,
         timeout: number,
     ): {promise: Promise<ZclPayload>; cancel: () => void} {
         const waiter = this.zclWaitress.waitFor(
-            {
-                sender: networkAddress,
-                endpoint,
-                clusterId: clusterID,
-                commandId: commandIdentifier,
-                transactionSequenceNumber,
-            },
+            {address: networkAddress, endpoint, clusterId, commandId, defaultRspCommandId, transactionSequenceNumber},
             timeout,
         );
         const cancel = (): void => this.zclWaitress.remove(waiter.ID);
@@ -540,7 +527,7 @@ export class ZoHAdapter extends Adapter {
                     const resp = await this.zdoWaitress
                         .waitFor(
                             {
-                                sender: responseClusterId === Zdo.ClusterId.NETWORK_ADDRESS_RESPONSE ? ieeeAddress : networkAddress,
+                                address: responseClusterId === Zdo.ClusterId.NETWORK_ADDRESS_RESPONSE ? ieeeAddress : networkAddress,
                                 clusterId: responseClusterId,
                                 transactionSequenceNumber: zdoSeqNum,
                             },
@@ -645,10 +632,11 @@ export class ZoHAdapter extends Adapter {
                         const resp = await this.zclWaitress
                             .waitFor(
                                 {
-                                    sender: networkAddress,
+                                    address: networkAddress,
                                     clusterId: zclFrame.cluster.ID,
                                     endpoint,
                                     commandId: commandResponseId,
+                                    defaultRspCommandId: undefined,
                                     transactionSequenceNumber: zclFrame.header.transactionSequenceNumber,
                                 },
                                 timeout,
@@ -774,11 +762,11 @@ export class ZoHAdapter extends Adapter {
                     // special case to properly resolve a NETWORK_ADDRESS_RESPONSE following a NETWORK_ADDRESS_REQUEST (based on EUI64 from ZDO payload)
                     // NOTE: if response has invalid status (no EUI64 available), response waiter will eventually time out
                     if (Zdo.Buffalo.checkStatus<Zdo.ClusterId.NETWORK_ADDRESS_RESPONSE>(result)) {
-                        this.zdoWaitress.resolve({sender: result[1].eui64, clusterId: apsHeader.clusterId, response: result, seqNum: apsPayload[0]});
+                        this.zdoWaitress.resolve({address: result[1].eui64, clusterId: apsHeader.clusterId, response: result, seqNum: apsPayload[0]});
                     }
                 } else {
                     // biome-ignore lint/style/noNonNullAssertion: ignored using `--suppress`
-                    this.zdoWaitress.resolve({sender: sender16!, clusterId: apsHeader.clusterId!, response: result, seqNum: apsPayload[0]});
+                    this.zdoWaitress.resolve({address: sender16!, clusterId: apsHeader.clusterId!, response: result, seqNum: apsPayload[0]});
                 }
 
                 // biome-ignore lint/style/noNonNullAssertion: ignored using `--suppress`
@@ -811,7 +799,10 @@ export class ZoHAdapter extends Adapter {
                 destinationEndpoint: apsHeader.destEndpoint!,
             };
 
-            this.zclWaitress.resolve(payload);
+            if (payload.header !== undefined) {
+                this.zclWaitress.resolve(payload as ZclWaitressPayload);
+            }
+
             this.emit("zclPayload", payload);
         }
     }
@@ -879,7 +870,10 @@ export class ZoHAdapter extends Adapter {
             destinationEndpoint: ZSpec.GP_ENDPOINT,
         };
 
-        this.zclWaitress.resolve(zclPayload);
+        if (zclPayload.header !== undefined) {
+            this.zclWaitress.resolve(zclPayload as ZclWaitressPayload);
+        }
+
         this.emit("zclPayload", zclPayload);
     }
 
@@ -907,25 +901,8 @@ export class ZoHAdapter extends Adapter {
     onDeviceAuthorized(_source16: number, _source64: bigint): void {}
     /* v8 ignore stop */
 
-    private waitressTimeoutFormatter(matcher: WaitressMatcher, timeout: number): string {
-        return `Timeout after ${timeout}ms [sender=${matcher.sender} clusterId=${matcher.clusterId} cmdId=${matcher.commandId}]`;
-    }
-
-    private zclWaitressValidator(payload: ZclPayload, matcher: WaitressMatcher): boolean {
-        return (
-            // no sender in Touchlink
-            (matcher.sender === undefined || payload.address === matcher.sender) &&
-            payload.clusterID === matcher.clusterId &&
-            payload.endpoint === matcher.endpoint &&
-            // biome-ignore lint/style/noNonNullAssertion: ignored using `--suppress`
-            payload.header!.commandIdentifier === matcher.commandId &&
-            // biome-ignore lint/style/noNonNullAssertion: ignored using `--suppress`
-            (matcher.transactionSequenceNumber === undefined || payload.header!.transactionSequenceNumber === matcher.transactionSequenceNumber)
-        );
-    }
-
-    private zdoWaitressValidator(payload: ZdoResponse, matcher: WaitressMatcher): boolean {
-        return matcher.sender === payload.sender && matcher.clusterId === payload.clusterId && matcher.transactionSequenceNumber === payload.seqNum;
+    private zdoWaitressValidator(payload: ZdoResponse, matcher: ClusterWaitressMatcher): boolean {
+        return matcher.address === payload.address && matcher.clusterId === payload.clusterId && matcher.transactionSequenceNumber === payload.seqNum;
     }
     // #endregion
 }

package/src/controller/controller.ts

@@ -11,6 +11,7 @@ import type {Eui64} from "../zspec/tstypes";
 import * as Zcl from "../zspec/zcl";
 import type {TPartialClusterAttributes} from "../zspec/zcl/definition/clusters-types";
 import type {CustomClusters, FrameControl} from "../zspec/zcl/definition/tstype";
+import {ZclStatusError} from "../zspec/zcl/zclStatusError";
 import * as Zdo from "../zspec/zdo";
 import type * as ZdoTypes from "../zspec/zdo/definition/tstypes";
 import Database from "./database";
@@ -305,7 +306,7 @@ export class Controller extends events.EventEmitter<ControllerEventMap> {
                 zcl.manufacturerCode,
                 0,
                 zcl.commandKey,
-                clusterKey ?? Zcl.Clusters.touchlink.ID,
+                clusterKey ?? "touchlink",
                 zcl.payload,
                 customClusters,
             );
@@ -735,6 +736,7 @@ export class Controller extends events.EventEmitter<ControllerEventMap> {
         this.selfAndDeviceEmit(device, "lastSeenChanged", {device, reason: "deviceAnnounce"});
         device.implicitCheckin();
         this.checkDeviceNetworkAddress(device, payload.eui64, payload.nwkAddress);
+        device.resetTransient(false);
         this.selfAndDeviceEmit(device, "deviceAnnounce", {device});
     }
 
@@ -883,10 +885,13 @@ export class Controller extends events.EventEmitter<ControllerEventMap> {
                 undefined,
                 this.database.id,
             );
+
+            device.resetTransient(true);
             this.selfAndDeviceEmit(device, "deviceJoined", {device});
         } else if (device.isDeleted) {
             logger.debug(`Deleted device '${payload.ieeeAddr}' joined, undeleting`, NS);
             device.undelete();
+            device.resetTransient(true);
             this.selfAndDeviceEmit(device, "deviceJoined", {device});
         }
 
@@ -950,6 +955,7 @@ export class Controller extends events.EventEmitter<ControllerEventMap> {
     private async onZclPayload(payload: AdapterEvents.ZclPayload): Promise<void> {
         let frame: Zcl.Frame | undefined;
         let device: Device | undefined;
+        let defaultResponse: Zcl.Status | undefined;
 
         if (payload.clusterID === Zcl.Clusters.touchlink.ID) {
             // This is handled by touchlink
@@ -1014,6 +1020,10 @@ export class Controller extends events.EventEmitter<ControllerEventMap> {
                 frame = Zcl.Frame.fromBuffer(payload.clusterID, payload.header, payload.data, device ? device.customClusters : {});
             } catch (error) {
                 logger.debug(`Failed to parse frame: ${error}`, NS);
+
+                if (error instanceof ZclStatusError) {
+                    defaultResponse = error.code;
+                }
             }
         }
 
@@ -1151,7 +1161,7 @@ export class Controller extends events.EventEmitter<ControllerEventMap> {
         }
 
         if (frame) {
-            await device.onZclData(payload, frame, endpoint);
+            await device.onZclData(payload, frame, endpoint, defaultResponse);
         }
     }
 }

package/src/controller/greenPower.ts

@@ -107,6 +107,8 @@ interface GreenPowerEventMap {
     deviceLeave: [sourceID: number];
 }
 
+const COMMISSIONING_NOTIFICATION_COMMAND_ID = Zcl.Clusters.greenPower.commands.commissioningNotification.ID;
+
 export class GreenPower extends EventEmitter<GreenPowerEventMap> {
     private adapter: Adapter;
     private databaseID: number;
@@ -219,7 +221,7 @@ export class GreenPower extends EventEmitter<GreenPowerEventMap> {
             undefined,
             zclTransactionSequenceNumber.next(),
             "pairing",
-            Zcl.Clusters.greenPower.ID,
+            "greenPower",
             payload,
             {},
         );
@@ -248,7 +250,7 @@ export class GreenPower extends EventEmitter<GreenPowerEventMap> {
         try {
             // notification: A.3.3.4.1
             // commissioningNotification: A.3.3.4.3
-            const isCommissioningNotification = frame.header.commandIdentifier === Zcl.Clusters.greenPower.commands.commissioningNotification.ID;
+            const isCommissioningNotification = frame.header.commandIdentifier === COMMISSIONING_NOTIFICATION_COMMAND_ID;
             const securityLevel = isCommissioningNotification ? (frame.payload.options >> 4) & 0x3 : (frame.payload.options >> 6) & 0x3;
 
             if (
@@ -380,7 +382,7 @@ export class GreenPower extends EventEmitter<GreenPowerEventMap> {
                             undefined,
                             zclTransactionSequenceNumber.next(),
                             "response",
-                            Zcl.Clusters.greenPower.ID,
+                            "greenPower",
                             payloadResponse,
                             {},
                         );
@@ -522,7 +524,7 @@ export class GreenPower extends EventEmitter<GreenPowerEventMap> {
                         undefined,
                         zclTransactionSequenceNumber.next(),
                         "response",
-                        Zcl.Clusters.greenPower.ID,
+                        "greenPower",
                         payload,
                         {},
                     );
@@ -535,10 +537,15 @@ export class GreenPower extends EventEmitter<GreenPowerEventMap> {
                     logger.debug(`[APP_DESCRIPTION] ${logStr}`, NS);
                     break;
                 }
-                case 0xa1: {
-                    // GP Manufacturer-specific Attribute Reporting
-                    break;
-                }
+                case 0xa0: // Attribute Reporting
+                case 0xa1: // Manufacturer-Specific Attribute Reporting
+                case 0xa2: // Multi-Cluster Reporting
+                case 0xa3: // Manufacturer-specific Multi-Cluster Reporting
+                case 0xa4: // Request Attributes => TODO: handle response
+                case 0xa5: // Read Attributes Response
+                    {
+                        break;
+                    }
                 /* v8 ignore stop */
                 default: {
                     // NOTE: this is spammy because it logs everything that is handed back to Controller without special processing here
@@ -594,7 +601,7 @@ export class GreenPower extends EventEmitter<GreenPowerEventMap> {
             undefined,
             zclTransactionSequenceNumber.next(),
             "commisioningMode",
-            Zcl.Clusters.greenPower.ID,
+            "greenPower",
             payload,
             {},
         );

package/src/controller/helpers/ota.ts

@@ -6,7 +6,7 @@ import {performance} from "node:perf_hooks";
 import {logger} from "../../utils/logger";
 import * as Zcl from "../../zspec/zcl";
 import type {TClusterCommandPayload, TClusterPayload} from "../../zspec/zcl/definition/clusters-types";
-import type {TZclFrame} from "../../zspec/zcl/zclFrame";
+import type {TFoundationZclFrame, TZclFrame} from "../../zspec/zcl/zclFrame";
 import type Endpoint from "../model/endpoint";
 import type {OtaDataSettings, OtaImage, OtaImageElement, OtaImageHeader, OtaSource, ZigbeeOtaImageMeta} from "../tstype";
 
@@ -58,6 +58,7 @@ const ZIGBEE_OTA_PREVIOUS_URL = "https://raw.githubusercontent.com/Koenkk/zigbee
 const UPGRADE_END_REQUEST_ID = Zcl.Clusters.genOta.commands.upgradeEndRequest.ID;
 const IMAGE_BLOCK_REQUEST_ID = Zcl.Clusters.genOta.commands.imageBlockRequest.ID;
 const IMAGE_PAGE_REQUEST_ID = Zcl.Clusters.genOta.commands.imagePageRequest.ID;
+const IMAGE_BLOCK_RESPONSE_ID = Zcl.Clusters.genOta.commandsResponse.imageBlockResponse.ID;
 
 /** uint32 LE */
 export const UPGRADE_FILE_IDENTIFIER = 0x0beef11e;
@@ -390,9 +391,9 @@ export class OtaSession {
         private readonly waitForOtaCommand: <Co extends string>(
             endpointId: number,
             commandId: number,
-            transactionSequenceNumber: number | undefined,
+            defaultRspCommandId: number | undefined,
             timeout: number,
-        ) => {promise: Promise<TZclFrame<"genOta", Co>>; cancel: () => void},
+        ) => {promise: Promise<TZclFrame<"genOta", Co> | TFoundationZclFrame<"defaultRsp">>; cancel: () => void},
     ) {
         this.#startTime = performance.now();
 
@@ -445,12 +446,18 @@ export class OtaSession {
         );
     }
 
-    public async run(): Promise<TZclFrame<"genOta", "upgradeEndRequest">> {
+    public async run(abortSignal: AbortSignal): Promise<TZclFrame<"genOta", "upgradeEndRequest"> | TFoundationZclFrame<"defaultRsp">> {
         // can take a long time, use max (int32 - 1), ~24 days
-        const upgradeEndRequest = this.waitForOtaCommand<"upgradeEndRequest">(this.endpoint.ID, UPGRADE_END_REQUEST_ID, undefined, 2147483647);
+        // never match on defaultRsp
+        const upgradeEndRequest = this.waitForOtaCommand<"upgradeEndRequest">(this.endpoint.ID, UPGRADE_END_REQUEST_ID, -1, 2147483647);
 
         try {
             for await (const request of this.commandStream(upgradeEndRequest)) {
+                if (request.header.isGlobal) {
+                    // ignore default responses, device should continue requesting blocks
+                    continue;
+                }
+
                 if (request.command.ID === UPGRADE_END_REQUEST_ID) {
                     return request as TZclFrame<"genOta", "upgradeEndRequest">;
                 }
@@ -465,7 +472,10 @@ export class OtaSession {
                             request.header.transactionSequenceNumber,
                             pageOffset,
                             pagePayload.pageSize,
+                            abortSignal.aborted,
                         );
+
+                        abortSignal.throwIfAborted();
                     }
                 } else {
                     await this.sendImageBlockResponse(
@@ -473,7 +483,9 @@ export class OtaSession {
                         request.header.transactionSequenceNumber,
                         0,
                         0,
+                        abortSignal.aborted,
                     );
+                    abortSignal.throwIfAborted();
                 }
                 /* v8 ignore start */
             }
@@ -489,27 +501,30 @@ export class OtaSession {
             upgradeEndRequest.cancel();
 
             const err = error as Error;
-            err.message = `Device ${this.ieeeAddr} did not start/finish firmware download after being notified. (${err.message})`;
 
-            throw err;
+            if (err.name === "AbortError") {
+                throw new Error(`OTA for device ${this.ieeeAddr} was aborted`);
+            }
+
+            throw new Error(`Device ${this.ieeeAddr} did not start/finish firmware download after being notified. (${err.message})`);
         }
     }
 
     private async *commandStream(upgradeEndRequest: {
-        promise: Promise<TZclFrame<"genOta", "upgradeEndRequest">>;
+        promise: Promise<TZclFrame<"genOta", "upgradeEndRequest"> | TFoundationZclFrame<"defaultRsp">>;
         cancel: () => void;
-    }): AsyncGenerator<OtaDataRequest | OtaUpgradeEndRequest> {
+    }): AsyncGenerator<OtaDataRequest | OtaUpgradeEndRequest | TFoundationZclFrame<"defaultRsp">> {
         while (true) {
             const imageBlockRequest = this.waitForOtaCommand<"imageBlockRequest">(
                 this.endpoint.ID,
                 IMAGE_BLOCK_REQUEST_ID,
-                undefined,
+                IMAGE_BLOCK_RESPONSE_ID,
                 this.dataSettings.requestTimeout,
             );
             const imagePageRequest = this.waitForOtaCommand<"imagePageRequest">(
                 this.endpoint.ID,
                 IMAGE_PAGE_REQUEST_ID,
-                undefined,
+                IMAGE_BLOCK_RESPONSE_ID,
                 this.dataSettings.requestTimeout,
             );
             const dataRequest = Promise.race([imageBlockRequest.promise, imagePageRequest.promise]);
@@ -528,6 +543,7 @@ export class OtaSession {
         requestTsn: number,
         pageOffset: number,
         pageSize: number,
+        abort: boolean,
     ): Promise<number> {
         // throttle if needed
         let callNow = performance.now();
@@ -543,6 +559,16 @@ export class OtaSession {
 
         this.#lastBlockResponseTime = callNow;
 
+        if (abort) {
+            try {
+                await this.endpoint.commandResponse("genOta", "imageBlockResponse", {status: Zcl.Status.ABORT}, undefined, requestTsn);
+            } catch (error) {
+                logger.debug(() => `Abort image block response failed for ${this.ieeeAddr}: ${(error as Error).message}`, NS);
+            }
+
+            return 0;
+        }
+
         try {
             const blockPayload = buildImageBlockPayload(this.image, requestPayload, pageOffset, pageSize, this.dataSettings.baseSize);
 

package/src/controller/helpers/zclFrameConverter.ts

@@ -1,23 +1,17 @@
 import {logger} from "../../utils/logger";
 import * as Zcl from "../../zspec/zcl";
 import type {TFoundation} from "../../zspec/zcl/definition/clusters-types";
-import type {Cluster, CustomClusters} from "../../zspec/zcl/definition/tstype";
+import type {CustomClusters} from "../../zspec/zcl/definition/tstype";
 import type {ClusterOrRawWriteAttributes, TCustomCluster} from "../tstype";
 
 const NS = "zh:controller:zcl";
 
-// Legrand devices (e.g. 4129) fail to set the manufacturerSpecific flag and
-// manufacturerCode in the frame header, despite using specific attributes.
-// This leads to incorrect reported attribute names.
-// Remap the attributes using the target device's manufacturer ID
-// if the header is lacking the information.
-function getCluster(frame: Zcl.Frame, deviceManufacturerID: number | undefined, customClusters: CustomClusters): Cluster {
-    let cluster = frame.cluster;
-    if (!frame?.header?.manufacturerCode && frame?.cluster && deviceManufacturerID === Zcl.ManufacturerCode.LEGRAND_GROUP) {
-        cluster = Zcl.Utils.getCluster(frame.cluster.ID, deviceManufacturerID, customClusters);
-    }
-    return cluster;
-}
+const LEGRAND_GROUP_MANUF_CODE = Zcl.ManufacturerCode.LEGRAND_GROUP;
+
+// NOTE: `legrandWorkaround`:
+//   Legrand devices fail to set the manufacturerSpecific flag and manufacturerCode in the frame header, despite using specific attributes.
+//   This leads to incorrect reported attribute names.
+//   Remap the attributes using the target device's manufacturer ID if the header is lacking the information.
 
 function attributeKeyValue<Cl extends number | string, Custom extends TCustomCluster | undefined = undefined>(
     frame: Zcl.Frame,
@@ -25,11 +19,18 @@ function attributeKeyValue<Cl extends number | string, Custom extends TCustomClu
     customClusters: CustomClusters,
 ): ClusterOrRawWriteAttributes<Cl, Custom> {
     const payload: Record<string | number, unknown> = {};
-    const cluster = getCluster(frame, deviceManufacturerID, customClusters);
+    const legrandWorkaround = frame.header?.manufacturerCode === undefined && deviceManufacturerID === LEGRAND_GROUP_MANUF_CODE;
+    const cluster = legrandWorkaround ? Zcl.Utils.getCluster(frame.cluster.name, deviceManufacturerID, customClusters) : frame.cluster;
+    const manufacturerCode = legrandWorkaround ? deviceManufacturerID : frame.header.manufacturerCode;
 
     // TODO: remove this type once Zcl.Frame is typed
     for (const item of frame.payload as TFoundation["report" | "write" | "readRsp"]) {
-        const attribute = cluster.getAttribute(item.attrId);
+        // Per ZCL spec, non-success `readRsp` records carry no value; don't synthesize one.
+        if ("status" in item && item.status !== Zcl.Status.SUCCESS) {
+            continue;
+        }
+
+        const attribute = Zcl.Utils.getClusterAttribute(cluster, item.attrId, manufacturerCode);
 
         if (attribute) {
             try {
@@ -49,11 +50,13 @@ function attributeKeyValue<Cl extends number | string, Custom extends TCustomClu
 
 function attributeList(frame: Zcl.Frame, deviceManufacturerID: number | undefined, customClusters: CustomClusters): Array<string | number> {
     const payload: Array<string | number> = [];
-    const cluster = getCluster(frame, deviceManufacturerID, customClusters);
+    const legrandWorkaround = frame.header?.manufacturerCode === undefined && deviceManufacturerID === LEGRAND_GROUP_MANUF_CODE;
+    const cluster = legrandWorkaround ? Zcl.Utils.getCluster(frame.cluster.name, deviceManufacturerID, customClusters) : frame.cluster;
+    const manufacturerCode = legrandWorkaround ? deviceManufacturerID : frame.header.manufacturerCode;
 
     // TODO: remove this type once Zcl.Frame is typed
     for (const item of frame.payload as TFoundation["read"]) {
-        const attribute = cluster.getAttribute(item.attrId);
+        const attribute = Zcl.Utils.getClusterAttribute(cluster, item.attrId, manufacturerCode);
 
         payload.push(attribute?.name ?? item.attrId);
     }