From 578ce1eeadd7508b00d5d978eefc7976d6094952 Mon Sep 17 00:00:00 2001
From: Joost Loohuis <github@loohuis.dev>
Date: Tue, 24 Mar 2026 13:23:30 +0100
Subject: [PATCH 1/9] Simplify readAttributes type definitions

---
 index.d.ts                | 66 +++++++++++++++++++--------------------
 scripts/generate-types.js |  3 +-
 2 files changed, 34 insertions(+), 35 deletions(-)

diff --git a/index.d.ts b/index.d.ts
index 0900b62..818e193 100644
--- a/index.d.ts
+++ b/index.d.ts
@@ -96,7 +96,7 @@ export interface AnalogInputClusterAttributes {
 }
 
 export interface AnalogInputCluster extends ZCLNodeCluster {
-  readAttributes<K extends 'description' | 'maxPresentValue' | 'minPresentValue' | 'outOfService' | 'presentValue' | 'reliability' | 'resolution' | 'statusFlags' | 'applicationType'>(attributeNames: K[], opts?: { timeout?: number }): Promise<Pick<AnalogInputClusterAttributes, K>>;
+  readAttributes<K extends keyof AnalogInputClusterAttributes>(attributeNames: K[], opts?: { timeout?: number }): Promise<Pick<AnalogInputClusterAttributes, K>>;
   readAttributes(attributeNames: Array<keyof AnalogInputClusterAttributes | number>, opts?: { timeout?: number }): Promise<Partial<AnalogInputClusterAttributes> & Record<number, unknown>>;
   writeAttributes(attributes: Partial<AnalogInputClusterAttributes>, opts?: { timeout?: number }): Promise<unknown>;
   on<K extends keyof AnalogInputClusterAttributes & string>(eventName: `attr.${K}`, listener: (value: AnalogInputClusterAttributes[K]) => void): this;
@@ -117,7 +117,7 @@ export interface AnalogOutputClusterAttributes {
 }
 
 export interface AnalogOutputCluster extends ZCLNodeCluster {
-  readAttributes<K extends 'description' | 'maxPresentValue' | 'minPresentValue' | 'outOfService' | 'presentValue' | 'reliability' | 'relinquishDefault' | 'resolution' | 'statusFlags' | 'applicationType'>(attributeNames: K[], opts?: { timeout?: number }): Promise<Pick<AnalogOutputClusterAttributes, K>>;
+  readAttributes<K extends keyof AnalogOutputClusterAttributes>(attributeNames: K[], opts?: { timeout?: number }): Promise<Pick<AnalogOutputClusterAttributes, K>>;
   readAttributes(attributeNames: Array<keyof AnalogOutputClusterAttributes | number>, opts?: { timeout?: number }): Promise<Partial<AnalogOutputClusterAttributes> & Record<number, unknown>>;
   writeAttributes(attributes: Partial<AnalogOutputClusterAttributes>, opts?: { timeout?: number }): Promise<unknown>;
   on<K extends keyof AnalogOutputClusterAttributes & string>(eventName: `attr.${K}`, listener: (value: AnalogOutputClusterAttributes[K]) => void): this;
@@ -135,7 +135,7 @@ export interface AnalogValueClusterAttributes {
 }
 
 export interface AnalogValueCluster extends ZCLNodeCluster {
-  readAttributes<K extends 'description' | 'outOfService' | 'presentValue' | 'reliability' | 'relinquishDefault' | 'statusFlags' | 'applicationType'>(attributeNames: K[], opts?: { timeout?: number }): Promise<Pick<AnalogValueClusterAttributes, K>>;
+  readAttributes<K extends keyof AnalogValueClusterAttributes>(attributeNames: K[], opts?: { timeout?: number }): Promise<Pick<AnalogValueClusterAttributes, K>>;
   readAttributes(attributeNames: Array<keyof AnalogValueClusterAttributes | number>, opts?: { timeout?: number }): Promise<Partial<AnalogValueClusterAttributes> & Record<number, unknown>>;
   writeAttributes(attributes: Partial<AnalogValueClusterAttributes>, opts?: { timeout?: number }): Promise<unknown>;
   on<K extends keyof AnalogValueClusterAttributes & string>(eventName: `attr.${K}`, listener: (value: AnalogValueClusterAttributes[K]) => void): this;
@@ -162,7 +162,7 @@ export interface BallastConfigurationClusterAttributes {
 }
 
 export interface BallastConfigurationCluster extends ZCLNodeCluster {
-  readAttributes<K extends 'physicalMinLevel' | 'physicalMaxLevel' | 'ballastStatus' | 'minLevel' | 'maxLevel' | 'powerOnLevel' | 'powerOnFadeTime' | 'intrinsicBallastFactor' | 'ballastFactorAdjustment' | 'lampQuantity' | 'lampType' | 'lampManufacturer' | 'lampRatedHours' | 'lampBurnHours' | 'lampAlarmMode' | 'lampBurnHoursTripPoint'>(attributeNames: K[], opts?: { timeout?: number }): Promise<Pick<BallastConfigurationClusterAttributes, K>>;
+  readAttributes<K extends keyof BallastConfigurationClusterAttributes>(attributeNames: K[], opts?: { timeout?: number }): Promise<Pick<BallastConfigurationClusterAttributes, K>>;
   readAttributes(attributeNames: Array<keyof BallastConfigurationClusterAttributes | number>, opts?: { timeout?: number }): Promise<Partial<BallastConfigurationClusterAttributes> & Record<number, unknown>>;
   writeAttributes(attributes: Partial<BallastConfigurationClusterAttributes>, opts?: { timeout?: number }): Promise<unknown>;
   on<K extends keyof BallastConfigurationClusterAttributes & string>(eventName: `attr.${K}`, listener: (value: BallastConfigurationClusterAttributes[K]) => void): this;
@@ -188,7 +188,7 @@ export interface BasicClusterAttributes {
 }
 
 export interface BasicCluster extends ZCLNodeCluster {
-  readAttributes<K extends 'zclVersion' | 'appVersion' | 'stackVersion' | 'hwVersion' | 'manufacturerName' | 'modelId' | 'dateCode' | 'powerSource' | 'appProfileVersion' | 'locationDesc' | 'physicalEnv' | 'deviceEnabled' | 'alarmMask' | 'disableLocalConfig' | 'swBuildId'>(attributeNames: K[], opts?: { timeout?: number }): Promise<Pick<BasicClusterAttributes, K>>;
+  readAttributes<K extends keyof BasicClusterAttributes>(attributeNames: K[], opts?: { timeout?: number }): Promise<Pick<BasicClusterAttributes, K>>;
   readAttributes(attributeNames: Array<keyof BasicClusterAttributes | number>, opts?: { timeout?: number }): Promise<Partial<BasicClusterAttributes> & Record<number, unknown>>;
   writeAttributes(attributes: Partial<BasicClusterAttributes>, opts?: { timeout?: number }): Promise<unknown>;
   on<K extends keyof BasicClusterAttributes & string>(eventName: `attr.${K}`, listener: (value: BasicClusterAttributes[K]) => void): this;
@@ -209,7 +209,7 @@ export interface BinaryInputClusterAttributes {
 }
 
 export interface BinaryInputCluster extends ZCLNodeCluster {
-  readAttributes<K extends 'activeText' | 'description' | 'inactiveText' | 'outOfService' | 'polarity' | 'presentValue' | 'reliability' | 'statusFlags' | 'applicationType'>(attributeNames: K[], opts?: { timeout?: number }): Promise<Pick<BinaryInputClusterAttributes, K>>;
+  readAttributes<K extends keyof BinaryInputClusterAttributes>(attributeNames: K[], opts?: { timeout?: number }): Promise<Pick<BinaryInputClusterAttributes, K>>;
   readAttributes(attributeNames: Array<keyof BinaryInputClusterAttributes | number>, opts?: { timeout?: number }): Promise<Partial<BinaryInputClusterAttributes> & Record<number, unknown>>;
   writeAttributes(attributes: Partial<BinaryInputClusterAttributes>, opts?: { timeout?: number }): Promise<unknown>;
   on<K extends keyof BinaryInputClusterAttributes & string>(eventName: `attr.${K}`, listener: (value: BinaryInputClusterAttributes[K]) => void): this;
@@ -232,7 +232,7 @@ export interface BinaryOutputClusterAttributes {
 }
 
 export interface BinaryOutputCluster extends ZCLNodeCluster {
-  readAttributes<K extends 'activeText' | 'description' | 'inactiveText' | 'minimumOffTime' | 'minimumOnTime' | 'outOfService' | 'polarity' | 'presentValue' | 'reliability' | 'relinquishDefault' | 'statusFlags' | 'applicationType'>(attributeNames: K[], opts?: { timeout?: number }): Promise<Pick<BinaryOutputClusterAttributes, K>>;
+  readAttributes<K extends keyof BinaryOutputClusterAttributes>(attributeNames: K[], opts?: { timeout?: number }): Promise<Pick<BinaryOutputClusterAttributes, K>>;
   readAttributes(attributeNames: Array<keyof BinaryOutputClusterAttributes | number>, opts?: { timeout?: number }): Promise<Partial<BinaryOutputClusterAttributes> & Record<number, unknown>>;
   writeAttributes(attributes: Partial<BinaryOutputClusterAttributes>, opts?: { timeout?: number }): Promise<unknown>;
   on<K extends keyof BinaryOutputClusterAttributes & string>(eventName: `attr.${K}`, listener: (value: BinaryOutputClusterAttributes[K]) => void): this;
@@ -255,7 +255,7 @@ export interface BinaryValueClusterAttributes {
 }
 
 export interface BinaryValueCluster extends ZCLNodeCluster {
-  readAttributes<K extends 'activeText' | 'description' | 'inactiveText' | 'minimumOffTime' | 'minimumOnTime' | 'outOfService' | 'polarity' | 'presentValue' | 'reliability' | 'relinquishDefault' | 'statusFlags' | 'applicationType'>(attributeNames: K[], opts?: { timeout?: number }): Promise<Pick<BinaryValueClusterAttributes, K>>;
+  readAttributes<K extends keyof BinaryValueClusterAttributes>(attributeNames: K[], opts?: { timeout?: number }): Promise<Pick<BinaryValueClusterAttributes, K>>;
   readAttributes(attributeNames: Array<keyof BinaryValueClusterAttributes | number>, opts?: { timeout?: number }): Promise<Partial<BinaryValueClusterAttributes> & Record<number, unknown>>;
   writeAttributes(attributes: Partial<BinaryValueClusterAttributes>, opts?: { timeout?: number }): Promise<unknown>;
   on<K extends keyof BinaryValueClusterAttributes & string>(eventName: `attr.${K}`, listener: (value: BinaryValueClusterAttributes[K]) => void): this;
@@ -275,7 +275,7 @@ export interface ColorControlClusterAttributes {
 }
 
 export interface ColorControlCluster extends ZCLNodeCluster {
-  readAttributes<K extends 'currentHue' | 'currentSaturation' | 'currentX' | 'currentY' | 'colorTemperatureMireds' | 'colorMode' | 'colorCapabilities' | 'colorTempPhysicalMinMireds' | 'colorTempPhysicalMaxMireds'>(attributeNames: K[], opts?: { timeout?: number }): Promise<Pick<ColorControlClusterAttributes, K>>;
+  readAttributes<K extends keyof ColorControlClusterAttributes>(attributeNames: K[], opts?: { timeout?: number }): Promise<Pick<ColorControlClusterAttributes, K>>;
   readAttributes(attributeNames: Array<keyof ColorControlClusterAttributes | number>, opts?: { timeout?: number }): Promise<Partial<ColorControlClusterAttributes> & Record<number, unknown>>;
   writeAttributes(attributes: Partial<ColorControlClusterAttributes>, opts?: { timeout?: number }): Promise<unknown>;
   on<K extends keyof ColorControlClusterAttributes & string>(eventName: `attr.${K}`, listener: (value: ColorControlClusterAttributes[K]) => void): this;
@@ -303,7 +303,7 @@ export interface DeviceTemperatureClusterAttributes {
 }
 
 export interface DeviceTemperatureCluster extends ZCLNodeCluster {
-  readAttributes<K extends 'currentTemperature' | 'minTempExperienced' | 'maxTempExperienced' | 'overTempTotalDwell' | 'deviceTempAlarmMask' | 'lowTempThreshold' | 'highTempThreshold' | 'lowTempDwellTripPoint' | 'highTempDwellTripPoint'>(attributeNames: K[], opts?: { timeout?: number }): Promise<Pick<DeviceTemperatureClusterAttributes, K>>;
+  readAttributes<K extends keyof DeviceTemperatureClusterAttributes>(attributeNames: K[], opts?: { timeout?: number }): Promise<Pick<DeviceTemperatureClusterAttributes, K>>;
   readAttributes(attributeNames: Array<keyof DeviceTemperatureClusterAttributes | number>, opts?: { timeout?: number }): Promise<Partial<DeviceTemperatureClusterAttributes> & Record<number, unknown>>;
   writeAttributes(attributes: Partial<DeviceTemperatureClusterAttributes>, opts?: { timeout?: number }): Promise<unknown>;
   on<K extends keyof DeviceTemperatureClusterAttributes & string>(eventName: `attr.${K}`, listener: (value: DeviceTemperatureClusterAttributes[K]) => void): this;
@@ -360,7 +360,7 @@ export interface DoorLockClusterAttributes {
 }
 
 export interface DoorLockCluster extends ZCLNodeCluster {
-  readAttributes<K extends 'lockState' | 'lockType' | 'actuatorEnabled' | 'doorState' | 'doorOpenEvents' | 'doorClosedEvents' | 'openPeriod' | 'numberOfLogRecordsSupported' | 'numberOfTotalUsersSupported' | 'numberOfPINUsersSupported' | 'numberOfRFIDUsersSupported' | 'numberOfWeekDaySchedulesSupportedPerUser' | 'numberOfYearDaySchedulesSupportedPerUser' | 'numberOfHolidaySchedulesSupported' | 'maxPINCodeLength' | 'minPINCodeLength' | 'maxRFIDCodeLength' | 'minRFIDCodeLength' | 'enableLogging' | 'language' | 'ledSettings' | 'autoRelockTime' | 'soundVolume' | 'operatingMode' | 'supportedOperatingModes' | 'defaultConfigurationRegister' | 'enableLocalProgramming' | 'enableOneTouchLocking' | 'enableInsideStatusLED' | 'enablePrivacyModeButton' | 'wrongCodeEntryLimit' | 'userCodeTemporaryDisableTime' | 'sendPINOverTheAir' | 'requirePINforRFOperation' | 'securityLevel' | 'alarmMask' | 'keypadOperationEventMask' | 'rfOperationEventMask' | 'manualOperationEventMask' | 'rfidOperationEventMask' | 'keypadProgrammingEventMask' | 'rfProgrammingEventMask' | 'rfidProgrammingEventMask'>(attributeNames: K[], opts?: { timeout?: number }): Promise<Pick<DoorLockClusterAttributes, K>>;
+  readAttributes<K extends keyof DoorLockClusterAttributes>(attributeNames: K[], opts?: { timeout?: number }): Promise<Pick<DoorLockClusterAttributes, K>>;
   readAttributes(attributeNames: Array<keyof DoorLockClusterAttributes | number>, opts?: { timeout?: number }): Promise<Partial<DoorLockClusterAttributes> & Record<number, unknown>>;
   writeAttributes(attributes: Partial<DoorLockClusterAttributes>, opts?: { timeout?: number }): Promise<unknown>;
   on<K extends keyof DoorLockClusterAttributes & string>(eventName: `attr.${K}`, listener: (value: DoorLockClusterAttributes[K]) => void): this;
@@ -419,7 +419,7 @@ export interface ElectricalMeasurementClusterAttributes {
 }
 
 export interface ElectricalMeasurementCluster extends ZCLNodeCluster {
-  readAttributes<K extends 'measurementType' | 'acFrequency' | 'measuredPhase1stHarmonicCurrent' | 'acFrequencyMultiplier' | 'acFrequencyDivisor' | 'phaseHarmonicCurrentMultiplier' | 'rmsVoltage' | 'rmsCurrent' | 'activePower' | 'reactivePower' | 'acVoltageMultiplier' | 'acVoltageDivisor' | 'acCurrentMultiplier' | 'acCurrentDivisor' | 'acPowerMultiplier' | 'acPowerDivisor' | 'acAlarmsMask' | 'acVoltageOverload' | 'acCurrentOverload' | 'acActivePowerOverload'>(attributeNames: K[], opts?: { timeout?: number }): Promise<Pick<ElectricalMeasurementClusterAttributes, K>>;
+  readAttributes<K extends keyof ElectricalMeasurementClusterAttributes>(attributeNames: K[], opts?: { timeout?: number }): Promise<Pick<ElectricalMeasurementClusterAttributes, K>>;
   readAttributes(attributeNames: Array<keyof ElectricalMeasurementClusterAttributes | number>, opts?: { timeout?: number }): Promise<Partial<ElectricalMeasurementClusterAttributes> & Record<number, unknown>>;
   writeAttributes(attributes: Partial<ElectricalMeasurementClusterAttributes>, opts?: { timeout?: number }): Promise<unknown>;
   on<K extends keyof ElectricalMeasurementClusterAttributes & string>(eventName: `attr.${K}`, listener: (value: ElectricalMeasurementClusterAttributes[K]) => void): this;
@@ -437,7 +437,7 @@ export interface FlowMeasurementClusterAttributes {
 }
 
 export interface FlowMeasurementCluster extends ZCLNodeCluster {
-  readAttributes<K extends 'measuredValue' | 'minMeasuredValue' | 'maxMeasuredValue' | 'tolerance'>(attributeNames: K[], opts?: { timeout?: number }): Promise<Pick<FlowMeasurementClusterAttributes, K>>;
+  readAttributes<K extends keyof FlowMeasurementClusterAttributes>(attributeNames: K[], opts?: { timeout?: number }): Promise<Pick<FlowMeasurementClusterAttributes, K>>;
   readAttributes(attributeNames: Array<keyof FlowMeasurementClusterAttributes | number>, opts?: { timeout?: number }): Promise<Partial<FlowMeasurementClusterAttributes> & Record<number, unknown>>;
   writeAttributes(attributes: Partial<FlowMeasurementClusterAttributes>, opts?: { timeout?: number }): Promise<unknown>;
   on<K extends keyof FlowMeasurementClusterAttributes & string>(eventName: `attr.${K}`, listener: (value: FlowMeasurementClusterAttributes[K]) => void): this;
@@ -449,7 +449,7 @@ export interface GroupsClusterAttributes {
 }
 
 export interface GroupsCluster extends ZCLNodeCluster {
-  readAttributes<K extends 'nameSupport'>(attributeNames: K[], opts?: { timeout?: number }): Promise<Pick<GroupsClusterAttributes, K>>;
+  readAttributes<K extends keyof GroupsClusterAttributes>(attributeNames: K[], opts?: { timeout?: number }): Promise<Pick<GroupsClusterAttributes, K>>;
   readAttributes(attributeNames: Array<keyof GroupsClusterAttributes | number>, opts?: { timeout?: number }): Promise<Partial<GroupsClusterAttributes> & Record<number, unknown>>;
   writeAttributes(attributes: Partial<GroupsClusterAttributes>, opts?: { timeout?: number }): Promise<unknown>;
   on<K extends keyof GroupsClusterAttributes & string>(eventName: `attr.${K}`, listener: (value: GroupsClusterAttributes[K]) => void): this;
@@ -477,7 +477,7 @@ export interface IASZoneClusterAttributes {
 }
 
 export interface IASZoneCluster extends ZCLNodeCluster {
-  readAttributes<K extends 'zoneState' | 'zoneType' | 'zoneStatus' | 'iasCIEAddress' | 'zoneId'>(attributeNames: K[], opts?: { timeout?: number }): Promise<Pick<IASZoneClusterAttributes, K>>;
+  readAttributes<K extends keyof IASZoneClusterAttributes>(attributeNames: K[], opts?: { timeout?: number }): Promise<Pick<IASZoneClusterAttributes, K>>;
   readAttributes(attributeNames: Array<keyof IASZoneClusterAttributes | number>, opts?: { timeout?: number }): Promise<Partial<IASZoneClusterAttributes> & Record<number, unknown>>;
   writeAttributes(attributes: Partial<IASZoneClusterAttributes>, opts?: { timeout?: number }): Promise<unknown>;
   on<K extends keyof IASZoneClusterAttributes & string>(eventName: `attr.${K}`, listener: (value: IASZoneClusterAttributes[K]) => void): this;
@@ -493,7 +493,7 @@ export interface IdentifyClusterAttributes {
 }
 
 export interface IdentifyCluster extends ZCLNodeCluster {
-  readAttributes<K extends 'identifyTime'>(attributeNames: K[], opts?: { timeout?: number }): Promise<Pick<IdentifyClusterAttributes, K>>;
+  readAttributes<K extends keyof IdentifyClusterAttributes>(attributeNames: K[], opts?: { timeout?: number }): Promise<Pick<IdentifyClusterAttributes, K>>;
   readAttributes(attributeNames: Array<keyof IdentifyClusterAttributes | number>, opts?: { timeout?: number }): Promise<Partial<IdentifyClusterAttributes> & Record<number, unknown>>;
   writeAttributes(attributes: Partial<IdentifyClusterAttributes>, opts?: { timeout?: number }): Promise<unknown>;
   on<K extends keyof IdentifyClusterAttributes & string>(eventName: `attr.${K}`, listener: (value: IdentifyClusterAttributes[K]) => void): this;
@@ -510,7 +510,7 @@ export interface IlluminanceLevelSensingClusterAttributes {
 }
 
 export interface IlluminanceLevelSensingCluster extends ZCLNodeCluster {
-  readAttributes<K extends 'levelStatus' | 'lightSensorType' | 'illuminanceTargetLevel'>(attributeNames: K[], opts?: { timeout?: number }): Promise<Pick<IlluminanceLevelSensingClusterAttributes, K>>;
+  readAttributes<K extends keyof IlluminanceLevelSensingClusterAttributes>(attributeNames: K[], opts?: { timeout?: number }): Promise<Pick<IlluminanceLevelSensingClusterAttributes, K>>;
   readAttributes(attributeNames: Array<keyof IlluminanceLevelSensingClusterAttributes | number>, opts?: { timeout?: number }): Promise<Partial<IlluminanceLevelSensingClusterAttributes> & Record<number, unknown>>;
   writeAttributes(attributes: Partial<IlluminanceLevelSensingClusterAttributes>, opts?: { timeout?: number }): Promise<unknown>;
   on<K extends keyof IlluminanceLevelSensingClusterAttributes & string>(eventName: `attr.${K}`, listener: (value: IlluminanceLevelSensingClusterAttributes[K]) => void): this;
@@ -526,7 +526,7 @@ export interface IlluminanceMeasurementClusterAttributes {
 }
 
 export interface IlluminanceMeasurementCluster extends ZCLNodeCluster {
-  readAttributes<K extends 'measuredValue' | 'minMeasuredValue' | 'maxMeasuredValue' | 'tolerance' | 'lightSensorType'>(attributeNames: K[], opts?: { timeout?: number }): Promise<Pick<IlluminanceMeasurementClusterAttributes, K>>;
+  readAttributes<K extends keyof IlluminanceMeasurementClusterAttributes>(attributeNames: K[], opts?: { timeout?: number }): Promise<Pick<IlluminanceMeasurementClusterAttributes, K>>;
   readAttributes(attributeNames: Array<keyof IlluminanceMeasurementClusterAttributes | number>, opts?: { timeout?: number }): Promise<Partial<IlluminanceMeasurementClusterAttributes> & Record<number, unknown>>;
   writeAttributes(attributes: Partial<IlluminanceMeasurementClusterAttributes>, opts?: { timeout?: number }): Promise<unknown>;
   on<K extends keyof IlluminanceMeasurementClusterAttributes & string>(eventName: `attr.${K}`, listener: (value: IlluminanceMeasurementClusterAttributes[K]) => void): this;
@@ -544,7 +544,7 @@ export interface LevelControlClusterAttributes {
 }
 
 export interface LevelControlCluster extends ZCLNodeCluster {
-  readAttributes<K extends 'currentLevel' | 'remainingTime' | 'onOffTransitionTime' | 'onLevel' | 'onTransitionTime' | 'offTransitionTime' | 'defaultMoveRate'>(attributeNames: K[], opts?: { timeout?: number }): Promise<Pick<LevelControlClusterAttributes, K>>;
+  readAttributes<K extends keyof LevelControlClusterAttributes>(attributeNames: K[], opts?: { timeout?: number }): Promise<Pick<LevelControlClusterAttributes, K>>;
   readAttributes(attributeNames: Array<keyof LevelControlClusterAttributes | number>, opts?: { timeout?: number }): Promise<Partial<LevelControlClusterAttributes> & Record<number, unknown>>;
   writeAttributes(attributes: Partial<LevelControlClusterAttributes>, opts?: { timeout?: number }): Promise<unknown>;
   on<K extends keyof LevelControlClusterAttributes & string>(eventName: `attr.${K}`, listener: (value: LevelControlClusterAttributes[K]) => void): this;
@@ -744,7 +744,7 @@ export interface MeteringClusterAttributes {
 }
 
 export interface MeteringCluster extends ZCLNodeCluster {
-  readAttributes<K extends 'currentSummationDelivered' | 'currentSummationReceived' | 'currentMaxDemandDelivered' | 'currentMaxDemandReceived' | 'dftSummation' | 'dailyFreezeTime' | 'powerFactor' | 'readingSnapShotTime' | 'currentMaxDemandDeliveredTime' | 'currentMaxDemandReceivedTime' | 'defaultUpdatePeriod' | 'fastPollUpdatePeriod' | 'currentBlockPeriodConsumptionDelivered' | 'dailyConsumptionTarget' | 'currentBlock' | 'profileIntervalPeriod' | 'currentTier1SummationDelivered' | 'currentTier1SummationReceived' | 'currentTier2SummationDelivered' | 'currentTier2SummationReceived' | 'currentTier3SummationDelivered' | 'currentTier3SummationReceived' | 'currentTier4SummationDelivered' | 'currentTier4SummationReceived' | 'status' | 'remainingBatteryLife' | 'hoursInOperation' | 'hoursInFault' | 'unitOfMeasure' | 'multiplier' | 'divisor' | 'siteId' | 'meterSerialNumber' | 'energyCarrierUnitOfMeasure' | 'temperatureUnitOfMeasure' | 'moduleSerialNumber' | 'operatingTariffLabelDelivered' | 'operatingTariffLabelReceived' | 'customerIdNumber' | 'alternativeUnitOfMeasure' | 'instantaneousDemand' | 'currentDayConsumptionDelivered' | 'currentDayConsumptionReceived' | 'previousDayConsumptionDelivered' | 'previousDayConsumptionReceived' | 'currentPartialProfileIntervalStartTimeDelivered' | 'currentPartialProfileIntervalStartTimeReceived' | 'currentPartialProfileIntervalValueDelivered' | 'currentPartialProfileIntervalValueReceived' | 'currentDayMaxPressure' | 'currentDayMinPressure' | 'previousDayMaxPressure' | 'previousDayMinPressure' | 'currentDayMaxDemand' | 'previousDayMaxDemand' | 'currentMonthMaxDemand' | 'currentYearMaxDemand' | 'currentDayMaxEnergyCarrierDemand' | 'previousDayMaxEnergyCarrierDemand' | 'currentMonthMaxEnergyCarrierDemand' | 'currentMonthMinEnergyCarrierDemand' | 'currentYearMaxEnergyCarrierDemand' | 'currentYearMinEnergyCarrierDemand' | 'maxNumberOfPeriodsDelivered' | 'currentDemandDelivered' | 'demandLimit' | 'demandIntegrationPeriod' | 'numberOfDemandSubintervals' | 'demandLimitArmDuration' | 'currentNoTierBlock1SummationDelivered' | 'currentNoTierBlock2SummationDelivered' | 'currentNoTierBlock3SummationDelivered' | 'currentNoTierBlock4SummationDelivered' | 'currentNoTierBlock5SummationDelivered' | 'currentNoTierBlock6SummationDelivered' | 'currentNoTierBlock7SummationDelivered' | 'currentNoTierBlock8SummationDelivered' | 'currentNoTierBlock9SummationDelivered' | 'currentNoTierBlock10SummationDelivered' | 'currentNoTierBlock11SummationDelivered' | 'currentNoTierBlock12SummationDelivered' | 'currentNoTierBlock13SummationDelivered' | 'currentNoTierBlock14SummationDelivered' | 'currentNoTierBlock15SummationDelivered' | 'currentNoTierBlock16SummationDelivered' | 'currentTier1Block1SummationDelivered' | 'currentTier1Block2SummationDelivered' | 'currentTier1Block3SummationDelivered' | 'currentTier1Block4SummationDelivered' | 'currentTier1Block5SummationDelivered' | 'currentTier1Block6SummationDelivered' | 'currentTier1Block7SummationDelivered' | 'currentTier1Block8SummationDelivered' | 'currentTier1Block9SummationDelivered' | 'currentTier1Block10SummationDelivered' | 'currentTier1Block11SummationDelivered' | 'currentTier1Block12SummationDelivered' | 'currentTier1Block13SummationDelivered' | 'currentTier1Block14SummationDelivered' | 'currentTier1Block15SummationDelivered' | 'currentTier1Block16SummationDelivered' | 'currentTier2Block1SummationDelivered' | 'currentTier2Block2SummationDelivered' | 'currentTier2Block3SummationDelivered' | 'currentTier2Block4SummationDelivered' | 'currentTier2Block5SummationDelivered' | 'currentTier2Block6SummationDelivered' | 'currentTier2Block7SummationDelivered' | 'currentTier2Block8SummationDelivered' | 'currentTier2Block9SummationDelivered' | 'currentTier2Block10SummationDelivered' | 'currentTier2Block11SummationDelivered' | 'currentTier2Block12SummationDelivered' | 'currentTier2Block13SummationDelivered' | 'currentTier2Block14SummationDelivered' | 'currentTier2Block15SummationDelivered' | 'currentTier2Block16SummationDelivered' | 'currentTier3Block1SummationDelivered' | 'currentTier3Block2SummationDelivered' | 'currentTier3Block3SummationDelivered' | 'currentTier3Block4SummationDelivered' | 'currentTier3Block5SummationDelivered' | 'currentTier3Block6SummationDelivered' | 'currentTier3Block7SummationDelivered' | 'currentTier3Block8SummationDelivered' | 'currentTier3Block9SummationDelivered' | 'currentTier3Block10SummationDelivered' | 'currentTier3Block11SummationDelivered' | 'currentTier3Block12SummationDelivered' | 'currentTier3Block13SummationDelivered' | 'currentTier3Block14SummationDelivered' | 'currentTier3Block15SummationDelivered' | 'currentTier3Block16SummationDelivered' | 'currentTier4Block1SummationDelivered' | 'currentTier4Block2SummationDelivered' | 'currentTier4Block3SummationDelivered' | 'currentTier4Block4SummationDelivered' | 'currentTier4Block5SummationDelivered' | 'currentTier4Block6SummationDelivered' | 'currentTier4Block7SummationDelivered' | 'currentTier4Block8SummationDelivered' | 'currentTier4Block9SummationDelivered' | 'currentTier4Block10SummationDelivered' | 'currentTier4Block11SummationDelivered' | 'currentTier4Block12SummationDelivered' | 'currentTier4Block13SummationDelivered' | 'currentTier4Block14SummationDelivered' | 'currentTier4Block15SummationDelivered' | 'currentTier4Block16SummationDelivered' | 'currentNoTierBlock1SummationReceived' | 'currentNoTierBlock2SummationReceived' | 'currentNoTierBlock3SummationReceived' | 'currentNoTierBlock4SummationReceived' | 'currentNoTierBlock5SummationReceived' | 'currentNoTierBlock6SummationReceived' | 'currentNoTierBlock7SummationReceived' | 'currentNoTierBlock8SummationReceived' | 'currentNoTierBlock9SummationReceived' | 'currentNoTierBlock10SummationReceived' | 'currentNoTierBlock11SummationReceived' | 'currentNoTierBlock12SummationReceived' | 'currentNoTierBlock13SummationReceived' | 'currentNoTierBlock14SummationReceived' | 'currentNoTierBlock15SummationReceived' | 'currentNoTierBlock16SummationReceived' | 'billToDateDelivered' | 'billToDateTimeStampDelivered' | 'projectedBillDelivered' | 'projectedBillTimeStampDelivered' | 'billToDateReceived' | 'billToDateTimeStampReceived' | 'projectedBillReceived' | 'projectedBillTimeStampReceived' | 'proposedChangeSupplyImplementationTime' | 'proposedChangeSupplyStatus' | 'uncontrolledFlowThreshold' | 'uncontrolledFlowThresholdUnitOfMeasure' | 'uncontrolledFlowMultiplier' | 'uncontrolledFlowDivisor' | 'flowStabilisationPeriod' | 'flowMeasurementPeriod'>(attributeNames: K[], opts?: { timeout?: number }): Promise<Pick<MeteringClusterAttributes, K>>;
+  readAttributes<K extends keyof MeteringClusterAttributes>(attributeNames: K[], opts?: { timeout?: number }): Promise<Pick<MeteringClusterAttributes, K>>;
   readAttributes(attributeNames: Array<keyof MeteringClusterAttributes | number>, opts?: { timeout?: number }): Promise<Partial<MeteringClusterAttributes> & Record<number, unknown>>;
   writeAttributes(attributes: Partial<MeteringClusterAttributes>, opts?: { timeout?: number }): Promise<unknown>;
   on<K extends keyof MeteringClusterAttributes & string>(eventName: `attr.${K}`, listener: (value: MeteringClusterAttributes[K]) => void): this;
@@ -762,7 +762,7 @@ export interface MultistateInputClusterAttributes {
 }
 
 export interface MultistateInputCluster extends ZCLNodeCluster {
-  readAttributes<K extends 'description' | 'numberOfStates' | 'outOfService' | 'presentValue' | 'reliability' | 'statusFlags' | 'applicationType'>(attributeNames: K[], opts?: { timeout?: number }): Promise<Pick<MultistateInputClusterAttributes, K>>;
+  readAttributes<K extends keyof MultistateInputClusterAttributes>(attributeNames: K[], opts?: { timeout?: number }): Promise<Pick<MultistateInputClusterAttributes, K>>;
   readAttributes(attributeNames: Array<keyof MultistateInputClusterAttributes | number>, opts?: { timeout?: number }): Promise<Partial<MultistateInputClusterAttributes> & Record<number, unknown>>;
   writeAttributes(attributes: Partial<MultistateInputClusterAttributes>, opts?: { timeout?: number }): Promise<unknown>;
   on<K extends keyof MultistateInputClusterAttributes & string>(eventName: `attr.${K}`, listener: (value: MultistateInputClusterAttributes[K]) => void): this;
@@ -781,7 +781,7 @@ export interface MultistateOutputClusterAttributes {
 }
 
 export interface MultistateOutputCluster extends ZCLNodeCluster {
-  readAttributes<K extends 'description' | 'numberOfStates' | 'outOfService' | 'presentValue' | 'reliability' | 'relinquishDefault' | 'statusFlags' | 'applicationType'>(attributeNames: K[], opts?: { timeout?: number }): Promise<Pick<MultistateOutputClusterAttributes, K>>;
+  readAttributes<K extends keyof MultistateOutputClusterAttributes>(attributeNames: K[], opts?: { timeout?: number }): Promise<Pick<MultistateOutputClusterAttributes, K>>;
   readAttributes(attributeNames: Array<keyof MultistateOutputClusterAttributes | number>, opts?: { timeout?: number }): Promise<Partial<MultistateOutputClusterAttributes> & Record<number, unknown>>;
   writeAttributes(attributes: Partial<MultistateOutputClusterAttributes>, opts?: { timeout?: number }): Promise<unknown>;
   on<K extends keyof MultistateOutputClusterAttributes & string>(eventName: `attr.${K}`, listener: (value: MultistateOutputClusterAttributes[K]) => void): this;
@@ -800,7 +800,7 @@ export interface MultistateValueClusterAttributes {
 }
 
 export interface MultistateValueCluster extends ZCLNodeCluster {
-  readAttributes<K extends 'description' | 'numberOfStates' | 'outOfService' | 'presentValue' | 'reliability' | 'relinquishDefault' | 'statusFlags' | 'applicationType'>(attributeNames: K[], opts?: { timeout?: number }): Promise<Pick<MultistateValueClusterAttributes, K>>;
+  readAttributes<K extends keyof MultistateValueClusterAttributes>(attributeNames: K[], opts?: { timeout?: number }): Promise<Pick<MultistateValueClusterAttributes, K>>;
   readAttributes(attributeNames: Array<keyof MultistateValueClusterAttributes | number>, opts?: { timeout?: number }): Promise<Partial<MultistateValueClusterAttributes> & Record<number, unknown>>;
   writeAttributes(attributes: Partial<MultistateValueClusterAttributes>, opts?: { timeout?: number }): Promise<unknown>;
   on<K extends keyof MultistateValueClusterAttributes & string>(eventName: `attr.${K}`, listener: (value: MultistateValueClusterAttributes[K]) => void): this;
@@ -823,7 +823,7 @@ export interface OccupancySensingClusterAttributes {
 }
 
 export interface OccupancySensingCluster extends ZCLNodeCluster {
-  readAttributes<K extends 'occupancy' | 'occupancySensorType' | 'occupancySensorTypeBitmap' | 'pirOccupiedToUnoccupiedDelay' | 'pirUnoccupiedToOccupiedDelay' | 'pirUnoccupiedToOccupiedThreshold' | 'ultrasonicOccupiedToUnoccupiedDelay' | 'ultrasonicUnoccupiedToOccupiedDelay' | 'ultrasonicUnoccupiedToOccupiedThreshold' | 'physicalContactOccupiedToUnoccupiedDelay' | 'physicalContactUnoccupiedToOccupiedDelay' | 'physicalContactUnoccupiedToOccupiedThreshold'>(attributeNames: K[], opts?: { timeout?: number }): Promise<Pick<OccupancySensingClusterAttributes, K>>;
+  readAttributes<K extends keyof OccupancySensingClusterAttributes>(attributeNames: K[], opts?: { timeout?: number }): Promise<Pick<OccupancySensingClusterAttributes, K>>;
   readAttributes(attributeNames: Array<keyof OccupancySensingClusterAttributes | number>, opts?: { timeout?: number }): Promise<Partial<OccupancySensingClusterAttributes> & Record<number, unknown>>;
   writeAttributes(attributes: Partial<OccupancySensingClusterAttributes>, opts?: { timeout?: number }): Promise<unknown>;
   on<K extends keyof OccupancySensingClusterAttributes & string>(eventName: `attr.${K}`, listener: (value: OccupancySensingClusterAttributes[K]) => void): this;
@@ -837,7 +837,7 @@ export interface OnOffClusterAttributes {
 }
 
 export interface OnOffCluster extends ZCLNodeCluster {
-  readAttributes<K extends 'onOff' | 'onTime' | 'offWaitTime'>(attributeNames: K[], opts?: { timeout?: number }): Promise<Pick<OnOffClusterAttributes, K>>;
+  readAttributes<K extends keyof OnOffClusterAttributes>(attributeNames: K[], opts?: { timeout?: number }): Promise<Pick<OnOffClusterAttributes, K>>;
   readAttributes(attributeNames: Array<keyof OnOffClusterAttributes | number>, opts?: { timeout?: number }): Promise<Partial<OnOffClusterAttributes> & Record<number, unknown>>;
   writeAttributes(attributes: Partial<OnOffClusterAttributes>, opts?: { timeout?: number }): Promise<unknown>;
   on<K extends keyof OnOffClusterAttributes & string>(eventName: `attr.${K}`, listener: (value: OnOffClusterAttributes[K]) => void): this;
@@ -870,7 +870,7 @@ export interface OTAClusterAttributes {
 }
 
 export interface OTACluster extends ZCLNodeCluster {
-  readAttributes<K extends 'upgradeServerID' | 'fileOffset' | 'currentFileVersion' | 'currentZigBeeStackVersion' | 'downloadedFileVersion' | 'downloadedZigBeeStackVersion' | 'imageUpgradeStatus' | 'manufacturerID' | 'imageTypeID' | 'minimumBlockPeriod' | 'imageStamp' | 'upgradeActivationPolicy' | 'upgradeTimeoutPolicy'>(attributeNames: K[], opts?: { timeout?: number }): Promise<Pick<OTAClusterAttributes, K>>;
+  readAttributes<K extends keyof OTAClusterAttributes>(attributeNames: K[], opts?: { timeout?: number }): Promise<Pick<OTAClusterAttributes, K>>;
   readAttributes(attributeNames: Array<keyof OTAClusterAttributes | number>, opts?: { timeout?: number }): Promise<Partial<OTAClusterAttributes> & Record<number, unknown>>;
   writeAttributes(attributes: Partial<OTAClusterAttributes>, opts?: { timeout?: number }): Promise<unknown>;
   on<K extends keyof OTAClusterAttributes & string>(eventName: `attr.${K}`, listener: (value: OTAClusterAttributes[K]) => void): this;
@@ -896,7 +896,7 @@ export interface PollControlClusterAttributes {
 }
 
 export interface PollControlCluster extends ZCLNodeCluster {
-  readAttributes<K extends 'checkInInterval' | 'longPollInterval' | 'shortPollInterval' | 'fastPollTimeout' | 'checkInIntervalMin' | 'longPollIntervalMin' | 'fastPollTimeoutMax'>(attributeNames: K[], opts?: { timeout?: number }): Promise<Pick<PollControlClusterAttributes, K>>;
+  readAttributes<K extends keyof PollControlClusterAttributes>(attributeNames: K[], opts?: { timeout?: number }): Promise<Pick<PollControlClusterAttributes, K>>;
   readAttributes(attributeNames: Array<keyof PollControlClusterAttributes | number>, opts?: { timeout?: number }): Promise<Partial<PollControlClusterAttributes> & Record<number, unknown>>;
   writeAttributes(attributes: Partial<PollControlClusterAttributes>, opts?: { timeout?: number }): Promise<unknown>;
   on<K extends keyof PollControlClusterAttributes & string>(eventName: `attr.${K}`, listener: (value: PollControlClusterAttributes[K]) => void): this;
@@ -917,7 +917,7 @@ export interface PowerConfigurationClusterAttributes {
 }
 
 export interface PowerConfigurationCluster extends ZCLNodeCluster {
-  readAttributes<K extends 'batteryVoltage' | 'batteryPercentageRemaining' | 'batterySize' | 'batteryQuantity' | 'batteryRatedVoltage' | 'batteryVoltageMinThreshold' | 'batteryAlarmState'>(attributeNames: K[], opts?: { timeout?: number }): Promise<Pick<PowerConfigurationClusterAttributes, K>>;
+  readAttributes<K extends keyof PowerConfigurationClusterAttributes>(attributeNames: K[], opts?: { timeout?: number }): Promise<Pick<PowerConfigurationClusterAttributes, K>>;
   readAttributes(attributeNames: Array<keyof PowerConfigurationClusterAttributes | number>, opts?: { timeout?: number }): Promise<Partial<PowerConfigurationClusterAttributes> & Record<number, unknown>>;
   writeAttributes(attributes: Partial<PowerConfigurationClusterAttributes>, opts?: { timeout?: number }): Promise<unknown>;
   on<K extends keyof PowerConfigurationClusterAttributes & string>(eventName: `attr.${K}`, listener: (value: PowerConfigurationClusterAttributes[K]) => void): this;
@@ -940,7 +940,7 @@ export interface PressureMeasurementClusterAttributes {
 }
 
 export interface PressureMeasurementCluster extends ZCLNodeCluster {
-  readAttributes<K extends 'measuredValue' | 'minMeasuredValue' | 'maxMeasuredValue' | 'tolerance' | 'scaledValue' | 'minScaledValue' | 'maxScaledValue' | 'scaledTolerance' | 'scale'>(attributeNames: K[], opts?: { timeout?: number }): Promise<Pick<PressureMeasurementClusterAttributes, K>>;
+  readAttributes<K extends keyof PressureMeasurementClusterAttributes>(attributeNames: K[], opts?: { timeout?: number }): Promise<Pick<PressureMeasurementClusterAttributes, K>>;
   readAttributes(attributeNames: Array<keyof PressureMeasurementClusterAttributes | number>, opts?: { timeout?: number }): Promise<Partial<PressureMeasurementClusterAttributes> & Record<number, unknown>>;
   writeAttributes(attributes: Partial<PressureMeasurementClusterAttributes>, opts?: { timeout?: number }): Promise<unknown>;
   on<K extends keyof PressureMeasurementClusterAttributes & string>(eventName: `attr.${K}`, listener: (value: PressureMeasurementClusterAttributes[K]) => void): this;
@@ -958,7 +958,7 @@ export interface RelativeHumidityClusterAttributes {
 }
 
 export interface RelativeHumidityCluster extends ZCLNodeCluster {
-  readAttributes<K extends 'measuredValue' | 'minMeasuredValue' | 'maxMeasuredValue' | 'tolerance'>(attributeNames: K[], opts?: { timeout?: number }): Promise<Pick<RelativeHumidityClusterAttributes, K>>;
+  readAttributes<K extends keyof RelativeHumidityClusterAttributes>(attributeNames: K[], opts?: { timeout?: number }): Promise<Pick<RelativeHumidityClusterAttributes, K>>;
   readAttributes(attributeNames: Array<keyof RelativeHumidityClusterAttributes | number>, opts?: { timeout?: number }): Promise<Partial<RelativeHumidityClusterAttributes> & Record<number, unknown>>;
   writeAttributes(attributes: Partial<RelativeHumidityClusterAttributes>, opts?: { timeout?: number }): Promise<unknown>;
   on<K extends keyof RelativeHumidityClusterAttributes & string>(eventName: `attr.${K}`, listener: (value: RelativeHumidityClusterAttributes[K]) => void): this;
@@ -978,7 +978,7 @@ export interface TemperatureMeasurementClusterAttributes {
 }
 
 export interface TemperatureMeasurementCluster extends ZCLNodeCluster {
-  readAttributes<K extends 'measuredValue' | 'minMeasuredValue' | 'maxMeasuredValue'>(attributeNames: K[], opts?: { timeout?: number }): Promise<Pick<TemperatureMeasurementClusterAttributes, K>>;
+  readAttributes<K extends keyof TemperatureMeasurementClusterAttributes>(attributeNames: K[], opts?: { timeout?: number }): Promise<Pick<TemperatureMeasurementClusterAttributes, K>>;
   readAttributes(attributeNames: Array<keyof TemperatureMeasurementClusterAttributes | number>, opts?: { timeout?: number }): Promise<Partial<TemperatureMeasurementClusterAttributes> & Record<number, unknown>>;
   writeAttributes(attributes: Partial<TemperatureMeasurementClusterAttributes>, opts?: { timeout?: number }): Promise<unknown>;
   on<K extends keyof TemperatureMeasurementClusterAttributes & string>(eventName: `attr.${K}`, listener: (value: TemperatureMeasurementClusterAttributes[K]) => void): this;
@@ -1012,7 +1012,7 @@ export interface ThermostatClusterAttributes {
 }
 
 export interface ThermostatCluster extends ZCLNodeCluster {
-  readAttributes<K extends 'localTemperature' | 'outdoorTemperature' | 'occupancy' | 'absMinHeatSetpointLimit' | 'absMaxHeatSetpointLimit' | 'absMinCoolSetpointLimit' | 'absMaxCoolSetpointLimit' | 'pICoolingDemand' | 'pIHeatingDemand' | 'localTemperatureCalibration' | 'occupiedCoolingSetpoint' | 'occupiedHeatingSetpoint' | 'unoccupiedCoolingSetpoint' | 'unoccupiedHeatingSetpoint' | 'minHeatSetpointLimit' | 'maxHeatSetpointLimit' | 'minCoolSetpointLimit' | 'maxCoolSetpointLimit' | 'minSetpointDeadBand' | 'remoteSensing' | 'controlSequenceOfOperation' | 'systemMode' | 'alarmMask'>(attributeNames: K[], opts?: { timeout?: number }): Promise<Pick<ThermostatClusterAttributes, K>>;
+  readAttributes<K extends keyof ThermostatClusterAttributes>(attributeNames: K[], opts?: { timeout?: number }): Promise<Pick<ThermostatClusterAttributes, K>>;
   readAttributes(attributeNames: Array<keyof ThermostatClusterAttributes | number>, opts?: { timeout?: number }): Promise<Partial<ThermostatClusterAttributes> & Record<number, unknown>>;
   writeAttributes(attributes: Partial<ThermostatClusterAttributes>, opts?: { timeout?: number }): Promise<unknown>;
   on<K extends keyof ThermostatClusterAttributes & string>(eventName: `attr.${K}`, listener: (value: ThermostatClusterAttributes[K]) => void): this;
@@ -1051,7 +1051,7 @@ export interface WindowCoveringClusterAttributes {
 }
 
 export interface WindowCoveringCluster extends ZCLNodeCluster {
-  readAttributes<K extends 'windowCoveringType' | 'physicalClosedLimitLift' | 'physicalClosedLimitTilt' | 'currentPositionLift' | 'currentPositionTilt' | 'numberofActuationsLift' | 'numberofActuationsTilt' | 'configStatus' | 'currentPositionLiftPercentage' | 'currentPositionTiltPercentage' | 'installedOpenLimitLift' | 'installedClosedLimitLift' | 'installedOpenLimitTilt' | 'installedClosedLimitTilt' | 'velocityLift' | 'accelerationTimeLift' | 'decelerationTimeLift' | 'mode' | 'intermediateSetpointsLift' | 'intermediateSetpointsTilt'>(attributeNames: K[], opts?: { timeout?: number }): Promise<Pick<WindowCoveringClusterAttributes, K>>;
+  readAttributes<K extends keyof WindowCoveringClusterAttributes>(attributeNames: K[], opts?: { timeout?: number }): Promise<Pick<WindowCoveringClusterAttributes, K>>;
   readAttributes(attributeNames: Array<keyof WindowCoveringClusterAttributes | number>, opts?: { timeout?: number }): Promise<Partial<WindowCoveringClusterAttributes> & Record<number, unknown>>;
   writeAttributes(attributes: Partial<WindowCoveringClusterAttributes>, opts?: { timeout?: number }): Promise<unknown>;
   on<K extends keyof WindowCoveringClusterAttributes & string>(eventName: `attr.${K}`, listener: (value: WindowCoveringClusterAttributes[K]) => void): this;
diff --git a/scripts/generate-types.js b/scripts/generate-types.js
index 1f5097f..f96aaa7 100644
--- a/scripts/generate-types.js
+++ b/scripts/generate-types.js
@@ -184,8 +184,7 @@ function generateClusterInterface(cluster) {
 
   // Add typed readAttributes if we have attributes
   if (cluster.attributes.length > 0) {
-    const attrNames = cluster.attributes.map(a => `'${a.name}'`).join(' | ');
-    lines.push(`  readAttributes<K extends ${attrNames}>(attributeNames: K[], opts?: { timeout?: number }): Promise<Pick<${interfaceName}Attributes, K>>;`);
+    lines.push(`  readAttributes<K extends keyof ${interfaceName}Attributes>(attributeNames: K[], opts?: { timeout?: number }): Promise<Pick<${interfaceName}Attributes, K>>;`);
     lines.push(`  readAttributes(attributeNames: Array<keyof ${interfaceName}Attributes | number>, opts?: { timeout?: number }): Promise<Partial<${interfaceName}Attributes> & Record<number, unknown>>;`);
     lines.push(`  writeAttributes(attributes: Partial<${interfaceName}Attributes>, opts?: { timeout?: number }): Promise<unknown>;`);
     lines.push(`  on<K extends keyof ${interfaceName}Attributes & string>(eventName: \`attr.\${K}\`, listener: (value: ${interfaceName}Attributes[K]) => void): this;`);

From b9b88ed3f24c50ee54612ba60a95f3a8f8bd6b26 Mon Sep 17 00:00:00 2001
From: Joost Loohuis <github@loohuis.dev>
Date: Tue, 24 Mar 2026 13:23:43 +0100
Subject: [PATCH 2/9] Export ZCLEnum8Status

---
 index.d.ts                | 2 +-
 scripts/generate-types.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/index.d.ts b/index.d.ts
index 818e193..13fa943 100644
--- a/index.d.ts
+++ b/index.d.ts
@@ -31,7 +31,7 @@ type ZCLNodeConstructorInput = {
   ) => Promise<void>;
 };
 
-type ZCLEnum8Status = 'SUCCESS' | 'FAILURE' | 'NOT_AUTHORIZED' | 'RESERVED_FIELD_NOT_ZERO' | 'MALFORMED_COMMAND' | 'UNSUP_CLUSTER_COMMAND' | 'UNSUP_GENERAL_COMMAND' | 'UNSUP_MANUF_CLUSTER_COMMAND' | 'UNSUP_MANUF_GENERAL_COMMAND' | 'INVALID_FIELD' | 'UNSUPPORTED_ATTRIBUTE' | 'INVALID_VALUE' | 'READ_ONLY' | 'INSUFFICIENT_SPACE' | 'DUPLICATE_EXISTS' | 'NOT_FOUND' | 'UNREPORTABLE_ATTRIBUTE' | 'INVALID_DATA_TYPE' | 'INVALID_SELECTOR' | 'WRITE_ONLY' | 'INCONSISTENT_STARTUP_STATE' | 'DEFINED_OUT_OF_BAND' | 'INCONSISTENT' | 'ACTION_DENIED' | 'TIMEOUT' | 'ABORT' | 'INVALID_IMAGE' | 'WAIT_FOR_DATA' | 'NO_IMAGE_AVAILABLE' | 'REQUIRE_MORE_IMAGE' | 'NOTIFICATION_PENDING' | 'HARDWARE_FAILURE' | 'SOFTWARE_FAILURE' | 'CALIBRATION_ERROR' | 'UNSUPPORTED_CLUSTER';
+export type ZCLEnum8Status = 'SUCCESS' | 'FAILURE' | 'NOT_AUTHORIZED' | 'RESERVED_FIELD_NOT_ZERO' | 'MALFORMED_COMMAND' | 'UNSUP_CLUSTER_COMMAND' | 'UNSUP_GENERAL_COMMAND' | 'UNSUP_MANUF_CLUSTER_COMMAND' | 'UNSUP_MANUF_GENERAL_COMMAND' | 'INVALID_FIELD' | 'UNSUPPORTED_ATTRIBUTE' | 'INVALID_VALUE' | 'READ_ONLY' | 'INSUFFICIENT_SPACE' | 'DUPLICATE_EXISTS' | 'NOT_FOUND' | 'UNREPORTABLE_ATTRIBUTE' | 'INVALID_DATA_TYPE' | 'INVALID_SELECTOR' | 'WRITE_ONLY' | 'INCONSISTENT_STARTUP_STATE' | 'DEFINED_OUT_OF_BAND' | 'INCONSISTENT' | 'ACTION_DENIED' | 'TIMEOUT' | 'ABORT' | 'INVALID_IMAGE' | 'WAIT_FOR_DATA' | 'NO_IMAGE_AVAILABLE' | 'REQUIRE_MORE_IMAGE' | 'NOTIFICATION_PENDING' | 'HARDWARE_FAILURE' | 'SOFTWARE_FAILURE' | 'CALIBRATION_ERROR' | 'UNSUPPORTED_CLUSTER';
 
 export interface ZCLNodeCluster extends EventEmitter {
   /** Dynamic command handler methods (e.g. `onZoneStatusChangeNotification`). */
diff --git a/scripts/generate-types.js b/scripts/generate-types.js
index f96aaa7..2150153 100644
--- a/scripts/generate-types.js
+++ b/scripts/generate-types.js
@@ -280,7 +280,7 @@ type ZCLNodeConstructorInput = {
   ) => Promise<void>;
 };
 
-type ZCLEnum8Status = ${zclTypeToTS(ZCLDataTypes.enum8Status, false)};
+export type ZCLEnum8Status = ${zclTypeToTS(ZCLDataTypes.enum8Status, false)};
 `);
 
   // Base ZCLNodeCluster interface

From 7912e709cbb6ab863d5663d6375e6dc4f9a723e0 Mon Sep 17 00:00:00 2001
From: Joost Loohuis <github@loohuis.dev>
Date: Tue, 24 Mar 2026 18:08:25 +0100
Subject: [PATCH 3/9] Add global attributes to cluster attribute type
 definitions

---
 index.d.ts                | 71 +++++++++++++++++++++------------------
 scripts/generate-types.js |  7 +++-
 2 files changed, 44 insertions(+), 34 deletions(-)

diff --git a/index.d.ts b/index.d.ts
index 13fa943..fb5ae9a 100644
--- a/index.d.ts
+++ b/index.d.ts
@@ -33,6 +33,11 @@ type ZCLNodeConstructorInput = {
 
 export type ZCLEnum8Status = 'SUCCESS' | 'FAILURE' | 'NOT_AUTHORIZED' | 'RESERVED_FIELD_NOT_ZERO' | 'MALFORMED_COMMAND' | 'UNSUP_CLUSTER_COMMAND' | 'UNSUP_GENERAL_COMMAND' | 'UNSUP_MANUF_CLUSTER_COMMAND' | 'UNSUP_MANUF_GENERAL_COMMAND' | 'INVALID_FIELD' | 'UNSUPPORTED_ATTRIBUTE' | 'INVALID_VALUE' | 'READ_ONLY' | 'INSUFFICIENT_SPACE' | 'DUPLICATE_EXISTS' | 'NOT_FOUND' | 'UNREPORTABLE_ATTRIBUTE' | 'INVALID_DATA_TYPE' | 'INVALID_SELECTOR' | 'WRITE_ONLY' | 'INCONSISTENT_STARTUP_STATE' | 'DEFINED_OUT_OF_BAND' | 'INCONSISTENT' | 'ACTION_DENIED' | 'TIMEOUT' | 'ABORT' | 'INVALID_IMAGE' | 'WAIT_FOR_DATA' | 'NO_IMAGE_AVAILABLE' | 'REQUIRE_MORE_IMAGE' | 'NOTIFICATION_PENDING' | 'HARDWARE_FAILURE' | 'SOFTWARE_FAILURE' | 'CALIBRATION_ERROR' | 'UNSUPPORTED_CLUSTER';
 
+export type GlobalClusterAttributes = {
+  clusterRevision: number;
+  attributeReportingStatus: 0 | 1;
+};
+
 export interface ZCLNodeCluster extends EventEmitter {
   /** Dynamic command handler methods (e.g. `onZoneStatusChangeNotification`). */
   [key: `on${string}`]: unknown;
@@ -83,7 +88,7 @@ export interface AlarmsCluster extends ZCLNodeCluster {
   resetAlarmLog(opts?: ClusterCommandOptions): Promise<void>;
 }
 
-export interface AnalogInputClusterAttributes {
+export interface AnalogInputClusterAttributes extends GlobalClusterAttributes {
   description?: string;
   maxPresentValue?: number;
   minPresentValue?: number;
@@ -103,7 +108,7 @@ export interface AnalogInputCluster extends ZCLNodeCluster {
   once<K extends keyof AnalogInputClusterAttributes & string>(eventName: `attr.${K}`, listener: (value: AnalogInputClusterAttributes[K]) => void): this;
 }
 
-export interface AnalogOutputClusterAttributes {
+export interface AnalogOutputClusterAttributes extends GlobalClusterAttributes {
   description?: string;
   maxPresentValue?: number;
   minPresentValue?: number;
@@ -124,7 +129,7 @@ export interface AnalogOutputCluster extends ZCLNodeCluster {
   once<K extends keyof AnalogOutputClusterAttributes & string>(eventName: `attr.${K}`, listener: (value: AnalogOutputClusterAttributes[K]) => void): this;
 }
 
-export interface AnalogValueClusterAttributes {
+export interface AnalogValueClusterAttributes extends GlobalClusterAttributes {
   description?: string;
   outOfService?: boolean;
   presentValue?: number;
@@ -142,7 +147,7 @@ export interface AnalogValueCluster extends ZCLNodeCluster {
   once<K extends keyof AnalogValueClusterAttributes & string>(eventName: `attr.${K}`, listener: (value: AnalogValueClusterAttributes[K]) => void): this;
 }
 
-export interface BallastConfigurationClusterAttributes {
+export interface BallastConfigurationClusterAttributes extends GlobalClusterAttributes {
   physicalMinLevel?: number;
   physicalMaxLevel?: number;
   ballastStatus?: Partial<{ nonOperational: boolean; lampNotInSocket: boolean }>;
@@ -169,7 +174,7 @@ export interface BallastConfigurationCluster extends ZCLNodeCluster {
   once<K extends keyof BallastConfigurationClusterAttributes & string>(eventName: `attr.${K}`, listener: (value: BallastConfigurationClusterAttributes[K]) => void): this;
 }
 
-export interface BasicClusterAttributes {
+export interface BasicClusterAttributes extends GlobalClusterAttributes {
   zclVersion?: number;
   appVersion?: number;
   stackVersion?: number;
@@ -196,7 +201,7 @@ export interface BasicCluster extends ZCLNodeCluster {
   factoryReset(opts?: ClusterCommandOptions): Promise<void>;
 }
 
-export interface BinaryInputClusterAttributes {
+export interface BinaryInputClusterAttributes extends GlobalClusterAttributes {
   activeText?: string;
   description?: string;
   inactiveText?: string;
@@ -216,7 +221,7 @@ export interface BinaryInputCluster extends ZCLNodeCluster {
   once<K extends keyof BinaryInputClusterAttributes & string>(eventName: `attr.${K}`, listener: (value: BinaryInputClusterAttributes[K]) => void): this;
 }
 
-export interface BinaryOutputClusterAttributes {
+export interface BinaryOutputClusterAttributes extends GlobalClusterAttributes {
   activeText?: string;
   description?: string;
   inactiveText?: string;
@@ -239,7 +244,7 @@ export interface BinaryOutputCluster extends ZCLNodeCluster {
   once<K extends keyof BinaryOutputClusterAttributes & string>(eventName: `attr.${K}`, listener: (value: BinaryOutputClusterAttributes[K]) => void): this;
 }
 
-export interface BinaryValueClusterAttributes {
+export interface BinaryValueClusterAttributes extends GlobalClusterAttributes {
   activeText?: string;
   description?: string;
   inactiveText?: string;
@@ -262,7 +267,7 @@ export interface BinaryValueCluster extends ZCLNodeCluster {
   once<K extends keyof BinaryValueClusterAttributes & string>(eventName: `attr.${K}`, listener: (value: BinaryValueClusterAttributes[K]) => void): this;
 }
 
-export interface ColorControlClusterAttributes {
+export interface ColorControlClusterAttributes extends GlobalClusterAttributes {
   currentHue?: number;
   currentSaturation?: number;
   currentX?: number;
@@ -290,7 +295,7 @@ export interface ColorControlCluster extends ZCLNodeCluster {
 export interface DehumidificationControlCluster extends ZCLNodeCluster {
 }
 
-export interface DeviceTemperatureClusterAttributes {
+export interface DeviceTemperatureClusterAttributes extends GlobalClusterAttributes {
   currentTemperature?: number;
   minTempExperienced?: number;
   maxTempExperienced?: number;
@@ -313,7 +318,7 @@ export interface DeviceTemperatureCluster extends ZCLNodeCluster {
 export interface DiagnosticsCluster extends ZCLNodeCluster {
 }
 
-export interface DoorLockClusterAttributes {
+export interface DoorLockClusterAttributes extends GlobalClusterAttributes {
   lockState?: 'notFullyLocked' | 'locked' | 'unlocked' | 'undefined';
   lockType?: 'deadBolt' | 'magnetic' | 'other' | 'mortise' | 'rim' | 'latchBolt' | 'cylindricalLock' | 'tubularLock' | 'interconnectedLock' | 'deadLatch' | 'doorFurniture';
   actuatorEnabled?: boolean;
@@ -395,7 +400,7 @@ export interface DoorLockCluster extends ZCLNodeCluster {
   programmingEventNotification(args: { programEventSource: number; programEventCode: number; userId: number; pin?: Buffer; userType: 'unrestricted' | 'yearDayScheduleUser' | 'weekDayScheduleUser' | 'masterUser' | 'nonAccessUser' | 'notSupported'; userStatus: 'available' | 'occupiedEnabled' | 'occupiedDisabled' | 'notSupported'; zigBeeLocalTime: number; data?: Buffer }, opts?: ClusterCommandOptions): Promise<void>;
 }
 
-export interface ElectricalMeasurementClusterAttributes {
+export interface ElectricalMeasurementClusterAttributes extends GlobalClusterAttributes {
   measurementType?: Partial<{ activeMeasurementAC: boolean; reactiveMeasurementAC: boolean; apparentMeasurementAC: boolean; phaseAMeasurement: boolean; phaseBMeasurement: boolean; phaseCMeasurement: boolean; dcMeasurement: boolean; harmonicsMeasurement: boolean; powerQualityMeasurement: boolean }>;
   acFrequency?: number;
   measuredPhase1stHarmonicCurrent?: number;
@@ -429,7 +434,7 @@ export interface ElectricalMeasurementCluster extends ZCLNodeCluster {
 export interface FanControlCluster extends ZCLNodeCluster {
 }
 
-export interface FlowMeasurementClusterAttributes {
+export interface FlowMeasurementClusterAttributes extends GlobalClusterAttributes {
   measuredValue?: number;
   minMeasuredValue?: number;
   maxMeasuredValue?: number;
@@ -444,7 +449,7 @@ export interface FlowMeasurementCluster extends ZCLNodeCluster {
   once<K extends keyof FlowMeasurementClusterAttributes & string>(eventName: `attr.${K}`, listener: (value: FlowMeasurementClusterAttributes[K]) => void): this;
 }
 
-export interface GroupsClusterAttributes {
+export interface GroupsClusterAttributes extends GlobalClusterAttributes {
   nameSupport?: Partial<{ groupNames: boolean }>;
 }
 
@@ -468,7 +473,7 @@ export interface IASACECluster extends ZCLNodeCluster {
 export interface IASWDCluster extends ZCLNodeCluster {
 }
 
-export interface IASZoneClusterAttributes {
+export interface IASZoneClusterAttributes extends GlobalClusterAttributes {
   zoneState?: 'notEnrolled' | 'enrolled';
   zoneType?: 'standardCIE' | 'motionSensor' | 'contactSwitch' | 'doorWindowHandle' | 'fireSensor' | 'waterSensor' | 'carbonMonoxideSensor' | 'personalEmergencyDevice' | 'vibrationMovementSensor' | 'remoteControl' | 'keyFob' | 'keypad' | 'standardWarningDevice' | 'glassBreakSensor' | 'securityRepeater' | 'invalidZoneType';
   zoneStatus?: Partial<{ alarm1: boolean; alarm2: boolean; tamper: boolean; battery: boolean; supervisionReports: boolean; restoreReports: boolean; trouble: boolean; acMains: boolean; test: boolean; batteryDefect: boolean }>;
@@ -488,7 +493,7 @@ export interface IASZoneCluster extends ZCLNodeCluster {
   initiateNormalOperationMode(opts?: ClusterCommandOptions): Promise<void>;
 }
 
-export interface IdentifyClusterAttributes {
+export interface IdentifyClusterAttributes extends GlobalClusterAttributes {
   identifyTime?: number;
 }
 
@@ -503,7 +508,7 @@ export interface IdentifyCluster extends ZCLNodeCluster {
   triggerEffect(args: { effectIdentifier: 'blink' | 'breathe' | 'okay' | 'channelChange' | 'finish' | 'stop'; effectVariant: number }, opts?: ClusterCommandOptions): Promise<void>;
 }
 
-export interface IlluminanceLevelSensingClusterAttributes {
+export interface IlluminanceLevelSensingClusterAttributes extends GlobalClusterAttributes {
   levelStatus?: 'illuminanceOnTarget' | 'illuminanceBelowTarget' | 'illuminanceAboveTarget';
   lightSensorType?: 'photodiode' | 'cmos' | 'unknown';
   illuminanceTargetLevel?: number;
@@ -517,7 +522,7 @@ export interface IlluminanceLevelSensingCluster extends ZCLNodeCluster {
   once<K extends keyof IlluminanceLevelSensingClusterAttributes & string>(eventName: `attr.${K}`, listener: (value: IlluminanceLevelSensingClusterAttributes[K]) => void): this;
 }
 
-export interface IlluminanceMeasurementClusterAttributes {
+export interface IlluminanceMeasurementClusterAttributes extends GlobalClusterAttributes {
   measuredValue?: number;
   minMeasuredValue?: number;
   maxMeasuredValue?: number;
@@ -533,7 +538,7 @@ export interface IlluminanceMeasurementCluster extends ZCLNodeCluster {
   once<K extends keyof IlluminanceMeasurementClusterAttributes & string>(eventName: `attr.${K}`, listener: (value: IlluminanceMeasurementClusterAttributes[K]) => void): this;
 }
 
-export interface LevelControlClusterAttributes {
+export interface LevelControlClusterAttributes extends GlobalClusterAttributes {
   currentLevel?: number;
   remainingTime?: number;
   onOffTransitionTime?: number;
@@ -559,7 +564,7 @@ export interface LevelControlCluster extends ZCLNodeCluster {
   stopWithOnOff(opts?: ClusterCommandOptions): Promise<void>;
 }
 
-export interface MeteringClusterAttributes {
+export interface MeteringClusterAttributes extends GlobalClusterAttributes {
   currentSummationDelivered?: number;
   currentSummationReceived?: number;
   currentMaxDemandDelivered?: number;
@@ -751,7 +756,7 @@ export interface MeteringCluster extends ZCLNodeCluster {
   once<K extends keyof MeteringClusterAttributes & string>(eventName: `attr.${K}`, listener: (value: MeteringClusterAttributes[K]) => void): this;
 }
 
-export interface MultistateInputClusterAttributes {
+export interface MultistateInputClusterAttributes extends GlobalClusterAttributes {
   description?: string;
   numberOfStates?: number;
   outOfService?: boolean;
@@ -769,7 +774,7 @@ export interface MultistateInputCluster extends ZCLNodeCluster {
   once<K extends keyof MultistateInputClusterAttributes & string>(eventName: `attr.${K}`, listener: (value: MultistateInputClusterAttributes[K]) => void): this;
 }
 
-export interface MultistateOutputClusterAttributes {
+export interface MultistateOutputClusterAttributes extends GlobalClusterAttributes {
   description?: string;
   numberOfStates?: number;
   outOfService?: boolean;
@@ -788,7 +793,7 @@ export interface MultistateOutputCluster extends ZCLNodeCluster {
   once<K extends keyof MultistateOutputClusterAttributes & string>(eventName: `attr.${K}`, listener: (value: MultistateOutputClusterAttributes[K]) => void): this;
 }
 
-export interface MultistateValueClusterAttributes {
+export interface MultistateValueClusterAttributes extends GlobalClusterAttributes {
   description?: string;
   numberOfStates?: number;
   outOfService?: boolean;
@@ -807,7 +812,7 @@ export interface MultistateValueCluster extends ZCLNodeCluster {
   once<K extends keyof MultistateValueClusterAttributes & string>(eventName: `attr.${K}`, listener: (value: MultistateValueClusterAttributes[K]) => void): this;
 }
 
-export interface OccupancySensingClusterAttributes {
+export interface OccupancySensingClusterAttributes extends GlobalClusterAttributes {
   occupancy?: Partial<{ occupied: boolean }>;
   occupancySensorType?: 'pir' | 'ultrasonic' | 'pirAndUltrasonic' | 'physicalContact';
   occupancySensorTypeBitmap?: Partial<{ pir: boolean; ultrasonic: boolean; physicalContact: boolean }>;
@@ -830,7 +835,7 @@ export interface OccupancySensingCluster extends ZCLNodeCluster {
   once<K extends keyof OccupancySensingClusterAttributes & string>(eventName: `attr.${K}`, listener: (value: OccupancySensingClusterAttributes[K]) => void): this;
 }
 
-export interface OnOffClusterAttributes {
+export interface OnOffClusterAttributes extends GlobalClusterAttributes {
   onOff?: boolean;
   onTime?: number;
   offWaitTime?: number;
@@ -853,7 +858,7 @@ export interface OnOffCluster extends ZCLNodeCluster {
 export interface OnOffSwitchCluster extends ZCLNodeCluster {
 }
 
-export interface OTAClusterAttributes {
+export interface OTAClusterAttributes extends GlobalClusterAttributes {
   upgradeServerID?: string;
   fileOffset?: number;
   currentFileVersion?: number;
@@ -885,7 +890,7 @@ export interface OTACluster extends ZCLNodeCluster {
   queryDeviceSpecificFileRequest(args: { requestNodeAddress: string; manufacturerCode: number; imageType: number; fileVersion: number; zigBeeStackVersion: number }, opts?: ClusterCommandOptions): Promise<{ status?: ZCLEnum8Status; manufacturerCode?: number; imageType?: number; fileVersion?: number; imageSize?: number }>;
 }
 
-export interface PollControlClusterAttributes {
+export interface PollControlClusterAttributes extends GlobalClusterAttributes {
   checkInInterval?: number;
   longPollInterval?: number;
   shortPollInterval?: number;
@@ -906,7 +911,7 @@ export interface PollControlCluster extends ZCLNodeCluster {
   setShortPollInterval(args: { newShortPollInterval: number }, opts?: ClusterCommandOptions): Promise<void>;
 }
 
-export interface PowerConfigurationClusterAttributes {
+export interface PowerConfigurationClusterAttributes extends GlobalClusterAttributes {
   batteryVoltage?: number;
   batteryPercentageRemaining?: number;
   batterySize?: 'noBattery' | 'builtIn' | 'other' | 'AA' | 'AAA' | 'C' | 'D' | 'CR2' | 'CR123A' | 'unknown';
@@ -927,7 +932,7 @@ export interface PowerConfigurationCluster extends ZCLNodeCluster {
 export interface PowerProfileCluster extends ZCLNodeCluster {
 }
 
-export interface PressureMeasurementClusterAttributes {
+export interface PressureMeasurementClusterAttributes extends GlobalClusterAttributes {
   measuredValue?: number;
   minMeasuredValue?: number;
   maxMeasuredValue?: number;
@@ -950,7 +955,7 @@ export interface PressureMeasurementCluster extends ZCLNodeCluster {
 export interface PumpConfigurationAndControlCluster extends ZCLNodeCluster {
 }
 
-export interface RelativeHumidityClusterAttributes {
+export interface RelativeHumidityClusterAttributes extends GlobalClusterAttributes {
   measuredValue?: number;
   minMeasuredValue?: number;
   maxMeasuredValue?: number;
@@ -971,7 +976,7 @@ export interface ScenesCluster extends ZCLNodeCluster {
 export interface ShadeConfigurationCluster extends ZCLNodeCluster {
 }
 
-export interface TemperatureMeasurementClusterAttributes {
+export interface TemperatureMeasurementClusterAttributes extends GlobalClusterAttributes {
   measuredValue?: number;
   minMeasuredValue?: number;
   maxMeasuredValue?: number;
@@ -985,7 +990,7 @@ export interface TemperatureMeasurementCluster extends ZCLNodeCluster {
   once<K extends keyof TemperatureMeasurementClusterAttributes & string>(eventName: `attr.${K}`, listener: (value: TemperatureMeasurementClusterAttributes[K]) => void): this;
 }
 
-export interface ThermostatClusterAttributes {
+export interface ThermostatClusterAttributes extends GlobalClusterAttributes {
   localTemperature?: number;
   outdoorTemperature?: number;
   occupancy?: Partial<{ occupied: boolean }>;
@@ -1027,7 +1032,7 @@ export interface TouchLinkCluster extends ZCLNodeCluster {
   getGroups(args: { startIdx: number }, opts?: ClusterCommandOptions): Promise<{ total: number; startIndex: number; groups: unknown[] }>;
 }
 
-export interface WindowCoveringClusterAttributes {
+export interface WindowCoveringClusterAttributes extends GlobalClusterAttributes {
   windowCoveringType?: 'rollershade' | 'rollershade2Motor' | 'rollershadeExterior' | 'rollershadeExterior2Motor' | 'drapery' | 'awning' | 'shutter' | 'tiltBlindTiltOnly' | 'tiltBlindLiftAndTilt' | 'projectorScreen';
   physicalClosedLimitLift?: number;
   physicalClosedLimitTilt?: number;
diff --git a/scripts/generate-types.js b/scripts/generate-types.js
index 2150153..77e6063 100644
--- a/scripts/generate-types.js
+++ b/scripts/generate-types.js
@@ -171,7 +171,7 @@ function generateClusterInterface(cluster) {
 
   // Generate attributes interface
   if (cluster.attributes.length > 0) {
-    lines.push(`export interface ${interfaceName}Attributes {`);
+    lines.push(`export interface ${interfaceName}Attributes extends GlobalClusterAttributes {`);
     for (const attr of cluster.attributes) {
       lines.push(`  ${attr.name}?: ${attr.tsType};`);
     }
@@ -281,6 +281,11 @@ type ZCLNodeConstructorInput = {
 };
 
 export type ZCLEnum8Status = ${zclTypeToTS(ZCLDataTypes.enum8Status, false)};
+
+export type GlobalClusterAttributes = {
+  clusterRevision: number;
+  attributeReportingStatus: 0 | 1;
+};
 `);
 
   // Base ZCLNodeCluster interface

From 530df5b25b065edda35222babc206480e6d1241d Mon Sep 17 00:00:00 2001
From: Joost Loohuis <github@loohuis.dev>
Date: Thu, 26 Mar 2026 16:55:51 +0100
Subject: [PATCH 4/9] Fix invalid enum8 definitions

---
 lib/clusters/metering.js | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/clusters/metering.js b/lib/clusters/metering.js
index 0b9fbb4..d0a24a7 100644
--- a/lib/clusters/metering.js
+++ b/lib/clusters/metering.js
@@ -19,8 +19,8 @@ const ATTRIBUTES = {
   fastPollUpdatePeriod: { id: 0x000B, type: ZCLDataTypes.uint8 }, // 11, Optional
   currentBlockPeriodConsumptionDelivered: { id: 0x000C, type: ZCLDataTypes.uint48 }, // 12, Optional
   dailyConsumptionTarget: { id: 0x000D, type: ZCLDataTypes.uint24 }, // 13, Optional
-  currentBlock: { id: 0x000E, type: ZCLDataTypes.enum8 }, // 14, Optional
-  profileIntervalPeriod: { id: 0x000F, type: ZCLDataTypes.enum8 }, // 15, Optional
+  currentBlock: { id: 0x000E, type: ZCLDataTypes.enum8({/* TODO fix */}) }, // 14, Optional
+  profileIntervalPeriod: { id: 0x000F, type: ZCLDataTypes.enum8({/* TODO fix */}) }, // 15, Optional
 
   // Summation TOU Information Set (0x0100 - 0x01FF)
   currentTier1SummationDelivered: { id: 0x0100, type: ZCLDataTypes.uint48 }, // 256, Optional
@@ -52,7 +52,7 @@ const ATTRIBUTES = {
   // extendedStatus: { id: 0x0204, type: ZCLDataTypes.map64() }, // 516, Optional
 
   // Formatting Set (0x0300 - 0x03FF)
-  unitOfMeasure: { id: 0x0300, type: ZCLDataTypes.enum8 }, // 768, Mandatory
+  unitOfMeasure: { id: 0x0300, type: ZCLDataTypes.enum8({/* TODO fix */}) }, // 768, Mandatory
   multiplier: { id: 0x0301, type: ZCLDataTypes.uint24 }, // 769, Optional
   divisor: { id: 0x0302, type: ZCLDataTypes.uint24 }, // 770, Optional
   // TODO: map8 packed fields — bits 0-2: right digits, 3-6: left digits, 7: suppress zeros
@@ -63,18 +63,18 @@ const ATTRIBUTES = {
   // meteringDeviceType: { id: 0x0306, type: ZCLDataTypes.map8() }, // 774, Mandatory
   siteId: { id: 0x0307, type: ZCLDataTypes.octstr }, // 775, Optional
   meterSerialNumber: { id: 0x0308, type: ZCLDataTypes.octstr }, // 776, Optional
-  energyCarrierUnitOfMeasure: { id: 0x0309, type: ZCLDataTypes.enum8 }, // 777, Optional
+  energyCarrierUnitOfMeasure: { id: 0x0309, type: ZCLDataTypes.enum8({/* TODO fix */}) }, // 777, Optional
   // TODO: map8 packed fields — bits 0-2: right digits, 3-6: left digits, 7: suppress zeros
   // energyCarrierSummationFormatting: { id: 0x030A, type: ZCLDataTypes.map8() }, // 778, Optional
   // energyCarrierDemandFormatting: { id: 0x030B, type: ZCLDataTypes.map8() }, // 779, Optional
-  temperatureUnitOfMeasure: { id: 0x030C, type: ZCLDataTypes.enum8 }, // 780, Optional
+  temperatureUnitOfMeasure: { id: 0x030C, type: ZCLDataTypes.enum8({/* TODO fix */}) }, // 780, Optional
   // TODO: map8 packed fields — bits 0-2: right digits, 3-6: left digits, 7: suppress zeros
   // temperatureFormatting: { id: 0x030D, type: ZCLDataTypes.map8() }, // 781, Optional
   moduleSerialNumber: { id: 0x030E, type: ZCLDataTypes.octstr }, // 782, Optional
   operatingTariffLabelDelivered: { id: 0x030F, type: ZCLDataTypes.octstr }, // 783, Optional
   operatingTariffLabelReceived: { id: 0x0310, type: ZCLDataTypes.octstr }, // 784, Optional
   customerIdNumber: { id: 0x0311, type: ZCLDataTypes.octstr }, // 785, Optional
-  alternativeUnitOfMeasure: { id: 0x0312, type: ZCLDataTypes.enum8 }, // 786, Optional
+  alternativeUnitOfMeasure: { id: 0x0312, type: ZCLDataTypes.enum8({/* TODO fix */}) }, // 786, Optional
   // TODO: map8 packed fields — bits 0-2: right digits, 3-6: left digits, 7: suppress zeros
   // alternativeDemandFormatting: { id: 0x0313, type: ZCLDataTypes.map8() }, // 787, Optional
   // alternativeConsumptionFormatting: { id: 0x0314, type: ZCLDataTypes.map8() }, // 788, Optional
@@ -258,11 +258,11 @@ const ATTRIBUTES = {
     id: 0x0B00, // 2816
     type: ZCLDataTypes.uint32,
   },
-  proposedChangeSupplyStatus: { id: 0x0B01, type: ZCLDataTypes.enum8 }, // 2817, Optional
+  proposedChangeSupplyStatus: { id: 0x0B01, type: ZCLDataTypes.enum8({/* TODO fix */}) }, // 2817, Optional
   uncontrolledFlowThreshold: { id: 0x0B10, type: ZCLDataTypes.uint16 }, // 2832, Optional
   uncontrolledFlowThresholdUnitOfMeasure: { // Optional
     id: 0x0B11, // 2833
-    type: ZCLDataTypes.enum8,
+    type: ZCLDataTypes.enum8({/* TODO fix */}),
   },
   uncontrolledFlowMultiplier: { id: 0x0B12, type: ZCLDataTypes.uint16 }, // 2834, Optional
   uncontrolledFlowDivisor: { id: 0x0B13, type: ZCLDataTypes.uint16 }, // 2835, Optional

From d782b218d24a2b9a9deb7d7f3803ca80dcf63c16 Mon Sep 17 00:00:00 2001
From: Joost Loohuis <github@loohuis.dev>
Date: Thu, 9 Apr 2026 15:47:31 +0200
Subject: [PATCH 5/9] Rewrite type generation

---
 .eslintrc.json             |   2 +-
 package-lock.json          | 819 ++++++++++++++++++++++++++++++++++++-
 package.json               |   4 +-
 scripts/generate-types.js  | 521 -----------------------
 scripts/generate-types.mts | 413 +++++++++++++++++++
 scripts/template.d.ts.txt  | 281 +++++++++++++
 tsconfig.json              |  27 +-
 7 files changed, 1521 insertions(+), 546 deletions(-)
 delete mode 100644 scripts/generate-types.js
 create mode 100644 scripts/generate-types.mts
 create mode 100644 scripts/template.d.ts.txt

diff --git a/.eslintrc.json b/.eslintrc.json
index 8893149..ec026c5 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -1,3 +1,3 @@
 {
   "extends": "athom"
-}
\ No newline at end of file
+}
diff --git a/package-lock.json b/package-lock.json
index 28ef2e9..fa5ad1c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -14,6 +14,7 @@
       },
       "devDependencies": {
         "@athombv/jsdoc-template": "^1.6.3",
+        "@types/homey": "npm:homey-apps-sdk-v3-types@^0.3.12",
         "@types/node": "^25.0.10",
         "@types/sinon": "^17.0.3",
         "concurrently": "^5.2.0",
@@ -24,6 +25,7 @@
         "mocha": "^10.1.0",
         "serve": "^14.0.1",
         "sinon": "^19.0.2",
+        "tsx": "^4.21.0",
         "typescript": "^5.9.3",
         "watch": "^1.0.2"
       },
@@ -267,6 +269,448 @@
       "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==",
       "dev": true
     },
+    "node_modules/@esbuild/aix-ppc64": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.27.7.tgz",
+      "integrity": "sha512-EKX3Qwmhz1eMdEJokhALr0YiD0lhQNwDqkPYyPhiSwKrh7/4KRjQc04sZ8db+5DVVnZ1LmbNDI1uAMPEUBnQPg==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "aix"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/android-arm": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.27.7.tgz",
+      "integrity": "sha512-jbPXvB4Yj2yBV7HUfE2KHe4GJX51QplCN1pGbYjvsyCZbQmies29EoJbkEc+vYuU5o45AfQn37vZlyXy4YJ8RQ==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/android-arm64": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.27.7.tgz",
+      "integrity": "sha512-62dPZHpIXzvChfvfLJow3q5dDtiNMkwiRzPylSCfriLvZeq0a1bWChrGx/BbUbPwOrsWKMn8idSllklzBy+dgQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/android-x64": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.27.7.tgz",
+      "integrity": "sha512-x5VpMODneVDb70PYV2VQOmIUUiBtY3D3mPBG8NxVk5CogneYhkR7MmM3yR/uMdITLrC1ml/NV1rj4bMJuy9MCg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/darwin-arm64": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.27.7.tgz",
+      "integrity": "sha512-5lckdqeuBPlKUwvoCXIgI2D9/ABmPq3Rdp7IfL70393YgaASt7tbju3Ac+ePVi3KDH6N2RqePfHnXkaDtY9fkw==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/darwin-x64": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.27.7.tgz",
+      "integrity": "sha512-rYnXrKcXuT7Z+WL5K980jVFdvVKhCHhUwid+dDYQpH+qu+TefcomiMAJpIiC2EM3Rjtq0sO3StMV/+3w3MyyqQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/freebsd-arm64": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.27.7.tgz",
+      "integrity": "sha512-B48PqeCsEgOtzME2GbNM2roU29AMTuOIN91dsMO30t+Ydis3z/3Ngoj5hhnsOSSwNzS+6JppqWsuhTp6E82l2w==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/freebsd-x64": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.27.7.tgz",
+      "integrity": "sha512-jOBDK5XEjA4m5IJK3bpAQF9/Lelu/Z9ZcdhTRLf4cajlB+8VEhFFRjWgfy3M1O4rO2GQ/b2dLwCUGpiF/eATNQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/linux-arm": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.27.7.tgz",
+      "integrity": "sha512-RkT/YXYBTSULo3+af8Ib0ykH8u2MBh57o7q/DAs3lTJlyVQkgQvlrPTnjIzzRPQyavxtPtfg0EopvDyIt0j1rA==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/linux-arm64": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.27.7.tgz",
+      "integrity": "sha512-RZPHBoxXuNnPQO9rvjh5jdkRmVizktkT7TCDkDmQ0W2SwHInKCAV95GRuvdSvA7w4VMwfCjUiPwDi0ZO6Nfe9A==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/linux-ia32": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.27.7.tgz",
+      "integrity": "sha512-GA48aKNkyQDbd3KtkplYWT102C5sn/EZTY4XROkxONgruHPU72l+gW+FfF8tf2cFjeHaRbWpOYa/uRBz/Xq1Pg==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/linux-loong64": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.27.7.tgz",
+      "integrity": "sha512-a4POruNM2oWsD4WKvBSEKGIiWQF8fZOAsycHOt6JBpZ+JN2n2JH9WAv56SOyu9X5IqAjqSIPTaJkqN8F7XOQ5Q==",
+      "cpu": [
+        "loong64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/linux-mips64el": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.27.7.tgz",
+      "integrity": "sha512-KabT5I6StirGfIz0FMgl1I+R1H73Gp0ofL9A3nG3i/cYFJzKHhouBV5VWK1CSgKvVaG4q1RNpCTR2LuTVB3fIw==",
+      "cpu": [
+        "mips64el"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/linux-ppc64": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.27.7.tgz",
+      "integrity": "sha512-gRsL4x6wsGHGRqhtI+ifpN/vpOFTQtnbsupUF5R5YTAg+y/lKelYR1hXbnBdzDjGbMYjVJLJTd2OFmMewAgwlQ==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/linux-riscv64": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.27.7.tgz",
+      "integrity": "sha512-hL25LbxO1QOngGzu2U5xeXtxXcW+/GvMN3ejANqXkxZ/opySAZMrc+9LY/WyjAan41unrR3YrmtTsUpwT66InQ==",
+      "cpu": [
+        "riscv64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/linux-s390x": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.27.7.tgz",
+      "integrity": "sha512-2k8go8Ycu1Kb46vEelhu1vqEP+UeRVj2zY1pSuPdgvbd5ykAw82Lrro28vXUrRmzEsUV0NzCf54yARIK8r0fdw==",
+      "cpu": [
+        "s390x"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/linux-x64": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.27.7.tgz",
+      "integrity": "sha512-hzznmADPt+OmsYzw1EE33ccA+HPdIqiCRq7cQeL1Jlq2gb1+OyWBkMCrYGBJ+sxVzve2ZJEVeePbLM2iEIZSxA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/netbsd-arm64": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.27.7.tgz",
+      "integrity": "sha512-b6pqtrQdigZBwZxAn1UpazEisvwaIDvdbMbmrly7cDTMFnw/+3lVxxCTGOrkPVnsYIosJJXAsILG9XcQS+Yu6w==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "netbsd"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/netbsd-x64": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.27.7.tgz",
+      "integrity": "sha512-OfatkLojr6U+WN5EDYuoQhtM+1xco+/6FSzJJnuWiUw5eVcicbyK3dq5EeV/QHT1uy6GoDhGbFpprUiHUYggrw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "netbsd"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/openbsd-arm64": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.27.7.tgz",
+      "integrity": "sha512-AFuojMQTxAz75Fo8idVcqoQWEHIXFRbOc1TrVcFSgCZtQfSdc1RXgB3tjOn/krRHENUB4j00bfGjyl2mJrU37A==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "openbsd"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/openbsd-x64": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.27.7.tgz",
+      "integrity": "sha512-+A1NJmfM8WNDv5CLVQYJ5PshuRm/4cI6WMZRg1by1GwPIQPCTs1GLEUHwiiQGT5zDdyLiRM/l1G0Pv54gvtKIg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "openbsd"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/openharmony-arm64": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmjs.org/@esbuild/openharmony-arm64/-/openharmony-arm64-0.27.7.tgz",
+      "integrity": "sha512-+KrvYb/C8zA9CU/g0sR6w2RBw7IGc5J2BPnc3dYc5VJxHCSF1yNMxTV5LQ7GuKteQXZtspjFbiuW5/dOj7H4Yw==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "openharmony"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/sunos-x64": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.27.7.tgz",
+      "integrity": "sha512-ikktIhFBzQNt/QDyOL580ti9+5mL/YZeUPKU2ivGtGjdTYoqz6jObj6nOMfhASpS4GU4Q/Clh1QtxWAvcYKamA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "sunos"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/win32-arm64": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.27.7.tgz",
+      "integrity": "sha512-7yRhbHvPqSpRUV7Q20VuDwbjW5kIMwTHpptuUzV+AA46kiPze5Z7qgt6CLCK3pWFrHeNfDd1VKgyP4O+ng17CA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/win32-ia32": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.27.7.tgz",
+      "integrity": "sha512-SmwKXe6VHIyZYbBLJrhOoCJRB/Z1tckzmgTLfFYOfpMAx63BJEaL9ExI8x7v0oAO3Zh6D/Oi1gVxEYr5oUCFhw==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/win32-x64": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.27.7.tgz",
+      "integrity": "sha512-56hiAJPhwQ1R4i+21FVF7V8kSD5zZTdHcVuRFMW0hn753vVfQN8xlx4uOPT4xoGH0Z/oVATuR82AiqSTDIpaHg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
     "node_modules/@jridgewell/gen-mapping": {
       "version": "0.3.5",
       "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz",
@@ -393,6 +837,24 @@
       "dev": true,
       "peer": true
     },
+    "node_modules/@types/homey": {
+      "name": "homey-apps-sdk-v3-types",
+      "version": "0.3.12",
+      "resolved": "https://registry.npmjs.org/homey-apps-sdk-v3-types/-/homey-apps-sdk-v3-types-0.3.12.tgz",
+      "integrity": "sha512-xr275VoF7FAiTi6PzElqHWpuGgSBY9hZFZsKeCTA4rluopf8sVk6zUPa+giSRSTiTrN3N3QjmHD5lUoNVwYd4g==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "@types/node": "^14.14.20"
+      }
+    },
+    "node_modules/@types/homey/node_modules/@types/node": {
+      "version": "14.18.63",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.63.tgz",
+      "integrity": "sha512-fAtCfv4jJg+ExtXhvCkCqUKZ+4ok/JQk01qDKhL5BDDoS3AxKXhV5/MAVUZyQnSEd2GT92fkgZl0pz0Q0AzcIQ==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/@types/json-schema": {
       "version": "7.0.11",
       "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.11.tgz",
@@ -1841,6 +2303,48 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/esbuild": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.27.7.tgz",
+      "integrity": "sha512-IxpibTjyVnmrIQo5aqNpCgoACA/dTKLTlhMHihVHhdkxKyPO1uBBthumT0rdHmcsk9uMonIWS0m4FljWzILh3w==",
+      "dev": true,
+      "hasInstallScript": true,
+      "license": "MIT",
+      "bin": {
+        "esbuild": "bin/esbuild"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "optionalDependencies": {
+        "@esbuild/aix-ppc64": "0.27.7",
+        "@esbuild/android-arm": "0.27.7",
+        "@esbuild/android-arm64": "0.27.7",
+        "@esbuild/android-x64": "0.27.7",
+        "@esbuild/darwin-arm64": "0.27.7",
+        "@esbuild/darwin-x64": "0.27.7",
+        "@esbuild/freebsd-arm64": "0.27.7",
+        "@esbuild/freebsd-x64": "0.27.7",
+        "@esbuild/linux-arm": "0.27.7",
+        "@esbuild/linux-arm64": "0.27.7",
+        "@esbuild/linux-ia32": "0.27.7",
+        "@esbuild/linux-loong64": "0.27.7",
+        "@esbuild/linux-mips64el": "0.27.7",
+        "@esbuild/linux-ppc64": "0.27.7",
+        "@esbuild/linux-riscv64": "0.27.7",
+        "@esbuild/linux-s390x": "0.27.7",
+        "@esbuild/linux-x64": "0.27.7",
+        "@esbuild/netbsd-arm64": "0.27.7",
+        "@esbuild/netbsd-x64": "0.27.7",
+        "@esbuild/openbsd-arm64": "0.27.7",
+        "@esbuild/openbsd-x64": "0.27.7",
+        "@esbuild/openharmony-arm64": "0.27.7",
+        "@esbuild/sunos-x64": "0.27.7",
+        "@esbuild/win32-arm64": "0.27.7",
+        "@esbuild/win32-ia32": "0.27.7",
+        "@esbuild/win32-x64": "0.27.7"
+      }
+    },
     "node_modules/escalade": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz",
@@ -2553,11 +3057,12 @@
       "dev": true
     },
     "node_modules/fsevents": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
-      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
+      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
       "dev": true,
       "hasInstallScript": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "darwin"
@@ -2599,6 +3104,19 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/get-tsconfig": {
+      "version": "4.13.7",
+      "resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.13.7.tgz",
+      "integrity": "sha512-7tN6rFgBlMgpBML5j8typ92BKFi2sFQvIdpAqLA2beia5avZDrMs0FLZiM5etShWq5irVyGcGMEA1jcDaK7A/Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "resolve-pkg-maps": "^1.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/privatenumber/get-tsconfig?sponsor=1"
+      }
+    },
     "node_modules/glob": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
@@ -4852,6 +5370,16 @@
         "node": ">=4"
       }
     },
+    "node_modules/resolve-pkg-maps": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-pkg-maps/-/resolve-pkg-maps-1.0.0.tgz",
+      "integrity": "sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw==",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "url": "https://github.com/privatenumber/resolve-pkg-maps?sponsor=1"
+      }
+    },
     "node_modules/restore-cursor": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
@@ -5501,6 +6029,26 @@
       "integrity": "sha512-aZW88SY8kQbU7gpV19lN24LtXh/yD4ZZg6qieAJDDg+YBsJcSmLGK9QpnUjAKVG/xefmvJGd1WUmfpT/g6AJGA==",
       "dev": true
     },
+    "node_modules/tsx": {
+      "version": "4.21.0",
+      "resolved": "https://registry.npmjs.org/tsx/-/tsx-4.21.0.tgz",
+      "integrity": "sha512-5C1sg4USs1lfG0GFb2RLXsdpXqBSEhAaA/0kPL01wxzpMqLILNxIxIOKiILz+cdg/pLnOUxFYOR5yhHU666wbw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "esbuild": "~0.27.0",
+        "get-tsconfig": "^4.7.5"
+      },
+      "bin": {
+        "tsx": "dist/cli.mjs"
+      },
+      "engines": {
+        "node": ">=18.0.0"
+      },
+      "optionalDependencies": {
+        "fsevents": "~2.3.3"
+      }
+    },
     "node_modules/type-check": {
       "version": "0.3.2",
       "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
@@ -6197,6 +6745,188 @@
         }
       }
     },
+    "@esbuild/aix-ppc64": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.27.7.tgz",
+      "integrity": "sha512-EKX3Qwmhz1eMdEJokhALr0YiD0lhQNwDqkPYyPhiSwKrh7/4KRjQc04sZ8db+5DVVnZ1LmbNDI1uAMPEUBnQPg==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/android-arm": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.27.7.tgz",
+      "integrity": "sha512-jbPXvB4Yj2yBV7HUfE2KHe4GJX51QplCN1pGbYjvsyCZbQmies29EoJbkEc+vYuU5o45AfQn37vZlyXy4YJ8RQ==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/android-arm64": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.27.7.tgz",
+      "integrity": "sha512-62dPZHpIXzvChfvfLJow3q5dDtiNMkwiRzPylSCfriLvZeq0a1bWChrGx/BbUbPwOrsWKMn8idSllklzBy+dgQ==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/android-x64": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.27.7.tgz",
+      "integrity": "sha512-x5VpMODneVDb70PYV2VQOmIUUiBtY3D3mPBG8NxVk5CogneYhkR7MmM3yR/uMdITLrC1ml/NV1rj4bMJuy9MCg==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/darwin-arm64": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.27.7.tgz",
+      "integrity": "sha512-5lckdqeuBPlKUwvoCXIgI2D9/ABmPq3Rdp7IfL70393YgaASt7tbju3Ac+ePVi3KDH6N2RqePfHnXkaDtY9fkw==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/darwin-x64": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.27.7.tgz",
+      "integrity": "sha512-rYnXrKcXuT7Z+WL5K980jVFdvVKhCHhUwid+dDYQpH+qu+TefcomiMAJpIiC2EM3Rjtq0sO3StMV/+3w3MyyqQ==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/freebsd-arm64": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.27.7.tgz",
+      "integrity": "sha512-B48PqeCsEgOtzME2GbNM2roU29AMTuOIN91dsMO30t+Ydis3z/3Ngoj5hhnsOSSwNzS+6JppqWsuhTp6E82l2w==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/freebsd-x64": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.27.7.tgz",
+      "integrity": "sha512-jOBDK5XEjA4m5IJK3bpAQF9/Lelu/Z9ZcdhTRLf4cajlB+8VEhFFRjWgfy3M1O4rO2GQ/b2dLwCUGpiF/eATNQ==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/linux-arm": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.27.7.tgz",
+      "integrity": "sha512-RkT/YXYBTSULo3+af8Ib0ykH8u2MBh57o7q/DAs3lTJlyVQkgQvlrPTnjIzzRPQyavxtPtfg0EopvDyIt0j1rA==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/linux-arm64": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.27.7.tgz",
+      "integrity": "sha512-RZPHBoxXuNnPQO9rvjh5jdkRmVizktkT7TCDkDmQ0W2SwHInKCAV95GRuvdSvA7w4VMwfCjUiPwDi0ZO6Nfe9A==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/linux-ia32": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.27.7.tgz",
+      "integrity": "sha512-GA48aKNkyQDbd3KtkplYWT102C5sn/EZTY4XROkxONgruHPU72l+gW+FfF8tf2cFjeHaRbWpOYa/uRBz/Xq1Pg==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/linux-loong64": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.27.7.tgz",
+      "integrity": "sha512-a4POruNM2oWsD4WKvBSEKGIiWQF8fZOAsycHOt6JBpZ+JN2n2JH9WAv56SOyu9X5IqAjqSIPTaJkqN8F7XOQ5Q==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/linux-mips64el": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.27.7.tgz",
+      "integrity": "sha512-KabT5I6StirGfIz0FMgl1I+R1H73Gp0ofL9A3nG3i/cYFJzKHhouBV5VWK1CSgKvVaG4q1RNpCTR2LuTVB3fIw==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/linux-ppc64": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.27.7.tgz",
+      "integrity": "sha512-gRsL4x6wsGHGRqhtI+ifpN/vpOFTQtnbsupUF5R5YTAg+y/lKelYR1hXbnBdzDjGbMYjVJLJTd2OFmMewAgwlQ==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/linux-riscv64": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.27.7.tgz",
+      "integrity": "sha512-hL25LbxO1QOngGzu2U5xeXtxXcW+/GvMN3ejANqXkxZ/opySAZMrc+9LY/WyjAan41unrR3YrmtTsUpwT66InQ==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/linux-s390x": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.27.7.tgz",
+      "integrity": "sha512-2k8go8Ycu1Kb46vEelhu1vqEP+UeRVj2zY1pSuPdgvbd5ykAw82Lrro28vXUrRmzEsUV0NzCf54yARIK8r0fdw==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/linux-x64": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.27.7.tgz",
+      "integrity": "sha512-hzznmADPt+OmsYzw1EE33ccA+HPdIqiCRq7cQeL1Jlq2gb1+OyWBkMCrYGBJ+sxVzve2ZJEVeePbLM2iEIZSxA==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/netbsd-arm64": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.27.7.tgz",
+      "integrity": "sha512-b6pqtrQdigZBwZxAn1UpazEisvwaIDvdbMbmrly7cDTMFnw/+3lVxxCTGOrkPVnsYIosJJXAsILG9XcQS+Yu6w==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/netbsd-x64": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.27.7.tgz",
+      "integrity": "sha512-OfatkLojr6U+WN5EDYuoQhtM+1xco+/6FSzJJnuWiUw5eVcicbyK3dq5EeV/QHT1uy6GoDhGbFpprUiHUYggrw==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/openbsd-arm64": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.27.7.tgz",
+      "integrity": "sha512-AFuojMQTxAz75Fo8idVcqoQWEHIXFRbOc1TrVcFSgCZtQfSdc1RXgB3tjOn/krRHENUB4j00bfGjyl2mJrU37A==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/openbsd-x64": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.27.7.tgz",
+      "integrity": "sha512-+A1NJmfM8WNDv5CLVQYJ5PshuRm/4cI6WMZRg1by1GwPIQPCTs1GLEUHwiiQGT5zDdyLiRM/l1G0Pv54gvtKIg==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/openharmony-arm64": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmjs.org/@esbuild/openharmony-arm64/-/openharmony-arm64-0.27.7.tgz",
+      "integrity": "sha512-+KrvYb/C8zA9CU/g0sR6w2RBw7IGc5J2BPnc3dYc5VJxHCSF1yNMxTV5LQ7GuKteQXZtspjFbiuW5/dOj7H4Yw==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/sunos-x64": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.27.7.tgz",
+      "integrity": "sha512-ikktIhFBzQNt/QDyOL580ti9+5mL/YZeUPKU2ivGtGjdTYoqz6jObj6nOMfhASpS4GU4Q/Clh1QtxWAvcYKamA==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/win32-arm64": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.27.7.tgz",
+      "integrity": "sha512-7yRhbHvPqSpRUV7Q20VuDwbjW5kIMwTHpptuUzV+AA46kiPze5Z7qgt6CLCK3pWFrHeNfDd1VKgyP4O+ng17CA==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/win32-ia32": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.27.7.tgz",
+      "integrity": "sha512-SmwKXe6VHIyZYbBLJrhOoCJRB/Z1tckzmgTLfFYOfpMAx63BJEaL9ExI8x7v0oAO3Zh6D/Oi1gVxEYr5oUCFhw==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/win32-x64": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.27.7.tgz",
+      "integrity": "sha512-56hiAJPhwQ1R4i+21FVF7V8kSD5zZTdHcVuRFMW0hn753vVfQN8xlx4uOPT4xoGH0Z/oVATuR82AiqSTDIpaHg==",
+      "dev": true,
+      "optional": true
+    },
     "@jridgewell/gen-mapping": {
       "version": "0.3.5",
       "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz",
@@ -6308,6 +7038,23 @@
       "dev": true,
       "peer": true
     },
+    "@types/homey": {
+      "version": "npm:homey-apps-sdk-v3-types@0.3.12",
+      "resolved": "https://registry.npmjs.org/homey-apps-sdk-v3-types/-/homey-apps-sdk-v3-types-0.3.12.tgz",
+      "integrity": "sha512-xr275VoF7FAiTi6PzElqHWpuGgSBY9hZFZsKeCTA4rluopf8sVk6zUPa+giSRSTiTrN3N3QjmHD5lUoNVwYd4g==",
+      "dev": true,
+      "requires": {
+        "@types/node": "^14.14.20"
+      },
+      "dependencies": {
+        "@types/node": {
+          "version": "14.18.63",
+          "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.63.tgz",
+          "integrity": "sha512-fAtCfv4jJg+ExtXhvCkCqUKZ+4ok/JQk01qDKhL5BDDoS3AxKXhV5/MAVUZyQnSEd2GT92fkgZl0pz0Q0AzcIQ==",
+          "dev": true
+        }
+      }
+    },
     "@types/json-schema": {
       "version": "7.0.11",
       "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.11.tgz",
@@ -7412,6 +8159,40 @@
         "is-symbol": "^1.0.2"
       }
     },
+    "esbuild": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.27.7.tgz",
+      "integrity": "sha512-IxpibTjyVnmrIQo5aqNpCgoACA/dTKLTlhMHihVHhdkxKyPO1uBBthumT0rdHmcsk9uMonIWS0m4FljWzILh3w==",
+      "dev": true,
+      "requires": {
+        "@esbuild/aix-ppc64": "0.27.7",
+        "@esbuild/android-arm": "0.27.7",
+        "@esbuild/android-arm64": "0.27.7",
+        "@esbuild/android-x64": "0.27.7",
+        "@esbuild/darwin-arm64": "0.27.7",
+        "@esbuild/darwin-x64": "0.27.7",
+        "@esbuild/freebsd-arm64": "0.27.7",
+        "@esbuild/freebsd-x64": "0.27.7",
+        "@esbuild/linux-arm": "0.27.7",
+        "@esbuild/linux-arm64": "0.27.7",
+        "@esbuild/linux-ia32": "0.27.7",
+        "@esbuild/linux-loong64": "0.27.7",
+        "@esbuild/linux-mips64el": "0.27.7",
+        "@esbuild/linux-ppc64": "0.27.7",
+        "@esbuild/linux-riscv64": "0.27.7",
+        "@esbuild/linux-s390x": "0.27.7",
+        "@esbuild/linux-x64": "0.27.7",
+        "@esbuild/netbsd-arm64": "0.27.7",
+        "@esbuild/netbsd-x64": "0.27.7",
+        "@esbuild/openbsd-arm64": "0.27.7",
+        "@esbuild/openbsd-x64": "0.27.7",
+        "@esbuild/openharmony-arm64": "0.27.7",
+        "@esbuild/sunos-x64": "0.27.7",
+        "@esbuild/win32-arm64": "0.27.7",
+        "@esbuild/win32-ia32": "0.27.7",
+        "@esbuild/win32-x64": "0.27.7"
+      }
+    },
     "escalade": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz",
@@ -7964,9 +8745,9 @@
       "dev": true
     },
     "fsevents": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
-      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
+      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
       "dev": true,
       "optional": true
     },
@@ -7994,6 +8775,15 @@
       "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
       "dev": true
     },
+    "get-tsconfig": {
+      "version": "4.13.7",
+      "resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.13.7.tgz",
+      "integrity": "sha512-7tN6rFgBlMgpBML5j8typ92BKFi2sFQvIdpAqLA2beia5avZDrMs0FLZiM5etShWq5irVyGcGMEA1jcDaK7A/Q==",
+      "dev": true,
+      "requires": {
+        "resolve-pkg-maps": "^1.0.0"
+      }
+    },
     "glob": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
@@ -9676,6 +10466,12 @@
       "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
       "dev": true
     },
+    "resolve-pkg-maps": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-pkg-maps/-/resolve-pkg-maps-1.0.0.tgz",
+      "integrity": "sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw==",
+      "dev": true
+    },
     "restore-cursor": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
@@ -10180,6 +10976,17 @@
       "integrity": "sha512-aZW88SY8kQbU7gpV19lN24LtXh/yD4ZZg6qieAJDDg+YBsJcSmLGK9QpnUjAKVG/xefmvJGd1WUmfpT/g6AJGA==",
       "dev": true
     },
+    "tsx": {
+      "version": "4.21.0",
+      "resolved": "https://registry.npmjs.org/tsx/-/tsx-4.21.0.tgz",
+      "integrity": "sha512-5C1sg4USs1lfG0GFb2RLXsdpXqBSEhAaA/0kPL01wxzpMqLILNxIxIOKiILz+cdg/pLnOUxFYOR5yhHU666wbw==",
+      "dev": true,
+      "requires": {
+        "esbuild": "~0.27.0",
+        "fsevents": "~2.3.3",
+        "get-tsconfig": "^4.7.5"
+      }
+    },
     "type-check": {
       "version": "0.3.2",
       "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
diff --git a/package.json b/package.json
index 66595cf..2b346b1 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
   "scripts": {
     "test": "mocha --reporter list",
     "lint": "eslint .",
-    "generate-types": "node scripts/generate-types.js",
+    "generate-types": "tsx scripts/generate-types.mts",
     "serve": "concurrently \"serve build/\" \"npm run build:watch\"",
     "build": "jsdoc --configure ./docs/jsdoc.json",
     "build:clean": "rm -rf ./build",
@@ -33,6 +33,7 @@
   "homepage": "https://github.com/athombv/node-zigbee-clusters#readme",
   "devDependencies": {
     "@athombv/jsdoc-template": "^1.6.3",
+    "@types/homey": "npm:homey-apps-sdk-v3-types@^0.3.12",
     "@types/node": "^25.0.10",
     "@types/sinon": "^17.0.3",
     "concurrently": "^5.2.0",
@@ -43,6 +44,7 @@
     "mocha": "^10.1.0",
     "serve": "^14.0.1",
     "sinon": "^19.0.2",
+    "tsx": "^4.21.0",
     "typescript": "^5.9.3",
     "watch": "^1.0.2"
   },
diff --git a/scripts/generate-types.js b/scripts/generate-types.js
deleted file mode 100644
index 77e6063..0000000
--- a/scripts/generate-types.js
+++ /dev/null
@@ -1,521 +0,0 @@
-'use strict';
-
-/* eslint-disable no-console, global-require */
-
-/**
- * Type generation script for zigbee-clusters
- * Loads cluster modules directly and generates TypeScript interfaces
- */
-
-const fs = require('fs');
-const path = require('path');
-const { ZCLDataTypes } = require('../lib/zclTypes');
-
-const OUTPUT_FILE = path.join(__dirname, '../index.d.ts');
-
-/**
- * Convert a ZCLDataType object to TypeScript type string
- * @param {object} dataType - ZCLDataType object with shortName and args
- * @returns {string} TypeScript type string
- */
-function zclTypeToTS(dataType, useEnum8StatusType = true) {
-  if (!dataType || !dataType.shortName) return 'unknown';
-
-  const { shortName, args } = dataType;
-
-  // No data
-  if (shortName === 'noData') return 'null';
-
-  // Boolean
-  if (shortName === 'bool') return 'boolean';
-
-  // Numeric types
-  if (/^u?int\d+$/.test(shortName)) return 'number';
-  // data8-32 use readUIntBE, return number
-  if (/^data(8|16|24|32)$/.test(shortName)) return 'number';
-  // data40-64 use buf.slice, return Buffer
-  if (/^data(40|48|56|64)$/.test(shortName)) return 'Buffer';
-  // Float types
-  if (shortName === 'single' || shortName === 'double') return 'number';
-
-  // String types
-  if (shortName === 'string' || shortName === '_FixedString') return 'string';
-  // EUI addresses return colon-separated hex strings
-  if (shortName === 'EUI64' || shortName === 'EUI48') return 'string';
-  // key128 returns colon-separated hex string
-  if (shortName === 'key128') return 'string';
-
-  // Buffer types
-  if (shortName === 'octstr' || shortName === '_buffer' || shortName === '_buffer8' || shortName === '_buffer16') {
-    return 'Buffer';
-  }
-
-  if (dataType === ZCLDataTypes.enum8Status && useEnum8StatusType) {
-    return 'ZCLEnum8Status';
-  }
-
-  // Enum types - extract keys from args[0]
-  if (/^enum(4|8|16|32)$/.test(shortName)) {
-    if (args && args[0] && typeof args[0] === 'object') {
-      const keys = Object.keys(args[0]);
-      if (keys.length > 0) {
-        return keys.map(k => `'${k}'`).join(' | ');
-      }
-    }
-    return 'number';
-  }
-
-  // Map/bitmap types - extract flag names from args
-  if (/^map(4|\d+)$/.test(shortName)) {
-    if (args && args.length > 0) {
-      const flags = args.filter(a => typeof a === 'string');
-      if (flags.length > 0) {
-        return `Partial<{ ${flags.map(f => `${f}: boolean`).join('; ')} }>`;
-      }
-    }
-    return 'Partial<Record<string, boolean>>';
-  }
-
-  // Array types (note: shortName has underscore prefix: _Array0, _Array8)
-  // Recursively determine element type from args[0]
-  if (/^_?Array(0|8|16)$/.test(shortName)) {
-    if (args && args[0]) {
-      const elementType = zclTypeToTS(args[0]);
-      return `${elementType}[]`;
-    }
-    return 'unknown[]';
-  }
-
-  return 'unknown';
-}
-
-/**
- * Parse a cluster and extract its type information
- * @param {Function} ClusterClass - Cluster class with static ATTRIBUTES/COMMANDS
- * @returns {object} Cluster definition
- */
-function parseCluster(ClusterClass, exportName) {
-  const clusterName = ClusterClass.NAME;
-  const clusterId = ClusterClass.ID;
-  const attributes = [];
-  const commands = [];
-
-  // Parse attributes
-  const attrs = ClusterClass.ATTRIBUTES || {};
-  for (const [name, def] of Object.entries(attrs)) {
-    if (def && def.type) {
-      attributes.push({
-        name,
-        tsType: zclTypeToTS(def.type),
-      });
-    }
-  }
-
-  // Parse commands
-  const cmds = ClusterClass.COMMANDS || {};
-  for (const [name, def] of Object.entries(cmds)) {
-    const cmdArgs = [];
-    const responseArgs = [];
-    const cmdArgsOptional = def && def.encodeMissingFieldsBehavior === 'skip';
-    const responseArgsOptional = def && def.response && def.response.encodeMissingFieldsBehavior === 'skip';
-    if (def && def.args) {
-      for (const [argName, argType] of Object.entries(def.args)) {
-        cmdArgs.push({
-          name: argName,
-          tsType: zclTypeToTS(argType),
-        });
-      }
-    }
-    // Parse response type if present
-    if (def && def.response && def.response.args) {
-      for (const [argName, argType] of Object.entries(def.response.args)) {
-        responseArgs.push({
-          name: argName,
-          tsType: zclTypeToTS(argType),
-        });
-      }
-    }
-    commands.push({
-      name, args: cmdArgs, responseArgs, cmdArgsOptional, responseArgsOptional,
-    });
-  }
-
-  return {
-    exportName,
-    clusterName,
-    clusterId,
-    attributes,
-    commands,
-  };
-}
-
-/**
- * Convert cluster name to PascalCase interface name
- * @param {string} clusterName
- * @returns {string}
- */
-function toInterfaceName(cluster) {
-  if (cluster.exportName) return cluster.exportName;
-  const name = cluster.clusterName.charAt(0).toUpperCase() + cluster.clusterName.slice(1);
-  return `${name}Cluster`;
-}
-
-/**
- * Generate TypeScript interface for a cluster
- * @param {object} cluster - Parsed cluster definition
- * @returns {string} TypeScript interface code
- */
-function generateClusterInterface(cluster) {
-  const interfaceName = toInterfaceName(cluster);
-  const lines = [];
-
-  // Generate attributes interface
-  if (cluster.attributes.length > 0) {
-    lines.push(`export interface ${interfaceName}Attributes extends GlobalClusterAttributes {`);
-    for (const attr of cluster.attributes) {
-      lines.push(`  ${attr.name}?: ${attr.tsType};`);
-    }
-    lines.push('}');
-    lines.push('');
-  }
-
-  // Generate cluster interface
-  lines.push(`export interface ${interfaceName} extends ZCLNodeCluster {`);
-
-  // Add typed readAttributes if we have attributes
-  if (cluster.attributes.length > 0) {
-    lines.push(`  readAttributes<K extends keyof ${interfaceName}Attributes>(attributeNames: K[], opts?: { timeout?: number }): Promise<Pick<${interfaceName}Attributes, K>>;`);
-    lines.push(`  readAttributes(attributeNames: Array<keyof ${interfaceName}Attributes | number>, opts?: { timeout?: number }): Promise<Partial<${interfaceName}Attributes> & Record<number, unknown>>;`);
-    lines.push(`  writeAttributes(attributes: Partial<${interfaceName}Attributes>, opts?: { timeout?: number }): Promise<unknown>;`);
-    lines.push(`  on<K extends keyof ${interfaceName}Attributes & string>(eventName: \`attr.\${K}\`, listener: (value: ${interfaceName}Attributes[K]) => void): this;`);
-    lines.push(`  once<K extends keyof ${interfaceName}Attributes & string>(eventName: \`attr.\${K}\`, listener: (value: ${interfaceName}Attributes[K]) => void): this;`);
-  }
-
-  // Add command methods
-  for (const cmd of cluster.commands) {
-    // Determine return type based on response args
-    let returnType = 'void';
-    if (cmd.responseArgs && cmd.responseArgs.length > 0) {
-      const sep = cmd.responseArgsOptional ? '?: ' : ': ';
-      returnType = `{ ${cmd.responseArgs.map(a => `${a.name}${sep}${a.tsType}`).join('; ')} }`;
-    }
-
-    if (cmd.args.length > 0) {
-      // Args are optional when encodeMissingFieldsBehavior is 'skip', or when all args are Buffers
-      const allArgsOptional = cmd.cmdArgsOptional || cmd.args.every(a => a.tsType === 'Buffer');
-      const argsType = `{ ${cmd.args.map(a => `${a.name}${(cmd.cmdArgsOptional || a.tsType === 'Buffer') ? '?' : ''}: ${a.tsType}`).join('; ')} }`;
-      // If all args are optional, make the entire args object optional
-      lines.push(`  ${cmd.name}(args${allArgsOptional ? '?' : ''}: ${argsType}, opts?: ClusterCommandOptions): Promise<${returnType}>;`);
-    } else {
-      lines.push(`  ${cmd.name}(opts?: ClusterCommandOptions): Promise<${returnType}>;`);
-    }
-  }
-
-  lines.push('}');
-
-  return lines.join('\n');
-}
-
-/**
- * Generate the full index.d.ts file
- * @param {object[]} clusters - Array of parsed cluster definitions
- * @param {Array<{
- *   constantName: string;
- *   clusterId: number;
- *   clusterName: string;
- * }>} clusterDefinitions - Array of CLUSTER definitions used to generate typed CLUSTER exports
- * @returns {string} Complete TypeScript definitions file
- */
-function generateConstantObject(obj, indent = 2) {
-  const lines = [];
-  const pad = ' '.repeat(indent);
-  for (const [key, value] of Object.entries(obj)) {
-    if (typeof value === 'object' && value !== null) {
-      lines.push(`${pad}${key}: {`);
-      lines.push(generateConstantObject(value, indent + 2));
-      lines.push(`${pad}};`);
-    } else {
-      lines.push(`${pad}${key}: ${typeof value === 'number' ? value : JSON.stringify(value)};`);
-    }
-  }
-  return lines.join('\n');
-}
-
-function generateTypesFile(clusters, clusterDefinitions, constants) {
-  const lines = [];
-
-  // Header
-  lines.push('// Auto-generated TypeScript definitions for zigbee-clusters');
-  lines.push('// Generated by scripts/generate-types.js');
-  lines.push('');
-  lines.push('import * as EventEmitter from "events";');
-  lines.push('');
-
-  // Base types
-  lines.push(`type EndpointDescriptor = {
-  endpointId: number;
-  inputClusters: number[];
-  outputClusters: number[];
-};
-
-type ConstructorOptions = {
-  endpointDescriptors: EndpointDescriptor[];
-  sendFrame: (endpointId: number, clusterId: number, frame: Buffer) => Promise<void>;
-};
-
-type ClusterCommandOptions = {
-  timeout?: number;
-  waitForResponse?: boolean;
-  disableDefaultResponse?: boolean;
-};
-
-type ZCLNodeConstructorInput = {
-  endpointDescriptors?: EndpointDescriptor[];
-  sendFrame: (endpointId: number, clusterId: number, frame: Buffer) => Promise<void>;
-  handleFrame?: (
-    endpointId: number,
-    clusterId: number,
-    frame: Buffer,
-    meta?: unknown
-  ) => Promise<void>;
-};
-
-export type ZCLEnum8Status = ${zclTypeToTS(ZCLDataTypes.enum8Status, false)};
-
-export type GlobalClusterAttributes = {
-  clusterRevision: number;
-  attributeReportingStatus: 0 | 1;
-};
-`);
-
-  // Base ZCLNodeCluster interface
-  lines.push(`export interface ZCLNodeCluster extends EventEmitter {
-  /** Dynamic command handler methods (e.g. \`onZoneStatusChangeNotification\`). */
-  [key: \`on\${string}\`]: unknown;
-
-  discoverCommandsGenerated(params?: {
-    startValue?: number;
-    maxResults?: number;
-  }, opts?: { timeout?: number }): Promise<(string | number)[]>;
-
-  discoverCommandsReceived(params?: {
-    startValue?: number;
-    maxResults?: number;
-  }, opts?: { timeout?: number }): Promise<(string | number)[]>;
-
-  readAttributes(
-    attributes: Array<string | number>,
-    opts?: { timeout?: number }
-  ): Promise<{ [x: string]: unknown }>;
-
-  writeAttributes(attributes?: object, opts?: { timeout?: number }): Promise<unknown>;
-
-  configureReporting(attributes?: object, opts?: { timeout?: number }): Promise<void>;
-
-  readReportingConfiguration(attributes?: (string | number)[], opts?: { timeout?: number }): Promise<{
-    status: string;
-    direction: 'reported' | 'received';
-    attributeId: number;
-    attributeDataType?: number;
-    minInterval?: number;
-    maxInterval?: number;
-    minChange?: number;
-    timeoutPeriod?: number;
-  }[]>;
-
-  discoverAttributes(opts?: { timeout?: number }): Promise<(string | number)[]>;
-
-  discoverAttributesExtended(opts?: { timeout?: number }): Promise<{
-    name?: string;
-    id: number;
-    dataTypeId: number;
-    acl: { readable: boolean; writable: boolean; reportable: boolean };
-  }[]>;
-}
-`);
-
-  // Generate individual cluster interfaces
-  for (const cluster of clusters) {
-    lines.push(generateClusterInterface(cluster));
-    lines.push('');
-  }
-
-  // Generate cluster registry type
-  lines.push('/** Type-safe cluster registry */');
-  lines.push('export interface ClusterRegistry {');
-  for (const cluster of clusters) {
-    const interfaceName = toInterfaceName(cluster);
-    lines.push(`  ${cluster.clusterName}?: ${interfaceName};`);
-  }
-  lines.push('}');
-  lines.push('');
-
-  // Generate cluster type lookup maps for inference helpers
-  lines.push('/** Cluster type lookup by cluster NAME */');
-  lines.push('export interface ClusterTypeByName {');
-  for (const cluster of clusters) {
-    const interfaceName = toInterfaceName(cluster);
-    lines.push(`  ${cluster.clusterName}: ${interfaceName};`);
-  }
-  lines.push('}');
-  lines.push('');
-
-  // Generate cluster attribute lookup maps for inference helpers
-  lines.push('/** Cluster attributes lookup by cluster NAME */');
-  lines.push('export interface ClusterAttributesByName {');
-  for (const cluster of clusters) {
-    const interfaceName = toInterfaceName(cluster);
-    const attributesInterfaceName = `${interfaceName}Attributes`;
-    const attributesType = cluster.attributes.length > 0 ? attributesInterfaceName : 'Record<string, unknown>';
-    lines.push(`  ${cluster.clusterName}: ${attributesType};`);
-  }
-  lines.push('}');
-  lines.push('');
-
-  lines.push('/** Infer a typed cluster interface from a CLUSTER definition object. */');
-  lines.push('export type ClusterTypeFromDefinition<TDef extends { NAME: string; ID: number }> =');
-  lines.push("  TDef['NAME'] extends keyof ClusterTypeByName");
-  lines.push("    ? ClusterTypeByName[TDef['NAME']]");
-  lines.push('    : ZCLNodeCluster;');
-  lines.push('');
-
-  lines.push('/** Infer typed cluster attribute map from a CLUSTER definition object. */');
-  lines.push('export type ClusterAttributesFromDefinition<TDef extends { NAME: string; ID: number }> =');
-  lines.push("  TDef['NAME'] extends keyof ClusterAttributesByName");
-  lines.push("    ? ClusterAttributesByName[TDef['NAME']]");
-  lines.push('    : Record<string, unknown>;');
-  lines.push('');
-
-  // Generate endpoint type
-  lines.push(`export type ZCLNodeEndpoint = {
-  clusters: ClusterRegistry & {
-    [clusterName: string]: ZCLNodeCluster | undefined;
-  };
-  bind(clusterName: string, impl: BoundCluster): void;
-};
-
-export interface ZCLNode {
-  endpoints: { [endpointId: number | string]: ZCLNodeEndpoint };
-  handleFrame: (
-    endpointId: number,
-    clusterId: number,
-    frame: Buffer,
-    meta?: unknown
-  ) => Promise<void>;
-}
-`);
-
-  // Runtime value exports
-  lines.push(`export const ZCLNode: {
-  new (node: ZCLNodeConstructorInput): ZCLNode;
-};
-
-export const CLUSTER: {
-`);
-  for (const def of clusterDefinitions) {
-    lines.push(`  ${def.constantName}: {`);
-    lines.push('    ID: number;');
-    lines.push(`    NAME: '${def.clusterName}';`);
-    lines.push('    ATTRIBUTES: unknown;');
-    lines.push('    COMMANDS: unknown;');
-    lines.push('  };');
-  }
-  lines.push('};');
-
-  lines.push(`export class BoundCluster {
-
-}
-
-export class ZCLError extends Error {
-  zclStatus: ZCLEnum8Status;
-  constructor(zclStatus?: ZCLEnum8Status);
-}`);
-
-  // Export all cluster classes
-  for (const cluster of clusters) {
-    const interfaceName = toInterfaceName(cluster);
-    const exportName = cluster.exportName || interfaceName;
-    lines.push(`export const ${exportName}: {`);
-    lines.push(`  new (...args: any[]): ${interfaceName};`);
-    lines.push(`  ID: ${cluster.clusterId};`);
-    lines.push(`  NAME: '${cluster.clusterName}';`);
-    lines.push('  ATTRIBUTES: unknown;');
-    lines.push('  COMMANDS: unknown;');
-    lines.push('};');
-  }
-
-  // Export constants
-  if (constants) {
-    for (const [name, value] of Object.entries(constants)) {
-      lines.push('');
-      lines.push(`export const ${name}: {`);
-      lines.push(generateConstantObject(value));
-      lines.push('};');
-    }
-  }
-
-  lines.push('');
-  lines.push('declare const _default: {');
-  lines.push('  ZCLNode: typeof ZCLNode;');
-  lines.push('  CLUSTER: typeof CLUSTER;');
-  for (const cluster of clusters) {
-    const exportName = cluster.exportName || toInterfaceName(cluster);
-    lines.push(`  ${exportName}: typeof ${exportName};`);
-  }
-  if (constants) {
-    for (const name of Object.keys(constants)) {
-      lines.push(`  ${name}: typeof ${name};`);
-    }
-  }
-  lines.push('};');
-  lines.push('export default _default;');
-
-  return lines.join('\n');
-}
-
-/**
- * Main entry point
- */
-function main() {
-  console.log('Loading cluster modules...');
-
-  // Load all clusters via the index
-  const clustersModule = require('../lib/clusters');
-  const clusters = [];
-
-  // Get all exported cluster classes (end with 'Cluster')
-  for (const [name, value] of Object.entries(clustersModule)) {
-    if (name.endsWith('Cluster') && typeof value === 'function' && value.NAME) {
-      try {
-        const cluster = parseCluster(value, name);
-        clusters.push(cluster);
-        console.log(`  ✓ ${cluster.clusterName} (${cluster.attributes.length} attrs, ${cluster.commands.length} cmds)`);
-      } catch (err) {
-        console.warn(`  ✗ Failed to parse ${name}: ${err.message}`);
-      }
-    }
-  }
-
-  // Sort clusters alphabetically
-  clusters.sort((a, b) => a.clusterName.localeCompare(b.clusterName));
-
-  const clusterDefinitions = Object.entries(clustersModule.CLUSTER)
-    .map(([constantName, value]) => ({
-      constantName,
-      clusterId: value.ID,
-      clusterName: value.NAME,
-    }))
-    .sort((a, b) => a.constantName.localeCompare(b.constantName));
-
-  // Load constants
-  const { ZIGBEE_PROFILE_ID, ZIGBEE_DEVICE_ID, IAS_ZONE_TYPE } = require('../lib/constants');
-  const constants = { ZIGBEE_PROFILE_ID, ZIGBEE_DEVICE_ID, IAS_ZONE_TYPE };
-
-  console.log(`\nGenerating ${OUTPUT_FILE}...`);
-  const output = generateTypesFile(clusters, clusterDefinitions, constants);
-  fs.writeFileSync(OUTPUT_FILE, output);
-
-  console.log(`Done! Generated types for ${clusters.length} clusters.`);
-}
-
-main();
diff --git a/scripts/generate-types.mts b/scripts/generate-types.mts
new file mode 100644
index 0000000..8faca6f
--- /dev/null
+++ b/scripts/generate-types.mts
@@ -0,0 +1,413 @@
+import {Cluster} from "zigbee-clusters";
+import path from "node:path";
+import * as fs from "node:fs/promises";
+import {DataType, DataTypes} from "@athombv/data-types";
+
+const INDENTATION_SPACES = 2;
+
+class StringBuilder {
+  private strings: string[];
+  private indentation: number;
+
+  constructor() {
+    this.strings = [];
+    this.indentation = 0;
+  }
+
+  public startLine(): void {
+    this.strings.push(" ".repeat(this.indentation));
+  }
+  public print(...line: string[]): void {
+    this.strings.push(...line);
+  }
+  public endLine(): void {
+    this.strings.push("\n");
+  }
+
+  public printLine(...line: string[]): void {
+    this.startLine();
+    this.strings.push(...line);
+    this.endLine();
+  }
+
+
+  public increaseIndent(levels = 1): void {
+    this.indentation += INDENTATION_SPACES * levels;
+  }
+  public setIndent(level: number): void {
+    this.indentation = INDENTATION_SPACES * level;
+  }
+  public decreaseIndent(levels = 1): void {
+    this.indentation -= INDENTATION_SPACES * levels;
+    if (this.indentation < 0) {
+      this.indentation = 0;
+    }
+  }
+
+  public toString(): string {
+    return this.strings.join("");
+  }
+}
+
+const filePath = path.resolve('index.d.ts');
+const templatePath = path.resolve('scripts/template.d.ts.txt');
+await main();
+
+async function main(): Promise<void> {
+  console.log('Writing clusters to', filePath);
+
+  // Write preamble and open module declaration
+  await fs.writeFile(filePath, '/* eslint-disable @typescript-eslint/no-explicit-any */\ndeclare module "zigbee-clusters" {\n  import {BitMap} from "@athombv/data-types";\n');
+
+  // @ts-expect-error No type declarations
+  const clustersModule = await import("../lib/clusters/index.js");
+  for (const [name, value] of Object.entries(clustersModule.default)) {
+    if (name !== 'Cluster' && name !== 'CLUSTER') {
+      await formatCluster(name, value as typeof Cluster);
+    }
+  }
+
+  const stringBuilder = new StringBuilder();
+  stringBuilder.setIndent(1);
+
+  // Open CLUSTER
+  stringBuilder.printLine("const CLUSTER: {");
+  stringBuilder.increaseIndent();
+
+  for (const [key, value] of Object.entries(clustersModule.default.CLUSTER)) {
+    const definition = value as {ID: number, NAME: string};
+    const clusterClass = clustersModule.default.Cluster.clusters[definition.ID];
+    let clusterName = clusterClass.name;
+    // Class names are inconsistent
+    if (clusterName === 'TouchlinkCluster') {
+      clusterName = 'TouchLinkCluster';
+    }
+    if (!clusterName.endsWith("Cluster")) {
+      clusterName = `${clusterName}Cluster`;
+    }
+    stringBuilder.printLine(`${key}: {`);
+    stringBuilder.increaseIndent();
+    stringBuilder.printLine(`ID: 0x${definition.ID.toString(16).padStart(4, "0")},`);
+    stringBuilder.printLine(`NAME: ${JSON.stringify(definition.NAME)},`);
+    stringBuilder.printLine(`ATTRIBUTES: Readonly<${clusterName}Attributes>,`);
+    stringBuilder.printLine(`COMMANDS: Readonly<${clusterName}Commands>,`);
+    stringBuilder.decreaseIndent();
+    stringBuilder.printLine('},');
+  }
+
+  // Close CLUSTER
+  stringBuilder.decreaseIndent();
+  stringBuilder.printLine("};");
+
+  await fs.appendFile(filePath, stringBuilder.toString());
+
+  const template = await fs.readFile(templatePath, 'utf8');
+  const templateHeader = "declare module 'zigbee-clusters' {";
+  const templateBody = template.slice(template.indexOf(templateHeader) + templateHeader.length);
+  // Close module declaration
+  await fs.appendFile(filePath, templateBody);
+
+  console.log("Done!");
+  // await stall();
+}
+
+
+async function formatCluster(className: string, classDefinition: typeof Cluster): Promise<void> {
+  const stringBuilder = new StringBuilder();
+  stringBuilder.setIndent(1);
+
+
+  stringBuilder.startLine();
+  stringBuilder.print(`type ${className}Attributes = `);
+  if (Object.keys(classDefinition.ATTRIBUTES).length === 0) {
+    stringBuilder.print("Record<never, never>;");
+    stringBuilder.endLine();
+  } else {
+    // Open attributes
+    stringBuilder.print("{");
+    stringBuilder.endLine();
+    stringBuilder.increaseIndent();
+    for (const attribute in classDefinition.ATTRIBUTES) {
+      const attributeDefinition = classDefinition.ATTRIBUTES[attribute];
+      formatAttribute(stringBuilder, className, attribute, attributeDefinition);
+    }
+    // Close attributes
+    stringBuilder.decreaseIndent();
+    stringBuilder.printLine('};');
+  }
+
+  stringBuilder.startLine();
+  stringBuilder.print(`type ${className}Commands = `);
+  if (Object.keys(classDefinition.COMMANDS).length === 0) {
+    stringBuilder.print("Record<never, never>;");
+    stringBuilder.endLine();
+  } else {
+    // Open commands
+    stringBuilder.print("{");
+    stringBuilder.endLine();
+    stringBuilder.increaseIndent();
+    for (const command in classDefinition.COMMANDS) {
+      const commandDefinition = classDefinition.COMMANDS[command];
+      formatCommand(stringBuilder, className, command, commandDefinition);
+    }
+    // Close commands
+    stringBuilder.decreaseIndent();
+    stringBuilder.printLine('};');
+  }
+
+  // Open class
+  stringBuilder.printLine(`class ${className}<Attributes extends AttributeDefinitions = ${className}Attributes, Commands extends CommandDefinitions = ${className}Commands> extends Cluster<Attributes, Commands> {`);
+
+  stringBuilder.increaseIndent();
+  for (const command in classDefinition.COMMANDS) {
+    const commandDefinition = classDefinition.COMMANDS[command];
+    formatCommandMethod(stringBuilder, className, command, commandDefinition);
+  }
+
+  // Close class
+  stringBuilder.decreaseIndent();
+  stringBuilder.printLine('}');
+
+  await fs.appendFile(filePath, stringBuilder.toString());
+}
+
+
+function formatAttribute(stringBuilder: StringBuilder, className: string, name: string, definition: AttributeDefinition): void {
+  stringBuilder.startLine();
+  stringBuilder.print(`${name}: { id: 0x${definition.id.toString(16).padStart(2, "0")}`);
+  stringBuilder.print(', type: ZCLDataType<');
+  formatZCLDataTypeGeneric(stringBuilder, className, name, definition.type);
+  stringBuilder.print("> },");
+  stringBuilder.endLine();
+}
+
+
+function formatCommand(stringBuilder: StringBuilder, className: string, name: string, definition: CommandDefinition): void {
+  stringBuilder.startLine();
+  stringBuilder.print(`${name}: { id: 0x${definition.id.toString(16).padStart(2, "0")}`);
+  stringBuilder.print(`, direction: ${JSON.stringify(definition.direction ?? "DIRECTION_SERVER_TO_CLIENT")}`);
+
+  if (definition.frameControl !== undefined) {
+    stringBuilder.print(`, frameControl: ${JSON.stringify(definition.frameControl)}`);
+  }
+  if (definition.encodeMissingFieldsBehavior !== undefined) {
+    stringBuilder.print(`, encodeMissingFieldsBehavior: ${JSON.stringify(definition.encodeMissingFieldsBehavior)}`);
+  }
+  if (definition.global !== undefined) {
+    stringBuilder.print(`, global: ${definition.global}`);
+  }
+
+  if (definition.args !== undefined) {
+    stringBuilder.print(", args: ");
+    if (Object.keys(definition.args).length === 0) {
+      stringBuilder.print("Record<never, never> /* TODO fix */ ");
+    } else {
+      // Open args
+      stringBuilder.print("{");
+      stringBuilder.endLine();
+      stringBuilder.increaseIndent(2);
+      for (const [key, arg] of Object.entries(definition.args)) {
+        stringBuilder.startLine();
+        stringBuilder.print(`${key}: ZCLDataType<`);
+        formatZCLDataTypeGeneric(stringBuilder, className, name, arg);
+        stringBuilder.print(">,");
+        stringBuilder.endLine();
+      }
+      // Close args
+      stringBuilder.decreaseIndent();
+      stringBuilder.printLine('},');
+      // Spaces before closing bracket of attribute
+      stringBuilder.decreaseIndent();
+      stringBuilder.startLine();
+    }
+  } else {
+    // Space before closing bracket of attribute
+    stringBuilder.print(" ");
+  }
+
+  // TODO response - use reference based on id if possible
+
+  stringBuilder.print('},');
+  stringBuilder.endLine();
+}
+
+
+function formatCommandMethod(stringBuilder: StringBuilder, className: string, name: string, definition: CommandDefinition): void {
+  // Method name
+  stringBuilder.startLine();
+  if (definition.direction === 'DIRECTION_SERVER_TO_CLIENT') {
+    // Bound cluster
+    stringBuilder.print("on", name.charAt(0).toUpperCase(), name.slice(1));
+  } else {
+    stringBuilder.print(name);
+  }
+
+  // Open method
+  stringBuilder.print("(");
+  stringBuilder.endLine();
+
+  // Open args
+  stringBuilder.increaseIndent();
+  stringBuilder.printLine("args: {");
+  stringBuilder.increaseIndent();
+  stringBuilder.printLine("manufacturerId?: number,");
+
+  for (const arg in definition.args) {
+    stringBuilder.startLine();
+    stringBuilder.print(`${arg}: `);
+    formatZCLDataTypeGeneric(stringBuilder, className, name, definition.args[arg]);
+    stringBuilder.print(",");
+    stringBuilder.endLine();
+  }
+
+  // Close args
+  stringBuilder.decreaseIndent();
+  stringBuilder.printLine("},");
+
+
+  // Opts
+  stringBuilder.printLine("opts?: {");
+  stringBuilder.increaseIndent();
+  stringBuilder.printLine("waitForResponse?: boolean,");
+  stringBuilder.printLine("timeout?: number,");
+  stringBuilder.printLine("disableDefaultResponse?: boolean,");
+  stringBuilder.decreaseIndent();
+  stringBuilder.printLine("},");
+
+  // Close method
+  stringBuilder.decreaseIndent();
+  stringBuilder.printLine("): Promise<void>;");
+}
+
+
+/**
+ * @returns whether indentation was increased
+ */
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+function formatZCLDataTypeGeneric(stringBuilder: StringBuilder, className: string, command: string, definition: DataType<any>): void {
+  const typeName = definition.shortName as keyof typeof DataTypes;
+  const typeArgs: Array<unknown> = definition.args;
+
+  if (typeName.startsWith('enum')) {
+    formatEnumDataType(stringBuilder, className, command, typeName, typeArgs);
+  } else if (typeName.startsWith('map')) {
+    formatMapDataType(stringBuilder, className, command, typeName, typeArgs);
+  } else if (typeName.startsWith("_Array")) {
+    stringBuilder.print("Array<unknown>");
+  } else {
+    stringBuilder.print(zclDataTypeToValueType(typeName));
+  }
+}
+
+
+function formatEnumDataType(stringBuilder: StringBuilder, className: string, field: string, typeName: string, typeArgs: Array<unknown>): void {
+  const typeArg = typeArgs[0];
+  if (typeof typeArg !== 'object' || Array.isArray(typeArg) || typeArg === null) {
+    throw new Error(`Invalid ${typeName} arg for ${className} ${field}`);
+  }
+
+  const entries = Object.keys(typeArg);
+  if (entries.length === 0) {
+    stringBuilder.print('unknown');
+  } else {
+    stringBuilder.print(entries.map(arg => JSON.stringify(arg)).join(" | "));
+  }
+}
+
+
+function formatMapDataType(stringBuilder: StringBuilder, className: string, field: string, typeName: string, typeArgs: Array<unknown>): void {
+  if (typeof typeArgs !== 'object' || !Array.isArray(typeArgs)) {
+    throw new Error(`Invalid ${typeName} arg for ${className} ${field}`);
+  }
+  for (const typeArg of typeArgs) {
+    if (!(typeArg === null || typeof typeArg === 'string')) {
+      throw new Error(`Invalid ${typeName} arg for ${className} ${field}`);
+    }
+  }
+  if (typeArgs.length === 0) {
+    stringBuilder.print('BitMap<string>');
+  } else {
+    stringBuilder.print('BitMap<');
+    stringBuilder.print(typeArgs.map(arg => JSON.stringify(arg)).join(" | "));
+    stringBuilder.print(">");
+  }
+}
+
+
+function zclDataTypeToValueType(type: keyof typeof DataTypes): string {
+  switch (type) {
+    case "noData":
+      return "null";
+    case "data8":
+    case "data16":
+    case "data24":
+    case "data32":
+    case "data40":
+    case "data48":
+    case "data56":
+      return "number";
+    case "bool":
+      return "boolean";
+    case "map8":
+    case "map16":
+    case "map24":
+    case "map32":
+    case "map40":
+    case "map48":
+    case "map56":
+    case "map64":
+      throw new Error("Complex type");
+    case "uint8":
+    case "uint16":
+    case "uint24":
+    case "uint32":
+    case "uint40":
+    case "uint48":
+    case "int8":
+    case "int16":
+    case "int24":
+    case "int32":
+    case "int40":
+    case "int48":
+      return "number";
+    case "enum8":
+    case "enum16":
+    case "enum32":
+      throw new Error("Complex type");
+    case "single":
+    case "double":
+      return "number";
+    case "octstr":
+    case "string":
+    case "EUI48":
+    case "EUI64":
+    case "key128":
+      return "string";
+  }
+  // Internal types
+  switch (type as string) {
+    case "_map4":
+      throw new Error("Complex type");
+    case "_uint4":
+      return "number";
+    case "_enum4":
+      throw new Error("Complex type");
+    case "_buffer":
+    case "_buffer8":
+    case "_buffer16":
+      return "Buffer";
+    case "_Array0":
+    case "_Array8":
+      throw new Error("Complex type");
+    case "_FixedString":
+      return "string";
+  }
+  throw new Error(`Unknown ZCL type ${type}`);
+}
+
+
+async function stall(): Promise<void> {
+  await new Promise(resolve => {
+    setTimeout(resolve, 1_000_000_000);
+  });
+}
diff --git a/scripts/template.d.ts.txt b/scripts/template.d.ts.txt
new file mode 100644
index 0000000..7cc9604
--- /dev/null
+++ b/scripts/template.d.ts.txt
@@ -0,0 +1,281 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
+declare module 'zigbee-clusters' {
+  import {EventEmitter} from "events";
+  import {ZigBeeNode} from "homey";
+  type ZCLEnum8Status = 'SUCCESS' | 'FAILURE' | 'NOT_AUTHORIZED' | 'RESERVED_FIELD_NOT_ZERO' | 'MALFORMED_COMMAND' | 'UNSUP_CLUSTER_COMMAND' | 'UNSUP_GENERAL_COMMAND' | 'UNSUP_MANUF_CLUSTER_COMMAND' | 'UNSUP_MANUF_GENERAL_COMMAND' | 'INVALID_FIELD' | 'UNSUPPORTED_ATTRIBUTE' | 'INVALID_VALUE' | 'READ_ONLY' | 'INSUFFICIENT_SPACE' | 'DUPLICATE_EXISTS' | 'NOT_FOUND' | 'UNREPORTABLE_ATTRIBUTE' | 'INVALID_DATA_TYPE' | 'INVALID_SELECTOR' | 'WRITE_ONLY' | 'INCONSISTENT_STARTUP_STATE' | 'DEFINED_OUT_OF_BAND' | 'INCONSISTENT' | 'ACTION_DENIED' | 'TIMEOUT' | 'ABORT' | 'INVALID_IMAGE' | 'WAIT_FOR_DATA' | 'NO_IMAGE_AVAILABLE' | 'REQUIRE_MORE_IMAGE' | 'NOTIFICATION_PENDING' | 'HARDWARE_FAILURE' | 'SOFTWARE_FAILURE' | 'CALIBRATION_ERROR' | 'UNSUPPORTED_CLUSTER';
+  type ZCLDataTypes = typeof import('@athombv/data-types').DataTypes & {
+    enum8Status: ZCLDataType<ZCLEnum8Status>
+  };
+
+  function debug(flag: boolean, namespaces: string): void;
+
+  class ZCLNode extends EventEmitter {
+    constructor(node: ZigBeeNode);
+    endpoints: Record<number, ZCLNodeEndpoint>;
+
+    getLogId(endpointId: number, clusterId: number): string;
+  }
+
+  class ZCLNodeEndpoint extends EventEmitter {
+    constructor(node: ZCLNode, descriptor: {
+      endpointId: number;
+      inputClusters: number[];
+      outputClusters: number[];
+    }[]);
+    clusters: Record<string, Cluster<any, any>>;
+    bindings: Record<string, BoundCluster>;
+
+    bind(clusterName: string, clusterImpl: BoundCluster): void;
+    unbind(clusterName: string): void;
+
+    makeDefaultResponseFrame(receivedFrame: unknown, success: boolean, status: ZCLEnum8Status): typeof zclFrames.ZCLStandardHeader | typeof zclFrames.ZCLMfgSpecificHeader;
+  }
+
+  type ZCLDataType<Value> = import('@athombv/data-types').DataType<Value>;
+  const ZCLDataTypes: ZCLDataTypes;
+  const ZCLStruct: typeof import('@athombv/data-types').Struct;
+
+  namespace zclTypes {
+    type ZCLDataType<Value> = import('@athombv/data-types').DataType<Value>;
+    const ZCLDataTypes: ZCLDataTypes;
+    const ZCLStruct: typeof import('@athombv/data-types').Struct;
+  }
+
+  type FrameControlFlag =
+    'clusterSpecific'
+    | 'manufacturerSpecific'
+    | 'directionToClient'
+    | 'disableDefaultResponse';
+  type ZCLFrameControlBitmap = ZCLDataType<BitMap<FrameControlFlag>>;
+
+  namespace zclFrames {
+    const ZCLStandardHeader: import('@athombv/data-types').StructInstance<{
+      frameControl: ZCLFrameControlBitmap,
+      trxSequenceNumber: ZCLDataTypes["data8"],
+      cmdId: ZCLDataTypes["data8"],
+      data: ZCLDataTypes["buffer"],
+    }>;
+    const ZCLMfgSpecificHeader: import('@athombv/data-types').StructInstance<{
+      frameControl: ZCLFrameControlBitmap,
+      manufacturerId: ZCLDataTypes["uint16"],
+      trxSequenceNumber: ZCLDataTypes["data8"],
+      cmdId: ZCLDataTypes["data8"],
+      data: ZCLDataTypes["buffer"],
+    }>;
+    function ZCLAttributeDataRecord(withStatus: boolean, attributes: AttributeDefinitions): ZCLDataType<{
+      id: number,
+      name: string,
+      status?: ZCLEnum8Status
+      value: ZCLDataType<any>
+    }>;
+    function ZCLConfigureReportingRecords({ withStatus }: {withStatus?: boolean}): ZCLDataType<{
+      attributeId: number,
+      status?: ZCLEnum8Status,
+      direction: 'reported' | 'received',
+      attributeDataType: number,
+      minInterval: number,
+      maxInterval: number,
+      minChange: number, // TODO Check whether this is actually a number, or a buffer like the JS docs imply
+    }>
+  }
+
+  class ZCLError extends Error {
+    zclStatus: ZCLEnum8Status;
+  }
+
+  const ZIGBEE_PROFILE_ID: {
+    INDUSTRIAL_PLANT_MONITORING: 0x0101,
+    HOME_AUTOMATION: 0x0104,
+    COMMERCIAL_BUILDING_AUTOMATION: 0x0105,
+    TELECOM_APPLICATIONS: 0x0107,
+    PERSONAL_HOME_AND_HOSPITAL_CARE: 0x0108,
+    ADVANCED_METERING_INITIATIVE: 0x0109,
+  };
+  const ZIGBEE_DEVICE_ID: {
+    GENERIC: {
+      ON_OFF_SWITCH: 0x0000,
+      LEVEL_CONTROL_SWITCH: 0x0001,
+      ON_OFF_OUTPUT: 0x0002,
+      LEVEL_CONTROLLABLE_OUTPUT: 0x0003,
+      SCENE_SELECTOR: 0x0004,
+      CONFIGURATION_TOOL: 0x0005,
+      REMOTE_CONTROL: 0x0006,
+      COMBINED_INTERFACE: 0x0007,
+      RANGE_EXTENDER: 0x0008,
+      MAINS_POWER_OUTLET: 0x0009,
+      DOOR_LOCK: 0x000a,
+      DOOR_LOCK_CONTROLLER: 0x000b,
+      SIMPLE_SENSOR: 0x000c,
+      CONSUMPTION_AWARENESS_DEVICE: 0x000d,
+      HOME_GATEWAY: 0x0050,
+      SMART_PLUG: 0x0051,
+      WHITE_GOODS: 0x0052,
+      METER_INTERFACE: 0x0053,
+    },
+    LIGHTING: {
+      ON_OFF_LIGHT: 0x0100,
+      DIMMABLE_LIGHT: 0x0101,
+      COLOR_DIMMABLE_LIGHT: 0x0102,
+      ON_OFF_LIGHT_SWITCH: 0x0103,
+      DIMMER_SWITCH: 0x0104,
+      COLOR_DIMMER_SWITCH: 0x0105,
+      LIGHT_SENSOR: 0x0106,
+      OCCUPANCY_SENSOR: 0x0107,
+    },
+    CLOSURES: {
+      SHADE: 0x0200,
+      SHADE_CONTROLLER: 0x0201,
+      WINDOW_COVERING_DEVICE: 0x0202,
+      WINDOW_COVERING_CONTROLLER: 0x0203,
+    },
+    HVAC: {
+      HEATING_COOLING_UNIT: 0x0300,
+      THERMOSTAT: 0x0301,
+      TEMPERATURE_SENSOR: 0x0302,
+      PUMP: 0x0303,
+      PUMP_CONTROLLER: 0x0304,
+      PRESSURE_SENSOR: 0x0305,
+      FLOW_SENSOR: 0x0306,
+    },
+    INTRUDER_ALARM_SYSTEMS: {
+      IAS_CONTROL_INDICATING_EQUIPMENT: 0x0400,
+      IAS_ANCILLARY_CONTROL_EQUIPMENT: 0x0401,
+      IAS_ZONE: 0x0402,
+      IAS_WARNING_DEVICE: 0x0403,
+    },
+  };
+  const IAS_ZONE_TYPE: {
+    STANDARD_CIE: 0x0000,
+    MOTION_SENSOR: 0x000d,
+    CONTACT_SWITCH: 0x0015,
+    FIRE_SENSOR: 0x0028,
+    WATER_SENSOR: 0x002a,
+    CARBON_MONOXIDE_SENSOR: 0x002b,
+    PERSONAL_EMERGENCY_DEVICE: 0x002c,
+    VIBRATION_MOVEMENT_SENSOR: 0x002d,
+    REMOTE_CONTROL: 0x010f,
+    KEY_FOB: 0x0115,
+    KEYPAD: 0x021d,
+    STANDARD_WARNING_DEVICE: 0x0225,
+    GLASS_BREAK_SENSOR: 0x0226,
+    SECURITY_REPEATER: 0x0229,
+    INVALID_ZONE_TYPE: 0xffff,
+  };
+
+  abstract class Cluster<Attributes extends AttributeDefinitions, Commands extends CommandDefinitions> extends EventEmitter {
+    static get ID(): number;
+    static get NAME(): string;
+    // @ts-expect-error Type should be defined on non-abstract inheritors
+    static get ATTRIBUTES(): Attributes;
+    // @ts-expect-error Type should be defined on non-abstract inheritors
+    static get COMMANDS(): Commands;
+
+    static DIRECTION_SERVER_TO_CLIENT: CommandToClientDirection;
+    static DIRECTION_CLIENT_TO_SERVER: CommandToServerDirection;
+
+    get logId(): string;
+
+    discoverCommandsGenerated({startValue, maxResults}?: {startValue?: number, maxResults?: number}, opts?: {timeout?: number}): Promise<Array<number>>;
+    discoverCommandsReceived({startValue, maxResults}?: {startValue?: number, maxResults?: number}, opts?: {timeout?: number}): Promise<Array<number>>;
+
+    readAttributes<K extends keyof Attributes | number>(attributes: ReadonlyArray<K>, opts?: {timeout?: number}): Promise<{[attribute in K]: AttributesFromDefinition<Attributes>[attribute]}>;
+    writeAttributes<K extends keyof Attributes>(attributes: {[attribute in K]: AttributesFromDefinition<Attributes>[attribute]}, opts?: {timeout?: number}): Promise<{[attribute in K]: {id: number, status: 'SUCCESS' | 'FAILURE'}}>
+
+    configureReporting(attributes: AttributeReportingConfiguration<Extract<keyof Attributes, string>>, opts?: {timeout?: number}): Promise<void>;
+    readReportingConfiguration(attributes: ReadonlyArray<string | number>, opts?: {timeout?: number}): Promise<Array<ReadReportingConfigurationResponse>>;
+
+    discoverAttributes(opts?: {timeout?: number}): Promise<Array<string | number>>;
+    discoverAttributesExtended(opts?: {timeout?: number}): Promise<Array<ExtendedAttributesResponse>>;
+
+    sendFrame(data: object): Promise<void>;
+    nextSeqNr(): number;
+
+    static addCluster(clusterClass: typeof Cluster<any, any>): void;
+    static removeCluster(clusterIdOrName: string | number): void;
+    static getCluster<Attributes extends AttributeDefinitions, Commands extends CommandDefinitions>(clusterIdOrName: string | number): Cluster<Attributes, Commands>;
+
+    on<Event extends Extract<keyof Attributes, string>>(eventName: `attr.${Event}`, listener: (value: AttributesFromDefinition<Attributes>[Event]) => void): this;
+    on<Values extends Array<any> = unknown[]>(eventName: string, listener: (...args: Values) => void): this;
+
+    attributes: Attributes;
+    attributesById: {[Attribute in keyof Attributes as Attributes[Attribute]['id']]: { name: Attribute } & Attributes[Attribute] };
+
+    commands: Commands;
+    commandsById: {[Command in keyof Commands as Commands[Command]['id']]: Array<{name: Command} & Commands[Command]>};
+  }
+
+  // TODO
+  abstract class BoundCluster {
+    endpoint: number;
+    cluster: Cluster<any, any>;
+
+    get logId(): string;
+  }
+}
+
+// TODO clean up so these are not global
+
+type CommandToServerDirection = 'DIRECTION_CLIENT_TO_SERVER';
+type CommandToClientDirection = 'DIRECTION_SERVER_TO_CLIENT';
+type CommandDirection = CommandToServerDirection | CommandToClientDirection;
+
+type FromZCLDataType<DataType> = DataType extends import('zigbee-clusters').ZCLDataType<infer InferredValue>? InferredValue : DataType;
+
+type AttributeDefinition = {
+  id: number,
+  type: import('zigbee-clusters').ZCLDataType<any>,
+  manufacturerId?: number,
+}
+
+type AttributeDefinitions = {
+  [attributeName: string]: AttributeDefinition,
+}
+
+type AttributesFromDefinition<Definition extends AttributeDefinitions> = {
+  [attribute in keyof Definition]: FromZCLDataType<Definition[attribute]['type']>
+}
+
+type CommandDefinition = {
+  id: number,
+  direction?: CommandDirection,
+  args?: {
+    [argName: string]: import('zigbee-clusters').ZCLDataType<any>,
+  }
+  response?: CommandDefinition,
+  frameControl?: import('zigbee-clusters').FrameControlFlag[];
+  encodeMissingFieldsBehavior?: 'default' | 'skip';
+  global?: boolean;
+}
+
+type CommandDefinitions = {
+  [commandName: string]: CommandDefinition,
+}
+
+type AttributeReportingConfiguration<AttributeKey extends string> = {
+  [attribute in AttributeKey]: {
+    minInterval?: number,
+    maxInterval?: number,
+    minChange?: number
+  }
+}
+
+type ReadReportingConfigurationResponse = {
+  status: import('zigbee-clusters').ZCLEnum8Status,
+  direction: 'reported'|'received';
+  attributeId: number;
+  attributeDataType?: number;
+  minInterval?: number;
+  maxInterval?: number;
+  minChange?: number;
+  timeoutPeriod?: number;
+}
+
+type ExtendedAttributesResponse = {
+  name?: string;
+  id: number;
+  acl: {
+    readable: boolean;
+    writable: boolean;
+    reportable: boolean;
+  }
+}
diff --git a/tsconfig.json b/tsconfig.json
index bb561c0..82403b4 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,21 +1,14 @@
 {
-  // Change this to match your project
-  "include": ["lib/**/*", "index.js"],
   "compilerOptions": {
-    // Tells TypeScript to read JS files, as
-    // normally they are ignored as source files
-    "allowJs": true,
-    // Generate d.ts files
-    "declaration": true,
-    // This compiler run should
-    // only output d.ts files
-    "emitDeclarationOnly": true,
-    // Types should go into this directory.
-    // Removing this would place the .d.ts files
-    // next to the .js files
-    "outDir": "dist",
-    // go to js file when using IDE functions like
-    // "Go to Definition" in VSCode
-    "declarationMap": true
+    "lib": ["es2021"],
+    "module": "Node16",
+    "target": "es2021",
+
+    "strict": true,
+    "esModuleInterop": true,
+    "forceConsistentCasingInFileNames": true,
+    "moduleResolution": "node",
+    "declaration": false,
+    "skipLibCheck": false,
   }
 }

From 77399b822fbf250d637513323b77ac7a4686a1c2 Mon Sep 17 00:00:00 2001
From: Joost Loohuis <github@loohuis.dev>
Date: Thu, 9 Apr 2026 15:47:40 +0200
Subject: [PATCH 6/9] Generate new types

---
 index.d.ts                | 4572 +++++++++++++++++++++----------------
 scripts/template.d.ts.txt |    6 +-
 2 files changed, 2634 insertions(+), 1944 deletions(-)

diff --git a/index.d.ts b/index.d.ts
index fb5ae9a..ab795c5 100644
--- a/index.d.ts
+++ b/index.d.ts
@@ -1,1994 +1,2686 @@
-// Auto-generated TypeScript definitions for zigbee-clusters
-// Generated by scripts/generate-types.js
-
-import * as EventEmitter from "events";
-
-type EndpointDescriptor = {
-  endpointId: number;
-  inputClusters: number[];
-  outputClusters: number[];
-};
-
-type ConstructorOptions = {
-  endpointDescriptors: EndpointDescriptor[];
-  sendFrame: (endpointId: number, clusterId: number, frame: Buffer) => Promise<void>;
-};
-
-type ClusterCommandOptions = {
-  timeout?: number;
-  waitForResponse?: boolean;
-  disableDefaultResponse?: boolean;
-};
-
-type ZCLNodeConstructorInput = {
-  endpointDescriptors?: EndpointDescriptor[];
-  sendFrame: (endpointId: number, clusterId: number, frame: Buffer) => Promise<void>;
-  handleFrame?: (
-    endpointId: number,
-    clusterId: number,
-    frame: Buffer,
-    meta?: unknown
-  ) => Promise<void>;
-};
-
-export type ZCLEnum8Status = 'SUCCESS' | 'FAILURE' | 'NOT_AUTHORIZED' | 'RESERVED_FIELD_NOT_ZERO' | 'MALFORMED_COMMAND' | 'UNSUP_CLUSTER_COMMAND' | 'UNSUP_GENERAL_COMMAND' | 'UNSUP_MANUF_CLUSTER_COMMAND' | 'UNSUP_MANUF_GENERAL_COMMAND' | 'INVALID_FIELD' | 'UNSUPPORTED_ATTRIBUTE' | 'INVALID_VALUE' | 'READ_ONLY' | 'INSUFFICIENT_SPACE' | 'DUPLICATE_EXISTS' | 'NOT_FOUND' | 'UNREPORTABLE_ATTRIBUTE' | 'INVALID_DATA_TYPE' | 'INVALID_SELECTOR' | 'WRITE_ONLY' | 'INCONSISTENT_STARTUP_STATE' | 'DEFINED_OUT_OF_BAND' | 'INCONSISTENT' | 'ACTION_DENIED' | 'TIMEOUT' | 'ABORT' | 'INVALID_IMAGE' | 'WAIT_FOR_DATA' | 'NO_IMAGE_AVAILABLE' | 'REQUIRE_MORE_IMAGE' | 'NOTIFICATION_PENDING' | 'HARDWARE_FAILURE' | 'SOFTWARE_FAILURE' | 'CALIBRATION_ERROR' | 'UNSUPPORTED_CLUSTER';
-
-export type GlobalClusterAttributes = {
-  clusterRevision: number;
-  attributeReportingStatus: 0 | 1;
-};
-
-export interface ZCLNodeCluster extends EventEmitter {
-  /** Dynamic command handler methods (e.g. `onZoneStatusChangeNotification`). */
-  [key: `on${string}`]: unknown;
-
-  discoverCommandsGenerated(params?: {
-    startValue?: number;
-    maxResults?: number;
-  }, opts?: { timeout?: number }): Promise<(string | number)[]>;
-
-  discoverCommandsReceived(params?: {
-    startValue?: number;
-    maxResults?: number;
-  }, opts?: { timeout?: number }): Promise<(string | number)[]>;
-
-  readAttributes(
-    attributes: Array<string | number>,
-    opts?: { timeout?: number }
-  ): Promise<{ [x: string]: unknown }>;
-
-  writeAttributes(attributes?: object, opts?: { timeout?: number }): Promise<unknown>;
-
-  configureReporting(attributes?: object, opts?: { timeout?: number }): Promise<void>;
-
-  readReportingConfiguration(attributes?: (string | number)[], opts?: { timeout?: number }): Promise<{
-    status: string;
-    direction: 'reported' | 'received';
-    attributeId: number;
-    attributeDataType?: number;
-    minInterval?: number;
-    maxInterval?: number;
-    minChange?: number;
-    timeoutPeriod?: number;
-  }[]>;
-
-  discoverAttributes(opts?: { timeout?: number }): Promise<(string | number)[]>;
-
-  discoverAttributesExtended(opts?: { timeout?: number }): Promise<{
-    name?: string;
-    id: number;
-    dataTypeId: number;
-    acl: { readable: boolean; writable: boolean; reportable: boolean };
-  }[]>;
-}
-
-export interface AlarmsCluster extends ZCLNodeCluster {
-  resetAllAlarms(opts?: ClusterCommandOptions): Promise<void>;
-  getAlarm(opts?: ClusterCommandOptions): Promise<void>;
-  resetAlarmLog(opts?: ClusterCommandOptions): Promise<void>;
-}
-
-export interface AnalogInputClusterAttributes extends GlobalClusterAttributes {
-  description?: string;
-  maxPresentValue?: number;
-  minPresentValue?: number;
-  outOfService?: boolean;
-  presentValue?: number;
-  reliability?: 'noFaultDetected' | 'noSensor' | 'overRange' | 'underRange' | 'openLoop' | 'shortedLoop' | 'noOutput' | 'unreliableOther' | 'processError' | 'configurationError';
-  resolution?: number;
-  statusFlags?: Partial<{ inAlarm: boolean; fault: boolean; overridden: boolean; outOfService: boolean }>;
-  applicationType?: number;
-}
-
-export interface AnalogInputCluster extends ZCLNodeCluster {
-  readAttributes<K extends keyof AnalogInputClusterAttributes>(attributeNames: K[], opts?: { timeout?: number }): Promise<Pick<AnalogInputClusterAttributes, K>>;
-  readAttributes(attributeNames: Array<keyof AnalogInputClusterAttributes | number>, opts?: { timeout?: number }): Promise<Partial<AnalogInputClusterAttributes> & Record<number, unknown>>;
-  writeAttributes(attributes: Partial<AnalogInputClusterAttributes>, opts?: { timeout?: number }): Promise<unknown>;
-  on<K extends keyof AnalogInputClusterAttributes & string>(eventName: `attr.${K}`, listener: (value: AnalogInputClusterAttributes[K]) => void): this;
-  once<K extends keyof AnalogInputClusterAttributes & string>(eventName: `attr.${K}`, listener: (value: AnalogInputClusterAttributes[K]) => void): this;
-}
-
-export interface AnalogOutputClusterAttributes extends GlobalClusterAttributes {
-  description?: string;
-  maxPresentValue?: number;
-  minPresentValue?: number;
-  outOfService?: boolean;
-  presentValue?: number;
-  reliability?: 'noFaultDetected' | 'overRange' | 'underRange' | 'openLoop' | 'shortedLoop' | 'unreliableOther' | 'processError' | 'configurationError';
-  relinquishDefault?: number;
-  resolution?: number;
-  statusFlags?: Partial<{ inAlarm: boolean; fault: boolean; overridden: boolean; outOfService: boolean }>;
-  applicationType?: number;
-}
-
-export interface AnalogOutputCluster extends ZCLNodeCluster {
-  readAttributes<K extends keyof AnalogOutputClusterAttributes>(attributeNames: K[], opts?: { timeout?: number }): Promise<Pick<AnalogOutputClusterAttributes, K>>;
-  readAttributes(attributeNames: Array<keyof AnalogOutputClusterAttributes | number>, opts?: { timeout?: number }): Promise<Partial<AnalogOutputClusterAttributes> & Record<number, unknown>>;
-  writeAttributes(attributes: Partial<AnalogOutputClusterAttributes>, opts?: { timeout?: number }): Promise<unknown>;
-  on<K extends keyof AnalogOutputClusterAttributes & string>(eventName: `attr.${K}`, listener: (value: AnalogOutputClusterAttributes[K]) => void): this;
-  once<K extends keyof AnalogOutputClusterAttributes & string>(eventName: `attr.${K}`, listener: (value: AnalogOutputClusterAttributes[K]) => void): this;
-}
-
-export interface AnalogValueClusterAttributes extends GlobalClusterAttributes {
-  description?: string;
-  outOfService?: boolean;
-  presentValue?: number;
-  reliability?: 'noFaultDetected' | 'overRange' | 'underRange' | 'openLoop' | 'shortedLoop' | 'unreliableOther' | 'processError' | 'configurationError';
-  relinquishDefault?: number;
-  statusFlags?: Partial<{ inAlarm: boolean; fault: boolean; overridden: boolean; outOfService: boolean }>;
-  applicationType?: number;
-}
-
-export interface AnalogValueCluster extends ZCLNodeCluster {
-  readAttributes<K extends keyof AnalogValueClusterAttributes>(attributeNames: K[], opts?: { timeout?: number }): Promise<Pick<AnalogValueClusterAttributes, K>>;
-  readAttributes(attributeNames: Array<keyof AnalogValueClusterAttributes | number>, opts?: { timeout?: number }): Promise<Partial<AnalogValueClusterAttributes> & Record<number, unknown>>;
-  writeAttributes(attributes: Partial<AnalogValueClusterAttributes>, opts?: { timeout?: number }): Promise<unknown>;
-  on<K extends keyof AnalogValueClusterAttributes & string>(eventName: `attr.${K}`, listener: (value: AnalogValueClusterAttributes[K]) => void): this;
-  once<K extends keyof AnalogValueClusterAttributes & string>(eventName: `attr.${K}`, listener: (value: AnalogValueClusterAttributes[K]) => void): this;
-}
-
-export interface BallastConfigurationClusterAttributes extends GlobalClusterAttributes {
-  physicalMinLevel?: number;
-  physicalMaxLevel?: number;
-  ballastStatus?: Partial<{ nonOperational: boolean; lampNotInSocket: boolean }>;
-  minLevel?: number;
-  maxLevel?: number;
-  powerOnLevel?: number;
-  powerOnFadeTime?: number;
-  intrinsicBallastFactor?: number;
-  ballastFactorAdjustment?: number;
-  lampQuantity?: number;
-  lampType?: string;
-  lampManufacturer?: string;
-  lampRatedHours?: number;
-  lampBurnHours?: number;
-  lampAlarmMode?: Partial<{ lampBurnHours: boolean }>;
-  lampBurnHoursTripPoint?: number;
-}
-
-export interface BallastConfigurationCluster extends ZCLNodeCluster {
-  readAttributes<K extends keyof BallastConfigurationClusterAttributes>(attributeNames: K[], opts?: { timeout?: number }): Promise<Pick<BallastConfigurationClusterAttributes, K>>;
-  readAttributes(attributeNames: Array<keyof BallastConfigurationClusterAttributes | number>, opts?: { timeout?: number }): Promise<Partial<BallastConfigurationClusterAttributes> & Record<number, unknown>>;
-  writeAttributes(attributes: Partial<BallastConfigurationClusterAttributes>, opts?: { timeout?: number }): Promise<unknown>;
-  on<K extends keyof BallastConfigurationClusterAttributes & string>(eventName: `attr.${K}`, listener: (value: BallastConfigurationClusterAttributes[K]) => void): this;
-  once<K extends keyof BallastConfigurationClusterAttributes & string>(eventName: `attr.${K}`, listener: (value: BallastConfigurationClusterAttributes[K]) => void): this;
-}
-
-export interface BasicClusterAttributes extends GlobalClusterAttributes {
-  zclVersion?: number;
-  appVersion?: number;
-  stackVersion?: number;
-  hwVersion?: number;
-  manufacturerName?: string;
-  modelId?: string;
-  dateCode?: string;
-  powerSource?: 'unknown' | 'mains' | 'mains3phase' | 'battery' | 'dc' | 'emergencyMains' | 'emergencyTransfer';
-  appProfileVersion?: number;
-  locationDesc?: string;
-  physicalEnv?: 'Unspecified' | 'Atrium' | 'Bar' | 'Courtyard' | 'Bathroom' | 'Bedroom' | 'BilliardRoom' | 'UtilityRoom' | 'Cellar' | 'StorageCloset' | 'Theater' | 'Office' | 'Deck' | 'Den' | 'DiningRoom' | 'ElectricalRoom' | 'Elevator' | 'Entry' | 'FamilyRoom' | 'MainFloor' | 'Upstairs' | 'Downstairs' | 'Basement' | 'Gallery' | 'GameRoom' | 'Garage' | 'Gym' | 'Hallway' | 'House' | 'Kitchen' | 'LaundryRoom' | 'Library' | 'MasterBedroom' | 'MudRoom' | 'Nursery' | 'Pantry' | 'Outside' | 'Pool' | 'Porch' | 'SewingRoom' | 'SittingRoom' | 'Stairway' | 'Yard' | 'Attic' | 'HotTub' | 'LivingRoom' | 'Sauna' | 'Workshop' | 'GuestBedroom' | 'GuestBath' | 'PowderRoom' | 'BackYard' | 'FrontYard' | 'Patio' | 'Driveway' | 'SunRoom' | 'Spa' | 'Whirlpool' | 'Shed' | 'EquipmentStorage' | 'HobbyRoom' | 'Fountain' | 'Pond' | 'ReceptionRoom' | 'BreakfastRoom' | 'Nook' | 'Garden' | 'Balcony' | 'PanicRoom' | 'Terrace' | 'Roof' | 'Toilet' | 'ToiletMain' | 'OutsideToilet' | 'ShowerRoom' | 'Study' | 'FrontGarden' | 'BackGarden' | 'Kettle' | 'Television' | 'Stove' | 'Microwave' | 'Toaster' | 'Vacuum' | 'Appliance' | 'FrontDoor' | 'BackDoor' | 'FridgeDoor' | 'MedicationCabinetDoor' | 'WardrobeDoor' | 'FrontCupboardDoor' | 'OtherDoor' | 'WaitingRoom' | 'TriageRoom' | 'DoctorsOffice' | 'PatientsPrivateRoom' | 'ConsultationRoom' | 'NurseStation' | 'Ward' | 'Corridor' | 'OperatingTheatre' | 'DentalSurgeryRoom' | 'MedicalImagingRoom' | 'DecontaminationRoom' | 'Unknown';
-  deviceEnabled?: boolean;
-  alarmMask?: Partial<{ hardwareFault: boolean; softwareFault: boolean }>;
-  disableLocalConfig?: Partial<{ factoryResetDisabled: boolean; configurationDisabled: boolean }>;
-  swBuildId?: string;
-}
-
-export interface BasicCluster extends ZCLNodeCluster {
-  readAttributes<K extends keyof BasicClusterAttributes>(attributeNames: K[], opts?: { timeout?: number }): Promise<Pick<BasicClusterAttributes, K>>;
-  readAttributes(attributeNames: Array<keyof BasicClusterAttributes | number>, opts?: { timeout?: number }): Promise<Partial<BasicClusterAttributes> & Record<number, unknown>>;
-  writeAttributes(attributes: Partial<BasicClusterAttributes>, opts?: { timeout?: number }): Promise<unknown>;
-  on<K extends keyof BasicClusterAttributes & string>(eventName: `attr.${K}`, listener: (value: BasicClusterAttributes[K]) => void): this;
-  once<K extends keyof BasicClusterAttributes & string>(eventName: `attr.${K}`, listener: (value: BasicClusterAttributes[K]) => void): this;
-  factoryReset(opts?: ClusterCommandOptions): Promise<void>;
-}
-
-export interface BinaryInputClusterAttributes extends GlobalClusterAttributes {
-  activeText?: string;
-  description?: string;
-  inactiveText?: string;
-  outOfService?: boolean;
-  polarity?: 'normal' | 'reverse';
-  presentValue?: boolean;
-  reliability?: 'noFaultDetected' | 'noSensor' | 'overRange' | 'underRange' | 'openLoop' | 'shortedLoop' | 'noOutput' | 'unreliableOther' | 'processError' | 'configurationError';
-  statusFlags?: Partial<{ inAlarm: boolean; fault: boolean; overridden: boolean; outOfService: boolean }>;
-  applicationType?: number;
-}
-
-export interface BinaryInputCluster extends ZCLNodeCluster {
-  readAttributes<K extends keyof BinaryInputClusterAttributes>(attributeNames: K[], opts?: { timeout?: number }): Promise<Pick<BinaryInputClusterAttributes, K>>;
-  readAttributes(attributeNames: Array<keyof BinaryInputClusterAttributes | number>, opts?: { timeout?: number }): Promise<Partial<BinaryInputClusterAttributes> & Record<number, unknown>>;
-  writeAttributes(attributes: Partial<BinaryInputClusterAttributes>, opts?: { timeout?: number }): Promise<unknown>;
-  on<K extends keyof BinaryInputClusterAttributes & string>(eventName: `attr.${K}`, listener: (value: BinaryInputClusterAttributes[K]) => void): this;
-  once<K extends keyof BinaryInputClusterAttributes & string>(eventName: `attr.${K}`, listener: (value: BinaryInputClusterAttributes[K]) => void): this;
-}
-
-export interface BinaryOutputClusterAttributes extends GlobalClusterAttributes {
-  activeText?: string;
-  description?: string;
-  inactiveText?: string;
-  minimumOffTime?: number;
-  minimumOnTime?: number;
-  outOfService?: boolean;
-  polarity?: 'normal' | 'reverse';
-  presentValue?: boolean;
-  reliability?: 'noFaultDetected' | 'overRange' | 'underRange' | 'openLoop' | 'shortedLoop' | 'unreliableOther' | 'processError' | 'configurationError';
-  relinquishDefault?: boolean;
-  statusFlags?: Partial<{ inAlarm: boolean; fault: boolean; overridden: boolean; outOfService: boolean }>;
-  applicationType?: number;
-}
-
-export interface BinaryOutputCluster extends ZCLNodeCluster {
-  readAttributes<K extends keyof BinaryOutputClusterAttributes>(attributeNames: K[], opts?: { timeout?: number }): Promise<Pick<BinaryOutputClusterAttributes, K>>;
-  readAttributes(attributeNames: Array<keyof BinaryOutputClusterAttributes | number>, opts?: { timeout?: number }): Promise<Partial<BinaryOutputClusterAttributes> & Record<number, unknown>>;
-  writeAttributes(attributes: Partial<BinaryOutputClusterAttributes>, opts?: { timeout?: number }): Promise<unknown>;
-  on<K extends keyof BinaryOutputClusterAttributes & string>(eventName: `attr.${K}`, listener: (value: BinaryOutputClusterAttributes[K]) => void): this;
-  once<K extends keyof BinaryOutputClusterAttributes & string>(eventName: `attr.${K}`, listener: (value: BinaryOutputClusterAttributes[K]) => void): this;
-}
-
-export interface BinaryValueClusterAttributes extends GlobalClusterAttributes {
-  activeText?: string;
-  description?: string;
-  inactiveText?: string;
-  minimumOffTime?: number;
-  minimumOnTime?: number;
-  outOfService?: boolean;
-  polarity?: 'normal' | 'reverse';
-  presentValue?: boolean;
-  reliability?: 'noFaultDetected' | 'overRange' | 'underRange' | 'openLoop' | 'shortedLoop' | 'unreliableOther' | 'processError' | 'configurationError';
-  relinquishDefault?: boolean;
-  statusFlags?: Partial<{ inAlarm: boolean; fault: boolean; overridden: boolean; outOfService: boolean }>;
-  applicationType?: number;
-}
-
-export interface BinaryValueCluster extends ZCLNodeCluster {
-  readAttributes<K extends keyof BinaryValueClusterAttributes>(attributeNames: K[], opts?: { timeout?: number }): Promise<Pick<BinaryValueClusterAttributes, K>>;
-  readAttributes(attributeNames: Array<keyof BinaryValueClusterAttributes | number>, opts?: { timeout?: number }): Promise<Partial<BinaryValueClusterAttributes> & Record<number, unknown>>;
-  writeAttributes(attributes: Partial<BinaryValueClusterAttributes>, opts?: { timeout?: number }): Promise<unknown>;
-  on<K extends keyof BinaryValueClusterAttributes & string>(eventName: `attr.${K}`, listener: (value: BinaryValueClusterAttributes[K]) => void): this;
-  once<K extends keyof BinaryValueClusterAttributes & string>(eventName: `attr.${K}`, listener: (value: BinaryValueClusterAttributes[K]) => void): this;
-}
-
-export interface ColorControlClusterAttributes extends GlobalClusterAttributes {
-  currentHue?: number;
-  currentSaturation?: number;
-  currentX?: number;
-  currentY?: number;
-  colorTemperatureMireds?: number;
-  colorMode?: 'currentHueAndCurrentSaturation' | 'currentXAndCurrentY' | 'colorTemperatureMireds';
-  colorCapabilities?: Partial<{ hueAndSaturation: boolean; enhancedHue: boolean; colorLoop: boolean; xy: boolean; colorTemperature: boolean }>;
-  colorTempPhysicalMinMireds?: number;
-  colorTempPhysicalMaxMireds?: number;
-}
-
-export interface ColorControlCluster extends ZCLNodeCluster {
-  readAttributes<K extends keyof ColorControlClusterAttributes>(attributeNames: K[], opts?: { timeout?: number }): Promise<Pick<ColorControlClusterAttributes, K>>;
-  readAttributes(attributeNames: Array<keyof ColorControlClusterAttributes | number>, opts?: { timeout?: number }): Promise<Partial<ColorControlClusterAttributes> & Record<number, unknown>>;
-  writeAttributes(attributes: Partial<ColorControlClusterAttributes>, opts?: { timeout?: number }): Promise<unknown>;
-  on<K extends keyof ColorControlClusterAttributes & string>(eventName: `attr.${K}`, listener: (value: ColorControlClusterAttributes[K]) => void): this;
-  once<K extends keyof ColorControlClusterAttributes & string>(eventName: `attr.${K}`, listener: (value: ColorControlClusterAttributes[K]) => void): this;
-  moveToHue(args: { hue: number; direction: 'shortestDistance' | 'longestDistance' | 'up' | 'down'; transitionTime: number }, opts?: ClusterCommandOptions): Promise<void>;
-  moveToSaturation(args: { saturation: number; transitionTime: number }, opts?: ClusterCommandOptions): Promise<void>;
-  moveToHueAndSaturation(args: { hue: number; saturation: number; transitionTime: number }, opts?: ClusterCommandOptions): Promise<void>;
-  moveToColor(args: { colorX: number; colorY: number; transitionTime: number }, opts?: ClusterCommandOptions): Promise<void>;
-  moveToColorTemperature(args: { colorTemperature: number; transitionTime: number }, opts?: ClusterCommandOptions): Promise<void>;
-}
-
-export interface DehumidificationControlCluster extends ZCLNodeCluster {
-}
-
-export interface DeviceTemperatureClusterAttributes extends GlobalClusterAttributes {
-  currentTemperature?: number;
-  minTempExperienced?: number;
-  maxTempExperienced?: number;
-  overTempTotalDwell?: number;
-  deviceTempAlarmMask?: Partial<{ deviceTemperatureTooLow: boolean; deviceTemperatureTooHigh: boolean }>;
-  lowTempThreshold?: number;
-  highTempThreshold?: number;
-  lowTempDwellTripPoint?: number;
-  highTempDwellTripPoint?: number;
-}
-
-export interface DeviceTemperatureCluster extends ZCLNodeCluster {
-  readAttributes<K extends keyof DeviceTemperatureClusterAttributes>(attributeNames: K[], opts?: { timeout?: number }): Promise<Pick<DeviceTemperatureClusterAttributes, K>>;
-  readAttributes(attributeNames: Array<keyof DeviceTemperatureClusterAttributes | number>, opts?: { timeout?: number }): Promise<Partial<DeviceTemperatureClusterAttributes> & Record<number, unknown>>;
-  writeAttributes(attributes: Partial<DeviceTemperatureClusterAttributes>, opts?: { timeout?: number }): Promise<unknown>;
-  on<K extends keyof DeviceTemperatureClusterAttributes & string>(eventName: `attr.${K}`, listener: (value: DeviceTemperatureClusterAttributes[K]) => void): this;
-  once<K extends keyof DeviceTemperatureClusterAttributes & string>(eventName: `attr.${K}`, listener: (value: DeviceTemperatureClusterAttributes[K]) => void): this;
-}
-
-export interface DiagnosticsCluster extends ZCLNodeCluster {
-}
-
-export interface DoorLockClusterAttributes extends GlobalClusterAttributes {
-  lockState?: 'notFullyLocked' | 'locked' | 'unlocked' | 'undefined';
-  lockType?: 'deadBolt' | 'magnetic' | 'other' | 'mortise' | 'rim' | 'latchBolt' | 'cylindricalLock' | 'tubularLock' | 'interconnectedLock' | 'deadLatch' | 'doorFurniture';
-  actuatorEnabled?: boolean;
-  doorState?: 'open' | 'closed' | 'errorJammed' | 'errorForcedOpen' | 'errorUnspecified' | 'undefined';
-  doorOpenEvents?: number;
-  doorClosedEvents?: number;
-  openPeriod?: number;
-  numberOfLogRecordsSupported?: number;
-  numberOfTotalUsersSupported?: number;
-  numberOfPINUsersSupported?: number;
-  numberOfRFIDUsersSupported?: number;
-  numberOfWeekDaySchedulesSupportedPerUser?: number;
-  numberOfYearDaySchedulesSupportedPerUser?: number;
-  numberOfHolidaySchedulesSupported?: number;
-  maxPINCodeLength?: number;
-  minPINCodeLength?: number;
-  maxRFIDCodeLength?: number;
-  minRFIDCodeLength?: number;
-  enableLogging?: boolean;
-  language?: string;
-  ledSettings?: number;
-  autoRelockTime?: number;
-  soundVolume?: number;
-  operatingMode?: 'normal' | 'vacation' | 'privacy' | 'noRFLockOrUnlock' | 'passage';
-  supportedOperatingModes?: Partial<{ normal: boolean; vacation: boolean; privacy: boolean; noRFLockOrUnlock: boolean; passage: boolean }>;
-  defaultConfigurationRegister?: Partial<{ enableLocalProgramming: boolean; keypadInterfaceDefaultAccess: boolean; rfInterfaceDefaultAccess: boolean; reserved3: boolean; reserved4: boolean; soundEnabled: boolean; autoRelockTimeSet: boolean; ledSettingsSet: boolean }>;
-  enableLocalProgramming?: boolean;
-  enableOneTouchLocking?: boolean;
-  enableInsideStatusLED?: boolean;
-  enablePrivacyModeButton?: boolean;
-  wrongCodeEntryLimit?: number;
-  userCodeTemporaryDisableTime?: number;
-  sendPINOverTheAir?: boolean;
-  requirePINforRFOperation?: boolean;
-  securityLevel?: 'network' | 'apsSecurity';
-  alarmMask?: Partial<{ deadboltJammed: boolean; lockResetToFactoryDefaults: boolean; reserved2: boolean; rfModulePowerCycled: boolean; tamperAlarmWrongCodeEntryLimit: boolean; tamperAlarmFrontEscutcheonRemoved: boolean; forcedDoorOpenUnderDoorLockedCondition: boolean }>;
-  keypadOperationEventMask?: Partial<{ unknownOrManufacturerSpecificKeypadOperationEvent: boolean; lockSourceKeypad: boolean; unlockSourceKeypad: boolean; lockSourceKeypadErrorInvalidPIN: boolean; lockSourceKeypadErrorInvalidSchedule: boolean; unlockSourceKeypadErrorInvalidCode: boolean; unlockSourceKeypadErrorInvalidSchedule: boolean; nonAccessUserOperationEventSourceKeypad: boolean }>;
-  rfOperationEventMask?: Partial<{ unknownOrManufacturerSpecificKeypadOperationEvent: boolean; lockSourceRF: boolean; unlockSourceRF: boolean; lockSourceRFErrorInvalidCode: boolean; lockSourceRFErrorInvalidSchedule: boolean; unlockSourceRFErrorInvalidCode: boolean; unlockSourceRFErrorInvalidSchedule: boolean }>;
-  manualOperationEventMask?: Partial<{ unknownOrManufacturerSpecificManualOperationEvent: boolean; thumbturnLock: boolean; thumbturnUnlock: boolean; oneTouchLock: boolean; keyLock: boolean; keyUnlock: boolean; autoLock: boolean; scheduleLock: boolean; scheduleUnlock: boolean; manualLock: boolean; manualUnlock: boolean }>;
-  rfidOperationEventMask?: Partial<{ unknownOrManufacturerSpecificKeypadOperationEvent: boolean; lockSourceRFID: boolean; unlockSourceRFID: boolean; lockSourceRFIDErrorInvalidRFIDID: boolean; lockSourceRFIDErrorInvalidSchedule: boolean; unlockSourceRFIDErrorInvalidRFIDID: boolean; unlockSourceRFIDErrorInvalidSchedule: boolean }>;
-  keypadProgrammingEventMask?: Partial<{ unknownOrManufacturerSpecificKeypadProgrammingEvent: boolean; masterCodeChanged: boolean; pinCodeAdded: boolean; pinCodeDeleted: boolean; pinCodeChanged: boolean }>;
-  rfProgrammingEventMask?: Partial<{ unknownOrManufacturerSpecificRFProgrammingEvent: boolean; reserved1: boolean; pinCodeAdded: boolean; pinCodeDeleted: boolean; pinCodeChanged: boolean; rfidCodeAdded: boolean; rfidCodeDeleted: boolean }>;
-  rfidProgrammingEventMask?: Partial<{ unknownOrManufacturerSpecificRFIDProgrammingEvent: boolean; rfidCodeAdded: boolean; rfidCodeDeleted: boolean }>;
-}
-
-export interface DoorLockCluster extends ZCLNodeCluster {
-  readAttributes<K extends keyof DoorLockClusterAttributes>(attributeNames: K[], opts?: { timeout?: number }): Promise<Pick<DoorLockClusterAttributes, K>>;
-  readAttributes(attributeNames: Array<keyof DoorLockClusterAttributes | number>, opts?: { timeout?: number }): Promise<Partial<DoorLockClusterAttributes> & Record<number, unknown>>;
-  writeAttributes(attributes: Partial<DoorLockClusterAttributes>, opts?: { timeout?: number }): Promise<unknown>;
-  on<K extends keyof DoorLockClusterAttributes & string>(eventName: `attr.${K}`, listener: (value: DoorLockClusterAttributes[K]) => void): this;
-  once<K extends keyof DoorLockClusterAttributes & string>(eventName: `attr.${K}`, listener: (value: DoorLockClusterAttributes[K]) => void): this;
-  lockDoor(args?: { pinCode?: Buffer }, opts?: ClusterCommandOptions): Promise<{ status: number }>;
-  unlockDoor(args?: { pinCode?: Buffer }, opts?: ClusterCommandOptions): Promise<{ status: number }>;
-  toggle(args?: { pinCode?: Buffer }, opts?: ClusterCommandOptions): Promise<{ status: number }>;
-  unlockWithTimeout(args: { timeout: number; pinCode?: Buffer }, opts?: ClusterCommandOptions): Promise<{ status: number }>;
-  getLogRecord(args: { logIndex: number }, opts?: ClusterCommandOptions): Promise<{ logEntryId: number; timestamp: number; eventType: number; source: number; eventIdOrAlarmCode: number; userId: number; pin: Buffer }>;
-  setPINCode(args: { userId: number; userStatus: 'available' | 'occupiedEnabled' | 'occupiedDisabled' | 'notSupported'; userType: 'unrestricted' | 'yearDayScheduleUser' | 'weekDayScheduleUser' | 'masterUser' | 'nonAccessUser' | 'notSupported'; pinCode?: Buffer }, opts?: ClusterCommandOptions): Promise<{ status: number }>;
-  getPINCode(args: { userId: number }, opts?: ClusterCommandOptions): Promise<{ userId: number; userStatus: 'available' | 'occupiedEnabled' | 'occupiedDisabled' | 'notSupported'; userType: 'unrestricted' | 'yearDayScheduleUser' | 'weekDayScheduleUser' | 'masterUser' | 'nonAccessUser' | 'notSupported'; pinCode: Buffer }>;
-  clearPINCode(args: { userId: number }, opts?: ClusterCommandOptions): Promise<{ status: number }>;
-  clearAllPINCodes(opts?: ClusterCommandOptions): Promise<{ status: number }>;
-  setUserStatus(args: { userId: number; userStatus: 'available' | 'occupiedEnabled' | 'occupiedDisabled' | 'notSupported' }, opts?: ClusterCommandOptions): Promise<{ status: number }>;
-  getUserStatus(args: { userId: number }, opts?: ClusterCommandOptions): Promise<{ userId: number; userStatus: 'available' | 'occupiedEnabled' | 'occupiedDisabled' | 'notSupported' }>;
-  setWeekDaySchedule(args: { scheduleId: number; userId: number; daysMask: Partial<{ sunday: boolean; monday: boolean; tuesday: boolean; wednesday: boolean; thursday: boolean; friday: boolean; saturday: boolean }>; startHour: number; startMinute: number; endHour: number; endMinute: number }, opts?: ClusterCommandOptions): Promise<{ status: number }>;
-  getWeekDaySchedule(args: { scheduleId: number; userId: number }, opts?: ClusterCommandOptions): Promise<{ scheduleId: number; userId: number; status: number; daysMask: Partial<{ sunday: boolean; monday: boolean; tuesday: boolean; wednesday: boolean; thursday: boolean; friday: boolean; saturday: boolean }>; startHour: number; startMinute: number; endHour: number; endMinute: number }>;
-  clearWeekDaySchedule(args: { scheduleId: number; userId: number }, opts?: ClusterCommandOptions): Promise<{ status: number }>;
-  setYearDaySchedule(args: { scheduleId: number; userId: number; localStartTime: number; localEndTime: number }, opts?: ClusterCommandOptions): Promise<{ status: number }>;
-  getYearDaySchedule(args: { scheduleId: number; userId: number }, opts?: ClusterCommandOptions): Promise<{ scheduleId: number; userId: number; status: number; localStartTime: number; localEndTime: number }>;
-  clearYearDaySchedule(args: { scheduleId: number; userId: number }, opts?: ClusterCommandOptions): Promise<{ status: number }>;
-  setHolidaySchedule(args: { holidayScheduleId: number; localStartTime: number; localEndTime: number; operatingModeDuringHoliday: 'normal' | 'vacation' | 'privacy' | 'noRFLockOrUnlock' | 'passage' }, opts?: ClusterCommandOptions): Promise<{ status: number }>;
-  getHolidaySchedule(args: { holidayScheduleId: number }, opts?: ClusterCommandOptions): Promise<{ holidayScheduleId: number; status: number; localStartTime: number; localEndTime: number; operatingMode: 'normal' | 'vacation' | 'privacy' | 'noRFLockOrUnlock' | 'passage' }>;
-  clearHolidaySchedule(args: { holidayScheduleId: number }, opts?: ClusterCommandOptions): Promise<{ status: number }>;
-  setUserType(args: { userId: number; userType: 'unrestricted' | 'yearDayScheduleUser' | 'weekDayScheduleUser' | 'masterUser' | 'nonAccessUser' | 'notSupported' }, opts?: ClusterCommandOptions): Promise<{ status: number }>;
-  getUserType(args: { userId: number }, opts?: ClusterCommandOptions): Promise<{ userId: number; userType: 'unrestricted' | 'yearDayScheduleUser' | 'weekDayScheduleUser' | 'masterUser' | 'nonAccessUser' | 'notSupported' }>;
-  setRFIDCode(args: { userId: number; userStatus: 'available' | 'occupiedEnabled' | 'occupiedDisabled' | 'notSupported'; userType: 'unrestricted' | 'yearDayScheduleUser' | 'weekDayScheduleUser' | 'masterUser' | 'nonAccessUser' | 'notSupported'; rfidCode?: Buffer }, opts?: ClusterCommandOptions): Promise<{ status: number }>;
-  getRFIDCode(args: { userId: number }, opts?: ClusterCommandOptions): Promise<{ userId: number; userStatus: 'available' | 'occupiedEnabled' | 'occupiedDisabled' | 'notSupported'; userType: 'unrestricted' | 'yearDayScheduleUser' | 'weekDayScheduleUser' | 'masterUser' | 'nonAccessUser' | 'notSupported'; rfidCode: Buffer }>;
-  clearRFIDCode(args: { userId: number }, opts?: ClusterCommandOptions): Promise<{ status: number }>;
-  clearAllRFIDCodes(opts?: ClusterCommandOptions): Promise<{ status: number }>;
-  operationEventNotification(args: { operationEventSource: number; operationEventCode: number; userId: number; pin?: Buffer; zigBeeLocalTime: number; data?: Buffer }, opts?: ClusterCommandOptions): Promise<void>;
-  programmingEventNotification(args: { programEventSource: number; programEventCode: number; userId: number; pin?: Buffer; userType: 'unrestricted' | 'yearDayScheduleUser' | 'weekDayScheduleUser' | 'masterUser' | 'nonAccessUser' | 'notSupported'; userStatus: 'available' | 'occupiedEnabled' | 'occupiedDisabled' | 'notSupported'; zigBeeLocalTime: number; data?: Buffer }, opts?: ClusterCommandOptions): Promise<void>;
-}
-
-export interface ElectricalMeasurementClusterAttributes extends GlobalClusterAttributes {
-  measurementType?: Partial<{ activeMeasurementAC: boolean; reactiveMeasurementAC: boolean; apparentMeasurementAC: boolean; phaseAMeasurement: boolean; phaseBMeasurement: boolean; phaseCMeasurement: boolean; dcMeasurement: boolean; harmonicsMeasurement: boolean; powerQualityMeasurement: boolean }>;
-  acFrequency?: number;
-  measuredPhase1stHarmonicCurrent?: number;
-  acFrequencyMultiplier?: number;
-  acFrequencyDivisor?: number;
-  phaseHarmonicCurrentMultiplier?: number;
-  rmsVoltage?: number;
-  rmsCurrent?: number;
-  activePower?: number;
-  reactivePower?: number;
-  acVoltageMultiplier?: number;
-  acVoltageDivisor?: number;
-  acCurrentMultiplier?: number;
-  acCurrentDivisor?: number;
-  acPowerMultiplier?: number;
-  acPowerDivisor?: number;
-  acAlarmsMask?: Partial<{ voltageOverload: boolean; currentOverload: boolean; activePowerOverload: boolean; reactivePowerOverload: boolean; averageRMSOverVoltage: boolean; averageRMSUnderVoltage: boolean; rmsExtremeOverVoltage: boolean; rmsExtremeUnderVoltage: boolean; rmsVoltageSag: boolean; rmsVoltageSwell: boolean }>;
-  acVoltageOverload?: number;
-  acCurrentOverload?: number;
-  acActivePowerOverload?: number;
-}
-
-export interface ElectricalMeasurementCluster extends ZCLNodeCluster {
-  readAttributes<K extends keyof ElectricalMeasurementClusterAttributes>(attributeNames: K[], opts?: { timeout?: number }): Promise<Pick<ElectricalMeasurementClusterAttributes, K>>;
-  readAttributes(attributeNames: Array<keyof ElectricalMeasurementClusterAttributes | number>, opts?: { timeout?: number }): Promise<Partial<ElectricalMeasurementClusterAttributes> & Record<number, unknown>>;
-  writeAttributes(attributes: Partial<ElectricalMeasurementClusterAttributes>, opts?: { timeout?: number }): Promise<unknown>;
-  on<K extends keyof ElectricalMeasurementClusterAttributes & string>(eventName: `attr.${K}`, listener: (value: ElectricalMeasurementClusterAttributes[K]) => void): this;
-  once<K extends keyof ElectricalMeasurementClusterAttributes & string>(eventName: `attr.${K}`, listener: (value: ElectricalMeasurementClusterAttributes[K]) => void): this;
-}
-
-export interface FanControlCluster extends ZCLNodeCluster {
-}
-
-export interface FlowMeasurementClusterAttributes extends GlobalClusterAttributes {
-  measuredValue?: number;
-  minMeasuredValue?: number;
-  maxMeasuredValue?: number;
-  tolerance?: number;
-}
-
-export interface FlowMeasurementCluster extends ZCLNodeCluster {
-  readAttributes<K extends keyof FlowMeasurementClusterAttributes>(attributeNames: K[], opts?: { timeout?: number }): Promise<Pick<FlowMeasurementClusterAttributes, K>>;
-  readAttributes(attributeNames: Array<keyof FlowMeasurementClusterAttributes | number>, opts?: { timeout?: number }): Promise<Partial<FlowMeasurementClusterAttributes> & Record<number, unknown>>;
-  writeAttributes(attributes: Partial<FlowMeasurementClusterAttributes>, opts?: { timeout?: number }): Promise<unknown>;
-  on<K extends keyof FlowMeasurementClusterAttributes & string>(eventName: `attr.${K}`, listener: (value: FlowMeasurementClusterAttributes[K]) => void): this;
-  once<K extends keyof FlowMeasurementClusterAttributes & string>(eventName: `attr.${K}`, listener: (value: FlowMeasurementClusterAttributes[K]) => void): this;
-}
-
-export interface GroupsClusterAttributes extends GlobalClusterAttributes {
-  nameSupport?: Partial<{ groupNames: boolean }>;
-}
-
-export interface GroupsCluster extends ZCLNodeCluster {
-  readAttributes<K extends keyof GroupsClusterAttributes>(attributeNames: K[], opts?: { timeout?: number }): Promise<Pick<GroupsClusterAttributes, K>>;
-  readAttributes(attributeNames: Array<keyof GroupsClusterAttributes | number>, opts?: { timeout?: number }): Promise<Partial<GroupsClusterAttributes> & Record<number, unknown>>;
-  writeAttributes(attributes: Partial<GroupsClusterAttributes>, opts?: { timeout?: number }): Promise<unknown>;
-  on<K extends keyof GroupsClusterAttributes & string>(eventName: `attr.${K}`, listener: (value: GroupsClusterAttributes[K]) => void): this;
-  once<K extends keyof GroupsClusterAttributes & string>(eventName: `attr.${K}`, listener: (value: GroupsClusterAttributes[K]) => void): this;
-  addGroup(args: { groupId: number; groupName: string }, opts?: ClusterCommandOptions): Promise<{ status: ZCLEnum8Status; groupId: number }>;
-  viewGroup(args: { groupId: number }, opts?: ClusterCommandOptions): Promise<{ status: ZCLEnum8Status; groupId: number; groupNames: string }>;
-  getGroupMembership(args: { groupIds: number[] }, opts?: ClusterCommandOptions): Promise<{ capacity: number; groups: number[] }>;
-  removeGroup(args: { groupId: number }, opts?: ClusterCommandOptions): Promise<{ status: ZCLEnum8Status; groupId: number }>;
-  removeAllGroups(opts?: ClusterCommandOptions): Promise<void>;
-  addGroupIfIdentify(args: { groupId: number; groupName: string }, opts?: ClusterCommandOptions): Promise<void>;
-}
-
-export interface IASACECluster extends ZCLNodeCluster {
-}
-
-export interface IASWDCluster extends ZCLNodeCluster {
-}
-
-export interface IASZoneClusterAttributes extends GlobalClusterAttributes {
-  zoneState?: 'notEnrolled' | 'enrolled';
-  zoneType?: 'standardCIE' | 'motionSensor' | 'contactSwitch' | 'doorWindowHandle' | 'fireSensor' | 'waterSensor' | 'carbonMonoxideSensor' | 'personalEmergencyDevice' | 'vibrationMovementSensor' | 'remoteControl' | 'keyFob' | 'keypad' | 'standardWarningDevice' | 'glassBreakSensor' | 'securityRepeater' | 'invalidZoneType';
-  zoneStatus?: Partial<{ alarm1: boolean; alarm2: boolean; tamper: boolean; battery: boolean; supervisionReports: boolean; restoreReports: boolean; trouble: boolean; acMains: boolean; test: boolean; batteryDefect: boolean }>;
-  iasCIEAddress?: string;
-  zoneId?: number;
-}
-
-export interface IASZoneCluster extends ZCLNodeCluster {
-  readAttributes<K extends keyof IASZoneClusterAttributes>(attributeNames: K[], opts?: { timeout?: number }): Promise<Pick<IASZoneClusterAttributes, K>>;
-  readAttributes(attributeNames: Array<keyof IASZoneClusterAttributes | number>, opts?: { timeout?: number }): Promise<Partial<IASZoneClusterAttributes> & Record<number, unknown>>;
-  writeAttributes(attributes: Partial<IASZoneClusterAttributes>, opts?: { timeout?: number }): Promise<unknown>;
-  on<K extends keyof IASZoneClusterAttributes & string>(eventName: `attr.${K}`, listener: (value: IASZoneClusterAttributes[K]) => void): this;
-  once<K extends keyof IASZoneClusterAttributes & string>(eventName: `attr.${K}`, listener: (value: IASZoneClusterAttributes[K]) => void): this;
-  zoneStatusChangeNotification(args: { zoneStatus: Partial<{ alarm1: boolean; alarm2: boolean; tamper: boolean; battery: boolean; supervisionReports: boolean; restoreReports: boolean; trouble: boolean; acMains: boolean; test: boolean; batteryDefect: boolean }>; extendedStatus: number; zoneId: number; delay: number }, opts?: ClusterCommandOptions): Promise<void>;
-  zoneEnrollResponse(args: { enrollResponseCode: 'success' | 'notSupported' | 'noEnrollPermit' | 'tooManyZones'; zoneId: number }, opts?: ClusterCommandOptions): Promise<void>;
-  zoneEnrollRequest(args: { zoneType: 'standardCIE' | 'motionSensor' | 'contactSwitch' | 'doorWindowHandle' | 'fireSensor' | 'waterSensor' | 'carbonMonoxideSensor' | 'personalEmergencyDevice' | 'vibrationMovementSensor' | 'remoteControl' | 'keyFob' | 'keypad' | 'standardWarningDevice' | 'glassBreakSensor' | 'securityRepeater' | 'invalidZoneType'; manufacturerCode: number }, opts?: ClusterCommandOptions): Promise<void>;
-  initiateNormalOperationMode(opts?: ClusterCommandOptions): Promise<void>;
-}
-
-export interface IdentifyClusterAttributes extends GlobalClusterAttributes {
-  identifyTime?: number;
-}
-
-export interface IdentifyCluster extends ZCLNodeCluster {
-  readAttributes<K extends keyof IdentifyClusterAttributes>(attributeNames: K[], opts?: { timeout?: number }): Promise<Pick<IdentifyClusterAttributes, K>>;
-  readAttributes(attributeNames: Array<keyof IdentifyClusterAttributes | number>, opts?: { timeout?: number }): Promise<Partial<IdentifyClusterAttributes> & Record<number, unknown>>;
-  writeAttributes(attributes: Partial<IdentifyClusterAttributes>, opts?: { timeout?: number }): Promise<unknown>;
-  on<K extends keyof IdentifyClusterAttributes & string>(eventName: `attr.${K}`, listener: (value: IdentifyClusterAttributes[K]) => void): this;
-  once<K extends keyof IdentifyClusterAttributes & string>(eventName: `attr.${K}`, listener: (value: IdentifyClusterAttributes[K]) => void): this;
-  identify(args: { identifyTime: number }, opts?: ClusterCommandOptions): Promise<void>;
-  identifyQuery(opts?: ClusterCommandOptions): Promise<{ timeout: number }>;
-  triggerEffect(args: { effectIdentifier: 'blink' | 'breathe' | 'okay' | 'channelChange' | 'finish' | 'stop'; effectVariant: number }, opts?: ClusterCommandOptions): Promise<void>;
-}
-
-export interface IlluminanceLevelSensingClusterAttributes extends GlobalClusterAttributes {
-  levelStatus?: 'illuminanceOnTarget' | 'illuminanceBelowTarget' | 'illuminanceAboveTarget';
-  lightSensorType?: 'photodiode' | 'cmos' | 'unknown';
-  illuminanceTargetLevel?: number;
-}
-
-export interface IlluminanceLevelSensingCluster extends ZCLNodeCluster {
-  readAttributes<K extends keyof IlluminanceLevelSensingClusterAttributes>(attributeNames: K[], opts?: { timeout?: number }): Promise<Pick<IlluminanceLevelSensingClusterAttributes, K>>;
-  readAttributes(attributeNames: Array<keyof IlluminanceLevelSensingClusterAttributes | number>, opts?: { timeout?: number }): Promise<Partial<IlluminanceLevelSensingClusterAttributes> & Record<number, unknown>>;
-  writeAttributes(attributes: Partial<IlluminanceLevelSensingClusterAttributes>, opts?: { timeout?: number }): Promise<unknown>;
-  on<K extends keyof IlluminanceLevelSensingClusterAttributes & string>(eventName: `attr.${K}`, listener: (value: IlluminanceLevelSensingClusterAttributes[K]) => void): this;
-  once<K extends keyof IlluminanceLevelSensingClusterAttributes & string>(eventName: `attr.${K}`, listener: (value: IlluminanceLevelSensingClusterAttributes[K]) => void): this;
-}
-
-export interface IlluminanceMeasurementClusterAttributes extends GlobalClusterAttributes {
-  measuredValue?: number;
-  minMeasuredValue?: number;
-  maxMeasuredValue?: number;
-  tolerance?: number;
-  lightSensorType?: 'photodiode' | 'cmos' | 'unknown';
-}
-
-export interface IlluminanceMeasurementCluster extends ZCLNodeCluster {
-  readAttributes<K extends keyof IlluminanceMeasurementClusterAttributes>(attributeNames: K[], opts?: { timeout?: number }): Promise<Pick<IlluminanceMeasurementClusterAttributes, K>>;
-  readAttributes(attributeNames: Array<keyof IlluminanceMeasurementClusterAttributes | number>, opts?: { timeout?: number }): Promise<Partial<IlluminanceMeasurementClusterAttributes> & Record<number, unknown>>;
-  writeAttributes(attributes: Partial<IlluminanceMeasurementClusterAttributes>, opts?: { timeout?: number }): Promise<unknown>;
-  on<K extends keyof IlluminanceMeasurementClusterAttributes & string>(eventName: `attr.${K}`, listener: (value: IlluminanceMeasurementClusterAttributes[K]) => void): this;
-  once<K extends keyof IlluminanceMeasurementClusterAttributes & string>(eventName: `attr.${K}`, listener: (value: IlluminanceMeasurementClusterAttributes[K]) => void): this;
-}
-
-export interface LevelControlClusterAttributes extends GlobalClusterAttributes {
-  currentLevel?: number;
-  remainingTime?: number;
-  onOffTransitionTime?: number;
-  onLevel?: number;
-  onTransitionTime?: number;
-  offTransitionTime?: number;
-  defaultMoveRate?: number;
-}
-
-export interface LevelControlCluster extends ZCLNodeCluster {
-  readAttributes<K extends keyof LevelControlClusterAttributes>(attributeNames: K[], opts?: { timeout?: number }): Promise<Pick<LevelControlClusterAttributes, K>>;
-  readAttributes(attributeNames: Array<keyof LevelControlClusterAttributes | number>, opts?: { timeout?: number }): Promise<Partial<LevelControlClusterAttributes> & Record<number, unknown>>;
-  writeAttributes(attributes: Partial<LevelControlClusterAttributes>, opts?: { timeout?: number }): Promise<unknown>;
-  on<K extends keyof LevelControlClusterAttributes & string>(eventName: `attr.${K}`, listener: (value: LevelControlClusterAttributes[K]) => void): this;
-  once<K extends keyof LevelControlClusterAttributes & string>(eventName: `attr.${K}`, listener: (value: LevelControlClusterAttributes[K]) => void): this;
-  moveToLevel(args: { level: number; transitionTime: number }, opts?: ClusterCommandOptions): Promise<void>;
-  move(args: { moveMode: 'up' | 'down'; rate: number }, opts?: ClusterCommandOptions): Promise<void>;
-  step(args: { mode: 'up' | 'down'; stepSize: number; transitionTime: number }, opts?: ClusterCommandOptions): Promise<void>;
-  stop(opts?: ClusterCommandOptions): Promise<void>;
-  moveToLevelWithOnOff(args: { level: number; transitionTime: number }, opts?: ClusterCommandOptions): Promise<void>;
-  moveWithOnOff(args: { moveMode: 'up' | 'down'; rate: number }, opts?: ClusterCommandOptions): Promise<void>;
-  stepWithOnOff(args: { mode: 'up' | 'down'; stepSize: number; transitionTime: number }, opts?: ClusterCommandOptions): Promise<void>;
-  stopWithOnOff(opts?: ClusterCommandOptions): Promise<void>;
-}
-
-export interface MeteringClusterAttributes extends GlobalClusterAttributes {
-  currentSummationDelivered?: number;
-  currentSummationReceived?: number;
-  currentMaxDemandDelivered?: number;
-  currentMaxDemandReceived?: number;
-  dftSummation?: number;
-  dailyFreezeTime?: number;
-  powerFactor?: number;
-  readingSnapShotTime?: number;
-  currentMaxDemandDeliveredTime?: number;
-  currentMaxDemandReceivedTime?: number;
-  defaultUpdatePeriod?: number;
-  fastPollUpdatePeriod?: number;
-  currentBlockPeriodConsumptionDelivered?: number;
-  dailyConsumptionTarget?: number;
-  currentBlock?: unknown;
-  profileIntervalPeriod?: unknown;
-  currentTier1SummationDelivered?: number;
-  currentTier1SummationReceived?: number;
-  currentTier2SummationDelivered?: number;
-  currentTier2SummationReceived?: number;
-  currentTier3SummationDelivered?: number;
-  currentTier3SummationReceived?: number;
-  currentTier4SummationDelivered?: number;
-  currentTier4SummationReceived?: number;
-  status?: Partial<{ checkMeter: boolean; lowBattery: boolean; tamperDetect: boolean; powerFailure: boolean; powerQuality: boolean; leakDetect: boolean; serviceDisconnect: boolean }>;
-  remainingBatteryLife?: number;
-  hoursInOperation?: number;
-  hoursInFault?: number;
-  unitOfMeasure?: unknown;
-  multiplier?: number;
-  divisor?: number;
-  siteId?: Buffer;
-  meterSerialNumber?: Buffer;
-  energyCarrierUnitOfMeasure?: unknown;
-  temperatureUnitOfMeasure?: unknown;
-  moduleSerialNumber?: Buffer;
-  operatingTariffLabelDelivered?: Buffer;
-  operatingTariffLabelReceived?: Buffer;
-  customerIdNumber?: Buffer;
-  alternativeUnitOfMeasure?: unknown;
-  instantaneousDemand?: number;
-  currentDayConsumptionDelivered?: number;
-  currentDayConsumptionReceived?: number;
-  previousDayConsumptionDelivered?: number;
-  previousDayConsumptionReceived?: number;
-  currentPartialProfileIntervalStartTimeDelivered?: number;
-  currentPartialProfileIntervalStartTimeReceived?: number;
-  currentPartialProfileIntervalValueDelivered?: number;
-  currentPartialProfileIntervalValueReceived?: number;
-  currentDayMaxPressure?: number;
-  currentDayMinPressure?: number;
-  previousDayMaxPressure?: number;
-  previousDayMinPressure?: number;
-  currentDayMaxDemand?: number;
-  previousDayMaxDemand?: number;
-  currentMonthMaxDemand?: number;
-  currentYearMaxDemand?: number;
-  currentDayMaxEnergyCarrierDemand?: number;
-  previousDayMaxEnergyCarrierDemand?: number;
-  currentMonthMaxEnergyCarrierDemand?: number;
-  currentMonthMinEnergyCarrierDemand?: number;
-  currentYearMaxEnergyCarrierDemand?: number;
-  currentYearMinEnergyCarrierDemand?: number;
-  maxNumberOfPeriodsDelivered?: number;
-  currentDemandDelivered?: number;
-  demandLimit?: number;
-  demandIntegrationPeriod?: number;
-  numberOfDemandSubintervals?: number;
-  demandLimitArmDuration?: number;
-  currentNoTierBlock1SummationDelivered?: number;
-  currentNoTierBlock2SummationDelivered?: number;
-  currentNoTierBlock3SummationDelivered?: number;
-  currentNoTierBlock4SummationDelivered?: number;
-  currentNoTierBlock5SummationDelivered?: number;
-  currentNoTierBlock6SummationDelivered?: number;
-  currentNoTierBlock7SummationDelivered?: number;
-  currentNoTierBlock8SummationDelivered?: number;
-  currentNoTierBlock9SummationDelivered?: number;
-  currentNoTierBlock10SummationDelivered?: number;
-  currentNoTierBlock11SummationDelivered?: number;
-  currentNoTierBlock12SummationDelivered?: number;
-  currentNoTierBlock13SummationDelivered?: number;
-  currentNoTierBlock14SummationDelivered?: number;
-  currentNoTierBlock15SummationDelivered?: number;
-  currentNoTierBlock16SummationDelivered?: number;
-  currentTier1Block1SummationDelivered?: number;
-  currentTier1Block2SummationDelivered?: number;
-  currentTier1Block3SummationDelivered?: number;
-  currentTier1Block4SummationDelivered?: number;
-  currentTier1Block5SummationDelivered?: number;
-  currentTier1Block6SummationDelivered?: number;
-  currentTier1Block7SummationDelivered?: number;
-  currentTier1Block8SummationDelivered?: number;
-  currentTier1Block9SummationDelivered?: number;
-  currentTier1Block10SummationDelivered?: number;
-  currentTier1Block11SummationDelivered?: number;
-  currentTier1Block12SummationDelivered?: number;
-  currentTier1Block13SummationDelivered?: number;
-  currentTier1Block14SummationDelivered?: number;
-  currentTier1Block15SummationDelivered?: number;
-  currentTier1Block16SummationDelivered?: number;
-  currentTier2Block1SummationDelivered?: number;
-  currentTier2Block2SummationDelivered?: number;
-  currentTier2Block3SummationDelivered?: number;
-  currentTier2Block4SummationDelivered?: number;
-  currentTier2Block5SummationDelivered?: number;
-  currentTier2Block6SummationDelivered?: number;
-  currentTier2Block7SummationDelivered?: number;
-  currentTier2Block8SummationDelivered?: number;
-  currentTier2Block9SummationDelivered?: number;
-  currentTier2Block10SummationDelivered?: number;
-  currentTier2Block11SummationDelivered?: number;
-  currentTier2Block12SummationDelivered?: number;
-  currentTier2Block13SummationDelivered?: number;
-  currentTier2Block14SummationDelivered?: number;
-  currentTier2Block15SummationDelivered?: number;
-  currentTier2Block16SummationDelivered?: number;
-  currentTier3Block1SummationDelivered?: number;
-  currentTier3Block2SummationDelivered?: number;
-  currentTier3Block3SummationDelivered?: number;
-  currentTier3Block4SummationDelivered?: number;
-  currentTier3Block5SummationDelivered?: number;
-  currentTier3Block6SummationDelivered?: number;
-  currentTier3Block7SummationDelivered?: number;
-  currentTier3Block8SummationDelivered?: number;
-  currentTier3Block9SummationDelivered?: number;
-  currentTier3Block10SummationDelivered?: number;
-  currentTier3Block11SummationDelivered?: number;
-  currentTier3Block12SummationDelivered?: number;
-  currentTier3Block13SummationDelivered?: number;
-  currentTier3Block14SummationDelivered?: number;
-  currentTier3Block15SummationDelivered?: number;
-  currentTier3Block16SummationDelivered?: number;
-  currentTier4Block1SummationDelivered?: number;
-  currentTier4Block2SummationDelivered?: number;
-  currentTier4Block3SummationDelivered?: number;
-  currentTier4Block4SummationDelivered?: number;
-  currentTier4Block5SummationDelivered?: number;
-  currentTier4Block6SummationDelivered?: number;
-  currentTier4Block7SummationDelivered?: number;
-  currentTier4Block8SummationDelivered?: number;
-  currentTier4Block9SummationDelivered?: number;
-  currentTier4Block10SummationDelivered?: number;
-  currentTier4Block11SummationDelivered?: number;
-  currentTier4Block12SummationDelivered?: number;
-  currentTier4Block13SummationDelivered?: number;
-  currentTier4Block14SummationDelivered?: number;
-  currentTier4Block15SummationDelivered?: number;
-  currentTier4Block16SummationDelivered?: number;
-  currentNoTierBlock1SummationReceived?: number;
-  currentNoTierBlock2SummationReceived?: number;
-  currentNoTierBlock3SummationReceived?: number;
-  currentNoTierBlock4SummationReceived?: number;
-  currentNoTierBlock5SummationReceived?: number;
-  currentNoTierBlock6SummationReceived?: number;
-  currentNoTierBlock7SummationReceived?: number;
-  currentNoTierBlock8SummationReceived?: number;
-  currentNoTierBlock9SummationReceived?: number;
-  currentNoTierBlock10SummationReceived?: number;
-  currentNoTierBlock11SummationReceived?: number;
-  currentNoTierBlock12SummationReceived?: number;
-  currentNoTierBlock13SummationReceived?: number;
-  currentNoTierBlock14SummationReceived?: number;
-  currentNoTierBlock15SummationReceived?: number;
-  currentNoTierBlock16SummationReceived?: number;
-  billToDateDelivered?: number;
-  billToDateTimeStampDelivered?: number;
-  projectedBillDelivered?: number;
-  projectedBillTimeStampDelivered?: number;
-  billToDateReceived?: number;
-  billToDateTimeStampReceived?: number;
-  projectedBillReceived?: number;
-  projectedBillTimeStampReceived?: number;
-  proposedChangeSupplyImplementationTime?: number;
-  proposedChangeSupplyStatus?: unknown;
-  uncontrolledFlowThreshold?: number;
-  uncontrolledFlowThresholdUnitOfMeasure?: unknown;
-  uncontrolledFlowMultiplier?: number;
-  uncontrolledFlowDivisor?: number;
-  flowStabilisationPeriod?: number;
-  flowMeasurementPeriod?: number;
-}
-
-export interface MeteringCluster extends ZCLNodeCluster {
-  readAttributes<K extends keyof MeteringClusterAttributes>(attributeNames: K[], opts?: { timeout?: number }): Promise<Pick<MeteringClusterAttributes, K>>;
-  readAttributes(attributeNames: Array<keyof MeteringClusterAttributes | number>, opts?: { timeout?: number }): Promise<Partial<MeteringClusterAttributes> & Record<number, unknown>>;
-  writeAttributes(attributes: Partial<MeteringClusterAttributes>, opts?: { timeout?: number }): Promise<unknown>;
-  on<K extends keyof MeteringClusterAttributes & string>(eventName: `attr.${K}`, listener: (value: MeteringClusterAttributes[K]) => void): this;
-  once<K extends keyof MeteringClusterAttributes & string>(eventName: `attr.${K}`, listener: (value: MeteringClusterAttributes[K]) => void): this;
-}
-
-export interface MultistateInputClusterAttributes extends GlobalClusterAttributes {
-  description?: string;
-  numberOfStates?: number;
-  outOfService?: boolean;
-  presentValue?: number;
-  reliability?: 'noFaultDetected' | 'noSensor' | 'overRange' | 'underRange' | 'openLoop' | 'shortedLoop' | 'noOutput' | 'unreliableOther' | 'processError' | 'multiStateFault' | 'configurationError';
-  statusFlags?: Partial<{ inAlarm: boolean; fault: boolean; overridden: boolean; outOfService: boolean }>;
-  applicationType?: number;
-}
-
-export interface MultistateInputCluster extends ZCLNodeCluster {
-  readAttributes<K extends keyof MultistateInputClusterAttributes>(attributeNames: K[], opts?: { timeout?: number }): Promise<Pick<MultistateInputClusterAttributes, K>>;
-  readAttributes(attributeNames: Array<keyof MultistateInputClusterAttributes | number>, opts?: { timeout?: number }): Promise<Partial<MultistateInputClusterAttributes> & Record<number, unknown>>;
-  writeAttributes(attributes: Partial<MultistateInputClusterAttributes>, opts?: { timeout?: number }): Promise<unknown>;
-  on<K extends keyof MultistateInputClusterAttributes & string>(eventName: `attr.${K}`, listener: (value: MultistateInputClusterAttributes[K]) => void): this;
-  once<K extends keyof MultistateInputClusterAttributes & string>(eventName: `attr.${K}`, listener: (value: MultistateInputClusterAttributes[K]) => void): this;
-}
-
-export interface MultistateOutputClusterAttributes extends GlobalClusterAttributes {
-  description?: string;
-  numberOfStates?: number;
-  outOfService?: boolean;
-  presentValue?: number;
-  reliability?: 'noFaultDetected' | 'overRange' | 'underRange' | 'openLoop' | 'shortedLoop' | 'unreliableOther' | 'processError' | 'multiStateFault' | 'configurationError';
-  relinquishDefault?: number;
-  statusFlags?: Partial<{ inAlarm: boolean; fault: boolean; overridden: boolean; outOfService: boolean }>;
-  applicationType?: number;
-}
-
-export interface MultistateOutputCluster extends ZCLNodeCluster {
-  readAttributes<K extends keyof MultistateOutputClusterAttributes>(attributeNames: K[], opts?: { timeout?: number }): Promise<Pick<MultistateOutputClusterAttributes, K>>;
-  readAttributes(attributeNames: Array<keyof MultistateOutputClusterAttributes | number>, opts?: { timeout?: number }): Promise<Partial<MultistateOutputClusterAttributes> & Record<number, unknown>>;
-  writeAttributes(attributes: Partial<MultistateOutputClusterAttributes>, opts?: { timeout?: number }): Promise<unknown>;
-  on<K extends keyof MultistateOutputClusterAttributes & string>(eventName: `attr.${K}`, listener: (value: MultistateOutputClusterAttributes[K]) => void): this;
-  once<K extends keyof MultistateOutputClusterAttributes & string>(eventName: `attr.${K}`, listener: (value: MultistateOutputClusterAttributes[K]) => void): this;
-}
-
-export interface MultistateValueClusterAttributes extends GlobalClusterAttributes {
-  description?: string;
-  numberOfStates?: number;
-  outOfService?: boolean;
-  presentValue?: number;
-  reliability?: 'noFaultDetected' | 'noSensor' | 'overRange' | 'underRange' | 'openLoop' | 'shortedLoop' | 'noOutput' | 'unreliableOther' | 'processError' | 'multiStateFault' | 'configurationError';
-  relinquishDefault?: number;
-  statusFlags?: Partial<{ inAlarm: boolean; fault: boolean; overridden: boolean; outOfService: boolean }>;
-  applicationType?: number;
-}
-
-export interface MultistateValueCluster extends ZCLNodeCluster {
-  readAttributes<K extends keyof MultistateValueClusterAttributes>(attributeNames: K[], opts?: { timeout?: number }): Promise<Pick<MultistateValueClusterAttributes, K>>;
-  readAttributes(attributeNames: Array<keyof MultistateValueClusterAttributes | number>, opts?: { timeout?: number }): Promise<Partial<MultistateValueClusterAttributes> & Record<number, unknown>>;
-  writeAttributes(attributes: Partial<MultistateValueClusterAttributes>, opts?: { timeout?: number }): Promise<unknown>;
-  on<K extends keyof MultistateValueClusterAttributes & string>(eventName: `attr.${K}`, listener: (value: MultistateValueClusterAttributes[K]) => void): this;
-  once<K extends keyof MultistateValueClusterAttributes & string>(eventName: `attr.${K}`, listener: (value: MultistateValueClusterAttributes[K]) => void): this;
-}
-
-export interface OccupancySensingClusterAttributes extends GlobalClusterAttributes {
-  occupancy?: Partial<{ occupied: boolean }>;
-  occupancySensorType?: 'pir' | 'ultrasonic' | 'pirAndUltrasonic' | 'physicalContact';
-  occupancySensorTypeBitmap?: Partial<{ pir: boolean; ultrasonic: boolean; physicalContact: boolean }>;
-  pirOccupiedToUnoccupiedDelay?: number;
-  pirUnoccupiedToOccupiedDelay?: number;
-  pirUnoccupiedToOccupiedThreshold?: number;
-  ultrasonicOccupiedToUnoccupiedDelay?: number;
-  ultrasonicUnoccupiedToOccupiedDelay?: number;
-  ultrasonicUnoccupiedToOccupiedThreshold?: number;
-  physicalContactOccupiedToUnoccupiedDelay?: number;
-  physicalContactUnoccupiedToOccupiedDelay?: number;
-  physicalContactUnoccupiedToOccupiedThreshold?: number;
-}
-
-export interface OccupancySensingCluster extends ZCLNodeCluster {
-  readAttributes<K extends keyof OccupancySensingClusterAttributes>(attributeNames: K[], opts?: { timeout?: number }): Promise<Pick<OccupancySensingClusterAttributes, K>>;
-  readAttributes(attributeNames: Array<keyof OccupancySensingClusterAttributes | number>, opts?: { timeout?: number }): Promise<Partial<OccupancySensingClusterAttributes> & Record<number, unknown>>;
-  writeAttributes(attributes: Partial<OccupancySensingClusterAttributes>, opts?: { timeout?: number }): Promise<unknown>;
-  on<K extends keyof OccupancySensingClusterAttributes & string>(eventName: `attr.${K}`, listener: (value: OccupancySensingClusterAttributes[K]) => void): this;
-  once<K extends keyof OccupancySensingClusterAttributes & string>(eventName: `attr.${K}`, listener: (value: OccupancySensingClusterAttributes[K]) => void): this;
-}
-
-export interface OnOffClusterAttributes extends GlobalClusterAttributes {
-  onOff?: boolean;
-  onTime?: number;
-  offWaitTime?: number;
-}
-
-export interface OnOffCluster extends ZCLNodeCluster {
-  readAttributes<K extends keyof OnOffClusterAttributes>(attributeNames: K[], opts?: { timeout?: number }): Promise<Pick<OnOffClusterAttributes, K>>;
-  readAttributes(attributeNames: Array<keyof OnOffClusterAttributes | number>, opts?: { timeout?: number }): Promise<Partial<OnOffClusterAttributes> & Record<number, unknown>>;
-  writeAttributes(attributes: Partial<OnOffClusterAttributes>, opts?: { timeout?: number }): Promise<unknown>;
-  on<K extends keyof OnOffClusterAttributes & string>(eventName: `attr.${K}`, listener: (value: OnOffClusterAttributes[K]) => void): this;
-  once<K extends keyof OnOffClusterAttributes & string>(eventName: `attr.${K}`, listener: (value: OnOffClusterAttributes[K]) => void): this;
-  setOff(opts?: ClusterCommandOptions): Promise<void>;
-  setOn(opts?: ClusterCommandOptions): Promise<void>;
-  toggle(opts?: ClusterCommandOptions): Promise<void>;
-  offWithEffect(args: { effectIdentifier: number; effectVariant: number }, opts?: ClusterCommandOptions): Promise<void>;
-  onWithRecallGlobalScene(opts?: ClusterCommandOptions): Promise<void>;
-  onWithTimedOff(args: { onOffControl: number; onTime: number; offWaitTime: number }, opts?: ClusterCommandOptions): Promise<void>;
-}
-
-export interface OnOffSwitchCluster extends ZCLNodeCluster {
-}
-
-export interface OTAClusterAttributes extends GlobalClusterAttributes {
-  upgradeServerID?: string;
-  fileOffset?: number;
-  currentFileVersion?: number;
-  currentZigBeeStackVersion?: number;
-  downloadedFileVersion?: number;
-  downloadedZigBeeStackVersion?: number;
-  imageUpgradeStatus?: 'normal' | 'downloadInProgress' | 'downloadComplete' | 'waitingToUpgrade' | 'countDown' | 'waitForMore' | 'waitingToUpgradeViaExternalEvent';
-  manufacturerID?: number;
-  imageTypeID?: number;
-  minimumBlockPeriod?: number;
-  imageStamp?: number;
-  upgradeActivationPolicy?: 'otaServerActivationAllowed' | 'outOfBandActivationOnly';
-  upgradeTimeoutPolicy?: 'applyUpgradeAfterTimeout' | 'doNotApplyUpgradeAfterTimeout';
-}
-
-export interface OTACluster extends ZCLNodeCluster {
-  readAttributes<K extends keyof OTAClusterAttributes>(attributeNames: K[], opts?: { timeout?: number }): Promise<Pick<OTAClusterAttributes, K>>;
-  readAttributes(attributeNames: Array<keyof OTAClusterAttributes | number>, opts?: { timeout?: number }): Promise<Partial<OTAClusterAttributes> & Record<number, unknown>>;
-  writeAttributes(attributes: Partial<OTAClusterAttributes>, opts?: { timeout?: number }): Promise<unknown>;
-  on<K extends keyof OTAClusterAttributes & string>(eventName: `attr.${K}`, listener: (value: OTAClusterAttributes[K]) => void): this;
-  once<K extends keyof OTAClusterAttributes & string>(eventName: `attr.${K}`, listener: (value: OTAClusterAttributes[K]) => void): this;
-  imageNotify(args?: { payloadType?: 'queryJitter' | 'queryJitterAndManufacturerCode' | 'queryJitterAndManufacturerCodeAndImageType' | 'queryJitterAndManufacturerCodeAndImageTypeAndNewFileVersion'; queryJitter?: number; manufacturerCode?: number; imageType?: number; newFileVersion?: number }, opts?: ClusterCommandOptions): Promise<void>;
-  queryNextImageRequest(args?: { fieldControl?: Partial<{ hardwareVersionPresent: boolean }>; manufacturerCode?: number; imageType?: number; fileVersion?: number; hardwareVersion?: number }, opts?: ClusterCommandOptions): Promise<{ status?: ZCLEnum8Status; manufacturerCode?: number; imageType?: number; fileVersion?: number; imageSize?: number }>;
-  imageBlockRequest(args?: { fieldControl?: Partial<{ requestNodeAddressPresent: boolean; minimumBlockPeriodPresent: boolean }>; manufacturerCode?: number; imageType?: number; fileVersion?: number; fileOffset?: number; maximumDataSize?: number; requestNodeAddress?: string; minimumBlockPeriod?: number }, opts?: ClusterCommandOptions): Promise<{ status?: ZCLEnum8Status; manufacturerCode?: number; imageType?: number; fileVersion?: number; fileOffset?: number; dataSize?: number; imageData?: Buffer; currentTime?: number; requestTime?: number; minimumBlockPeriod?: number }>;
-  imagePageRequest(args?: { fieldControl?: Partial<{ requestNodeAddressPresent: boolean }>; manufacturerCode?: number; imageType?: number; fileVersion?: number; fileOffset?: number; maximumDataSize?: number; pageSize?: number; responseSpacing?: number; requestNodeAddress?: string }, opts?: ClusterCommandOptions): Promise<{ status?: ZCLEnum8Status; manufacturerCode?: number; imageType?: number; fileVersion?: number; fileOffset?: number; dataSize?: number; imageData?: Buffer; currentTime?: number; requestTime?: number; minimumBlockPeriod?: number }>;
-  imageBlockResponse(args?: { status?: ZCLEnum8Status; manufacturerCode?: number; imageType?: number; fileVersion?: number; fileOffset?: number; dataSize?: number; imageData?: Buffer; currentTime?: number; requestTime?: number; minimumBlockPeriod?: number }, opts?: ClusterCommandOptions): Promise<void>;
-  upgradeEndRequest(args: { status: ZCLEnum8Status; manufacturerCode: number; imageType: number; fileVersion: number }, opts?: ClusterCommandOptions): Promise<{ manufacturerCode: number; imageType: number; fileVersion: number; currentTime: number; upgradeTime: number }>;
-  upgradeEndResponse(args: { manufacturerCode: number; imageType: number; fileVersion: number; currentTime: number; upgradeTime: number }, opts?: ClusterCommandOptions): Promise<void>;
-  queryDeviceSpecificFileRequest(args: { requestNodeAddress: string; manufacturerCode: number; imageType: number; fileVersion: number; zigBeeStackVersion: number }, opts?: ClusterCommandOptions): Promise<{ status?: ZCLEnum8Status; manufacturerCode?: number; imageType?: number; fileVersion?: number; imageSize?: number }>;
-}
-
-export interface PollControlClusterAttributes extends GlobalClusterAttributes {
-  checkInInterval?: number;
-  longPollInterval?: number;
-  shortPollInterval?: number;
-  fastPollTimeout?: number;
-  checkInIntervalMin?: number;
-  longPollIntervalMin?: number;
-  fastPollTimeoutMax?: number;
-}
-
-export interface PollControlCluster extends ZCLNodeCluster {
-  readAttributes<K extends keyof PollControlClusterAttributes>(attributeNames: K[], opts?: { timeout?: number }): Promise<Pick<PollControlClusterAttributes, K>>;
-  readAttributes(attributeNames: Array<keyof PollControlClusterAttributes | number>, opts?: { timeout?: number }): Promise<Partial<PollControlClusterAttributes> & Record<number, unknown>>;
-  writeAttributes(attributes: Partial<PollControlClusterAttributes>, opts?: { timeout?: number }): Promise<unknown>;
-  on<K extends keyof PollControlClusterAttributes & string>(eventName: `attr.${K}`, listener: (value: PollControlClusterAttributes[K]) => void): this;
-  once<K extends keyof PollControlClusterAttributes & string>(eventName: `attr.${K}`, listener: (value: PollControlClusterAttributes[K]) => void): this;
-  fastPollStop(opts?: ClusterCommandOptions): Promise<void>;
-  setLongPollInterval(args: { newLongPollInterval: number }, opts?: ClusterCommandOptions): Promise<void>;
-  setShortPollInterval(args: { newShortPollInterval: number }, opts?: ClusterCommandOptions): Promise<void>;
-}
-
-export interface PowerConfigurationClusterAttributes extends GlobalClusterAttributes {
-  batteryVoltage?: number;
-  batteryPercentageRemaining?: number;
-  batterySize?: 'noBattery' | 'builtIn' | 'other' | 'AA' | 'AAA' | 'C' | 'D' | 'CR2' | 'CR123A' | 'unknown';
-  batteryQuantity?: number;
-  batteryRatedVoltage?: number;
-  batteryVoltageMinThreshold?: number;
-  batteryAlarmState?: Partial<{ batteryThresholdBatterySource1: boolean; batteryThreshold1BatterySource1: boolean; batteryThreshold2BatterySource1: boolean; batteryThreshold3BatterySource1: boolean; reserved4: boolean; reserved5: boolean; reserved6: boolean; reserved7: boolean; reserved8: boolean; reserved9: boolean; batteryThresholdBatterySource2: boolean; batteryThreshold1BatterySource2: boolean; batteryThreshold2BatterySource2: boolean; batteryThreshold3BatterySource2: boolean; reserved14: boolean; reserved15: boolean; reserved16: boolean; reserved17: boolean; reserved18: boolean; reserved19: boolean; batteryThresholdBatterySource3: boolean; batteryThreshold1BatterySource3: boolean; batteryThreshold2BatterySource3: boolean; batteryThreshold3BatterySource3: boolean; reserved24: boolean; reserved25: boolean; reserved26: boolean; reserved27: boolean; reserved28: boolean; reserved29: boolean; mainsPowerSupplyLostUnavailable: boolean }>;
-}
-
-export interface PowerConfigurationCluster extends ZCLNodeCluster {
-  readAttributes<K extends keyof PowerConfigurationClusterAttributes>(attributeNames: K[], opts?: { timeout?: number }): Promise<Pick<PowerConfigurationClusterAttributes, K>>;
-  readAttributes(attributeNames: Array<keyof PowerConfigurationClusterAttributes | number>, opts?: { timeout?: number }): Promise<Partial<PowerConfigurationClusterAttributes> & Record<number, unknown>>;
-  writeAttributes(attributes: Partial<PowerConfigurationClusterAttributes>, opts?: { timeout?: number }): Promise<unknown>;
-  on<K extends keyof PowerConfigurationClusterAttributes & string>(eventName: `attr.${K}`, listener: (value: PowerConfigurationClusterAttributes[K]) => void): this;
-  once<K extends keyof PowerConfigurationClusterAttributes & string>(eventName: `attr.${K}`, listener: (value: PowerConfigurationClusterAttributes[K]) => void): this;
-}
-
-export interface PowerProfileCluster extends ZCLNodeCluster {
-}
-
-export interface PressureMeasurementClusterAttributes extends GlobalClusterAttributes {
-  measuredValue?: number;
-  minMeasuredValue?: number;
-  maxMeasuredValue?: number;
-  tolerance?: number;
-  scaledValue?: number;
-  minScaledValue?: number;
-  maxScaledValue?: number;
-  scaledTolerance?: number;
-  scale?: number;
-}
-
-export interface PressureMeasurementCluster extends ZCLNodeCluster {
-  readAttributes<K extends keyof PressureMeasurementClusterAttributes>(attributeNames: K[], opts?: { timeout?: number }): Promise<Pick<PressureMeasurementClusterAttributes, K>>;
-  readAttributes(attributeNames: Array<keyof PressureMeasurementClusterAttributes | number>, opts?: { timeout?: number }): Promise<Partial<PressureMeasurementClusterAttributes> & Record<number, unknown>>;
-  writeAttributes(attributes: Partial<PressureMeasurementClusterAttributes>, opts?: { timeout?: number }): Promise<unknown>;
-  on<K extends keyof PressureMeasurementClusterAttributes & string>(eventName: `attr.${K}`, listener: (value: PressureMeasurementClusterAttributes[K]) => void): this;
-  once<K extends keyof PressureMeasurementClusterAttributes & string>(eventName: `attr.${K}`, listener: (value: PressureMeasurementClusterAttributes[K]) => void): this;
-}
-
-export interface PumpConfigurationAndControlCluster extends ZCLNodeCluster {
-}
-
-export interface RelativeHumidityClusterAttributes extends GlobalClusterAttributes {
-  measuredValue?: number;
-  minMeasuredValue?: number;
-  maxMeasuredValue?: number;
-  tolerance?: number;
-}
-
-export interface RelativeHumidityCluster extends ZCLNodeCluster {
-  readAttributes<K extends keyof RelativeHumidityClusterAttributes>(attributeNames: K[], opts?: { timeout?: number }): Promise<Pick<RelativeHumidityClusterAttributes, K>>;
-  readAttributes(attributeNames: Array<keyof RelativeHumidityClusterAttributes | number>, opts?: { timeout?: number }): Promise<Partial<RelativeHumidityClusterAttributes> & Record<number, unknown>>;
-  writeAttributes(attributes: Partial<RelativeHumidityClusterAttributes>, opts?: { timeout?: number }): Promise<unknown>;
-  on<K extends keyof RelativeHumidityClusterAttributes & string>(eventName: `attr.${K}`, listener: (value: RelativeHumidityClusterAttributes[K]) => void): this;
-  once<K extends keyof RelativeHumidityClusterAttributes & string>(eventName: `attr.${K}`, listener: (value: RelativeHumidityClusterAttributes[K]) => void): this;
-}
-
-export interface ScenesCluster extends ZCLNodeCluster {
-}
-
-export interface ShadeConfigurationCluster extends ZCLNodeCluster {
-}
-
-export interface TemperatureMeasurementClusterAttributes extends GlobalClusterAttributes {
-  measuredValue?: number;
-  minMeasuredValue?: number;
-  maxMeasuredValue?: number;
-}
-
-export interface TemperatureMeasurementCluster extends ZCLNodeCluster {
-  readAttributes<K extends keyof TemperatureMeasurementClusterAttributes>(attributeNames: K[], opts?: { timeout?: number }): Promise<Pick<TemperatureMeasurementClusterAttributes, K>>;
-  readAttributes(attributeNames: Array<keyof TemperatureMeasurementClusterAttributes | number>, opts?: { timeout?: number }): Promise<Partial<TemperatureMeasurementClusterAttributes> & Record<number, unknown>>;
-  writeAttributes(attributes: Partial<TemperatureMeasurementClusterAttributes>, opts?: { timeout?: number }): Promise<unknown>;
-  on<K extends keyof TemperatureMeasurementClusterAttributes & string>(eventName: `attr.${K}`, listener: (value: TemperatureMeasurementClusterAttributes[K]) => void): this;
-  once<K extends keyof TemperatureMeasurementClusterAttributes & string>(eventName: `attr.${K}`, listener: (value: TemperatureMeasurementClusterAttributes[K]) => void): this;
-}
-
-export interface ThermostatClusterAttributes extends GlobalClusterAttributes {
-  localTemperature?: number;
-  outdoorTemperature?: number;
-  occupancy?: Partial<{ occupied: boolean }>;
-  absMinHeatSetpointLimit?: number;
-  absMaxHeatSetpointLimit?: number;
-  absMinCoolSetpointLimit?: number;
-  absMaxCoolSetpointLimit?: number;
-  pICoolingDemand?: number;
-  pIHeatingDemand?: number;
-  localTemperatureCalibration?: number;
-  occupiedCoolingSetpoint?: number;
-  occupiedHeatingSetpoint?: number;
-  unoccupiedCoolingSetpoint?: number;
-  unoccupiedHeatingSetpoint?: number;
-  minHeatSetpointLimit?: number;
-  maxHeatSetpointLimit?: number;
-  minCoolSetpointLimit?: number;
-  maxCoolSetpointLimit?: number;
-  minSetpointDeadBand?: number;
-  remoteSensing?: Partial<{ localTemperature: boolean; outdoorTemperature: boolean; occupancy: boolean }>;
-  controlSequenceOfOperation?: 'cooling' | 'coolingWithReheat' | 'heating' | 'heatingWithReheat' | 'coolingAndHeating4Pipes' | 'coolingAndHeating4PipesWithReheat';
-  systemMode?: 'off' | 'auto' | 'cool' | 'heat' | 'emergencyHeating' | 'precooling' | 'fanOnly' | 'dry' | 'sleep';
-  alarmMask?: Partial<{ initializationFailure: boolean; hardwareFailure: boolean; selfCalibrationFailure: boolean }>;
-}
-
-export interface ThermostatCluster extends ZCLNodeCluster {
-  readAttributes<K extends keyof ThermostatClusterAttributes>(attributeNames: K[], opts?: { timeout?: number }): Promise<Pick<ThermostatClusterAttributes, K>>;
-  readAttributes(attributeNames: Array<keyof ThermostatClusterAttributes | number>, opts?: { timeout?: number }): Promise<Partial<ThermostatClusterAttributes> & Record<number, unknown>>;
-  writeAttributes(attributes: Partial<ThermostatClusterAttributes>, opts?: { timeout?: number }): Promise<unknown>;
-  on<K extends keyof ThermostatClusterAttributes & string>(eventName: `attr.${K}`, listener: (value: ThermostatClusterAttributes[K]) => void): this;
-  once<K extends keyof ThermostatClusterAttributes & string>(eventName: `attr.${K}`, listener: (value: ThermostatClusterAttributes[K]) => void): this;
-  setSetpoint(args: { mode: 'heat' | 'cool' | 'both'; amount: number }, opts?: ClusterCommandOptions): Promise<void>;
-}
-
-export interface TimeCluster extends ZCLNodeCluster {
-}
-
-export interface TouchLinkCluster extends ZCLNodeCluster {
-  getGroups(args: { startIdx: number }, opts?: ClusterCommandOptions): Promise<{ total: number; startIndex: number; groups: unknown[] }>;
-}
-
-export interface WindowCoveringClusterAttributes extends GlobalClusterAttributes {
-  windowCoveringType?: 'rollershade' | 'rollershade2Motor' | 'rollershadeExterior' | 'rollershadeExterior2Motor' | 'drapery' | 'awning' | 'shutter' | 'tiltBlindTiltOnly' | 'tiltBlindLiftAndTilt' | 'projectorScreen';
-  physicalClosedLimitLift?: number;
-  physicalClosedLimitTilt?: number;
-  currentPositionLift?: number;
-  currentPositionTilt?: number;
-  numberofActuationsLift?: number;
-  numberofActuationsTilt?: number;
-  configStatus?: Partial<{ operational: boolean; online: boolean; reversalLiftCommands: boolean; controlLift: boolean; controlTilt: boolean; encoderLift: boolean; encoderTilt: boolean; reserved: boolean }>;
-  currentPositionLiftPercentage?: number;
-  currentPositionTiltPercentage?: number;
-  installedOpenLimitLift?: number;
-  installedClosedLimitLift?: number;
-  installedOpenLimitTilt?: number;
-  installedClosedLimitTilt?: number;
-  velocityLift?: number;
-  accelerationTimeLift?: number;
-  decelerationTimeLift?: number;
-  mode?: Partial<{ motorDirectionReversed: boolean; calibrationMode: boolean; maintenanceMode: boolean; ledFeedback: boolean }>;
-  intermediateSetpointsLift?: Buffer;
-  intermediateSetpointsTilt?: Buffer;
-}
-
-export interface WindowCoveringCluster extends ZCLNodeCluster {
-  readAttributes<K extends keyof WindowCoveringClusterAttributes>(attributeNames: K[], opts?: { timeout?: number }): Promise<Pick<WindowCoveringClusterAttributes, K>>;
-  readAttributes(attributeNames: Array<keyof WindowCoveringClusterAttributes | number>, opts?: { timeout?: number }): Promise<Partial<WindowCoveringClusterAttributes> & Record<number, unknown>>;
-  writeAttributes(attributes: Partial<WindowCoveringClusterAttributes>, opts?: { timeout?: number }): Promise<unknown>;
-  on<K extends keyof WindowCoveringClusterAttributes & string>(eventName: `attr.${K}`, listener: (value: WindowCoveringClusterAttributes[K]) => void): this;
-  once<K extends keyof WindowCoveringClusterAttributes & string>(eventName: `attr.${K}`, listener: (value: WindowCoveringClusterAttributes[K]) => void): this;
-  upOpen(opts?: ClusterCommandOptions): Promise<void>;
-  downClose(opts?: ClusterCommandOptions): Promise<void>;
-  stop(opts?: ClusterCommandOptions): Promise<void>;
-  goToLiftValue(args: { liftValue: number }, opts?: ClusterCommandOptions): Promise<void>;
-  goToLiftPercentage(args: { percentageLiftValue: number }, opts?: ClusterCommandOptions): Promise<void>;
-  goToTiltValue(args: { tiltValue: number }, opts?: ClusterCommandOptions): Promise<void>;
-  goToTiltPercentage(args: { percentageTiltValue: number }, opts?: ClusterCommandOptions): Promise<void>;
-}
-
-/** Type-safe cluster registry */
-export interface ClusterRegistry {
-  alarms?: AlarmsCluster;
-  analogInput?: AnalogInputCluster;
-  analogOutput?: AnalogOutputCluster;
-  analogValue?: AnalogValueCluster;
-  ballastConfiguration?: BallastConfigurationCluster;
-  basic?: BasicCluster;
-  binaryInput?: BinaryInputCluster;
-  binaryOutput?: BinaryOutputCluster;
-  binaryValue?: BinaryValueCluster;
-  colorControl?: ColorControlCluster;
-  dehumidificationControl?: DehumidificationControlCluster;
-  deviceTemperature?: DeviceTemperatureCluster;
-  diagnostics?: DiagnosticsCluster;
-  doorLock?: DoorLockCluster;
-  electricalMeasurement?: ElectricalMeasurementCluster;
-  fanControl?: FanControlCluster;
-  flowMeasurement?: FlowMeasurementCluster;
-  groups?: GroupsCluster;
-  iasACE?: IASACECluster;
-  iasWD?: IASWDCluster;
-  iasZone?: IASZoneCluster;
-  identify?: IdentifyCluster;
-  illuminanceLevelSensing?: IlluminanceLevelSensingCluster;
-  illuminanceMeasurement?: IlluminanceMeasurementCluster;
-  levelControl?: LevelControlCluster;
-  metering?: MeteringCluster;
-  multistateInput?: MultistateInputCluster;
-  multistateOutput?: MultistateOutputCluster;
-  multistateValue?: MultistateValueCluster;
-  occupancySensing?: OccupancySensingCluster;
-  onOff?: OnOffCluster;
-  onOffSwitch?: OnOffSwitchCluster;
-  ota?: OTACluster;
-  pollControl?: PollControlCluster;
-  powerConfiguration?: PowerConfigurationCluster;
-  powerProfile?: PowerProfileCluster;
-  pressureMeasurement?: PressureMeasurementCluster;
-  pumpConfigurationAndControl?: PumpConfigurationAndControlCluster;
-  relativeHumidity?: RelativeHumidityCluster;
-  scenes?: ScenesCluster;
-  shadeConfiguration?: ShadeConfigurationCluster;
-  temperatureMeasurement?: TemperatureMeasurementCluster;
-  thermostat?: ThermostatCluster;
-  time?: TimeCluster;
-  touchlink?: TouchLinkCluster;
-  windowCovering?: WindowCoveringCluster;
-}
-
-/** Cluster type lookup by cluster NAME */
-export interface ClusterTypeByName {
-  alarms: AlarmsCluster;
-  analogInput: AnalogInputCluster;
-  analogOutput: AnalogOutputCluster;
-  analogValue: AnalogValueCluster;
-  ballastConfiguration: BallastConfigurationCluster;
-  basic: BasicCluster;
-  binaryInput: BinaryInputCluster;
-  binaryOutput: BinaryOutputCluster;
-  binaryValue: BinaryValueCluster;
-  colorControl: ColorControlCluster;
-  dehumidificationControl: DehumidificationControlCluster;
-  deviceTemperature: DeviceTemperatureCluster;
-  diagnostics: DiagnosticsCluster;
-  doorLock: DoorLockCluster;
-  electricalMeasurement: ElectricalMeasurementCluster;
-  fanControl: FanControlCluster;
-  flowMeasurement: FlowMeasurementCluster;
-  groups: GroupsCluster;
-  iasACE: IASACECluster;
-  iasWD: IASWDCluster;
-  iasZone: IASZoneCluster;
-  identify: IdentifyCluster;
-  illuminanceLevelSensing: IlluminanceLevelSensingCluster;
-  illuminanceMeasurement: IlluminanceMeasurementCluster;
-  levelControl: LevelControlCluster;
-  metering: MeteringCluster;
-  multistateInput: MultistateInputCluster;
-  multistateOutput: MultistateOutputCluster;
-  multistateValue: MultistateValueCluster;
-  occupancySensing: OccupancySensingCluster;
-  onOff: OnOffCluster;
-  onOffSwitch: OnOffSwitchCluster;
-  ota: OTACluster;
-  pollControl: PollControlCluster;
-  powerConfiguration: PowerConfigurationCluster;
-  powerProfile: PowerProfileCluster;
-  pressureMeasurement: PressureMeasurementCluster;
-  pumpConfigurationAndControl: PumpConfigurationAndControlCluster;
-  relativeHumidity: RelativeHumidityCluster;
-  scenes: ScenesCluster;
-  shadeConfiguration: ShadeConfigurationCluster;
-  temperatureMeasurement: TemperatureMeasurementCluster;
-  thermostat: ThermostatCluster;
-  time: TimeCluster;
-  touchlink: TouchLinkCluster;
-  windowCovering: WindowCoveringCluster;
-}
-
-/** Cluster attributes lookup by cluster NAME */
-export interface ClusterAttributesByName {
-  alarms: Record<string, unknown>;
-  analogInput: AnalogInputClusterAttributes;
-  analogOutput: AnalogOutputClusterAttributes;
-  analogValue: AnalogValueClusterAttributes;
-  ballastConfiguration: BallastConfigurationClusterAttributes;
-  basic: BasicClusterAttributes;
-  binaryInput: BinaryInputClusterAttributes;
-  binaryOutput: BinaryOutputClusterAttributes;
-  binaryValue: BinaryValueClusterAttributes;
-  colorControl: ColorControlClusterAttributes;
-  dehumidificationControl: Record<string, unknown>;
-  deviceTemperature: DeviceTemperatureClusterAttributes;
-  diagnostics: Record<string, unknown>;
-  doorLock: DoorLockClusterAttributes;
-  electricalMeasurement: ElectricalMeasurementClusterAttributes;
-  fanControl: Record<string, unknown>;
-  flowMeasurement: FlowMeasurementClusterAttributes;
-  groups: GroupsClusterAttributes;
-  iasACE: Record<string, unknown>;
-  iasWD: Record<string, unknown>;
-  iasZone: IASZoneClusterAttributes;
-  identify: IdentifyClusterAttributes;
-  illuminanceLevelSensing: IlluminanceLevelSensingClusterAttributes;
-  illuminanceMeasurement: IlluminanceMeasurementClusterAttributes;
-  levelControl: LevelControlClusterAttributes;
-  metering: MeteringClusterAttributes;
-  multistateInput: MultistateInputClusterAttributes;
-  multistateOutput: MultistateOutputClusterAttributes;
-  multistateValue: MultistateValueClusterAttributes;
-  occupancySensing: OccupancySensingClusterAttributes;
-  onOff: OnOffClusterAttributes;
-  onOffSwitch: Record<string, unknown>;
-  ota: OTAClusterAttributes;
-  pollControl: PollControlClusterAttributes;
-  powerConfiguration: PowerConfigurationClusterAttributes;
-  powerProfile: Record<string, unknown>;
-  pressureMeasurement: PressureMeasurementClusterAttributes;
-  pumpConfigurationAndControl: Record<string, unknown>;
-  relativeHumidity: RelativeHumidityClusterAttributes;
-  scenes: Record<string, unknown>;
-  shadeConfiguration: Record<string, unknown>;
-  temperatureMeasurement: TemperatureMeasurementClusterAttributes;
-  thermostat: ThermostatClusterAttributes;
-  time: Record<string, unknown>;
-  touchlink: Record<string, unknown>;
-  windowCovering: WindowCoveringClusterAttributes;
-}
-
-/** Infer a typed cluster interface from a CLUSTER definition object. */
-export type ClusterTypeFromDefinition<TDef extends { NAME: string; ID: number }> =
-  TDef['NAME'] extends keyof ClusterTypeByName
-    ? ClusterTypeByName[TDef['NAME']]
-    : ZCLNodeCluster;
-
-/** Infer typed cluster attribute map from a CLUSTER definition object. */
-export type ClusterAttributesFromDefinition<TDef extends { NAME: string; ID: number }> =
-  TDef['NAME'] extends keyof ClusterAttributesByName
-    ? ClusterAttributesByName[TDef['NAME']]
-    : Record<string, unknown>;
-
-export type ZCLNodeEndpoint = {
-  clusters: ClusterRegistry & {
-    [clusterName: string]: ZCLNodeCluster | undefined;
+/* eslint-disable @typescript-eslint/no-explicit-any */
+declare module "zigbee-clusters" {
+  import {BitMap} from "@athombv/data-types";
+  type BasicClusterAttributes = {
+    zclVersion: { id: 0x00, type: ZCLDataType<number> },
+    appVersion: { id: 0x01, type: ZCLDataType<number> },
+    stackVersion: { id: 0x02, type: ZCLDataType<number> },
+    hwVersion: { id: 0x03, type: ZCLDataType<number> },
+    manufacturerName: { id: 0x04, type: ZCLDataType<string> },
+    modelId: { id: 0x05, type: ZCLDataType<string> },
+    dateCode: { id: 0x06, type: ZCLDataType<string> },
+    powerSource: { id: 0x07, type: ZCLDataType<"unknown" | "mains" | "mains3phase" | "battery" | "dc" | "emergencyMains" | "emergencyTransfer"> },
+    appProfileVersion: { id: 0x08, type: ZCLDataType<number> },
+    locationDesc: { id: 0x10, type: ZCLDataType<string> },
+    physicalEnv: { id: 0x11, type: ZCLDataType<"Unspecified" | "Atrium" | "Bar" | "Courtyard" | "Bathroom" | "Bedroom" | "BilliardRoom" | "UtilityRoom" | "Cellar" | "StorageCloset" | "Theater" | "Office" | "Deck" | "Den" | "DiningRoom" | "ElectricalRoom" | "Elevator" | "Entry" | "FamilyRoom" | "MainFloor" | "Upstairs" | "Downstairs" | "Basement" | "Gallery" | "GameRoom" | "Garage" | "Gym" | "Hallway" | "House" | "Kitchen" | "LaundryRoom" | "Library" | "MasterBedroom" | "MudRoom" | "Nursery" | "Pantry" | "Outside" | "Pool" | "Porch" | "SewingRoom" | "SittingRoom" | "Stairway" | "Yard" | "Attic" | "HotTub" | "LivingRoom" | "Sauna" | "Workshop" | "GuestBedroom" | "GuestBath" | "PowderRoom" | "BackYard" | "FrontYard" | "Patio" | "Driveway" | "SunRoom" | "Spa" | "Whirlpool" | "Shed" | "EquipmentStorage" | "HobbyRoom" | "Fountain" | "Pond" | "ReceptionRoom" | "BreakfastRoom" | "Nook" | "Garden" | "Balcony" | "PanicRoom" | "Terrace" | "Roof" | "Toilet" | "ToiletMain" | "OutsideToilet" | "ShowerRoom" | "Study" | "FrontGarden" | "BackGarden" | "Kettle" | "Television" | "Stove" | "Microwave" | "Toaster" | "Vacuum" | "Appliance" | "FrontDoor" | "BackDoor" | "FridgeDoor" | "MedicationCabinetDoor" | "WardrobeDoor" | "FrontCupboardDoor" | "OtherDoor" | "WaitingRoom" | "TriageRoom" | "DoctorsOffice" | "PatientsPrivateRoom" | "ConsultationRoom" | "NurseStation" | "Ward" | "Corridor" | "OperatingTheatre" | "DentalSurgeryRoom" | "MedicalImagingRoom" | "DecontaminationRoom" | "Unknown"> },
+    deviceEnabled: { id: 0x12, type: ZCLDataType<boolean> },
+    alarmMask: { id: 0x13, type: ZCLDataType<BitMap<"hardwareFault" | "softwareFault">> },
+    disableLocalConfig: { id: 0x14, type: ZCLDataType<BitMap<"factoryResetDisabled" | "configurationDisabled">> },
+    swBuildId: { id: 0x4000, type: ZCLDataType<string> },
   };
-  bind(clusterName: string, impl: BoundCluster): void;
-};
-
-export interface ZCLNode {
-  endpoints: { [endpointId: number | string]: ZCLNodeEndpoint };
-  handleFrame: (
-    endpointId: number,
-    clusterId: number,
-    frame: Buffer,
-    meta?: unknown
-  ) => Promise<void>;
-}
-
-export const ZCLNode: {
-  new (node: ZCLNodeConstructorInput): ZCLNode;
-};
-
-export const CLUSTER: {
-
-  ALARMS: {
-    ID: number;
-    NAME: 'alarms';
-    ATTRIBUTES: unknown;
-    COMMANDS: unknown;
+  type BasicClusterCommands = {
+    factoryReset: { id: 0x00, direction: "DIRECTION_SERVER_TO_CLIENT" },
+  };
+  class BasicCluster<Attributes extends AttributeDefinitions = BasicClusterAttributes, Commands extends CommandDefinitions = BasicClusterCommands> extends Cluster<Attributes, Commands> {
+    factoryReset(
+      args: {
+        manufacturerId?: number,
+      },
+      opts?: {
+        waitForResponse?: boolean,
+        timeout?: number,
+        disableDefaultResponse?: boolean,
+      },
+    ): Promise<void>;
+  }
+  type PowerConfigurationClusterAttributes = {
+    batteryVoltage: { id: 0x20, type: ZCLDataType<number> },
+    batteryPercentageRemaining: { id: 0x21, type: ZCLDataType<number> },
+    batterySize: { id: 0x31, type: ZCLDataType<"noBattery" | "builtIn" | "other" | "AA" | "AAA" | "C" | "D" | "CR2" | "CR123A" | "unknown"> },
+    batteryQuantity: { id: 0x33, type: ZCLDataType<number> },
+    batteryRatedVoltage: { id: 0x34, type: ZCLDataType<number> },
+    batteryVoltageMinThreshold: { id: 0x36, type: ZCLDataType<number> },
+    batteryAlarmState: { id: 0x3e, type: ZCLDataType<BitMap<"batteryThresholdBatterySource1" | "batteryThreshold1BatterySource1" | "batteryThreshold2BatterySource1" | "batteryThreshold3BatterySource1" | "reserved4" | "reserved5" | "reserved6" | "reserved7" | "reserved8" | "reserved9" | "batteryThresholdBatterySource2" | "batteryThreshold1BatterySource2" | "batteryThreshold2BatterySource2" | "batteryThreshold3BatterySource2" | "reserved14" | "reserved15" | "reserved16" | "reserved17" | "reserved18" | "reserved19" | "batteryThresholdBatterySource3" | "batteryThreshold1BatterySource3" | "batteryThreshold2BatterySource3" | "batteryThreshold3BatterySource3" | "reserved24" | "reserved25" | "reserved26" | "reserved27" | "reserved28" | "reserved29" | "mainsPowerSupplyLostUnavailable">> },
+  };
+  type PowerConfigurationClusterCommands = Record<never, never>;
+  class PowerConfigurationCluster<Attributes extends AttributeDefinitions = PowerConfigurationClusterAttributes, Commands extends CommandDefinitions = PowerConfigurationClusterCommands> extends Cluster<Attributes, Commands> {
+  }
+  type DeviceTemperatureClusterAttributes = {
+    currentTemperature: { id: 0x00, type: ZCLDataType<number> },
+    minTempExperienced: { id: 0x01, type: ZCLDataType<number> },
+    maxTempExperienced: { id: 0x02, type: ZCLDataType<number> },
+    overTempTotalDwell: { id: 0x03, type: ZCLDataType<number> },
+    deviceTempAlarmMask: { id: 0x10, type: ZCLDataType<BitMap<"deviceTemperatureTooLow" | "deviceTemperatureTooHigh">> },
+    lowTempThreshold: { id: 0x11, type: ZCLDataType<number> },
+    highTempThreshold: { id: 0x12, type: ZCLDataType<number> },
+    lowTempDwellTripPoint: { id: 0x13, type: ZCLDataType<number> },
+    highTempDwellTripPoint: { id: 0x14, type: ZCLDataType<number> },
+  };
+  type DeviceTemperatureClusterCommands = Record<never, never>;
+  class DeviceTemperatureCluster<Attributes extends AttributeDefinitions = DeviceTemperatureClusterAttributes, Commands extends CommandDefinitions = DeviceTemperatureClusterCommands> extends Cluster<Attributes, Commands> {
+  }
+  type IdentifyClusterAttributes = {
+    identifyTime: { id: 0x00, type: ZCLDataType<number> },
   };
-  ANALOG_INPUT: {
-    ID: number;
-    NAME: 'analogInput';
-    ATTRIBUTES: unknown;
-    COMMANDS: unknown;
+  type IdentifyClusterCommands = {
+    identify: { id: 0x00, direction: "DIRECTION_SERVER_TO_CLIENT", args: {
+        identifyTime: ZCLDataType<number>,
+      },
+    },
+    identifyQuery: { id: 0x01, direction: "DIRECTION_SERVER_TO_CLIENT" },
+    triggerEffect: { id: 0x40, direction: "DIRECTION_SERVER_TO_CLIENT", args: {
+        effectIdentifier: ZCLDataType<"blink" | "breathe" | "okay" | "channelChange" | "finish" | "stop">,
+        effectVariant: ZCLDataType<number>,
+      },
+    },
   };
-  ANALOG_OUTPUT: {
-    ID: number;
-    NAME: 'analogOutput';
-    ATTRIBUTES: unknown;
-    COMMANDS: unknown;
+  class IdentifyCluster<Attributes extends AttributeDefinitions = IdentifyClusterAttributes, Commands extends CommandDefinitions = IdentifyClusterCommands> extends Cluster<Attributes, Commands> {
+    identify(
+      args: {
+        manufacturerId?: number,
+        identifyTime: number,
+      },
+      opts?: {
+        waitForResponse?: boolean,
+        timeout?: number,
+        disableDefaultResponse?: boolean,
+      },
+    ): Promise<void>;
+    identifyQuery(
+      args: {
+        manufacturerId?: number,
+      },
+      opts?: {
+        waitForResponse?: boolean,
+        timeout?: number,
+        disableDefaultResponse?: boolean,
+      },
+    ): Promise<void>;
+    triggerEffect(
+      args: {
+        manufacturerId?: number,
+        effectIdentifier: "blink" | "breathe" | "okay" | "channelChange" | "finish" | "stop",
+        effectVariant: number,
+      },
+      opts?: {
+        waitForResponse?: boolean,
+        timeout?: number,
+        disableDefaultResponse?: boolean,
+      },
+    ): Promise<void>;
+  }
+  type GroupsClusterAttributes = {
+    nameSupport: { id: 0x00, type: ZCLDataType<BitMap<null | null | null | null | null | null | null | "groupNames">> },
   };
-  ANALOG_VALUE: {
-    ID: number;
-    NAME: 'analogValue';
-    ATTRIBUTES: unknown;
-    COMMANDS: unknown;
+  type GroupsClusterCommands = {
+    addGroup: { id: 0x00, direction: "DIRECTION_SERVER_TO_CLIENT", args: {
+        groupId: ZCLDataType<number>,
+        groupName: ZCLDataType<string>,
+      },
+    },
+    viewGroup: { id: 0x01, direction: "DIRECTION_SERVER_TO_CLIENT", args: {
+        groupId: ZCLDataType<number>,
+      },
+    },
+    getGroupMembership: { id: 0x02, direction: "DIRECTION_SERVER_TO_CLIENT", args: {
+        groupIds: ZCLDataType<Array<unknown>>,
+      },
+    },
+    removeGroup: { id: 0x03, direction: "DIRECTION_SERVER_TO_CLIENT", args: {
+        groupId: ZCLDataType<number>,
+      },
+    },
+    removeAllGroups: { id: 0x04, direction: "DIRECTION_SERVER_TO_CLIENT" },
+    addGroupIfIdentify: { id: 0x05, direction: "DIRECTION_SERVER_TO_CLIENT", args: {
+        groupId: ZCLDataType<number>,
+        groupName: ZCLDataType<string>,
+      },
+    },
   };
-  BALLAST_CONFIGURATION: {
-    ID: number;
-    NAME: 'ballastConfiguration';
-    ATTRIBUTES: unknown;
-    COMMANDS: unknown;
+  class GroupsCluster<Attributes extends AttributeDefinitions = GroupsClusterAttributes, Commands extends CommandDefinitions = GroupsClusterCommands> extends Cluster<Attributes, Commands> {
+    addGroup(
+      args: {
+        manufacturerId?: number,
+        groupId: number,
+        groupName: string,
+      },
+      opts?: {
+        waitForResponse?: boolean,
+        timeout?: number,
+        disableDefaultResponse?: boolean,
+      },
+    ): Promise<void>;
+    viewGroup(
+      args: {
+        manufacturerId?: number,
+        groupId: number,
+      },
+      opts?: {
+        waitForResponse?: boolean,
+        timeout?: number,
+        disableDefaultResponse?: boolean,
+      },
+    ): Promise<void>;
+    getGroupMembership(
+      args: {
+        manufacturerId?: number,
+        groupIds: Array<unknown>,
+      },
+      opts?: {
+        waitForResponse?: boolean,
+        timeout?: number,
+        disableDefaultResponse?: boolean,
+      },
+    ): Promise<void>;
+    removeGroup(
+      args: {
+        manufacturerId?: number,
+        groupId: number,
+      },
+      opts?: {
+        waitForResponse?: boolean,
+        timeout?: number,
+        disableDefaultResponse?: boolean,
+      },
+    ): Promise<void>;
+    removeAllGroups(
+      args: {
+        manufacturerId?: number,
+      },
+      opts?: {
+        waitForResponse?: boolean,
+        timeout?: number,
+        disableDefaultResponse?: boolean,
+      },
+    ): Promise<void>;
+    addGroupIfIdentify(
+      args: {
+        manufacturerId?: number,
+        groupId: number,
+        groupName: string,
+      },
+      opts?: {
+        waitForResponse?: boolean,
+        timeout?: number,
+        disableDefaultResponse?: boolean,
+      },
+    ): Promise<void>;
+  }
+  type ScenesClusterAttributes = Record<never, never>;
+  type ScenesClusterCommands = Record<never, never>;
+  class ScenesCluster<Attributes extends AttributeDefinitions = ScenesClusterAttributes, Commands extends CommandDefinitions = ScenesClusterCommands> extends Cluster<Attributes, Commands> {
+  }
+  type OnOffClusterAttributes = {
+    onOff: { id: 0x00, type: ZCLDataType<boolean> },
+    onTime: { id: 0x4001, type: ZCLDataType<number> },
+    offWaitTime: { id: 0x4002, type: ZCLDataType<number> },
   };
-  BASIC: {
-    ID: number;
-    NAME: 'basic';
-    ATTRIBUTES: unknown;
-    COMMANDS: unknown;
+  type OnOffClusterCommands = {
+    setOff: { id: 0x00, direction: "DIRECTION_SERVER_TO_CLIENT" },
+    setOn: { id: 0x01, direction: "DIRECTION_SERVER_TO_CLIENT" },
+    toggle: { id: 0x02, direction: "DIRECTION_SERVER_TO_CLIENT" },
+    offWithEffect: { id: 0x40, direction: "DIRECTION_SERVER_TO_CLIENT", args: {
+        effectIdentifier: ZCLDataType<number>,
+        effectVariant: ZCLDataType<number>,
+      },
+    },
+    onWithRecallGlobalScene: { id: 0x41, direction: "DIRECTION_SERVER_TO_CLIENT" },
+    onWithTimedOff: { id: 0x42, direction: "DIRECTION_SERVER_TO_CLIENT", args: {
+        onOffControl: ZCLDataType<number>,
+        onTime: ZCLDataType<number>,
+        offWaitTime: ZCLDataType<number>,
+      },
+    },
   };
-  BINARY_INPUT: {
-    ID: number;
-    NAME: 'binaryInput';
-    ATTRIBUTES: unknown;
-    COMMANDS: unknown;
+  class OnOffCluster<Attributes extends AttributeDefinitions = OnOffClusterAttributes, Commands extends CommandDefinitions = OnOffClusterCommands> extends Cluster<Attributes, Commands> {
+    setOff(
+      args: {
+        manufacturerId?: number,
+      },
+      opts?: {
+        waitForResponse?: boolean,
+        timeout?: number,
+        disableDefaultResponse?: boolean,
+      },
+    ): Promise<void>;
+    setOn(
+      args: {
+        manufacturerId?: number,
+      },
+      opts?: {
+        waitForResponse?: boolean,
+        timeout?: number,
+        disableDefaultResponse?: boolean,
+      },
+    ): Promise<void>;
+    toggle(
+      args: {
+        manufacturerId?: number,
+      },
+      opts?: {
+        waitForResponse?: boolean,
+        timeout?: number,
+        disableDefaultResponse?: boolean,
+      },
+    ): Promise<void>;
+    offWithEffect(
+      args: {
+        manufacturerId?: number,
+        effectIdentifier: number,
+        effectVariant: number,
+      },
+      opts?: {
+        waitForResponse?: boolean,
+        timeout?: number,
+        disableDefaultResponse?: boolean,
+      },
+    ): Promise<void>;
+    onWithRecallGlobalScene(
+      args: {
+        manufacturerId?: number,
+      },
+      opts?: {
+        waitForResponse?: boolean,
+        timeout?: number,
+        disableDefaultResponse?: boolean,
+      },
+    ): Promise<void>;
+    onWithTimedOff(
+      args: {
+        manufacturerId?: number,
+        onOffControl: number,
+        onTime: number,
+        offWaitTime: number,
+      },
+      opts?: {
+        waitForResponse?: boolean,
+        timeout?: number,
+        disableDefaultResponse?: boolean,
+      },
+    ): Promise<void>;
+  }
+  type OnOffSwitchClusterAttributes = Record<never, never>;
+  type OnOffSwitchClusterCommands = Record<never, never>;
+  class OnOffSwitchCluster<Attributes extends AttributeDefinitions = OnOffSwitchClusterAttributes, Commands extends CommandDefinitions = OnOffSwitchClusterCommands> extends Cluster<Attributes, Commands> {
+  }
+  type LevelControlClusterAttributes = {
+    currentLevel: { id: 0x00, type: ZCLDataType<number> },
+    remainingTime: { id: 0x01, type: ZCLDataType<number> },
+    onOffTransitionTime: { id: 0x10, type: ZCLDataType<number> },
+    onLevel: { id: 0x11, type: ZCLDataType<number> },
+    onTransitionTime: { id: 0x12, type: ZCLDataType<number> },
+    offTransitionTime: { id: 0x13, type: ZCLDataType<number> },
+    defaultMoveRate: { id: 0x14, type: ZCLDataType<number> },
   };
-  BINARY_OUTPUT: {
-    ID: number;
-    NAME: 'binaryOutput';
-    ATTRIBUTES: unknown;
-    COMMANDS: unknown;
+  type LevelControlClusterCommands = {
+    moveToLevel: { id: 0x00, direction: "DIRECTION_SERVER_TO_CLIENT", args: {
+        level: ZCLDataType<number>,
+        transitionTime: ZCLDataType<number>,
+      },
+    },
+    move: { id: 0x01, direction: "DIRECTION_SERVER_TO_CLIENT", args: {
+        moveMode: ZCLDataType<"up" | "down">,
+        rate: ZCLDataType<number>,
+      },
+    },
+    step: { id: 0x02, direction: "DIRECTION_SERVER_TO_CLIENT", args: {
+        mode: ZCLDataType<"up" | "down">,
+        stepSize: ZCLDataType<number>,
+        transitionTime: ZCLDataType<number>,
+      },
+    },
+    stop: { id: 0x03, direction: "DIRECTION_SERVER_TO_CLIENT" },
+    moveToLevelWithOnOff: { id: 0x04, direction: "DIRECTION_SERVER_TO_CLIENT", args: {
+        level: ZCLDataType<number>,
+        transitionTime: ZCLDataType<number>,
+      },
+    },
+    moveWithOnOff: { id: 0x05, direction: "DIRECTION_SERVER_TO_CLIENT", args: {
+        moveMode: ZCLDataType<"up" | "down">,
+        rate: ZCLDataType<number>,
+      },
+    },
+    stepWithOnOff: { id: 0x06, direction: "DIRECTION_SERVER_TO_CLIENT", args: {
+        mode: ZCLDataType<"up" | "down">,
+        stepSize: ZCLDataType<number>,
+        transitionTime: ZCLDataType<number>,
+      },
+    },
+    stopWithOnOff: { id: 0x07, direction: "DIRECTION_SERVER_TO_CLIENT" },
   };
-  BINARY_VALUE: {
-    ID: number;
-    NAME: 'binaryValue';
-    ATTRIBUTES: unknown;
-    COMMANDS: unknown;
+  class LevelControlCluster<Attributes extends AttributeDefinitions = LevelControlClusterAttributes, Commands extends CommandDefinitions = LevelControlClusterCommands> extends Cluster<Attributes, Commands> {
+    moveToLevel(
+      args: {
+        manufacturerId?: number,
+        level: number,
+        transitionTime: number,
+      },
+      opts?: {
+        waitForResponse?: boolean,
+        timeout?: number,
+        disableDefaultResponse?: boolean,
+      },
+    ): Promise<void>;
+    move(
+      args: {
+        manufacturerId?: number,
+        moveMode: "up" | "down",
+        rate: number,
+      },
+      opts?: {
+        waitForResponse?: boolean,
+        timeout?: number,
+        disableDefaultResponse?: boolean,
+      },
+    ): Promise<void>;
+    step(
+      args: {
+        manufacturerId?: number,
+        mode: "up" | "down",
+        stepSize: number,
+        transitionTime: number,
+      },
+      opts?: {
+        waitForResponse?: boolean,
+        timeout?: number,
+        disableDefaultResponse?: boolean,
+      },
+    ): Promise<void>;
+    stop(
+      args: {
+        manufacturerId?: number,
+      },
+      opts?: {
+        waitForResponse?: boolean,
+        timeout?: number,
+        disableDefaultResponse?: boolean,
+      },
+    ): Promise<void>;
+    moveToLevelWithOnOff(
+      args: {
+        manufacturerId?: number,
+        level: number,
+        transitionTime: number,
+      },
+      opts?: {
+        waitForResponse?: boolean,
+        timeout?: number,
+        disableDefaultResponse?: boolean,
+      },
+    ): Promise<void>;
+    moveWithOnOff(
+      args: {
+        manufacturerId?: number,
+        moveMode: "up" | "down",
+        rate: number,
+      },
+      opts?: {
+        waitForResponse?: boolean,
+        timeout?: number,
+        disableDefaultResponse?: boolean,
+      },
+    ): Promise<void>;
+    stepWithOnOff(
+      args: {
+        manufacturerId?: number,
+        mode: "up" | "down",
+        stepSize: number,
+        transitionTime: number,
+      },
+      opts?: {
+        waitForResponse?: boolean,
+        timeout?: number,
+        disableDefaultResponse?: boolean,
+      },
+    ): Promise<void>;
+    stopWithOnOff(
+      args: {
+        manufacturerId?: number,
+      },
+      opts?: {
+        waitForResponse?: boolean,
+        timeout?: number,
+        disableDefaultResponse?: boolean,
+      },
+    ): Promise<void>;
+  }
+  type AlarmsClusterAttributes = Record<never, never>;
+  type AlarmsClusterCommands = {
+    resetAllAlarms: { id: 0x01, direction: "DIRECTION_SERVER_TO_CLIENT", args: Record<never, never> /* TODO fix */ },
+    getAlarm: { id: 0x02, direction: "DIRECTION_SERVER_TO_CLIENT", args: Record<never, never> /* TODO fix */ },
+    resetAlarmLog: { id: 0x03, direction: "DIRECTION_SERVER_TO_CLIENT", args: Record<never, never> /* TODO fix */ },
   };
-  COLOR_CONTROL: {
-    ID: number;
-    NAME: 'colorControl';
-    ATTRIBUTES: unknown;
-    COMMANDS: unknown;
+  class AlarmsCluster<Attributes extends AttributeDefinitions = AlarmsClusterAttributes, Commands extends CommandDefinitions = AlarmsClusterCommands> extends Cluster<Attributes, Commands> {
+    resetAllAlarms(
+      args: {
+        manufacturerId?: number,
+      },
+      opts?: {
+        waitForResponse?: boolean,
+        timeout?: number,
+        disableDefaultResponse?: boolean,
+      },
+    ): Promise<void>;
+    getAlarm(
+      args: {
+        manufacturerId?: number,
+      },
+      opts?: {
+        waitForResponse?: boolean,
+        timeout?: number,
+        disableDefaultResponse?: boolean,
+      },
+    ): Promise<void>;
+    resetAlarmLog(
+      args: {
+        manufacturerId?: number,
+      },
+      opts?: {
+        waitForResponse?: boolean,
+        timeout?: number,
+        disableDefaultResponse?: boolean,
+      },
+    ): Promise<void>;
+  }
+  type TimeClusterAttributes = Record<never, never>;
+  type TimeClusterCommands = Record<never, never>;
+  class TimeCluster<Attributes extends AttributeDefinitions = TimeClusterAttributes, Commands extends CommandDefinitions = TimeClusterCommands> extends Cluster<Attributes, Commands> {
+  }
+  type AnalogInputClusterAttributes = {
+    description: { id: 0x1c, type: ZCLDataType<string> },
+    maxPresentValue: { id: 0x41, type: ZCLDataType<number> },
+    minPresentValue: { id: 0x45, type: ZCLDataType<number> },
+    outOfService: { id: 0x51, type: ZCLDataType<boolean> },
+    presentValue: { id: 0x55, type: ZCLDataType<number> },
+    reliability: { id: 0x67, type: ZCLDataType<"noFaultDetected" | "noSensor" | "overRange" | "underRange" | "openLoop" | "shortedLoop" | "noOutput" | "unreliableOther" | "processError" | "configurationError"> },
+    resolution: { id: 0x6a, type: ZCLDataType<number> },
+    statusFlags: { id: 0x6f, type: ZCLDataType<BitMap<"inAlarm" | "fault" | "overridden" | "outOfService">> },
+    applicationType: { id: 0x100, type: ZCLDataType<number> },
   };
-  DEVICE_TEMPERATURE: {
-    ID: number;
-    NAME: 'deviceTemperature';
-    ATTRIBUTES: unknown;
-    COMMANDS: unknown;
+  type AnalogInputClusterCommands = Record<never, never>;
+  class AnalogInputCluster<Attributes extends AttributeDefinitions = AnalogInputClusterAttributes, Commands extends CommandDefinitions = AnalogInputClusterCommands> extends Cluster<Attributes, Commands> {
+  }
+  type AnalogOutputClusterAttributes = {
+    description: { id: 0x1c, type: ZCLDataType<string> },
+    maxPresentValue: { id: 0x41, type: ZCLDataType<number> },
+    minPresentValue: { id: 0x45, type: ZCLDataType<number> },
+    outOfService: { id: 0x51, type: ZCLDataType<boolean> },
+    presentValue: { id: 0x55, type: ZCLDataType<number> },
+    reliability: { id: 0x67, type: ZCLDataType<"noFaultDetected" | "overRange" | "underRange" | "openLoop" | "shortedLoop" | "unreliableOther" | "processError" | "configurationError"> },
+    relinquishDefault: { id: 0x68, type: ZCLDataType<number> },
+    resolution: { id: 0x6a, type: ZCLDataType<number> },
+    statusFlags: { id: 0x6f, type: ZCLDataType<BitMap<"inAlarm" | "fault" | "overridden" | "outOfService">> },
+    applicationType: { id: 0x100, type: ZCLDataType<number> },
   };
-  DIAGNOSTICS: {
-    ID: number;
-    NAME: 'diagnostics';
-    ATTRIBUTES: unknown;
-    COMMANDS: unknown;
+  type AnalogOutputClusterCommands = Record<never, never>;
+  class AnalogOutputCluster<Attributes extends AttributeDefinitions = AnalogOutputClusterAttributes, Commands extends CommandDefinitions = AnalogOutputClusterCommands> extends Cluster<Attributes, Commands> {
+  }
+  type AnalogValueClusterAttributes = {
+    description: { id: 0x1c, type: ZCLDataType<string> },
+    outOfService: { id: 0x51, type: ZCLDataType<boolean> },
+    presentValue: { id: 0x55, type: ZCLDataType<number> },
+    reliability: { id: 0x67, type: ZCLDataType<"noFaultDetected" | "overRange" | "underRange" | "openLoop" | "shortedLoop" | "unreliableOther" | "processError" | "configurationError"> },
+    relinquishDefault: { id: 0x68, type: ZCLDataType<number> },
+    statusFlags: { id: 0x6f, type: ZCLDataType<BitMap<"inAlarm" | "fault" | "overridden" | "outOfService">> },
+    applicationType: { id: 0x100, type: ZCLDataType<number> },
   };
-  DOOR_LOCK: {
-    ID: number;
-    NAME: 'doorLock';
-    ATTRIBUTES: unknown;
-    COMMANDS: unknown;
+  type AnalogValueClusterCommands = Record<never, never>;
+  class AnalogValueCluster<Attributes extends AttributeDefinitions = AnalogValueClusterAttributes, Commands extends CommandDefinitions = AnalogValueClusterCommands> extends Cluster<Attributes, Commands> {
+  }
+  type BinaryInputClusterAttributes = {
+    activeText: { id: 0x04, type: ZCLDataType<string> },
+    description: { id: 0x1c, type: ZCLDataType<string> },
+    inactiveText: { id: 0x2e, type: ZCLDataType<string> },
+    outOfService: { id: 0x51, type: ZCLDataType<boolean> },
+    polarity: { id: 0x54, type: ZCLDataType<"normal" | "reverse"> },
+    presentValue: { id: 0x55, type: ZCLDataType<boolean> },
+    reliability: { id: 0x67, type: ZCLDataType<"noFaultDetected" | "noSensor" | "overRange" | "underRange" | "openLoop" | "shortedLoop" | "noOutput" | "unreliableOther" | "processError" | "configurationError"> },
+    statusFlags: { id: 0x6f, type: ZCLDataType<BitMap<"inAlarm" | "fault" | "overridden" | "outOfService">> },
+    applicationType: { id: 0x100, type: ZCLDataType<number> },
   };
-  ELECTRICAL_MEASUREMENT: {
-    ID: number;
-    NAME: 'electricalMeasurement';
-    ATTRIBUTES: unknown;
-    COMMANDS: unknown;
+  type BinaryInputClusterCommands = Record<never, never>;
+  class BinaryInputCluster<Attributes extends AttributeDefinitions = BinaryInputClusterAttributes, Commands extends CommandDefinitions = BinaryInputClusterCommands> extends Cluster<Attributes, Commands> {
+  }
+  type BinaryOutputClusterAttributes = {
+    activeText: { id: 0x04, type: ZCLDataType<string> },
+    description: { id: 0x1c, type: ZCLDataType<string> },
+    inactiveText: { id: 0x2e, type: ZCLDataType<string> },
+    minimumOffTime: { id: 0x42, type: ZCLDataType<number> },
+    minimumOnTime: { id: 0x43, type: ZCLDataType<number> },
+    outOfService: { id: 0x51, type: ZCLDataType<boolean> },
+    polarity: { id: 0x54, type: ZCLDataType<"normal" | "reverse"> },
+    presentValue: { id: 0x55, type: ZCLDataType<boolean> },
+    reliability: { id: 0x67, type: ZCLDataType<"noFaultDetected" | "overRange" | "underRange" | "openLoop" | "shortedLoop" | "unreliableOther" | "processError" | "configurationError"> },
+    relinquishDefault: { id: 0x68, type: ZCLDataType<boolean> },
+    statusFlags: { id: 0x6f, type: ZCLDataType<BitMap<"inAlarm" | "fault" | "overridden" | "outOfService">> },
+    applicationType: { id: 0x100, type: ZCLDataType<number> },
   };
-  FAN_CONTROL: {
-    ID: number;
-    NAME: 'fanControl';
-    ATTRIBUTES: unknown;
-    COMMANDS: unknown;
+  type BinaryOutputClusterCommands = Record<never, never>;
+  class BinaryOutputCluster<Attributes extends AttributeDefinitions = BinaryOutputClusterAttributes, Commands extends CommandDefinitions = BinaryOutputClusterCommands> extends Cluster<Attributes, Commands> {
+  }
+  type BinaryValueClusterAttributes = {
+    activeText: { id: 0x04, type: ZCLDataType<string> },
+    description: { id: 0x1c, type: ZCLDataType<string> },
+    inactiveText: { id: 0x2e, type: ZCLDataType<string> },
+    minimumOffTime: { id: 0x42, type: ZCLDataType<number> },
+    minimumOnTime: { id: 0x43, type: ZCLDataType<number> },
+    outOfService: { id: 0x51, type: ZCLDataType<boolean> },
+    polarity: { id: 0x54, type: ZCLDataType<"normal" | "reverse"> },
+    presentValue: { id: 0x55, type: ZCLDataType<boolean> },
+    reliability: { id: 0x67, type: ZCLDataType<"noFaultDetected" | "overRange" | "underRange" | "openLoop" | "shortedLoop" | "unreliableOther" | "processError" | "configurationError"> },
+    relinquishDefault: { id: 0x68, type: ZCLDataType<boolean> },
+    statusFlags: { id: 0x6f, type: ZCLDataType<BitMap<"inAlarm" | "fault" | "overridden" | "outOfService">> },
+    applicationType: { id: 0x100, type: ZCLDataType<number> },
   };
-  FLOW_MEASUREMENT: {
-    ID: number;
-    NAME: 'flowMeasurement';
-    ATTRIBUTES: unknown;
-    COMMANDS: unknown;
+  type BinaryValueClusterCommands = Record<never, never>;
+  class BinaryValueCluster<Attributes extends AttributeDefinitions = BinaryValueClusterAttributes, Commands extends CommandDefinitions = BinaryValueClusterCommands> extends Cluster<Attributes, Commands> {
+  }
+  type MultistateInputClusterAttributes = {
+    description: { id: 0x1c, type: ZCLDataType<string> },
+    numberOfStates: { id: 0x4a, type: ZCLDataType<number> },
+    outOfService: { id: 0x51, type: ZCLDataType<boolean> },
+    presentValue: { id: 0x55, type: ZCLDataType<number> },
+    reliability: { id: 0x67, type: ZCLDataType<"noFaultDetected" | "noSensor" | "overRange" | "underRange" | "openLoop" | "shortedLoop" | "noOutput" | "unreliableOther" | "processError" | "multiStateFault" | "configurationError"> },
+    statusFlags: { id: 0x6f, type: ZCLDataType<BitMap<"inAlarm" | "fault" | "overridden" | "outOfService">> },
+    applicationType: { id: 0x100, type: ZCLDataType<number> },
   };
-  GROUPS: {
-    ID: number;
-    NAME: 'groups';
-    ATTRIBUTES: unknown;
-    COMMANDS: unknown;
+  type MultistateInputClusterCommands = Record<never, never>;
+  class MultistateInputCluster<Attributes extends AttributeDefinitions = MultistateInputClusterAttributes, Commands extends CommandDefinitions = MultistateInputClusterCommands> extends Cluster<Attributes, Commands> {
+  }
+  type MultistateOutputClusterAttributes = {
+    description: { id: 0x1c, type: ZCLDataType<string> },
+    numberOfStates: { id: 0x4a, type: ZCLDataType<number> },
+    outOfService: { id: 0x51, type: ZCLDataType<boolean> },
+    presentValue: { id: 0x55, type: ZCLDataType<number> },
+    reliability: { id: 0x67, type: ZCLDataType<"noFaultDetected" | "overRange" | "underRange" | "openLoop" | "shortedLoop" | "unreliableOther" | "processError" | "multiStateFault" | "configurationError"> },
+    relinquishDefault: { id: 0x68, type: ZCLDataType<number> },
+    statusFlags: { id: 0x6f, type: ZCLDataType<BitMap<"inAlarm" | "fault" | "overridden" | "outOfService">> },
+    applicationType: { id: 0x100, type: ZCLDataType<number> },
   };
-  IAS_ACE: {
-    ID: number;
-    NAME: 'iasACE';
-    ATTRIBUTES: unknown;
-    COMMANDS: unknown;
+  type MultistateOutputClusterCommands = Record<never, never>;
+  class MultistateOutputCluster<Attributes extends AttributeDefinitions = MultistateOutputClusterAttributes, Commands extends CommandDefinitions = MultistateOutputClusterCommands> extends Cluster<Attributes, Commands> {
+  }
+  type MultistateValueClusterAttributes = {
+    description: { id: 0x1c, type: ZCLDataType<string> },
+    numberOfStates: { id: 0x4a, type: ZCLDataType<number> },
+    outOfService: { id: 0x51, type: ZCLDataType<boolean> },
+    presentValue: { id: 0x55, type: ZCLDataType<number> },
+    reliability: { id: 0x67, type: ZCLDataType<"noFaultDetected" | "noSensor" | "overRange" | "underRange" | "openLoop" | "shortedLoop" | "noOutput" | "unreliableOther" | "processError" | "multiStateFault" | "configurationError"> },
+    relinquishDefault: { id: 0x68, type: ZCLDataType<number> },
+    statusFlags: { id: 0x6f, type: ZCLDataType<BitMap<"inAlarm" | "fault" | "overridden" | "outOfService">> },
+    applicationType: { id: 0x100, type: ZCLDataType<number> },
   };
-  IAS_WD: {
-    ID: number;
-    NAME: 'iasWD';
-    ATTRIBUTES: unknown;
-    COMMANDS: unknown;
+  type MultistateValueClusterCommands = Record<never, never>;
+  class MultistateValueCluster<Attributes extends AttributeDefinitions = MultistateValueClusterAttributes, Commands extends CommandDefinitions = MultistateValueClusterCommands> extends Cluster<Attributes, Commands> {
+  }
+  type OTAClusterAttributes = {
+    upgradeServerID: { id: 0x00, type: ZCLDataType<string> },
+    fileOffset: { id: 0x01, type: ZCLDataType<number> },
+    currentFileVersion: { id: 0x02, type: ZCLDataType<number> },
+    currentZigBeeStackVersion: { id: 0x03, type: ZCLDataType<number> },
+    downloadedFileVersion: { id: 0x04, type: ZCLDataType<number> },
+    downloadedZigBeeStackVersion: { id: 0x05, type: ZCLDataType<number> },
+    imageUpgradeStatus: { id: 0x06, type: ZCLDataType<"normal" | "downloadInProgress" | "downloadComplete" | "waitingToUpgrade" | "countDown" | "waitForMore" | "waitingToUpgradeViaExternalEvent"> },
+    manufacturerID: { id: 0x07, type: ZCLDataType<number> },
+    imageTypeID: { id: 0x08, type: ZCLDataType<number> },
+    minimumBlockPeriod: { id: 0x09, type: ZCLDataType<number> },
+    imageStamp: { id: 0x0a, type: ZCLDataType<number> },
+    upgradeActivationPolicy: { id: 0x0b, type: ZCLDataType<"otaServerActivationAllowed" | "outOfBandActivationOnly"> },
+    upgradeTimeoutPolicy: { id: 0x0c, type: ZCLDataType<"applyUpgradeAfterTimeout" | "doNotApplyUpgradeAfterTimeout"> },
   };
-  IAS_ZONE: {
-    ID: number;
-    NAME: 'iasZone';
-    ATTRIBUTES: unknown;
-    COMMANDS: unknown;
+  type OTAClusterCommands = {
+    imageNotify: { id: 0x00, direction: "DIRECTION_SERVER_TO_CLIENT", frameControl: ["directionToClient","clusterSpecific","disableDefaultResponse"], encodeMissingFieldsBehavior: "skip", args: {
+        payloadType: ZCLDataType<"queryJitter" | "queryJitterAndManufacturerCode" | "queryJitterAndManufacturerCodeAndImageType" | "queryJitterAndManufacturerCodeAndImageTypeAndNewFileVersion">,
+        queryJitter: ZCLDataType<number>,
+        manufacturerCode: ZCLDataType<number>,
+        imageType: ZCLDataType<number>,
+        newFileVersion: ZCLDataType<number>,
+      },
+    },
+    queryNextImageRequest: { id: 0x01, direction: "DIRECTION_SERVER_TO_CLIENT", encodeMissingFieldsBehavior: "skip", args: {
+        fieldControl: ZCLDataType<BitMap<"hardwareVersionPresent">>,
+        manufacturerCode: ZCLDataType<number>,
+        imageType: ZCLDataType<number>,
+        fileVersion: ZCLDataType<number>,
+        hardwareVersion: ZCLDataType<number>,
+      },
+    },
+    imageBlockRequest: { id: 0x03, direction: "DIRECTION_SERVER_TO_CLIENT", encodeMissingFieldsBehavior: "skip", args: {
+        fieldControl: ZCLDataType<BitMap<"requestNodeAddressPresent" | "minimumBlockPeriodPresent">>,
+        manufacturerCode: ZCLDataType<number>,
+        imageType: ZCLDataType<number>,
+        fileVersion: ZCLDataType<number>,
+        fileOffset: ZCLDataType<number>,
+        maximumDataSize: ZCLDataType<number>,
+        requestNodeAddress: ZCLDataType<string>,
+        minimumBlockPeriod: ZCLDataType<number>,
+      },
+    },
+    imagePageRequest: { id: 0x04, direction: "DIRECTION_SERVER_TO_CLIENT", encodeMissingFieldsBehavior: "skip", args: {
+        fieldControl: ZCLDataType<BitMap<"requestNodeAddressPresent">>,
+        manufacturerCode: ZCLDataType<number>,
+        imageType: ZCLDataType<number>,
+        fileVersion: ZCLDataType<number>,
+        fileOffset: ZCLDataType<number>,
+        maximumDataSize: ZCLDataType<number>,
+        pageSize: ZCLDataType<number>,
+        responseSpacing: ZCLDataType<number>,
+        requestNodeAddress: ZCLDataType<string>,
+      },
+    },
+    imageBlockResponse: { id: 0x05, direction: "DIRECTION_SERVER_TO_CLIENT", frameControl: ["directionToClient","clusterSpecific","disableDefaultResponse"], encodeMissingFieldsBehavior: "skip", args: {
+        status: ZCLDataType<"SUCCESS" | "FAILURE" | "NOT_AUTHORIZED" | "RESERVED_FIELD_NOT_ZERO" | "MALFORMED_COMMAND" | "UNSUP_CLUSTER_COMMAND" | "UNSUP_GENERAL_COMMAND" | "UNSUP_MANUF_CLUSTER_COMMAND" | "UNSUP_MANUF_GENERAL_COMMAND" | "INVALID_FIELD" | "UNSUPPORTED_ATTRIBUTE" | "INVALID_VALUE" | "READ_ONLY" | "INSUFFICIENT_SPACE" | "DUPLICATE_EXISTS" | "NOT_FOUND" | "UNREPORTABLE_ATTRIBUTE" | "INVALID_DATA_TYPE" | "INVALID_SELECTOR" | "WRITE_ONLY" | "INCONSISTENT_STARTUP_STATE" | "DEFINED_OUT_OF_BAND" | "INCONSISTENT" | "ACTION_DENIED" | "TIMEOUT" | "ABORT" | "INVALID_IMAGE" | "WAIT_FOR_DATA" | "NO_IMAGE_AVAILABLE" | "REQUIRE_MORE_IMAGE" | "NOTIFICATION_PENDING" | "HARDWARE_FAILURE" | "SOFTWARE_FAILURE" | "CALIBRATION_ERROR" | "UNSUPPORTED_CLUSTER">,
+        manufacturerCode: ZCLDataType<number>,
+        imageType: ZCLDataType<number>,
+        fileVersion: ZCLDataType<number>,
+        fileOffset: ZCLDataType<number>,
+        dataSize: ZCLDataType<number>,
+        imageData: ZCLDataType<Buffer>,
+        currentTime: ZCLDataType<number>,
+        requestTime: ZCLDataType<number>,
+        minimumBlockPeriod: ZCLDataType<number>,
+      },
+    },
+    upgradeEndRequest: { id: 0x06, direction: "DIRECTION_SERVER_TO_CLIENT", args: {
+        status: ZCLDataType<"SUCCESS" | "FAILURE" | "NOT_AUTHORIZED" | "RESERVED_FIELD_NOT_ZERO" | "MALFORMED_COMMAND" | "UNSUP_CLUSTER_COMMAND" | "UNSUP_GENERAL_COMMAND" | "UNSUP_MANUF_CLUSTER_COMMAND" | "UNSUP_MANUF_GENERAL_COMMAND" | "INVALID_FIELD" | "UNSUPPORTED_ATTRIBUTE" | "INVALID_VALUE" | "READ_ONLY" | "INSUFFICIENT_SPACE" | "DUPLICATE_EXISTS" | "NOT_FOUND" | "UNREPORTABLE_ATTRIBUTE" | "INVALID_DATA_TYPE" | "INVALID_SELECTOR" | "WRITE_ONLY" | "INCONSISTENT_STARTUP_STATE" | "DEFINED_OUT_OF_BAND" | "INCONSISTENT" | "ACTION_DENIED" | "TIMEOUT" | "ABORT" | "INVALID_IMAGE" | "WAIT_FOR_DATA" | "NO_IMAGE_AVAILABLE" | "REQUIRE_MORE_IMAGE" | "NOTIFICATION_PENDING" | "HARDWARE_FAILURE" | "SOFTWARE_FAILURE" | "CALIBRATION_ERROR" | "UNSUPPORTED_CLUSTER">,
+        manufacturerCode: ZCLDataType<number>,
+        imageType: ZCLDataType<number>,
+        fileVersion: ZCLDataType<number>,
+      },
+    },
+    upgradeEndResponse: { id: 0x07, direction: "DIRECTION_SERVER_TO_CLIENT", frameControl: ["directionToClient","clusterSpecific","disableDefaultResponse"], args: {
+        manufacturerCode: ZCLDataType<number>,
+        imageType: ZCLDataType<number>,
+        fileVersion: ZCLDataType<number>,
+        currentTime: ZCLDataType<number>,
+        upgradeTime: ZCLDataType<number>,
+      },
+    },
+    queryDeviceSpecificFileRequest: { id: 0x08, direction: "DIRECTION_SERVER_TO_CLIENT", args: {
+        requestNodeAddress: ZCLDataType<string>,
+        manufacturerCode: ZCLDataType<number>,
+        imageType: ZCLDataType<number>,
+        fileVersion: ZCLDataType<number>,
+        zigBeeStackVersion: ZCLDataType<number>,
+      },
+    },
   };
-  IDENTIFY: {
-    ID: number;
-    NAME: 'identify';
-    ATTRIBUTES: unknown;
-    COMMANDS: unknown;
+  class OTACluster<Attributes extends AttributeDefinitions = OTAClusterAttributes, Commands extends CommandDefinitions = OTAClusterCommands> extends Cluster<Attributes, Commands> {
+    onImageNotify(
+      args: {
+        manufacturerId?: number,
+        payloadType: "queryJitter" | "queryJitterAndManufacturerCode" | "queryJitterAndManufacturerCodeAndImageType" | "queryJitterAndManufacturerCodeAndImageTypeAndNewFileVersion",
+        queryJitter: number,
+        manufacturerCode: number,
+        imageType: number,
+        newFileVersion: number,
+      },
+      opts?: {
+        waitForResponse?: boolean,
+        timeout?: number,
+        disableDefaultResponse?: boolean,
+      },
+    ): Promise<void>;
+    queryNextImageRequest(
+      args: {
+        manufacturerId?: number,
+        fieldControl: BitMap<"hardwareVersionPresent">,
+        manufacturerCode: number,
+        imageType: number,
+        fileVersion: number,
+        hardwareVersion: number,
+      },
+      opts?: {
+        waitForResponse?: boolean,
+        timeout?: number,
+        disableDefaultResponse?: boolean,
+      },
+    ): Promise<void>;
+    imageBlockRequest(
+      args: {
+        manufacturerId?: number,
+        fieldControl: BitMap<"requestNodeAddressPresent" | "minimumBlockPeriodPresent">,
+        manufacturerCode: number,
+        imageType: number,
+        fileVersion: number,
+        fileOffset: number,
+        maximumDataSize: number,
+        requestNodeAddress: string,
+        minimumBlockPeriod: number,
+      },
+      opts?: {
+        waitForResponse?: boolean,
+        timeout?: number,
+        disableDefaultResponse?: boolean,
+      },
+    ): Promise<void>;
+    imagePageRequest(
+      args: {
+        manufacturerId?: number,
+        fieldControl: BitMap<"requestNodeAddressPresent">,
+        manufacturerCode: number,
+        imageType: number,
+        fileVersion: number,
+        fileOffset: number,
+        maximumDataSize: number,
+        pageSize: number,
+        responseSpacing: number,
+        requestNodeAddress: string,
+      },
+      opts?: {
+        waitForResponse?: boolean,
+        timeout?: number,
+        disableDefaultResponse?: boolean,
+      },
+    ): Promise<void>;
+    onImageBlockResponse(
+      args: {
+        manufacturerId?: number,
+        status: "SUCCESS" | "FAILURE" | "NOT_AUTHORIZED" | "RESERVED_FIELD_NOT_ZERO" | "MALFORMED_COMMAND" | "UNSUP_CLUSTER_COMMAND" | "UNSUP_GENERAL_COMMAND" | "UNSUP_MANUF_CLUSTER_COMMAND" | "UNSUP_MANUF_GENERAL_COMMAND" | "INVALID_FIELD" | "UNSUPPORTED_ATTRIBUTE" | "INVALID_VALUE" | "READ_ONLY" | "INSUFFICIENT_SPACE" | "DUPLICATE_EXISTS" | "NOT_FOUND" | "UNREPORTABLE_ATTRIBUTE" | "INVALID_DATA_TYPE" | "INVALID_SELECTOR" | "WRITE_ONLY" | "INCONSISTENT_STARTUP_STATE" | "DEFINED_OUT_OF_BAND" | "INCONSISTENT" | "ACTION_DENIED" | "TIMEOUT" | "ABORT" | "INVALID_IMAGE" | "WAIT_FOR_DATA" | "NO_IMAGE_AVAILABLE" | "REQUIRE_MORE_IMAGE" | "NOTIFICATION_PENDING" | "HARDWARE_FAILURE" | "SOFTWARE_FAILURE" | "CALIBRATION_ERROR" | "UNSUPPORTED_CLUSTER",
+        manufacturerCode: number,
+        imageType: number,
+        fileVersion: number,
+        fileOffset: number,
+        dataSize: number,
+        imageData: Buffer,
+        currentTime: number,
+        requestTime: number,
+        minimumBlockPeriod: number,
+      },
+      opts?: {
+        waitForResponse?: boolean,
+        timeout?: number,
+        disableDefaultResponse?: boolean,
+      },
+    ): Promise<void>;
+    upgradeEndRequest(
+      args: {
+        manufacturerId?: number,
+        status: "SUCCESS" | "FAILURE" | "NOT_AUTHORIZED" | "RESERVED_FIELD_NOT_ZERO" | "MALFORMED_COMMAND" | "UNSUP_CLUSTER_COMMAND" | "UNSUP_GENERAL_COMMAND" | "UNSUP_MANUF_CLUSTER_COMMAND" | "UNSUP_MANUF_GENERAL_COMMAND" | "INVALID_FIELD" | "UNSUPPORTED_ATTRIBUTE" | "INVALID_VALUE" | "READ_ONLY" | "INSUFFICIENT_SPACE" | "DUPLICATE_EXISTS" | "NOT_FOUND" | "UNREPORTABLE_ATTRIBUTE" | "INVALID_DATA_TYPE" | "INVALID_SELECTOR" | "WRITE_ONLY" | "INCONSISTENT_STARTUP_STATE" | "DEFINED_OUT_OF_BAND" | "INCONSISTENT" | "ACTION_DENIED" | "TIMEOUT" | "ABORT" | "INVALID_IMAGE" | "WAIT_FOR_DATA" | "NO_IMAGE_AVAILABLE" | "REQUIRE_MORE_IMAGE" | "NOTIFICATION_PENDING" | "HARDWARE_FAILURE" | "SOFTWARE_FAILURE" | "CALIBRATION_ERROR" | "UNSUPPORTED_CLUSTER",
+        manufacturerCode: number,
+        imageType: number,
+        fileVersion: number,
+      },
+      opts?: {
+        waitForResponse?: boolean,
+        timeout?: number,
+        disableDefaultResponse?: boolean,
+      },
+    ): Promise<void>;
+    onUpgradeEndResponse(
+      args: {
+        manufacturerId?: number,
+        manufacturerCode: number,
+        imageType: number,
+        fileVersion: number,
+        currentTime: number,
+        upgradeTime: number,
+      },
+      opts?: {
+        waitForResponse?: boolean,
+        timeout?: number,
+        disableDefaultResponse?: boolean,
+      },
+    ): Promise<void>;
+    queryDeviceSpecificFileRequest(
+      args: {
+        manufacturerId?: number,
+        requestNodeAddress: string,
+        manufacturerCode: number,
+        imageType: number,
+        fileVersion: number,
+        zigBeeStackVersion: number,
+      },
+      opts?: {
+        waitForResponse?: boolean,
+        timeout?: number,
+        disableDefaultResponse?: boolean,
+      },
+    ): Promise<void>;
+  }
+  type PowerProfileClusterAttributes = Record<never, never>;
+  type PowerProfileClusterCommands = Record<never, never>;
+  class PowerProfileCluster<Attributes extends AttributeDefinitions = PowerProfileClusterAttributes, Commands extends CommandDefinitions = PowerProfileClusterCommands> extends Cluster<Attributes, Commands> {
+  }
+  type PollControlClusterAttributes = {
+    checkInInterval: { id: 0x00, type: ZCLDataType<number> },
+    longPollInterval: { id: 0x01, type: ZCLDataType<number> },
+    shortPollInterval: { id: 0x02, type: ZCLDataType<number> },
+    fastPollTimeout: { id: 0x03, type: ZCLDataType<number> },
+    checkInIntervalMin: { id: 0x04, type: ZCLDataType<number> },
+    longPollIntervalMin: { id: 0x05, type: ZCLDataType<number> },
+    fastPollTimeoutMax: { id: 0x06, type: ZCLDataType<number> },
   };
-  ILLUMINANCE_LEVEL_SENSING: {
-    ID: number;
-    NAME: 'illuminanceLevelSensing';
-    ATTRIBUTES: unknown;
-    COMMANDS: unknown;
+  type PollControlClusterCommands = {
+    fastPollStop: { id: 0x01, direction: "DIRECTION_SERVER_TO_CLIENT" },
+    setLongPollInterval: { id: 0x02, direction: "DIRECTION_SERVER_TO_CLIENT", args: {
+        newLongPollInterval: ZCLDataType<number>,
+      },
+    },
+    setShortPollInterval: { id: 0x03, direction: "DIRECTION_SERVER_TO_CLIENT", args: {
+        newShortPollInterval: ZCLDataType<number>,
+      },
+    },
   };
-  ILLUMINANCE_MEASUREMENT: {
-    ID: number;
-    NAME: 'illuminanceMeasurement';
-    ATTRIBUTES: unknown;
-    COMMANDS: unknown;
+  class PollControlCluster<Attributes extends AttributeDefinitions = PollControlClusterAttributes, Commands extends CommandDefinitions = PollControlClusterCommands> extends Cluster<Attributes, Commands> {
+    fastPollStop(
+      args: {
+        manufacturerId?: number,
+      },
+      opts?: {
+        waitForResponse?: boolean,
+        timeout?: number,
+        disableDefaultResponse?: boolean,
+      },
+    ): Promise<void>;
+    setLongPollInterval(
+      args: {
+        manufacturerId?: number,
+        newLongPollInterval: number,
+      },
+      opts?: {
+        waitForResponse?: boolean,
+        timeout?: number,
+        disableDefaultResponse?: boolean,
+      },
+    ): Promise<void>;
+    setShortPollInterval(
+      args: {
+        manufacturerId?: number,
+        newShortPollInterval: number,
+      },
+      opts?: {
+        waitForResponse?: boolean,
+        timeout?: number,
+        disableDefaultResponse?: boolean,
+      },
+    ): Promise<void>;
+  }
+  type ShadeConfigurationClusterAttributes = Record<never, never>;
+  type ShadeConfigurationClusterCommands = Record<never, never>;
+  class ShadeConfigurationCluster<Attributes extends AttributeDefinitions = ShadeConfigurationClusterAttributes, Commands extends CommandDefinitions = ShadeConfigurationClusterCommands> extends Cluster<Attributes, Commands> {
+  }
+  type DoorLockClusterAttributes = {
+    lockState: { id: 0x00, type: ZCLDataType<"notFullyLocked" | "locked" | "unlocked" | "undefined"> },
+    lockType: { id: 0x01, type: ZCLDataType<"deadBolt" | "magnetic" | "other" | "mortise" | "rim" | "latchBolt" | "cylindricalLock" | "tubularLock" | "interconnectedLock" | "deadLatch" | "doorFurniture"> },
+    actuatorEnabled: { id: 0x02, type: ZCLDataType<boolean> },
+    doorState: { id: 0x03, type: ZCLDataType<"open" | "closed" | "errorJammed" | "errorForcedOpen" | "errorUnspecified" | "undefined"> },
+    doorOpenEvents: { id: 0x04, type: ZCLDataType<number> },
+    doorClosedEvents: { id: 0x05, type: ZCLDataType<number> },
+    openPeriod: { id: 0x06, type: ZCLDataType<number> },
+    numberOfLogRecordsSupported: { id: 0x10, type: ZCLDataType<number> },
+    numberOfTotalUsersSupported: { id: 0x11, type: ZCLDataType<number> },
+    numberOfPINUsersSupported: { id: 0x12, type: ZCLDataType<number> },
+    numberOfRFIDUsersSupported: { id: 0x13, type: ZCLDataType<number> },
+    numberOfWeekDaySchedulesSupportedPerUser: { id: 0x14, type: ZCLDataType<number> },
+    numberOfYearDaySchedulesSupportedPerUser: { id: 0x15, type: ZCLDataType<number> },
+    numberOfHolidaySchedulesSupported: { id: 0x16, type: ZCLDataType<number> },
+    maxPINCodeLength: { id: 0x17, type: ZCLDataType<number> },
+    minPINCodeLength: { id: 0x18, type: ZCLDataType<number> },
+    maxRFIDCodeLength: { id: 0x19, type: ZCLDataType<number> },
+    minRFIDCodeLength: { id: 0x1a, type: ZCLDataType<number> },
+    enableLogging: { id: 0x20, type: ZCLDataType<boolean> },
+    language: { id: 0x21, type: ZCLDataType<string> },
+    ledSettings: { id: 0x22, type: ZCLDataType<number> },
+    autoRelockTime: { id: 0x23, type: ZCLDataType<number> },
+    soundVolume: { id: 0x24, type: ZCLDataType<number> },
+    operatingMode: { id: 0x25, type: ZCLDataType<"normal" | "vacation" | "privacy" | "noRFLockOrUnlock" | "passage"> },
+    supportedOperatingModes: { id: 0x26, type: ZCLDataType<BitMap<"normal" | "vacation" | "privacy" | "noRFLockOrUnlock" | "passage">> },
+    defaultConfigurationRegister: { id: 0x27, type: ZCLDataType<BitMap<"enableLocalProgramming" | "keypadInterfaceDefaultAccess" | "rfInterfaceDefaultAccess" | "reserved3" | "reserved4" | "soundEnabled" | "autoRelockTimeSet" | "ledSettingsSet">> },
+    enableLocalProgramming: { id: 0x28, type: ZCLDataType<boolean> },
+    enableOneTouchLocking: { id: 0x29, type: ZCLDataType<boolean> },
+    enableInsideStatusLED: { id: 0x2a, type: ZCLDataType<boolean> },
+    enablePrivacyModeButton: { id: 0x2b, type: ZCLDataType<boolean> },
+    wrongCodeEntryLimit: { id: 0x30, type: ZCLDataType<number> },
+    userCodeTemporaryDisableTime: { id: 0x31, type: ZCLDataType<number> },
+    sendPINOverTheAir: { id: 0x32, type: ZCLDataType<boolean> },
+    requirePINforRFOperation: { id: 0x33, type: ZCLDataType<boolean> },
+    securityLevel: { id: 0x34, type: ZCLDataType<"network" | "apsSecurity"> },
+    alarmMask: { id: 0x40, type: ZCLDataType<BitMap<"deadboltJammed" | "lockResetToFactoryDefaults" | "reserved2" | "rfModulePowerCycled" | "tamperAlarmWrongCodeEntryLimit" | "tamperAlarmFrontEscutcheonRemoved" | "forcedDoorOpenUnderDoorLockedCondition">> },
+    keypadOperationEventMask: { id: 0x41, type: ZCLDataType<BitMap<"unknownOrManufacturerSpecificKeypadOperationEvent" | "lockSourceKeypad" | "unlockSourceKeypad" | "lockSourceKeypadErrorInvalidPIN" | "lockSourceKeypadErrorInvalidSchedule" | "unlockSourceKeypadErrorInvalidCode" | "unlockSourceKeypadErrorInvalidSchedule" | "nonAccessUserOperationEventSourceKeypad">> },
+    rfOperationEventMask: { id: 0x42, type: ZCLDataType<BitMap<"unknownOrManufacturerSpecificKeypadOperationEvent" | "lockSourceRF" | "unlockSourceRF" | "lockSourceRFErrorInvalidCode" | "lockSourceRFErrorInvalidSchedule" | "unlockSourceRFErrorInvalidCode" | "unlockSourceRFErrorInvalidSchedule">> },
+    manualOperationEventMask: { id: 0x43, type: ZCLDataType<BitMap<"unknownOrManufacturerSpecificManualOperationEvent" | "thumbturnLock" | "thumbturnUnlock" | "oneTouchLock" | "keyLock" | "keyUnlock" | "autoLock" | "scheduleLock" | "scheduleUnlock" | "manualLock" | "manualUnlock">> },
+    rfidOperationEventMask: { id: 0x44, type: ZCLDataType<BitMap<"unknownOrManufacturerSpecificKeypadOperationEvent" | "lockSourceRFID" | "unlockSourceRFID" | "lockSourceRFIDErrorInvalidRFIDID" | "lockSourceRFIDErrorInvalidSchedule" | "unlockSourceRFIDErrorInvalidRFIDID" | "unlockSourceRFIDErrorInvalidSchedule">> },
+    keypadProgrammingEventMask: { id: 0x45, type: ZCLDataType<BitMap<"unknownOrManufacturerSpecificKeypadProgrammingEvent" | "masterCodeChanged" | "pinCodeAdded" | "pinCodeDeleted" | "pinCodeChanged">> },
+    rfProgrammingEventMask: { id: 0x46, type: ZCLDataType<BitMap<"unknownOrManufacturerSpecificRFProgrammingEvent" | "reserved1" | "pinCodeAdded" | "pinCodeDeleted" | "pinCodeChanged" | "rfidCodeAdded" | "rfidCodeDeleted">> },
+    rfidProgrammingEventMask: { id: 0x47, type: ZCLDataType<BitMap<"unknownOrManufacturerSpecificRFIDProgrammingEvent" | "rfidCodeAdded" | "rfidCodeDeleted">> },
   };
-  LEVEL_CONTROL: {
-    ID: number;
-    NAME: 'levelControl';
-    ATTRIBUTES: unknown;
-    COMMANDS: unknown;
+  type DoorLockClusterCommands = {
+    lockDoor: { id: 0x00, direction: "DIRECTION_SERVER_TO_CLIENT", args: {
+        pinCode: ZCLDataType<string>,
+      },
+    },
+    unlockDoor: { id: 0x01, direction: "DIRECTION_SERVER_TO_CLIENT", args: {
+        pinCode: ZCLDataType<string>,
+      },
+    },
+    toggle: { id: 0x02, direction: "DIRECTION_SERVER_TO_CLIENT", args: {
+        pinCode: ZCLDataType<string>,
+      },
+    },
+    unlockWithTimeout: { id: 0x03, direction: "DIRECTION_SERVER_TO_CLIENT", args: {
+        timeout: ZCLDataType<number>,
+        pinCode: ZCLDataType<string>,
+      },
+    },
+    getLogRecord: { id: 0x04, direction: "DIRECTION_SERVER_TO_CLIENT", args: {
+        logIndex: ZCLDataType<number>,
+      },
+    },
+    setPINCode: { id: 0x05, direction: "DIRECTION_SERVER_TO_CLIENT", args: {
+        userId: ZCLDataType<number>,
+        userStatus: ZCLDataType<"available" | "occupiedEnabled" | "occupiedDisabled" | "notSupported">,
+        userType: ZCLDataType<"unrestricted" | "yearDayScheduleUser" | "weekDayScheduleUser" | "masterUser" | "nonAccessUser" | "notSupported">,
+        pinCode: ZCLDataType<string>,
+      },
+    },
+    getPINCode: { id: 0x06, direction: "DIRECTION_SERVER_TO_CLIENT", args: {
+        userId: ZCLDataType<number>,
+      },
+    },
+    clearPINCode: { id: 0x07, direction: "DIRECTION_SERVER_TO_CLIENT", args: {
+        userId: ZCLDataType<number>,
+      },
+    },
+    clearAllPINCodes: { id: 0x08, direction: "DIRECTION_SERVER_TO_CLIENT" },
+    setUserStatus: { id: 0x09, direction: "DIRECTION_SERVER_TO_CLIENT", args: {
+        userId: ZCLDataType<number>,
+        userStatus: ZCLDataType<"available" | "occupiedEnabled" | "occupiedDisabled" | "notSupported">,
+      },
+    },
+    getUserStatus: { id: 0x0a, direction: "DIRECTION_SERVER_TO_CLIENT", args: {
+        userId: ZCLDataType<number>,
+      },
+    },
+    setWeekDaySchedule: { id: 0x0b, direction: "DIRECTION_SERVER_TO_CLIENT", args: {
+        scheduleId: ZCLDataType<number>,
+        userId: ZCLDataType<number>,
+        daysMask: ZCLDataType<BitMap<"sunday" | "monday" | "tuesday" | "wednesday" | "thursday" | "friday" | "saturday">>,
+        startHour: ZCLDataType<number>,
+        startMinute: ZCLDataType<number>,
+        endHour: ZCLDataType<number>,
+        endMinute: ZCLDataType<number>,
+      },
+    },
+    getWeekDaySchedule: { id: 0x0c, direction: "DIRECTION_SERVER_TO_CLIENT", args: {
+        scheduleId: ZCLDataType<number>,
+        userId: ZCLDataType<number>,
+      },
+    },
+    clearWeekDaySchedule: { id: 0x0d, direction: "DIRECTION_SERVER_TO_CLIENT", args: {
+        scheduleId: ZCLDataType<number>,
+        userId: ZCLDataType<number>,
+      },
+    },
+    setYearDaySchedule: { id: 0x0e, direction: "DIRECTION_SERVER_TO_CLIENT", args: {
+        scheduleId: ZCLDataType<number>,
+        userId: ZCLDataType<number>,
+        localStartTime: ZCLDataType<number>,
+        localEndTime: ZCLDataType<number>,
+      },
+    },
+    getYearDaySchedule: { id: 0x0f, direction: "DIRECTION_SERVER_TO_CLIENT", args: {
+        scheduleId: ZCLDataType<number>,
+        userId: ZCLDataType<number>,
+      },
+    },
+    clearYearDaySchedule: { id: 0x10, direction: "DIRECTION_SERVER_TO_CLIENT", args: {
+        scheduleId: ZCLDataType<number>,
+        userId: ZCLDataType<number>,
+      },
+    },
+    setHolidaySchedule: { id: 0x11, direction: "DIRECTION_SERVER_TO_CLIENT", args: {
+        holidayScheduleId: ZCLDataType<number>,
+        localStartTime: ZCLDataType<number>,
+        localEndTime: ZCLDataType<number>,
+        operatingModeDuringHoliday: ZCLDataType<"normal" | "vacation" | "privacy" | "noRFLockOrUnlock" | "passage">,
+      },
+    },
+    getHolidaySchedule: { id: 0x12, direction: "DIRECTION_SERVER_TO_CLIENT", args: {
+        holidayScheduleId: ZCLDataType<number>,
+      },
+    },
+    clearHolidaySchedule: { id: 0x13, direction: "DIRECTION_SERVER_TO_CLIENT", args: {
+        holidayScheduleId: ZCLDataType<number>,
+      },
+    },
+    setUserType: { id: 0x14, direction: "DIRECTION_SERVER_TO_CLIENT", args: {
+        userId: ZCLDataType<number>,
+        userType: ZCLDataType<"unrestricted" | "yearDayScheduleUser" | "weekDayScheduleUser" | "masterUser" | "nonAccessUser" | "notSupported">,
+      },
+    },
+    getUserType: { id: 0x15, direction: "DIRECTION_SERVER_TO_CLIENT", args: {
+        userId: ZCLDataType<number>,
+      },
+    },
+    setRFIDCode: { id: 0x16, direction: "DIRECTION_SERVER_TO_CLIENT", args: {
+        userId: ZCLDataType<number>,
+        userStatus: ZCLDataType<"available" | "occupiedEnabled" | "occupiedDisabled" | "notSupported">,
+        userType: ZCLDataType<"unrestricted" | "yearDayScheduleUser" | "weekDayScheduleUser" | "masterUser" | "nonAccessUser" | "notSupported">,
+        rfidCode: ZCLDataType<string>,
+      },
+    },
+    getRFIDCode: { id: 0x17, direction: "DIRECTION_SERVER_TO_CLIENT", args: {
+        userId: ZCLDataType<number>,
+      },
+    },
+    clearRFIDCode: { id: 0x18, direction: "DIRECTION_SERVER_TO_CLIENT", args: {
+        userId: ZCLDataType<number>,
+      },
+    },
+    clearAllRFIDCodes: { id: 0x19, direction: "DIRECTION_SERVER_TO_CLIENT" },
+    operationEventNotification: { id: 0x20, direction: "DIRECTION_SERVER_TO_CLIENT", args: {
+        operationEventSource: ZCLDataType<number>,
+        operationEventCode: ZCLDataType<number>,
+        userId: ZCLDataType<number>,
+        pin: ZCLDataType<string>,
+        zigBeeLocalTime: ZCLDataType<number>,
+        data: ZCLDataType<string>,
+      },
+    },
+    programmingEventNotification: { id: 0x21, direction: "DIRECTION_SERVER_TO_CLIENT", args: {
+        programEventSource: ZCLDataType<number>,
+        programEventCode: ZCLDataType<number>,
+        userId: ZCLDataType<number>,
+        pin: ZCLDataType<string>,
+        userType: ZCLDataType<"unrestricted" | "yearDayScheduleUser" | "weekDayScheduleUser" | "masterUser" | "nonAccessUser" | "notSupported">,
+        userStatus: ZCLDataType<"available" | "occupiedEnabled" | "occupiedDisabled" | "notSupported">,
+        zigBeeLocalTime: ZCLDataType<number>,
+        data: ZCLDataType<string>,
+      },
+    },
   };
-  METERING: {
-    ID: number;
-    NAME: 'metering';
-    ATTRIBUTES: unknown;
-    COMMANDS: unknown;
+  class DoorLockCluster<Attributes extends AttributeDefinitions = DoorLockClusterAttributes, Commands extends CommandDefinitions = DoorLockClusterCommands> extends Cluster<Attributes, Commands> {
+    lockDoor(
+      args: {
+        manufacturerId?: number,
+        pinCode: string,
+      },
+      opts?: {
+        waitForResponse?: boolean,
+        timeout?: number,
+        disableDefaultResponse?: boolean,
+      },
+    ): Promise<void>;
+    unlockDoor(
+      args: {
+        manufacturerId?: number,
+        pinCode: string,
+      },
+      opts?: {
+        waitForResponse?: boolean,
+        timeout?: number,
+        disableDefaultResponse?: boolean,
+      },
+    ): Promise<void>;
+    toggle(
+      args: {
+        manufacturerId?: number,
+        pinCode: string,
+      },
+      opts?: {
+        waitForResponse?: boolean,
+        timeout?: number,
+        disableDefaultResponse?: boolean,
+      },
+    ): Promise<void>;
+    unlockWithTimeout(
+      args: {
+        manufacturerId?: number,
+        timeout: number,
+        pinCode: string,
+      },
+      opts?: {
+        waitForResponse?: boolean,
+        timeout?: number,
+        disableDefaultResponse?: boolean,
+      },
+    ): Promise<void>;
+    getLogRecord(
+      args: {
+        manufacturerId?: number,
+        logIndex: number,
+      },
+      opts?: {
+        waitForResponse?: boolean,
+        timeout?: number,
+        disableDefaultResponse?: boolean,
+      },
+    ): Promise<void>;
+    setPINCode(
+      args: {
+        manufacturerId?: number,
+        userId: number,
+        userStatus: "available" | "occupiedEnabled" | "occupiedDisabled" | "notSupported",
+        userType: "unrestricted" | "yearDayScheduleUser" | "weekDayScheduleUser" | "masterUser" | "nonAccessUser" | "notSupported",
+        pinCode: string,
+      },
+      opts?: {
+        waitForResponse?: boolean,
+        timeout?: number,
+        disableDefaultResponse?: boolean,
+      },
+    ): Promise<void>;
+    getPINCode(
+      args: {
+        manufacturerId?: number,
+        userId: number,
+      },
+      opts?: {
+        waitForResponse?: boolean,
+        timeout?: number,
+        disableDefaultResponse?: boolean,
+      },
+    ): Promise<void>;
+    clearPINCode(
+      args: {
+        manufacturerId?: number,
+        userId: number,
+      },
+      opts?: {
+        waitForResponse?: boolean,
+        timeout?: number,
+        disableDefaultResponse?: boolean,
+      },
+    ): Promise<void>;
+    clearAllPINCodes(
+      args: {
+        manufacturerId?: number,
+      },
+      opts?: {
+        waitForResponse?: boolean,
+        timeout?: number,
+        disableDefaultResponse?: boolean,
+      },
+    ): Promise<void>;
+    setUserStatus(
+      args: {
+        manufacturerId?: number,
+        userId: number,
+        userStatus: "available" | "occupiedEnabled" | "occupiedDisabled" | "notSupported",
+      },
+      opts?: {
+        waitForResponse?: boolean,
+        timeout?: number,
+        disableDefaultResponse?: boolean,
+      },
+    ): Promise<void>;
+    getUserStatus(
+      args: {
+        manufacturerId?: number,
+        userId: number,
+      },
+      opts?: {
+        waitForResponse?: boolean,
+        timeout?: number,
+        disableDefaultResponse?: boolean,
+      },
+    ): Promise<void>;
+    setWeekDaySchedule(
+      args: {
+        manufacturerId?: number,
+        scheduleId: number,
+        userId: number,
+        daysMask: BitMap<"sunday" | "monday" | "tuesday" | "wednesday" | "thursday" | "friday" | "saturday">,
+        startHour: number,
+        startMinute: number,
+        endHour: number,
+        endMinute: number,
+      },
+      opts?: {
+        waitForResponse?: boolean,
+        timeout?: number,
+        disableDefaultResponse?: boolean,
+      },
+    ): Promise<void>;
+    getWeekDaySchedule(
+      args: {
+        manufacturerId?: number,
+        scheduleId: number,
+        userId: number,
+      },
+      opts?: {
+        waitForResponse?: boolean,
+        timeout?: number,
+        disableDefaultResponse?: boolean,
+      },
+    ): Promise<void>;
+    clearWeekDaySchedule(
+      args: {
+        manufacturerId?: number,
+        scheduleId: number,
+        userId: number,
+      },
+      opts?: {
+        waitForResponse?: boolean,
+        timeout?: number,
+        disableDefaultResponse?: boolean,
+      },
+    ): Promise<void>;
+    setYearDaySchedule(
+      args: {
+        manufacturerId?: number,
+        scheduleId: number,
+        userId: number,
+        localStartTime: number,
+        localEndTime: number,
+      },
+      opts?: {
+        waitForResponse?: boolean,
+        timeout?: number,
+        disableDefaultResponse?: boolean,
+      },
+    ): Promise<void>;
+    getYearDaySchedule(
+      args: {
+        manufacturerId?: number,
+        scheduleId: number,
+        userId: number,
+      },
+      opts?: {
+        waitForResponse?: boolean,
+        timeout?: number,
+        disableDefaultResponse?: boolean,
+      },
+    ): Promise<void>;
+    clearYearDaySchedule(
+      args: {
+        manufacturerId?: number,
+        scheduleId: number,
+        userId: number,
+      },
+      opts?: {
+        waitForResponse?: boolean,
+        timeout?: number,
+        disableDefaultResponse?: boolean,
+      },
+    ): Promise<void>;
+    setHolidaySchedule(
+      args: {
+        manufacturerId?: number,
+        holidayScheduleId: number,
+        localStartTime: number,
+        localEndTime: number,
+        operatingModeDuringHoliday: "normal" | "vacation" | "privacy" | "noRFLockOrUnlock" | "passage",
+      },
+      opts?: {
+        waitForResponse?: boolean,
+        timeout?: number,
+        disableDefaultResponse?: boolean,
+      },
+    ): Promise<void>;
+    getHolidaySchedule(
+      args: {
+        manufacturerId?: number,
+        holidayScheduleId: number,
+      },
+      opts?: {
+        waitForResponse?: boolean,
+        timeout?: number,
+        disableDefaultResponse?: boolean,
+      },
+    ): Promise<void>;
+    clearHolidaySchedule(
+      args: {
+        manufacturerId?: number,
+        holidayScheduleId: number,
+      },
+      opts?: {
+        waitForResponse?: boolean,
+        timeout?: number,
+        disableDefaultResponse?: boolean,
+      },
+    ): Promise<void>;
+    setUserType(
+      args: {
+        manufacturerId?: number,
+        userId: number,
+        userType: "unrestricted" | "yearDayScheduleUser" | "weekDayScheduleUser" | "masterUser" | "nonAccessUser" | "notSupported",
+      },
+      opts?: {
+        waitForResponse?: boolean,
+        timeout?: number,
+        disableDefaultResponse?: boolean,
+      },
+    ): Promise<void>;
+    getUserType(
+      args: {
+        manufacturerId?: number,
+        userId: number,
+      },
+      opts?: {
+        waitForResponse?: boolean,
+        timeout?: number,
+        disableDefaultResponse?: boolean,
+      },
+    ): Promise<void>;
+    setRFIDCode(
+      args: {
+        manufacturerId?: number,
+        userId: number,
+        userStatus: "available" | "occupiedEnabled" | "occupiedDisabled" | "notSupported",
+        userType: "unrestricted" | "yearDayScheduleUser" | "weekDayScheduleUser" | "masterUser" | "nonAccessUser" | "notSupported",
+        rfidCode: string,
+      },
+      opts?: {
+        waitForResponse?: boolean,
+        timeout?: number,
+        disableDefaultResponse?: boolean,
+      },
+    ): Promise<void>;
+    getRFIDCode(
+      args: {
+        manufacturerId?: number,
+        userId: number,
+      },
+      opts?: {
+        waitForResponse?: boolean,
+        timeout?: number,
+        disableDefaultResponse?: boolean,
+      },
+    ): Promise<void>;
+    clearRFIDCode(
+      args: {
+        manufacturerId?: number,
+        userId: number,
+      },
+      opts?: {
+        waitForResponse?: boolean,
+        timeout?: number,
+        disableDefaultResponse?: boolean,
+      },
+    ): Promise<void>;
+    clearAllRFIDCodes(
+      args: {
+        manufacturerId?: number,
+      },
+      opts?: {
+        waitForResponse?: boolean,
+        timeout?: number,
+        disableDefaultResponse?: boolean,
+      },
+    ): Promise<void>;
+    onOperationEventNotification(
+      args: {
+        manufacturerId?: number,
+        operationEventSource: number,
+        operationEventCode: number,
+        userId: number,
+        pin: string,
+        zigBeeLocalTime: number,
+        data: string,
+      },
+      opts?: {
+        waitForResponse?: boolean,
+        timeout?: number,
+        disableDefaultResponse?: boolean,
+      },
+    ): Promise<void>;
+    onProgrammingEventNotification(
+      args: {
+        manufacturerId?: number,
+        programEventSource: number,
+        programEventCode: number,
+        userId: number,
+        pin: string,
+        userType: "unrestricted" | "yearDayScheduleUser" | "weekDayScheduleUser" | "masterUser" | "nonAccessUser" | "notSupported",
+        userStatus: "available" | "occupiedEnabled" | "occupiedDisabled" | "notSupported",
+        zigBeeLocalTime: number,
+        data: string,
+      },
+      opts?: {
+        waitForResponse?: boolean,
+        timeout?: number,
+        disableDefaultResponse?: boolean,
+      },
+    ): Promise<void>;
+  }
+  type WindowCoveringClusterAttributes = {
+    windowCoveringType: { id: 0x00, type: ZCLDataType<"rollershade" | "rollershade2Motor" | "rollershadeExterior" | "rollershadeExterior2Motor" | "drapery" | "awning" | "shutter" | "tiltBlindTiltOnly" | "tiltBlindLiftAndTilt" | "projectorScreen"> },
+    physicalClosedLimitLift: { id: 0x01, type: ZCLDataType<number> },
+    physicalClosedLimitTilt: { id: 0x02, type: ZCLDataType<number> },
+    currentPositionLift: { id: 0x03, type: ZCLDataType<number> },
+    currentPositionTilt: { id: 0x04, type: ZCLDataType<number> },
+    numberofActuationsLift: { id: 0x05, type: ZCLDataType<number> },
+    numberofActuationsTilt: { id: 0x06, type: ZCLDataType<number> },
+    configStatus: { id: 0x07, type: ZCLDataType<BitMap<"operational" | "online" | "reversalLiftCommands" | "controlLift" | "controlTilt" | "encoderLift" | "encoderTilt" | "reserved">> },
+    currentPositionLiftPercentage: { id: 0x08, type: ZCLDataType<number> },
+    currentPositionTiltPercentage: { id: 0x09, type: ZCLDataType<number> },
+    installedOpenLimitLift: { id: 0x10, type: ZCLDataType<number> },
+    installedClosedLimitLift: { id: 0x11, type: ZCLDataType<number> },
+    installedOpenLimitTilt: { id: 0x12, type: ZCLDataType<number> },
+    installedClosedLimitTilt: { id: 0x13, type: ZCLDataType<number> },
+    velocityLift: { id: 0x14, type: ZCLDataType<number> },
+    accelerationTimeLift: { id: 0x15, type: ZCLDataType<number> },
+    decelerationTimeLift: { id: 0x16, type: ZCLDataType<number> },
+    mode: { id: 0x17, type: ZCLDataType<BitMap<"motorDirectionReversed" | "calibrationMode" | "maintenanceMode" | "ledFeedback">> },
+    intermediateSetpointsLift: { id: 0x18, type: ZCLDataType<string> },
+    intermediateSetpointsTilt: { id: 0x19, type: ZCLDataType<string> },
   };
-  MULTI_STATE_INPUT: {
-    ID: number;
-    NAME: 'multistateInput';
-    ATTRIBUTES: unknown;
-    COMMANDS: unknown;
+  type WindowCoveringClusterCommands = {
+    upOpen: { id: 0x00, direction: "DIRECTION_SERVER_TO_CLIENT" },
+    downClose: { id: 0x01, direction: "DIRECTION_SERVER_TO_CLIENT" },
+    stop: { id: 0x02, direction: "DIRECTION_SERVER_TO_CLIENT" },
+    goToLiftValue: { id: 0x04, direction: "DIRECTION_SERVER_TO_CLIENT", args: {
+        liftValue: ZCLDataType<number>,
+      },
+    },
+    goToLiftPercentage: { id: 0x05, direction: "DIRECTION_SERVER_TO_CLIENT", args: {
+        percentageLiftValue: ZCLDataType<number>,
+      },
+    },
+    goToTiltValue: { id: 0x07, direction: "DIRECTION_SERVER_TO_CLIENT", args: {
+        tiltValue: ZCLDataType<number>,
+      },
+    },
+    goToTiltPercentage: { id: 0x08, direction: "DIRECTION_SERVER_TO_CLIENT", args: {
+        percentageTiltValue: ZCLDataType<number>,
+      },
+    },
   };
-  MULTI_STATE_OUTPUT: {
-    ID: number;
-    NAME: 'multistateOutput';
-    ATTRIBUTES: unknown;
-    COMMANDS: unknown;
+  class WindowCoveringCluster<Attributes extends AttributeDefinitions = WindowCoveringClusterAttributes, Commands extends CommandDefinitions = WindowCoveringClusterCommands> extends Cluster<Attributes, Commands> {
+    upOpen(
+      args: {
+        manufacturerId?: number,
+      },
+      opts?: {
+        waitForResponse?: boolean,
+        timeout?: number,
+        disableDefaultResponse?: boolean,
+      },
+    ): Promise<void>;
+    downClose(
+      args: {
+        manufacturerId?: number,
+      },
+      opts?: {
+        waitForResponse?: boolean,
+        timeout?: number,
+        disableDefaultResponse?: boolean,
+      },
+    ): Promise<void>;
+    stop(
+      args: {
+        manufacturerId?: number,
+      },
+      opts?: {
+        waitForResponse?: boolean,
+        timeout?: number,
+        disableDefaultResponse?: boolean,
+      },
+    ): Promise<void>;
+    goToLiftValue(
+      args: {
+        manufacturerId?: number,
+        liftValue: number,
+      },
+      opts?: {
+        waitForResponse?: boolean,
+        timeout?: number,
+        disableDefaultResponse?: boolean,
+      },
+    ): Promise<void>;
+    goToLiftPercentage(
+      args: {
+        manufacturerId?: number,
+        percentageLiftValue: number,
+      },
+      opts?: {
+        waitForResponse?: boolean,
+        timeout?: number,
+        disableDefaultResponse?: boolean,
+      },
+    ): Promise<void>;
+    goToTiltValue(
+      args: {
+        manufacturerId?: number,
+        tiltValue: number,
+      },
+      opts?: {
+        waitForResponse?: boolean,
+        timeout?: number,
+        disableDefaultResponse?: boolean,
+      },
+    ): Promise<void>;
+    goToTiltPercentage(
+      args: {
+        manufacturerId?: number,
+        percentageTiltValue: number,
+      },
+      opts?: {
+        waitForResponse?: boolean,
+        timeout?: number,
+        disableDefaultResponse?: boolean,
+      },
+    ): Promise<void>;
+  }
+  type ThermostatClusterAttributes = {
+    localTemperature: { id: 0x00, type: ZCLDataType<number> },
+    outdoorTemperature: { id: 0x01, type: ZCLDataType<number> },
+    occupancy: { id: 0x02, type: ZCLDataType<BitMap<"occupied">> },
+    absMinHeatSetpointLimit: { id: 0x03, type: ZCLDataType<number> },
+    absMaxHeatSetpointLimit: { id: 0x04, type: ZCLDataType<number> },
+    absMinCoolSetpointLimit: { id: 0x05, type: ZCLDataType<number> },
+    absMaxCoolSetpointLimit: { id: 0x06, type: ZCLDataType<number> },
+    pICoolingDemand: { id: 0x07, type: ZCLDataType<number> },
+    pIHeatingDemand: { id: 0x08, type: ZCLDataType<number> },
+    localTemperatureCalibration: { id: 0x10, type: ZCLDataType<number> },
+    occupiedCoolingSetpoint: { id: 0x11, type: ZCLDataType<number> },
+    occupiedHeatingSetpoint: { id: 0x12, type: ZCLDataType<number> },
+    unoccupiedCoolingSetpoint: { id: 0x13, type: ZCLDataType<number> },
+    unoccupiedHeatingSetpoint: { id: 0x14, type: ZCLDataType<number> },
+    minHeatSetpointLimit: { id: 0x15, type: ZCLDataType<number> },
+    maxHeatSetpointLimit: { id: 0x16, type: ZCLDataType<number> },
+    minCoolSetpointLimit: { id: 0x17, type: ZCLDataType<number> },
+    maxCoolSetpointLimit: { id: 0x18, type: ZCLDataType<number> },
+    minSetpointDeadBand: { id: 0x19, type: ZCLDataType<number> },
+    remoteSensing: { id: 0x1a, type: ZCLDataType<BitMap<"localTemperature" | "outdoorTemperature" | "occupancy">> },
+    controlSequenceOfOperation: { id: 0x1b, type: ZCLDataType<"cooling" | "coolingWithReheat" | "heating" | "heatingWithReheat" | "coolingAndHeating4Pipes" | "coolingAndHeating4PipesWithReheat"> },
+    systemMode: { id: 0x1c, type: ZCLDataType<"off" | "auto" | "cool" | "heat" | "emergencyHeating" | "precooling" | "fanOnly" | "dry" | "sleep"> },
+    alarmMask: { id: 0x1d, type: ZCLDataType<BitMap<"initializationFailure" | "hardwareFailure" | "selfCalibrationFailure">> },
   };
-  MULTI_STATE_VALUE: {
-    ID: number;
-    NAME: 'multistateValue';
-    ATTRIBUTES: unknown;
-    COMMANDS: unknown;
+  type ThermostatClusterCommands = {
+    setSetpoint: { id: 0x00, direction: "DIRECTION_SERVER_TO_CLIENT", args: {
+        mode: ZCLDataType<"heat" | "cool" | "both">,
+        amount: ZCLDataType<number>,
+      },
+    },
   };
-  OCCUPANCY_SENSING: {
-    ID: number;
-    NAME: 'occupancySensing';
-    ATTRIBUTES: unknown;
-    COMMANDS: unknown;
+  class ThermostatCluster<Attributes extends AttributeDefinitions = ThermostatClusterAttributes, Commands extends CommandDefinitions = ThermostatClusterCommands> extends Cluster<Attributes, Commands> {
+    setSetpoint(
+      args: {
+        manufacturerId?: number,
+        mode: "heat" | "cool" | "both",
+        amount: number,
+      },
+      opts?: {
+        waitForResponse?: boolean,
+        timeout?: number,
+        disableDefaultResponse?: boolean,
+      },
+    ): Promise<void>;
+  }
+  type PumpConfigurationAndControlClusterAttributes = Record<never, never>;
+  type PumpConfigurationAndControlClusterCommands = Record<never, never>;
+  class PumpConfigurationAndControlCluster<Attributes extends AttributeDefinitions = PumpConfigurationAndControlClusterAttributes, Commands extends CommandDefinitions = PumpConfigurationAndControlClusterCommands> extends Cluster<Attributes, Commands> {
+  }
+  type FanControlClusterAttributes = Record<never, never>;
+  type FanControlClusterCommands = Record<never, never>;
+  class FanControlCluster<Attributes extends AttributeDefinitions = FanControlClusterAttributes, Commands extends CommandDefinitions = FanControlClusterCommands> extends Cluster<Attributes, Commands> {
+  }
+  type DehumidificationControlClusterAttributes = Record<never, never>;
+  type DehumidificationControlClusterCommands = Record<never, never>;
+  class DehumidificationControlCluster<Attributes extends AttributeDefinitions = DehumidificationControlClusterAttributes, Commands extends CommandDefinitions = DehumidificationControlClusterCommands> extends Cluster<Attributes, Commands> {
+  }
+  type ColorControlClusterAttributes = {
+    currentHue: { id: 0x00, type: ZCLDataType<number> },
+    currentSaturation: { id: 0x01, type: ZCLDataType<number> },
+    currentX: { id: 0x03, type: ZCLDataType<number> },
+    currentY: { id: 0x04, type: ZCLDataType<number> },
+    colorTemperatureMireds: { id: 0x07, type: ZCLDataType<number> },
+    colorMode: { id: 0x08, type: ZCLDataType<"currentHueAndCurrentSaturation" | "currentXAndCurrentY" | "colorTemperatureMireds"> },
+    colorCapabilities: { id: 0x400a, type: ZCLDataType<BitMap<"hueAndSaturation" | "enhancedHue" | "colorLoop" | "xy" | "colorTemperature">> },
+    colorTempPhysicalMinMireds: { id: 0x400b, type: ZCLDataType<number> },
+    colorTempPhysicalMaxMireds: { id: 0x400c, type: ZCLDataType<number> },
   };
-  ON_OFF: {
-    ID: number;
-    NAME: 'onOff';
-    ATTRIBUTES: unknown;
-    COMMANDS: unknown;
+  type ColorControlClusterCommands = {
+    moveToHue: { id: 0x00, direction: "DIRECTION_SERVER_TO_CLIENT", args: {
+        hue: ZCLDataType<number>,
+        direction: ZCLDataType<"shortestDistance" | "longestDistance" | "up" | "down">,
+        transitionTime: ZCLDataType<number>,
+      },
+    },
+    moveToSaturation: { id: 0x03, direction: "DIRECTION_SERVER_TO_CLIENT", args: {
+        saturation: ZCLDataType<number>,
+        transitionTime: ZCLDataType<number>,
+      },
+    },
+    moveToHueAndSaturation: { id: 0x06, direction: "DIRECTION_SERVER_TO_CLIENT", args: {
+        hue: ZCLDataType<number>,
+        saturation: ZCLDataType<number>,
+        transitionTime: ZCLDataType<number>,
+      },
+    },
+    moveToColor: { id: 0x07, direction: "DIRECTION_SERVER_TO_CLIENT", args: {
+        colorX: ZCLDataType<number>,
+        colorY: ZCLDataType<number>,
+        transitionTime: ZCLDataType<number>,
+      },
+    },
+    moveToColorTemperature: { id: 0x0a, direction: "DIRECTION_SERVER_TO_CLIENT", args: {
+        colorTemperature: ZCLDataType<number>,
+        transitionTime: ZCLDataType<number>,
+      },
+    },
   };
-  ON_OFF_SWITCH: {
-    ID: number;
-    NAME: 'onOffSwitch';
-    ATTRIBUTES: unknown;
-    COMMANDS: unknown;
+  class ColorControlCluster<Attributes extends AttributeDefinitions = ColorControlClusterAttributes, Commands extends CommandDefinitions = ColorControlClusterCommands> extends Cluster<Attributes, Commands> {
+    moveToHue(
+      args: {
+        manufacturerId?: number,
+        hue: number,
+        direction: "shortestDistance" | "longestDistance" | "up" | "down",
+        transitionTime: number,
+      },
+      opts?: {
+        waitForResponse?: boolean,
+        timeout?: number,
+        disableDefaultResponse?: boolean,
+      },
+    ): Promise<void>;
+    moveToSaturation(
+      args: {
+        manufacturerId?: number,
+        saturation: number,
+        transitionTime: number,
+      },
+      opts?: {
+        waitForResponse?: boolean,
+        timeout?: number,
+        disableDefaultResponse?: boolean,
+      },
+    ): Promise<void>;
+    moveToHueAndSaturation(
+      args: {
+        manufacturerId?: number,
+        hue: number,
+        saturation: number,
+        transitionTime: number,
+      },
+      opts?: {
+        waitForResponse?: boolean,
+        timeout?: number,
+        disableDefaultResponse?: boolean,
+      },
+    ): Promise<void>;
+    moveToColor(
+      args: {
+        manufacturerId?: number,
+        colorX: number,
+        colorY: number,
+        transitionTime: number,
+      },
+      opts?: {
+        waitForResponse?: boolean,
+        timeout?: number,
+        disableDefaultResponse?: boolean,
+      },
+    ): Promise<void>;
+    moveToColorTemperature(
+      args: {
+        manufacturerId?: number,
+        colorTemperature: number,
+        transitionTime: number,
+      },
+      opts?: {
+        waitForResponse?: boolean,
+        timeout?: number,
+        disableDefaultResponse?: boolean,
+      },
+    ): Promise<void>;
+  }
+  type BallastConfigurationClusterAttributes = {
+    physicalMinLevel: { id: 0x00, type: ZCLDataType<number> },
+    physicalMaxLevel: { id: 0x01, type: ZCLDataType<number> },
+    ballastStatus: { id: 0x02, type: ZCLDataType<BitMap<"nonOperational" | "lampNotInSocket">> },
+    minLevel: { id: 0x10, type: ZCLDataType<number> },
+    maxLevel: { id: 0x11, type: ZCLDataType<number> },
+    powerOnLevel: { id: 0x12, type: ZCLDataType<number> },
+    powerOnFadeTime: { id: 0x13, type: ZCLDataType<number> },
+    intrinsicBallastFactor: { id: 0x14, type: ZCLDataType<number> },
+    ballastFactorAdjustment: { id: 0x15, type: ZCLDataType<number> },
+    lampQuantity: { id: 0x20, type: ZCLDataType<number> },
+    lampType: { id: 0x30, type: ZCLDataType<string> },
+    lampManufacturer: { id: 0x31, type: ZCLDataType<string> },
+    lampRatedHours: { id: 0x32, type: ZCLDataType<number> },
+    lampBurnHours: { id: 0x33, type: ZCLDataType<number> },
+    lampAlarmMode: { id: 0x34, type: ZCLDataType<BitMap<"lampBurnHours">> },
+    lampBurnHoursTripPoint: { id: 0x35, type: ZCLDataType<number> },
   };
-  OTA: {
-    ID: number;
-    NAME: 'ota';
-    ATTRIBUTES: unknown;
-    COMMANDS: unknown;
+  type BallastConfigurationClusterCommands = Record<never, never>;
+  class BallastConfigurationCluster<Attributes extends AttributeDefinitions = BallastConfigurationClusterAttributes, Commands extends CommandDefinitions = BallastConfigurationClusterCommands> extends Cluster<Attributes, Commands> {
+  }
+  type IlluminanceMeasurementClusterAttributes = {
+    measuredValue: { id: 0x00, type: ZCLDataType<number> },
+    minMeasuredValue: { id: 0x01, type: ZCLDataType<number> },
+    maxMeasuredValue: { id: 0x02, type: ZCLDataType<number> },
+    tolerance: { id: 0x03, type: ZCLDataType<number> },
+    lightSensorType: { id: 0x04, type: ZCLDataType<"photodiode" | "cmos" | "unknown"> },
   };
-  POLL_CONTROL: {
-    ID: number;
-    NAME: 'pollControl';
-    ATTRIBUTES: unknown;
-    COMMANDS: unknown;
+  type IlluminanceMeasurementClusterCommands = Record<never, never>;
+  class IlluminanceMeasurementCluster<Attributes extends AttributeDefinitions = IlluminanceMeasurementClusterAttributes, Commands extends CommandDefinitions = IlluminanceMeasurementClusterCommands> extends Cluster<Attributes, Commands> {
+  }
+  type IlluminanceLevelSensingClusterAttributes = {
+    levelStatus: { id: 0x00, type: ZCLDataType<"illuminanceOnTarget" | "illuminanceBelowTarget" | "illuminanceAboveTarget"> },
+    lightSensorType: { id: 0x01, type: ZCLDataType<"photodiode" | "cmos" | "unknown"> },
+    illuminanceTargetLevel: { id: 0x10, type: ZCLDataType<number> },
   };
-  POWER_CONFIGURATION: {
-    ID: number;
-    NAME: 'powerConfiguration';
-    ATTRIBUTES: unknown;
-    COMMANDS: unknown;
+  type IlluminanceLevelSensingClusterCommands = Record<never, never>;
+  class IlluminanceLevelSensingCluster<Attributes extends AttributeDefinitions = IlluminanceLevelSensingClusterAttributes, Commands extends CommandDefinitions = IlluminanceLevelSensingClusterCommands> extends Cluster<Attributes, Commands> {
+  }
+  type TemperatureMeasurementClusterAttributes = {
+    measuredValue: { id: 0x00, type: ZCLDataType<number> },
+    minMeasuredValue: { id: 0x01, type: ZCLDataType<number> },
+    maxMeasuredValue: { id: 0x02, type: ZCLDataType<number> },
   };
-  POWER_PROFILE: {
-    ID: number;
-    NAME: 'powerProfile';
-    ATTRIBUTES: unknown;
-    COMMANDS: unknown;
+  type TemperatureMeasurementClusterCommands = Record<never, never>;
+  class TemperatureMeasurementCluster<Attributes extends AttributeDefinitions = TemperatureMeasurementClusterAttributes, Commands extends CommandDefinitions = TemperatureMeasurementClusterCommands> extends Cluster<Attributes, Commands> {
+  }
+  type PressureMeasurementClusterAttributes = {
+    measuredValue: { id: 0x00, type: ZCLDataType<number> },
+    minMeasuredValue: { id: 0x01, type: ZCLDataType<number> },
+    maxMeasuredValue: { id: 0x02, type: ZCLDataType<number> },
+    tolerance: { id: 0x03, type: ZCLDataType<number> },
+    scaledValue: { id: 0x10, type: ZCLDataType<number> },
+    minScaledValue: { id: 0x11, type: ZCLDataType<number> },
+    maxScaledValue: { id: 0x12, type: ZCLDataType<number> },
+    scaledTolerance: { id: 0x13, type: ZCLDataType<number> },
+    scale: { id: 0x14, type: ZCLDataType<number> },
   };
-  PRESSURE_MEASUREMENT: {
-    ID: number;
-    NAME: 'pressureMeasurement';
-    ATTRIBUTES: unknown;
-    COMMANDS: unknown;
+  type PressureMeasurementClusterCommands = Record<never, never>;
+  class PressureMeasurementCluster<Attributes extends AttributeDefinitions = PressureMeasurementClusterAttributes, Commands extends CommandDefinitions = PressureMeasurementClusterCommands> extends Cluster<Attributes, Commands> {
+  }
+  type FlowMeasurementClusterAttributes = {
+    measuredValue: { id: 0x00, type: ZCLDataType<number> },
+    minMeasuredValue: { id: 0x01, type: ZCLDataType<number> },
+    maxMeasuredValue: { id: 0x02, type: ZCLDataType<number> },
+    tolerance: { id: 0x03, type: ZCLDataType<number> },
   };
-  PUMP_CONFIGURATION_AND_CONTROL: {
-    ID: number;
-    NAME: 'pumpConfigurationAndControl';
-    ATTRIBUTES: unknown;
-    COMMANDS: unknown;
+  type FlowMeasurementClusterCommands = Record<never, never>;
+  class FlowMeasurementCluster<Attributes extends AttributeDefinitions = FlowMeasurementClusterAttributes, Commands extends CommandDefinitions = FlowMeasurementClusterCommands> extends Cluster<Attributes, Commands> {
+  }
+  type RelativeHumidityClusterAttributes = {
+    measuredValue: { id: 0x00, type: ZCLDataType<number> },
+    minMeasuredValue: { id: 0x01, type: ZCLDataType<number> },
+    maxMeasuredValue: { id: 0x02, type: ZCLDataType<number> },
+    tolerance: { id: 0x03, type: ZCLDataType<number> },
   };
-  RELATIVE_HUMIDITY_MEASUREMENT: {
-    ID: number;
-    NAME: 'relativeHumidity';
-    ATTRIBUTES: unknown;
-    COMMANDS: unknown;
+  type RelativeHumidityClusterCommands = Record<never, never>;
+  class RelativeHumidityCluster<Attributes extends AttributeDefinitions = RelativeHumidityClusterAttributes, Commands extends CommandDefinitions = RelativeHumidityClusterCommands> extends Cluster<Attributes, Commands> {
+  }
+  type OccupancySensingClusterAttributes = {
+    occupancy: { id: 0x00, type: ZCLDataType<BitMap<"occupied">> },
+    occupancySensorType: { id: 0x01, type: ZCLDataType<"pir" | "ultrasonic" | "pirAndUltrasonic" | "physicalContact"> },
+    occupancySensorTypeBitmap: { id: 0x02, type: ZCLDataType<BitMap<"pir" | "ultrasonic" | "physicalContact">> },
+    pirOccupiedToUnoccupiedDelay: { id: 0x10, type: ZCLDataType<number> },
+    pirUnoccupiedToOccupiedDelay: { id: 0x11, type: ZCLDataType<number> },
+    pirUnoccupiedToOccupiedThreshold: { id: 0x12, type: ZCLDataType<number> },
+    ultrasonicOccupiedToUnoccupiedDelay: { id: 0x20, type: ZCLDataType<number> },
+    ultrasonicUnoccupiedToOccupiedDelay: { id: 0x21, type: ZCLDataType<number> },
+    ultrasonicUnoccupiedToOccupiedThreshold: { id: 0x22, type: ZCLDataType<number> },
+    physicalContactOccupiedToUnoccupiedDelay: { id: 0x30, type: ZCLDataType<number> },
+    physicalContactUnoccupiedToOccupiedDelay: { id: 0x31, type: ZCLDataType<number> },
+    physicalContactUnoccupiedToOccupiedThreshold: { id: 0x32, type: ZCLDataType<number> },
   };
-  SCENES: {
-    ID: number;
-    NAME: 'scenes';
-    ATTRIBUTES: unknown;
-    COMMANDS: unknown;
+  type OccupancySensingClusterCommands = Record<never, never>;
+  class OccupancySensingCluster<Attributes extends AttributeDefinitions = OccupancySensingClusterAttributes, Commands extends CommandDefinitions = OccupancySensingClusterCommands> extends Cluster<Attributes, Commands> {
+  }
+  type IASZoneClusterAttributes = {
+    zoneState: { id: 0x00, type: ZCLDataType<"notEnrolled" | "enrolled"> },
+    zoneType: { id: 0x01, type: ZCLDataType<"standardCIE" | "motionSensor" | "contactSwitch" | "doorWindowHandle" | "fireSensor" | "waterSensor" | "carbonMonoxideSensor" | "personalEmergencyDevice" | "vibrationMovementSensor" | "remoteControl" | "keyFob" | "keypad" | "standardWarningDevice" | "glassBreakSensor" | "securityRepeater" | "invalidZoneType"> },
+    zoneStatus: { id: 0x02, type: ZCLDataType<BitMap<"alarm1" | "alarm2" | "tamper" | "battery" | "supervisionReports" | "restoreReports" | "trouble" | "acMains" | "test" | "batteryDefect">> },
+    iasCIEAddress: { id: 0x10, type: ZCLDataType<string> },
+    zoneId: { id: 0x11, type: ZCLDataType<number> },
   };
-  SHADE_CONFIGURATION: {
-    ID: number;
-    NAME: 'shadeConfiguration';
-    ATTRIBUTES: unknown;
-    COMMANDS: unknown;
+  type IASZoneClusterCommands = {
+    zoneStatusChangeNotification: { id: 0x00, direction: "DIRECTION_SERVER_TO_CLIENT", args: {
+        zoneStatus: ZCLDataType<BitMap<"alarm1" | "alarm2" | "tamper" | "battery" | "supervisionReports" | "restoreReports" | "trouble" | "acMains" | "test" | "batteryDefect">>,
+        extendedStatus: ZCLDataType<number>,
+        zoneId: ZCLDataType<number>,
+        delay: ZCLDataType<number>,
+      },
+    },
+    zoneEnrollResponse: { id: 0x00, direction: "DIRECTION_CLIENT_TO_SERVER", args: {
+        enrollResponseCode: ZCLDataType<"success" | "notSupported" | "noEnrollPermit" | "tooManyZones">,
+        zoneId: ZCLDataType<number>,
+      },
+    },
+    zoneEnrollRequest: { id: 0x01, direction: "DIRECTION_SERVER_TO_CLIENT", args: {
+        zoneType: ZCLDataType<"standardCIE" | "motionSensor" | "contactSwitch" | "doorWindowHandle" | "fireSensor" | "waterSensor" | "carbonMonoxideSensor" | "personalEmergencyDevice" | "vibrationMovementSensor" | "remoteControl" | "keyFob" | "keypad" | "standardWarningDevice" | "glassBreakSensor" | "securityRepeater" | "invalidZoneType">,
+        manufacturerCode: ZCLDataType<number>,
+      },
+    },
+    initiateNormalOperationMode: { id: 0x01, direction: "DIRECTION_CLIENT_TO_SERVER" },
   };
-  TEMPERATURE_MEASUREMENT: {
-    ID: number;
-    NAME: 'temperatureMeasurement';
-    ATTRIBUTES: unknown;
-    COMMANDS: unknown;
+  class IASZoneCluster<Attributes extends AttributeDefinitions = IASZoneClusterAttributes, Commands extends CommandDefinitions = IASZoneClusterCommands> extends Cluster<Attributes, Commands> {
+    onZoneStatusChangeNotification(
+      args: {
+        manufacturerId?: number,
+        zoneStatus: BitMap<"alarm1" | "alarm2" | "tamper" | "battery" | "supervisionReports" | "restoreReports" | "trouble" | "acMains" | "test" | "batteryDefect">,
+        extendedStatus: number,
+        zoneId: number,
+        delay: number,
+      },
+      opts?: {
+        waitForResponse?: boolean,
+        timeout?: number,
+        disableDefaultResponse?: boolean,
+      },
+    ): Promise<void>;
+    zoneEnrollResponse(
+      args: {
+        manufacturerId?: number,
+        enrollResponseCode: "success" | "notSupported" | "noEnrollPermit" | "tooManyZones",
+        zoneId: number,
+      },
+      opts?: {
+        waitForResponse?: boolean,
+        timeout?: number,
+        disableDefaultResponse?: boolean,
+      },
+    ): Promise<void>;
+    onZoneEnrollRequest(
+      args: {
+        manufacturerId?: number,
+        zoneType: "standardCIE" | "motionSensor" | "contactSwitch" | "doorWindowHandle" | "fireSensor" | "waterSensor" | "carbonMonoxideSensor" | "personalEmergencyDevice" | "vibrationMovementSensor" | "remoteControl" | "keyFob" | "keypad" | "standardWarningDevice" | "glassBreakSensor" | "securityRepeater" | "invalidZoneType",
+        manufacturerCode: number,
+      },
+      opts?: {
+        waitForResponse?: boolean,
+        timeout?: number,
+        disableDefaultResponse?: boolean,
+      },
+    ): Promise<void>;
+    initiateNormalOperationMode(
+      args: {
+        manufacturerId?: number,
+      },
+      opts?: {
+        waitForResponse?: boolean,
+        timeout?: number,
+        disableDefaultResponse?: boolean,
+      },
+    ): Promise<void>;
+  }
+  type IASACEClusterAttributes = Record<never, never>;
+  type IASACEClusterCommands = Record<never, never>;
+  class IASACECluster<Attributes extends AttributeDefinitions = IASACEClusterAttributes, Commands extends CommandDefinitions = IASACEClusterCommands> extends Cluster<Attributes, Commands> {
+  }
+  type IASWDClusterAttributes = Record<never, never>;
+  type IASWDClusterCommands = Record<never, never>;
+  class IASWDCluster<Attributes extends AttributeDefinitions = IASWDClusterAttributes, Commands extends CommandDefinitions = IASWDClusterCommands> extends Cluster<Attributes, Commands> {
+  }
+  type MeteringClusterAttributes = {
+    currentSummationDelivered: { id: 0x00, type: ZCLDataType<number> },
+    currentSummationReceived: { id: 0x01, type: ZCLDataType<number> },
+    currentMaxDemandDelivered: { id: 0x02, type: ZCLDataType<number> },
+    currentMaxDemandReceived: { id: 0x03, type: ZCLDataType<number> },
+    dftSummation: { id: 0x04, type: ZCLDataType<number> },
+    dailyFreezeTime: { id: 0x05, type: ZCLDataType<number> },
+    powerFactor: { id: 0x06, type: ZCLDataType<number> },
+    readingSnapShotTime: { id: 0x07, type: ZCLDataType<number> },
+    currentMaxDemandDeliveredTime: { id: 0x08, type: ZCLDataType<number> },
+    currentMaxDemandReceivedTime: { id: 0x09, type: ZCLDataType<number> },
+    defaultUpdatePeriod: { id: 0x0a, type: ZCLDataType<number> },
+    fastPollUpdatePeriod: { id: 0x0b, type: ZCLDataType<number> },
+    currentBlockPeriodConsumptionDelivered: { id: 0x0c, type: ZCLDataType<number> },
+    dailyConsumptionTarget: { id: 0x0d, type: ZCLDataType<number> },
+    currentBlock: { id: 0x0e, type: ZCLDataType<unknown> },
+    profileIntervalPeriod: { id: 0x0f, type: ZCLDataType<unknown> },
+    currentTier1SummationDelivered: { id: 0x100, type: ZCLDataType<number> },
+    currentTier1SummationReceived: { id: 0x101, type: ZCLDataType<number> },
+    currentTier2SummationDelivered: { id: 0x102, type: ZCLDataType<number> },
+    currentTier2SummationReceived: { id: 0x103, type: ZCLDataType<number> },
+    currentTier3SummationDelivered: { id: 0x104, type: ZCLDataType<number> },
+    currentTier3SummationReceived: { id: 0x105, type: ZCLDataType<number> },
+    currentTier4SummationDelivered: { id: 0x106, type: ZCLDataType<number> },
+    currentTier4SummationReceived: { id: 0x107, type: ZCLDataType<number> },
+    status: { id: 0x200, type: ZCLDataType<BitMap<"checkMeter" | "lowBattery" | "tamperDetect" | "powerFailure" | "powerQuality" | "leakDetect" | "serviceDisconnect">> },
+    remainingBatteryLife: { id: 0x201, type: ZCLDataType<number> },
+    hoursInOperation: { id: 0x202, type: ZCLDataType<number> },
+    hoursInFault: { id: 0x203, type: ZCLDataType<number> },
+    unitOfMeasure: { id: 0x300, type: ZCLDataType<unknown> },
+    multiplier: { id: 0x301, type: ZCLDataType<number> },
+    divisor: { id: 0x302, type: ZCLDataType<number> },
+    siteId: { id: 0x307, type: ZCLDataType<string> },
+    meterSerialNumber: { id: 0x308, type: ZCLDataType<string> },
+    energyCarrierUnitOfMeasure: { id: 0x309, type: ZCLDataType<unknown> },
+    temperatureUnitOfMeasure: { id: 0x30c, type: ZCLDataType<unknown> },
+    moduleSerialNumber: { id: 0x30e, type: ZCLDataType<string> },
+    operatingTariffLabelDelivered: { id: 0x30f, type: ZCLDataType<string> },
+    operatingTariffLabelReceived: { id: 0x310, type: ZCLDataType<string> },
+    customerIdNumber: { id: 0x311, type: ZCLDataType<string> },
+    alternativeUnitOfMeasure: { id: 0x312, type: ZCLDataType<unknown> },
+    instantaneousDemand: { id: 0x400, type: ZCLDataType<number> },
+    currentDayConsumptionDelivered: { id: 0x401, type: ZCLDataType<number> },
+    currentDayConsumptionReceived: { id: 0x402, type: ZCLDataType<number> },
+    previousDayConsumptionDelivered: { id: 0x403, type: ZCLDataType<number> },
+    previousDayConsumptionReceived: { id: 0x404, type: ZCLDataType<number> },
+    currentPartialProfileIntervalStartTimeDelivered: { id: 0x405, type: ZCLDataType<number> },
+    currentPartialProfileIntervalStartTimeReceived: { id: 0x406, type: ZCLDataType<number> },
+    currentPartialProfileIntervalValueDelivered: { id: 0x407, type: ZCLDataType<number> },
+    currentPartialProfileIntervalValueReceived: { id: 0x408, type: ZCLDataType<number> },
+    currentDayMaxPressure: { id: 0x409, type: ZCLDataType<number> },
+    currentDayMinPressure: { id: 0x40a, type: ZCLDataType<number> },
+    previousDayMaxPressure: { id: 0x40b, type: ZCLDataType<number> },
+    previousDayMinPressure: { id: 0x40c, type: ZCLDataType<number> },
+    currentDayMaxDemand: { id: 0x40d, type: ZCLDataType<number> },
+    previousDayMaxDemand: { id: 0x40e, type: ZCLDataType<number> },
+    currentMonthMaxDemand: { id: 0x40f, type: ZCLDataType<number> },
+    currentYearMaxDemand: { id: 0x410, type: ZCLDataType<number> },
+    currentDayMaxEnergyCarrierDemand: { id: 0x411, type: ZCLDataType<number> },
+    previousDayMaxEnergyCarrierDemand: { id: 0x412, type: ZCLDataType<number> },
+    currentMonthMaxEnergyCarrierDemand: { id: 0x413, type: ZCLDataType<number> },
+    currentMonthMinEnergyCarrierDemand: { id: 0x414, type: ZCLDataType<number> },
+    currentYearMaxEnergyCarrierDemand: { id: 0x415, type: ZCLDataType<number> },
+    currentYearMinEnergyCarrierDemand: { id: 0x416, type: ZCLDataType<number> },
+    maxNumberOfPeriodsDelivered: { id: 0x500, type: ZCLDataType<number> },
+    currentDemandDelivered: { id: 0x600, type: ZCLDataType<number> },
+    demandLimit: { id: 0x601, type: ZCLDataType<number> },
+    demandIntegrationPeriod: { id: 0x602, type: ZCLDataType<number> },
+    numberOfDemandSubintervals: { id: 0x603, type: ZCLDataType<number> },
+    demandLimitArmDuration: { id: 0x604, type: ZCLDataType<number> },
+    currentNoTierBlock1SummationDelivered: { id: 0x700, type: ZCLDataType<number> },
+    currentNoTierBlock2SummationDelivered: { id: 0x701, type: ZCLDataType<number> },
+    currentNoTierBlock3SummationDelivered: { id: 0x702, type: ZCLDataType<number> },
+    currentNoTierBlock4SummationDelivered: { id: 0x703, type: ZCLDataType<number> },
+    currentNoTierBlock5SummationDelivered: { id: 0x704, type: ZCLDataType<number> },
+    currentNoTierBlock6SummationDelivered: { id: 0x705, type: ZCLDataType<number> },
+    currentNoTierBlock7SummationDelivered: { id: 0x706, type: ZCLDataType<number> },
+    currentNoTierBlock8SummationDelivered: { id: 0x707, type: ZCLDataType<number> },
+    currentNoTierBlock9SummationDelivered: { id: 0x708, type: ZCLDataType<number> },
+    currentNoTierBlock10SummationDelivered: { id: 0x709, type: ZCLDataType<number> },
+    currentNoTierBlock11SummationDelivered: { id: 0x70a, type: ZCLDataType<number> },
+    currentNoTierBlock12SummationDelivered: { id: 0x70b, type: ZCLDataType<number> },
+    currentNoTierBlock13SummationDelivered: { id: 0x70c, type: ZCLDataType<number> },
+    currentNoTierBlock14SummationDelivered: { id: 0x70d, type: ZCLDataType<number> },
+    currentNoTierBlock15SummationDelivered: { id: 0x70e, type: ZCLDataType<number> },
+    currentNoTierBlock16SummationDelivered: { id: 0x70f, type: ZCLDataType<number> },
+    currentTier1Block1SummationDelivered: { id: 0x710, type: ZCLDataType<number> },
+    currentTier1Block2SummationDelivered: { id: 0x711, type: ZCLDataType<number> },
+    currentTier1Block3SummationDelivered: { id: 0x712, type: ZCLDataType<number> },
+    currentTier1Block4SummationDelivered: { id: 0x713, type: ZCLDataType<number> },
+    currentTier1Block5SummationDelivered: { id: 0x714, type: ZCLDataType<number> },
+    currentTier1Block6SummationDelivered: { id: 0x715, type: ZCLDataType<number> },
+    currentTier1Block7SummationDelivered: { id: 0x716, type: ZCLDataType<number> },
+    currentTier1Block8SummationDelivered: { id: 0x717, type: ZCLDataType<number> },
+    currentTier1Block9SummationDelivered: { id: 0x718, type: ZCLDataType<number> },
+    currentTier1Block10SummationDelivered: { id: 0x719, type: ZCLDataType<number> },
+    currentTier1Block11SummationDelivered: { id: 0x71a, type: ZCLDataType<number> },
+    currentTier1Block12SummationDelivered: { id: 0x71b, type: ZCLDataType<number> },
+    currentTier1Block13SummationDelivered: { id: 0x71c, type: ZCLDataType<number> },
+    currentTier1Block14SummationDelivered: { id: 0x71d, type: ZCLDataType<number> },
+    currentTier1Block15SummationDelivered: { id: 0x71e, type: ZCLDataType<number> },
+    currentTier1Block16SummationDelivered: { id: 0x71f, type: ZCLDataType<number> },
+    currentTier2Block1SummationDelivered: { id: 0x720, type: ZCLDataType<number> },
+    currentTier2Block2SummationDelivered: { id: 0x721, type: ZCLDataType<number> },
+    currentTier2Block3SummationDelivered: { id: 0x722, type: ZCLDataType<number> },
+    currentTier2Block4SummationDelivered: { id: 0x723, type: ZCLDataType<number> },
+    currentTier2Block5SummationDelivered: { id: 0x724, type: ZCLDataType<number> },
+    currentTier2Block6SummationDelivered: { id: 0x725, type: ZCLDataType<number> },
+    currentTier2Block7SummationDelivered: { id: 0x726, type: ZCLDataType<number> },
+    currentTier2Block8SummationDelivered: { id: 0x727, type: ZCLDataType<number> },
+    currentTier2Block9SummationDelivered: { id: 0x728, type: ZCLDataType<number> },
+    currentTier2Block10SummationDelivered: { id: 0x729, type: ZCLDataType<number> },
+    currentTier2Block11SummationDelivered: { id: 0x72a, type: ZCLDataType<number> },
+    currentTier2Block12SummationDelivered: { id: 0x72b, type: ZCLDataType<number> },
+    currentTier2Block13SummationDelivered: { id: 0x72c, type: ZCLDataType<number> },
+    currentTier2Block14SummationDelivered: { id: 0x72d, type: ZCLDataType<number> },
+    currentTier2Block15SummationDelivered: { id: 0x72e, type: ZCLDataType<number> },
+    currentTier2Block16SummationDelivered: { id: 0x72f, type: ZCLDataType<number> },
+    currentTier3Block1SummationDelivered: { id: 0x730, type: ZCLDataType<number> },
+    currentTier3Block2SummationDelivered: { id: 0x731, type: ZCLDataType<number> },
+    currentTier3Block3SummationDelivered: { id: 0x732, type: ZCLDataType<number> },
+    currentTier3Block4SummationDelivered: { id: 0x733, type: ZCLDataType<number> },
+    currentTier3Block5SummationDelivered: { id: 0x734, type: ZCLDataType<number> },
+    currentTier3Block6SummationDelivered: { id: 0x735, type: ZCLDataType<number> },
+    currentTier3Block7SummationDelivered: { id: 0x736, type: ZCLDataType<number> },
+    currentTier3Block8SummationDelivered: { id: 0x737, type: ZCLDataType<number> },
+    currentTier3Block9SummationDelivered: { id: 0x738, type: ZCLDataType<number> },
+    currentTier3Block10SummationDelivered: { id: 0x739, type: ZCLDataType<number> },
+    currentTier3Block11SummationDelivered: { id: 0x73a, type: ZCLDataType<number> },
+    currentTier3Block12SummationDelivered: { id: 0x73b, type: ZCLDataType<number> },
+    currentTier3Block13SummationDelivered: { id: 0x73c, type: ZCLDataType<number> },
+    currentTier3Block14SummationDelivered: { id: 0x73d, type: ZCLDataType<number> },
+    currentTier3Block15SummationDelivered: { id: 0x73e, type: ZCLDataType<number> },
+    currentTier3Block16SummationDelivered: { id: 0x73f, type: ZCLDataType<number> },
+    currentTier4Block1SummationDelivered: { id: 0x740, type: ZCLDataType<number> },
+    currentTier4Block2SummationDelivered: { id: 0x741, type: ZCLDataType<number> },
+    currentTier4Block3SummationDelivered: { id: 0x742, type: ZCLDataType<number> },
+    currentTier4Block4SummationDelivered: { id: 0x743, type: ZCLDataType<number> },
+    currentTier4Block5SummationDelivered: { id: 0x744, type: ZCLDataType<number> },
+    currentTier4Block6SummationDelivered: { id: 0x745, type: ZCLDataType<number> },
+    currentTier4Block7SummationDelivered: { id: 0x746, type: ZCLDataType<number> },
+    currentTier4Block8SummationDelivered: { id: 0x747, type: ZCLDataType<number> },
+    currentTier4Block9SummationDelivered: { id: 0x748, type: ZCLDataType<number> },
+    currentTier4Block10SummationDelivered: { id: 0x749, type: ZCLDataType<number> },
+    currentTier4Block11SummationDelivered: { id: 0x74a, type: ZCLDataType<number> },
+    currentTier4Block12SummationDelivered: { id: 0x74b, type: ZCLDataType<number> },
+    currentTier4Block13SummationDelivered: { id: 0x74c, type: ZCLDataType<number> },
+    currentTier4Block14SummationDelivered: { id: 0x74d, type: ZCLDataType<number> },
+    currentTier4Block15SummationDelivered: { id: 0x74e, type: ZCLDataType<number> },
+    currentTier4Block16SummationDelivered: { id: 0x74f, type: ZCLDataType<number> },
+    currentNoTierBlock1SummationReceived: { id: 0x900, type: ZCLDataType<number> },
+    currentNoTierBlock2SummationReceived: { id: 0x901, type: ZCLDataType<number> },
+    currentNoTierBlock3SummationReceived: { id: 0x902, type: ZCLDataType<number> },
+    currentNoTierBlock4SummationReceived: { id: 0x903, type: ZCLDataType<number> },
+    currentNoTierBlock5SummationReceived: { id: 0x904, type: ZCLDataType<number> },
+    currentNoTierBlock6SummationReceived: { id: 0x905, type: ZCLDataType<number> },
+    currentNoTierBlock7SummationReceived: { id: 0x906, type: ZCLDataType<number> },
+    currentNoTierBlock8SummationReceived: { id: 0x907, type: ZCLDataType<number> },
+    currentNoTierBlock9SummationReceived: { id: 0x908, type: ZCLDataType<number> },
+    currentNoTierBlock10SummationReceived: { id: 0x909, type: ZCLDataType<number> },
+    currentNoTierBlock11SummationReceived: { id: 0x90a, type: ZCLDataType<number> },
+    currentNoTierBlock12SummationReceived: { id: 0x90b, type: ZCLDataType<number> },
+    currentNoTierBlock13SummationReceived: { id: 0x90c, type: ZCLDataType<number> },
+    currentNoTierBlock14SummationReceived: { id: 0x90d, type: ZCLDataType<number> },
+    currentNoTierBlock15SummationReceived: { id: 0x90e, type: ZCLDataType<number> },
+    currentNoTierBlock16SummationReceived: { id: 0x90f, type: ZCLDataType<number> },
+    billToDateDelivered: { id: 0xa00, type: ZCLDataType<number> },
+    billToDateTimeStampDelivered: { id: 0xa01, type: ZCLDataType<number> },
+    projectedBillDelivered: { id: 0xa02, type: ZCLDataType<number> },
+    projectedBillTimeStampDelivered: { id: 0xa03, type: ZCLDataType<number> },
+    billToDateReceived: { id: 0xa10, type: ZCLDataType<number> },
+    billToDateTimeStampReceived: { id: 0xa11, type: ZCLDataType<number> },
+    projectedBillReceived: { id: 0xa12, type: ZCLDataType<number> },
+    projectedBillTimeStampReceived: { id: 0xa13, type: ZCLDataType<number> },
+    proposedChangeSupplyImplementationTime: { id: 0xb00, type: ZCLDataType<number> },
+    proposedChangeSupplyStatus: { id: 0xb01, type: ZCLDataType<unknown> },
+    uncontrolledFlowThreshold: { id: 0xb10, type: ZCLDataType<number> },
+    uncontrolledFlowThresholdUnitOfMeasure: { id: 0xb11, type: ZCLDataType<unknown> },
+    uncontrolledFlowMultiplier: { id: 0xb12, type: ZCLDataType<number> },
+    uncontrolledFlowDivisor: { id: 0xb13, type: ZCLDataType<number> },
+    flowStabilisationPeriod: { id: 0xb14, type: ZCLDataType<number> },
+    flowMeasurementPeriod: { id: 0xb15, type: ZCLDataType<number> },
   };
-  THERMOSTAT: {
-    ID: number;
-    NAME: 'thermostat';
-    ATTRIBUTES: unknown;
-    COMMANDS: unknown;
+  type MeteringClusterCommands = Record<never, never>;
+  class MeteringCluster<Attributes extends AttributeDefinitions = MeteringClusterAttributes, Commands extends CommandDefinitions = MeteringClusterCommands> extends Cluster<Attributes, Commands> {
+  }
+  type ElectricalMeasurementClusterAttributes = {
+    measurementType: { id: 0x00, type: ZCLDataType<BitMap<"activeMeasurementAC" | "reactiveMeasurementAC" | "apparentMeasurementAC" | "phaseAMeasurement" | "phaseBMeasurement" | "phaseCMeasurement" | "dcMeasurement" | "harmonicsMeasurement" | "powerQualityMeasurement">> },
+    acFrequency: { id: 0x300, type: ZCLDataType<number> },
+    measuredPhase1stHarmonicCurrent: { id: 0x30d, type: ZCLDataType<number> },
+    acFrequencyMultiplier: { id: 0x400, type: ZCLDataType<number> },
+    acFrequencyDivisor: { id: 0x401, type: ZCLDataType<number> },
+    phaseHarmonicCurrentMultiplier: { id: 0x405, type: ZCLDataType<number> },
+    rmsVoltage: { id: 0x505, type: ZCLDataType<number> },
+    rmsCurrent: { id: 0x508, type: ZCLDataType<number> },
+    activePower: { id: 0x50b, type: ZCLDataType<number> },
+    reactivePower: { id: 0x50e, type: ZCLDataType<number> },
+    acVoltageMultiplier: { id: 0x600, type: ZCLDataType<number> },
+    acVoltageDivisor: { id: 0x601, type: ZCLDataType<number> },
+    acCurrentMultiplier: { id: 0x602, type: ZCLDataType<number> },
+    acCurrentDivisor: { id: 0x603, type: ZCLDataType<number> },
+    acPowerMultiplier: { id: 0x604, type: ZCLDataType<number> },
+    acPowerDivisor: { id: 0x605, type: ZCLDataType<number> },
+    acAlarmsMask: { id: 0x800, type: ZCLDataType<BitMap<"voltageOverload" | "currentOverload" | "activePowerOverload" | "reactivePowerOverload" | "averageRMSOverVoltage" | "averageRMSUnderVoltage" | "rmsExtremeOverVoltage" | "rmsExtremeUnderVoltage" | "rmsVoltageSag" | "rmsVoltageSwell">> },
+    acVoltageOverload: { id: 0x801, type: ZCLDataType<number> },
+    acCurrentOverload: { id: 0x802, type: ZCLDataType<number> },
+    acActivePowerOverload: { id: 0x803, type: ZCLDataType<number> },
   };
-  TIME: {
-    ID: number;
-    NAME: 'time';
-    ATTRIBUTES: unknown;
-    COMMANDS: unknown;
+  type ElectricalMeasurementClusterCommands = Record<never, never>;
+  class ElectricalMeasurementCluster<Attributes extends AttributeDefinitions = ElectricalMeasurementClusterAttributes, Commands extends CommandDefinitions = ElectricalMeasurementClusterCommands> extends Cluster<Attributes, Commands> {
+  }
+  type DiagnosticsClusterAttributes = Record<never, never>;
+  type DiagnosticsClusterCommands = Record<never, never>;
+  class DiagnosticsCluster<Attributes extends AttributeDefinitions = DiagnosticsClusterAttributes, Commands extends CommandDefinitions = DiagnosticsClusterCommands> extends Cluster<Attributes, Commands> {
+  }
+  type TouchLinkClusterAttributes = Record<never, never>;
+  type TouchLinkClusterCommands = {
+    getGroups: { id: 0x41, direction: "DIRECTION_SERVER_TO_CLIENT", args: {
+        startIdx: ZCLDataType<number>,
+      },
+    },
   };
-  TOUCHLINK: {
-    ID: number;
-    NAME: 'touchlink';
-    ATTRIBUTES: unknown;
-    COMMANDS: unknown;
+  class TouchLinkCluster<Attributes extends AttributeDefinitions = TouchLinkClusterAttributes, Commands extends CommandDefinitions = TouchLinkClusterCommands> extends Cluster<Attributes, Commands> {
+    getGroups(
+      args: {
+        manufacturerId?: number,
+        startIdx: number,
+      },
+      opts?: {
+        waitForResponse?: boolean,
+        timeout?: number,
+        disableDefaultResponse?: boolean,
+      },
+    ): Promise<void>;
+  }
+  const CLUSTER: {
+    BASIC: {
+      ID: 0x0000,
+      NAME: "basic",
+      ATTRIBUTES: Readonly<BasicClusterAttributes>,
+      COMMANDS: Readonly<BasicClusterCommands>,
+    },
+    POWER_CONFIGURATION: {
+      ID: 0x0001,
+      NAME: "powerConfiguration",
+      ATTRIBUTES: Readonly<PowerConfigurationClusterAttributes>,
+      COMMANDS: Readonly<PowerConfigurationClusterCommands>,
+    },
+    DEVICE_TEMPERATURE: {
+      ID: 0x0002,
+      NAME: "deviceTemperature",
+      ATTRIBUTES: Readonly<DeviceTemperatureClusterAttributes>,
+      COMMANDS: Readonly<DeviceTemperatureClusterCommands>,
+    },
+    IDENTIFY: {
+      ID: 0x0003,
+      NAME: "identify",
+      ATTRIBUTES: Readonly<IdentifyClusterAttributes>,
+      COMMANDS: Readonly<IdentifyClusterCommands>,
+    },
+    GROUPS: {
+      ID: 0x0004,
+      NAME: "groups",
+      ATTRIBUTES: Readonly<GroupsClusterAttributes>,
+      COMMANDS: Readonly<GroupsClusterCommands>,
+    },
+    SCENES: {
+      ID: 0x0005,
+      NAME: "scenes",
+      ATTRIBUTES: Readonly<ScenesClusterAttributes>,
+      COMMANDS: Readonly<ScenesClusterCommands>,
+    },
+    ON_OFF: {
+      ID: 0x0006,
+      NAME: "onOff",
+      ATTRIBUTES: Readonly<OnOffClusterAttributes>,
+      COMMANDS: Readonly<OnOffClusterCommands>,
+    },
+    ON_OFF_SWITCH: {
+      ID: 0x0007,
+      NAME: "onOffSwitch",
+      ATTRIBUTES: Readonly<OnOffSwitchClusterAttributes>,
+      COMMANDS: Readonly<OnOffSwitchClusterCommands>,
+    },
+    LEVEL_CONTROL: {
+      ID: 0x0008,
+      NAME: "levelControl",
+      ATTRIBUTES: Readonly<LevelControlClusterAttributes>,
+      COMMANDS: Readonly<LevelControlClusterCommands>,
+    },
+    ALARMS: {
+      ID: 0x0009,
+      NAME: "alarms",
+      ATTRIBUTES: Readonly<AlarmsClusterAttributes>,
+      COMMANDS: Readonly<AlarmsClusterCommands>,
+    },
+    TIME: {
+      ID: 0x000a,
+      NAME: "time",
+      ATTRIBUTES: Readonly<TimeClusterAttributes>,
+      COMMANDS: Readonly<TimeClusterCommands>,
+    },
+    ANALOG_INPUT: {
+      ID: 0x000c,
+      NAME: "analogInput",
+      ATTRIBUTES: Readonly<AnalogInputClusterAttributes>,
+      COMMANDS: Readonly<AnalogInputClusterCommands>,
+    },
+    ANALOG_OUTPUT: {
+      ID: 0x000d,
+      NAME: "analogOutput",
+      ATTRIBUTES: Readonly<AnalogOutputClusterAttributes>,
+      COMMANDS: Readonly<AnalogOutputClusterCommands>,
+    },
+    ANALOG_VALUE: {
+      ID: 0x000e,
+      NAME: "analogValue",
+      ATTRIBUTES: Readonly<AnalogValueClusterAttributes>,
+      COMMANDS: Readonly<AnalogValueClusterCommands>,
+    },
+    BINARY_INPUT: {
+      ID: 0x000f,
+      NAME: "binaryInput",
+      ATTRIBUTES: Readonly<BinaryInputClusterAttributes>,
+      COMMANDS: Readonly<BinaryInputClusterCommands>,
+    },
+    BINARY_OUTPUT: {
+      ID: 0x0010,
+      NAME: "binaryOutput",
+      ATTRIBUTES: Readonly<BinaryOutputClusterAttributes>,
+      COMMANDS: Readonly<BinaryOutputClusterCommands>,
+    },
+    BINARY_VALUE: {
+      ID: 0x0011,
+      NAME: "binaryValue",
+      ATTRIBUTES: Readonly<BinaryValueClusterAttributes>,
+      COMMANDS: Readonly<BinaryValueClusterCommands>,
+    },
+    MULTI_STATE_INPUT: {
+      ID: 0x0012,
+      NAME: "multistateInput",
+      ATTRIBUTES: Readonly<MultistateInputClusterAttributes>,
+      COMMANDS: Readonly<MultistateInputClusterCommands>,
+    },
+    MULTI_STATE_OUTPUT: {
+      ID: 0x0013,
+      NAME: "multistateOutput",
+      ATTRIBUTES: Readonly<MultistateOutputClusterAttributes>,
+      COMMANDS: Readonly<MultistateOutputClusterCommands>,
+    },
+    MULTI_STATE_VALUE: {
+      ID: 0x0014,
+      NAME: "multistateValue",
+      ATTRIBUTES: Readonly<MultistateValueClusterAttributes>,
+      COMMANDS: Readonly<MultistateValueClusterCommands>,
+    },
+    OTA: {
+      ID: 0x0019,
+      NAME: "ota",
+      ATTRIBUTES: Readonly<OTAClusterAttributes>,
+      COMMANDS: Readonly<OTAClusterCommands>,
+    },
+    POWER_PROFILE: {
+      ID: 0x001a,
+      NAME: "powerProfile",
+      ATTRIBUTES: Readonly<PowerProfileClusterAttributes>,
+      COMMANDS: Readonly<PowerProfileClusterCommands>,
+    },
+    POLL_CONTROL: {
+      ID: 0x0020,
+      NAME: "pollControl",
+      ATTRIBUTES: Readonly<PollControlClusterAttributes>,
+      COMMANDS: Readonly<PollControlClusterCommands>,
+    },
+    SHADE_CONFIGURATION: {
+      ID: 0x0100,
+      NAME: "shadeConfiguration",
+      ATTRIBUTES: Readonly<ShadeConfigurationClusterAttributes>,
+      COMMANDS: Readonly<ShadeConfigurationClusterCommands>,
+    },
+    DOOR_LOCK: {
+      ID: 0x0101,
+      NAME: "doorLock",
+      ATTRIBUTES: Readonly<DoorLockClusterAttributes>,
+      COMMANDS: Readonly<DoorLockClusterCommands>,
+    },
+    WINDOW_COVERING: {
+      ID: 0x0102,
+      NAME: "windowCovering",
+      ATTRIBUTES: Readonly<WindowCoveringClusterAttributes>,
+      COMMANDS: Readonly<WindowCoveringClusterCommands>,
+    },
+    THERMOSTAT: {
+      ID: 0x0201,
+      NAME: "thermostat",
+      ATTRIBUTES: Readonly<ThermostatClusterAttributes>,
+      COMMANDS: Readonly<ThermostatClusterCommands>,
+    },
+    PUMP_CONFIGURATION_AND_CONTROL: {
+      ID: 0x0200,
+      NAME: "pumpConfigurationAndControl",
+      ATTRIBUTES: Readonly<PumpConfigurationAndControlClusterAttributes>,
+      COMMANDS: Readonly<PumpConfigurationAndControlClusterCommands>,
+    },
+    FAN_CONTROL: {
+      ID: 0x0202,
+      NAME: "fanControl",
+      ATTRIBUTES: Readonly<FanControlClusterAttributes>,
+      COMMANDS: Readonly<FanControlClusterCommands>,
+    },
+    COLOR_CONTROL: {
+      ID: 0x0300,
+      NAME: "colorControl",
+      ATTRIBUTES: Readonly<ColorControlClusterAttributes>,
+      COMMANDS: Readonly<ColorControlClusterCommands>,
+    },
+    BALLAST_CONFIGURATION: {
+      ID: 0x0301,
+      NAME: "ballastConfiguration",
+      ATTRIBUTES: Readonly<BallastConfigurationClusterAttributes>,
+      COMMANDS: Readonly<BallastConfigurationClusterCommands>,
+    },
+    ILLUMINANCE_MEASUREMENT: {
+      ID: 0x0400,
+      NAME: "illuminanceMeasurement",
+      ATTRIBUTES: Readonly<IlluminanceMeasurementClusterAttributes>,
+      COMMANDS: Readonly<IlluminanceMeasurementClusterCommands>,
+    },
+    ILLUMINANCE_LEVEL_SENSING: {
+      ID: 0x0401,
+      NAME: "illuminanceLevelSensing",
+      ATTRIBUTES: Readonly<IlluminanceLevelSensingClusterAttributes>,
+      COMMANDS: Readonly<IlluminanceLevelSensingClusterCommands>,
+    },
+    TEMPERATURE_MEASUREMENT: {
+      ID: 0x0402,
+      NAME: "temperatureMeasurement",
+      ATTRIBUTES: Readonly<TemperatureMeasurementClusterAttributes>,
+      COMMANDS: Readonly<TemperatureMeasurementClusterCommands>,
+    },
+    PRESSURE_MEASUREMENT: {
+      ID: 0x0403,
+      NAME: "pressureMeasurement",
+      ATTRIBUTES: Readonly<PressureMeasurementClusterAttributes>,
+      COMMANDS: Readonly<PressureMeasurementClusterCommands>,
+    },
+    FLOW_MEASUREMENT: {
+      ID: 0x0404,
+      NAME: "flowMeasurement",
+      ATTRIBUTES: Readonly<FlowMeasurementClusterAttributes>,
+      COMMANDS: Readonly<FlowMeasurementClusterCommands>,
+    },
+    RELATIVE_HUMIDITY_MEASUREMENT: {
+      ID: 0x0405,
+      NAME: "relativeHumidity",
+      ATTRIBUTES: Readonly<RelativeHumidityClusterAttributes>,
+      COMMANDS: Readonly<RelativeHumidityClusterCommands>,
+    },
+    OCCUPANCY_SENSING: {
+      ID: 0x0406,
+      NAME: "occupancySensing",
+      ATTRIBUTES: Readonly<OccupancySensingClusterAttributes>,
+      COMMANDS: Readonly<OccupancySensingClusterCommands>,
+    },
+    IAS_ZONE: {
+      ID: 0x0500,
+      NAME: "iasZone",
+      ATTRIBUTES: Readonly<IASZoneClusterAttributes>,
+      COMMANDS: Readonly<IASZoneClusterCommands>,
+    },
+    IAS_ACE: {
+      ID: 0x0501,
+      NAME: "iasACE",
+      ATTRIBUTES: Readonly<IASACEClusterAttributes>,
+      COMMANDS: Readonly<IASACEClusterCommands>,
+    },
+    IAS_WD: {
+      ID: 0x0502,
+      NAME: "iasWD",
+      ATTRIBUTES: Readonly<IASWDClusterAttributes>,
+      COMMANDS: Readonly<IASWDClusterCommands>,
+    },
+    METERING: {
+      ID: 0x0702,
+      NAME: "metering",
+      ATTRIBUTES: Readonly<MeteringClusterAttributes>,
+      COMMANDS: Readonly<MeteringClusterCommands>,
+    },
+    ELECTRICAL_MEASUREMENT: {
+      ID: 0x0b04,
+      NAME: "electricalMeasurement",
+      ATTRIBUTES: Readonly<ElectricalMeasurementClusterAttributes>,
+      COMMANDS: Readonly<ElectricalMeasurementClusterCommands>,
+    },
+    DIAGNOSTICS: {
+      ID: 0x0b05,
+      NAME: "diagnostics",
+      ATTRIBUTES: Readonly<DiagnosticsClusterAttributes>,
+      COMMANDS: Readonly<DiagnosticsClusterCommands>,
+    },
+    TOUCHLINK: {
+      ID: 0x1000,
+      NAME: "touchlink",
+      ATTRIBUTES: Readonly<TouchLinkClusterAttributes>,
+      COMMANDS: Readonly<TouchLinkClusterCommands>,
+    },
   };
-  WINDOW_COVERING: {
-    ID: number;
-    NAME: 'windowCovering';
-    ATTRIBUTES: unknown;
-    COMMANDS: unknown;
+
+  import {EventEmitter} from "events";
+  import {ZigBeeNode} from "homey";
+  type ZCLEnum8Status = 'SUCCESS' | 'FAILURE' | 'NOT_AUTHORIZED' | 'RESERVED_FIELD_NOT_ZERO' | 'MALFORMED_COMMAND' | 'UNSUP_CLUSTER_COMMAND' | 'UNSUP_GENERAL_COMMAND' | 'UNSUP_MANUF_CLUSTER_COMMAND' | 'UNSUP_MANUF_GENERAL_COMMAND' | 'INVALID_FIELD' | 'UNSUPPORTED_ATTRIBUTE' | 'INVALID_VALUE' | 'READ_ONLY' | 'INSUFFICIENT_SPACE' | 'DUPLICATE_EXISTS' | 'NOT_FOUND' | 'UNREPORTABLE_ATTRIBUTE' | 'INVALID_DATA_TYPE' | 'INVALID_SELECTOR' | 'WRITE_ONLY' | 'INCONSISTENT_STARTUP_STATE' | 'DEFINED_OUT_OF_BAND' | 'INCONSISTENT' | 'ACTION_DENIED' | 'TIMEOUT' | 'ABORT' | 'INVALID_IMAGE' | 'WAIT_FOR_DATA' | 'NO_IMAGE_AVAILABLE' | 'REQUIRE_MORE_IMAGE' | 'NOTIFICATION_PENDING' | 'HARDWARE_FAILURE' | 'SOFTWARE_FAILURE' | 'CALIBRATION_ERROR' | 'UNSUPPORTED_CLUSTER';
+  type ZCLDataTypes = typeof import('@athombv/data-types').DataTypes & {
+    enum8Status: ZCLDataType<ZCLEnum8Status>
+  };
+
+  function debug(flag: boolean, namespaces: string): void;
+
+  class ZCLNode extends EventEmitter {
+    constructor(node: ZigBeeNode);
+    endpoints: Record<number, ZCLNodeEndpoint>;
+
+    getLogId(endpointId: number, clusterId: number): string;
+  }
+
+  class ZCLNodeEndpoint extends EventEmitter {
+    constructor(node: ZCLNode, descriptor: {
+      endpointId: number;
+      inputClusters: number[];
+      outputClusters: number[];
+    }[]);
+    clusters: Record<string, Cluster<any, any>>;
+    bindings: Record<string, BoundCluster>;
+
+    bind(clusterName: string, clusterImpl: BoundCluster): void;
+    unbind(clusterName: string): void;
+
+    makeDefaultResponseFrame(receivedFrame: unknown, success: boolean, status: ZCLEnum8Status): typeof zclFrames.ZCLStandardHeader | typeof zclFrames.ZCLMfgSpecificHeader;
+  }
+
+  type ZCLDataType<Value> = import('@athombv/data-types').DataType<Value>;
+  const ZCLDataTypes: ZCLDataTypes;
+  const ZCLStruct: typeof import('@athombv/data-types').Struct;
+
+  namespace zclTypes {
+    type ZCLDataType<Value> = import('@athombv/data-types').DataType<Value>;
+    const ZCLDataTypes: ZCLDataTypes;
+    const ZCLStruct: typeof import('@athombv/data-types').Struct;
+  }
+
+  type FrameControlFlag =
+    'clusterSpecific'
+    | 'manufacturerSpecific'
+    | 'directionToClient'
+    | 'disableDefaultResponse';
+  type ZCLFrameControlBitmap = ZCLDataType<BitMap<FrameControlFlag>>;
+
+  namespace zclFrames {
+    const ZCLStandardHeader: import('@athombv/data-types').StaticStruct<{
+      frameControl: ZCLFrameControlBitmap,
+      trxSequenceNumber: ZCLDataTypes["data8"],
+      cmdId: ZCLDataTypes["data8"],
+      data: ZCLDataTypes["buffer"],
+    }>;
+    const ZCLMfgSpecificHeader: import('@athombv/data-types').StaticStruct<{
+      frameControl: ZCLFrameControlBitmap,
+      manufacturerId: ZCLDataTypes["uint16"],
+      trxSequenceNumber: ZCLDataTypes["data8"],
+      cmdId: ZCLDataTypes["data8"],
+      data: ZCLDataTypes["buffer"],
+    }>;
+    function ZCLAttributeDataRecord(withStatus: boolean, attributes: AttributeDefinitions): ZCLDataType<{
+      id: number,
+      name: string,
+      status?: ZCLEnum8Status
+      value: ZCLDataType<any>
+    }>;
+    function ZCLConfigureReportingRecords({ withStatus }: {withStatus?: boolean}): ZCLDataType<{
+      attributeId: number,
+      status?: ZCLEnum8Status,
+      direction: 'reported' | 'received',
+      attributeDataType: number,
+      minInterval: number,
+      maxInterval: number,
+      minChange: number, // TODO Check whether this is actually a number, or a buffer like the JS docs imply
+    }>
+  }
+
+  class ZCLError extends Error {
+    zclStatus: ZCLEnum8Status;
+  }
+
+  const ZIGBEE_PROFILE_ID: {
+    INDUSTRIAL_PLANT_MONITORING: 0x0101,
+    HOME_AUTOMATION: 0x0104,
+    COMMERCIAL_BUILDING_AUTOMATION: 0x0105,
+    TELECOM_APPLICATIONS: 0x0107,
+    PERSONAL_HOME_AND_HOSPITAL_CARE: 0x0108,
+    ADVANCED_METERING_INITIATIVE: 0x0109,
+  };
+  const ZIGBEE_DEVICE_ID: {
+    GENERIC: {
+      ON_OFF_SWITCH: 0x0000,
+      LEVEL_CONTROL_SWITCH: 0x0001,
+      ON_OFF_OUTPUT: 0x0002,
+      LEVEL_CONTROLLABLE_OUTPUT: 0x0003,
+      SCENE_SELECTOR: 0x0004,
+      CONFIGURATION_TOOL: 0x0005,
+      REMOTE_CONTROL: 0x0006,
+      COMBINED_INTERFACE: 0x0007,
+      RANGE_EXTENDER: 0x0008,
+      MAINS_POWER_OUTLET: 0x0009,
+      DOOR_LOCK: 0x000a,
+      DOOR_LOCK_CONTROLLER: 0x000b,
+      SIMPLE_SENSOR: 0x000c,
+      CONSUMPTION_AWARENESS_DEVICE: 0x000d,
+      HOME_GATEWAY: 0x0050,
+      SMART_PLUG: 0x0051,
+      WHITE_GOODS: 0x0052,
+      METER_INTERFACE: 0x0053,
+    },
+    LIGHTING: {
+      ON_OFF_LIGHT: 0x0100,
+      DIMMABLE_LIGHT: 0x0101,
+      COLOR_DIMMABLE_LIGHT: 0x0102,
+      ON_OFF_LIGHT_SWITCH: 0x0103,
+      DIMMER_SWITCH: 0x0104,
+      COLOR_DIMMER_SWITCH: 0x0105,
+      LIGHT_SENSOR: 0x0106,
+      OCCUPANCY_SENSOR: 0x0107,
+    },
+    CLOSURES: {
+      SHADE: 0x0200,
+      SHADE_CONTROLLER: 0x0201,
+      WINDOW_COVERING_DEVICE: 0x0202,
+      WINDOW_COVERING_CONTROLLER: 0x0203,
+    },
+    HVAC: {
+      HEATING_COOLING_UNIT: 0x0300,
+      THERMOSTAT: 0x0301,
+      TEMPERATURE_SENSOR: 0x0302,
+      PUMP: 0x0303,
+      PUMP_CONTROLLER: 0x0304,
+      PRESSURE_SENSOR: 0x0305,
+      FLOW_SENSOR: 0x0306,
+    },
+    INTRUDER_ALARM_SYSTEMS: {
+      IAS_CONTROL_INDICATING_EQUIPMENT: 0x0400,
+      IAS_ANCILLARY_CONTROL_EQUIPMENT: 0x0401,
+      IAS_ZONE: 0x0402,
+      IAS_WARNING_DEVICE: 0x0403,
+    },
   };
-};
-export class BoundCluster {
+  const IAS_ZONE_TYPE: {
+    STANDARD_CIE: 0x0000,
+    MOTION_SENSOR: 0x000d,
+    CONTACT_SWITCH: 0x0015,
+    FIRE_SENSOR: 0x0028,
+    WATER_SENSOR: 0x002a,
+    CARBON_MONOXIDE_SENSOR: 0x002b,
+    PERSONAL_EMERGENCY_DEVICE: 0x002c,
+    VIBRATION_MOVEMENT_SENSOR: 0x002d,
+    REMOTE_CONTROL: 0x010f,
+    KEY_FOB: 0x0115,
+    KEYPAD: 0x021d,
+    STANDARD_WARNING_DEVICE: 0x0225,
+    GLASS_BREAK_SENSOR: 0x0226,
+    SECURITY_REPEATER: 0x0229,
+    INVALID_ZONE_TYPE: 0xffff,
+  };
+
+  abstract class Cluster<Attributes extends AttributeDefinitions, Commands extends CommandDefinitions> extends EventEmitter {
+    static get ID(): number;
+    static get NAME(): string;
+    // @ts-expect-error Type should be defined on non-abstract inheritors
+    static get ATTRIBUTES(): Attributes;
+    // @ts-expect-error Type should be defined on non-abstract inheritors
+    static get COMMANDS(): Commands;
+
+    static DIRECTION_SERVER_TO_CLIENT: CommandToClientDirection;
+    static DIRECTION_CLIENT_TO_SERVER: CommandToServerDirection;
 
+    get logId(): string;
+
+    discoverCommandsGenerated({startValue, maxResults}?: {startValue?: number, maxResults?: number}, opts?: {timeout?: number}): Promise<Array<number>>;
+    discoverCommandsReceived({startValue, maxResults}?: {startValue?: number, maxResults?: number}, opts?: {timeout?: number}): Promise<Array<number>>;
+
+    readAttributes<K extends keyof Attributes | number>(attributes: ReadonlyArray<K>, opts?: {timeout?: number}): Promise<{[attribute in K]: AttributesFromDefinition<Attributes>[attribute]}>;
+    writeAttributes<K extends keyof Attributes>(attributes: {[attribute in K]: AttributesFromDefinition<Attributes>[attribute]}, opts?: {timeout?: number}): Promise<{[attribute in K]: {id: number, status: 'SUCCESS' | 'FAILURE'}}>
+
+    configureReporting(attributes: AttributeReportingConfiguration<Extract<keyof Attributes, string>>, opts?: {timeout?: number}): Promise<void>;
+    readReportingConfiguration(attributes: ReadonlyArray<string | number>, opts?: {timeout?: number}): Promise<Array<ReadReportingConfigurationResponse>>;
+
+    discoverAttributes(opts?: {timeout?: number}): Promise<Array<string | number>>;
+    discoverAttributesExtended(opts?: {timeout?: number}): Promise<Array<ExtendedAttributesResponse>>;
+
+    sendFrame(data: object): Promise<void>;
+    nextSeqNr(): number;
+
+    static addCluster(clusterClass: typeof Cluster<any, any>): void;
+    static removeCluster(clusterIdOrName: string | number): void;
+    static getCluster<Attributes extends AttributeDefinitions, Commands extends CommandDefinitions>(clusterIdOrName: string | number): Cluster<Attributes, Commands>;
+
+    on<Event extends Extract<keyof Attributes, string>>(eventName: `attr.${Event}`, listener: (value: AttributesFromDefinition<Attributes>[Event]) => void): this;
+    on<Values extends Array<any> = unknown[]>(eventName: string, listener: (...args: Values) => void): this;
+
+    attributes: Attributes;
+    attributesById: {[Attribute in keyof Attributes as Attributes[Attribute]['id']]: { name: Attribute } & Attributes[Attribute] };
+
+    commands: Commands;
+    commandsById: {[Command in keyof Commands as Commands[Command]['id']]: Array<{name: Command} & Commands[Command]>};
+  }
+
+  // TODO
+  abstract class BoundCluster {
+    endpoint: number;
+    cluster: Cluster<any, any>;
+
+    get logId(): string;
+  }
+}
+
+type CommandToServerDirection = 'DIRECTION_CLIENT_TO_SERVER';
+type CommandToClientDirection = 'DIRECTION_SERVER_TO_CLIENT';
+type CommandDirection = CommandToServerDirection | CommandToClientDirection;
+
+type FromZCLDataType<DataType> = DataType extends import('zigbee-clusters').ZCLDataType<infer InferredValue>? InferredValue : DataType;
+
+type AttributeDefinition = {
+  id: number,
+  type: import('zigbee-clusters').ZCLDataType<any>,
+  manufacturerId?: number,
 }
 
-export class ZCLError extends Error {
-  zclStatus: ZCLEnum8Status;
-  constructor(zclStatus?: ZCLEnum8Status);
+type AttributeDefinitions = {
+  [attributeName: string]: AttributeDefinition,
 }
-export const AlarmsCluster: {
-  new (...args: any[]): AlarmsCluster;
-  ID: 9;
-  NAME: 'alarms';
-  ATTRIBUTES: unknown;
-  COMMANDS: unknown;
-};
-export const AnalogInputCluster: {
-  new (...args: any[]): AnalogInputCluster;
-  ID: 12;
-  NAME: 'analogInput';
-  ATTRIBUTES: unknown;
-  COMMANDS: unknown;
-};
-export const AnalogOutputCluster: {
-  new (...args: any[]): AnalogOutputCluster;
-  ID: 13;
-  NAME: 'analogOutput';
-  ATTRIBUTES: unknown;
-  COMMANDS: unknown;
-};
-export const AnalogValueCluster: {
-  new (...args: any[]): AnalogValueCluster;
-  ID: 14;
-  NAME: 'analogValue';
-  ATTRIBUTES: unknown;
-  COMMANDS: unknown;
-};
-export const BallastConfigurationCluster: {
-  new (...args: any[]): BallastConfigurationCluster;
-  ID: 769;
-  NAME: 'ballastConfiguration';
-  ATTRIBUTES: unknown;
-  COMMANDS: unknown;
-};
-export const BasicCluster: {
-  new (...args: any[]): BasicCluster;
-  ID: 0;
-  NAME: 'basic';
-  ATTRIBUTES: unknown;
-  COMMANDS: unknown;
-};
-export const BinaryInputCluster: {
-  new (...args: any[]): BinaryInputCluster;
-  ID: 15;
-  NAME: 'binaryInput';
-  ATTRIBUTES: unknown;
-  COMMANDS: unknown;
-};
-export const BinaryOutputCluster: {
-  new (...args: any[]): BinaryOutputCluster;
-  ID: 16;
-  NAME: 'binaryOutput';
-  ATTRIBUTES: unknown;
-  COMMANDS: unknown;
-};
-export const BinaryValueCluster: {
-  new (...args: any[]): BinaryValueCluster;
-  ID: 17;
-  NAME: 'binaryValue';
-  ATTRIBUTES: unknown;
-  COMMANDS: unknown;
-};
-export const ColorControlCluster: {
-  new (...args: any[]): ColorControlCluster;
-  ID: 768;
-  NAME: 'colorControl';
-  ATTRIBUTES: unknown;
-  COMMANDS: unknown;
-};
-export const DehumidificationControlCluster: {
-  new (...args: any[]): DehumidificationControlCluster;
-  ID: 515;
-  NAME: 'dehumidificationControl';
-  ATTRIBUTES: unknown;
-  COMMANDS: unknown;
-};
-export const DeviceTemperatureCluster: {
-  new (...args: any[]): DeviceTemperatureCluster;
-  ID: 2;
-  NAME: 'deviceTemperature';
-  ATTRIBUTES: unknown;
-  COMMANDS: unknown;
-};
-export const DiagnosticsCluster: {
-  new (...args: any[]): DiagnosticsCluster;
-  ID: 2821;
-  NAME: 'diagnostics';
-  ATTRIBUTES: unknown;
-  COMMANDS: unknown;
-};
-export const DoorLockCluster: {
-  new (...args: any[]): DoorLockCluster;
-  ID: 257;
-  NAME: 'doorLock';
-  ATTRIBUTES: unknown;
-  COMMANDS: unknown;
-};
-export const ElectricalMeasurementCluster: {
-  new (...args: any[]): ElectricalMeasurementCluster;
-  ID: 2820;
-  NAME: 'electricalMeasurement';
-  ATTRIBUTES: unknown;
-  COMMANDS: unknown;
-};
-export const FanControlCluster: {
-  new (...args: any[]): FanControlCluster;
-  ID: 514;
-  NAME: 'fanControl';
-  ATTRIBUTES: unknown;
-  COMMANDS: unknown;
-};
-export const FlowMeasurementCluster: {
-  new (...args: any[]): FlowMeasurementCluster;
-  ID: 1028;
-  NAME: 'flowMeasurement';
-  ATTRIBUTES: unknown;
-  COMMANDS: unknown;
-};
-export const GroupsCluster: {
-  new (...args: any[]): GroupsCluster;
-  ID: 4;
-  NAME: 'groups';
-  ATTRIBUTES: unknown;
-  COMMANDS: unknown;
-};
-export const IASACECluster: {
-  new (...args: any[]): IASACECluster;
-  ID: 1281;
-  NAME: 'iasACE';
-  ATTRIBUTES: unknown;
-  COMMANDS: unknown;
-};
-export const IASWDCluster: {
-  new (...args: any[]): IASWDCluster;
-  ID: 1282;
-  NAME: 'iasWD';
-  ATTRIBUTES: unknown;
-  COMMANDS: unknown;
-};
-export const IASZoneCluster: {
-  new (...args: any[]): IASZoneCluster;
-  ID: 1280;
-  NAME: 'iasZone';
-  ATTRIBUTES: unknown;
-  COMMANDS: unknown;
-};
-export const IdentifyCluster: {
-  new (...args: any[]): IdentifyCluster;
-  ID: 3;
-  NAME: 'identify';
-  ATTRIBUTES: unknown;
-  COMMANDS: unknown;
-};
-export const IlluminanceLevelSensingCluster: {
-  new (...args: any[]): IlluminanceLevelSensingCluster;
-  ID: 1025;
-  NAME: 'illuminanceLevelSensing';
-  ATTRIBUTES: unknown;
-  COMMANDS: unknown;
-};
-export const IlluminanceMeasurementCluster: {
-  new (...args: any[]): IlluminanceMeasurementCluster;
-  ID: 1024;
-  NAME: 'illuminanceMeasurement';
-  ATTRIBUTES: unknown;
-  COMMANDS: unknown;
-};
-export const LevelControlCluster: {
-  new (...args: any[]): LevelControlCluster;
-  ID: 8;
-  NAME: 'levelControl';
-  ATTRIBUTES: unknown;
-  COMMANDS: unknown;
-};
-export const MeteringCluster: {
-  new (...args: any[]): MeteringCluster;
-  ID: 1794;
-  NAME: 'metering';
-  ATTRIBUTES: unknown;
-  COMMANDS: unknown;
-};
-export const MultistateInputCluster: {
-  new (...args: any[]): MultistateInputCluster;
-  ID: 18;
-  NAME: 'multistateInput';
-  ATTRIBUTES: unknown;
-  COMMANDS: unknown;
-};
-export const MultistateOutputCluster: {
-  new (...args: any[]): MultistateOutputCluster;
-  ID: 19;
-  NAME: 'multistateOutput';
-  ATTRIBUTES: unknown;
-  COMMANDS: unknown;
-};
-export const MultistateValueCluster: {
-  new (...args: any[]): MultistateValueCluster;
-  ID: 20;
-  NAME: 'multistateValue';
-  ATTRIBUTES: unknown;
-  COMMANDS: unknown;
-};
-export const OccupancySensingCluster: {
-  new (...args: any[]): OccupancySensingCluster;
-  ID: 1030;
-  NAME: 'occupancySensing';
-  ATTRIBUTES: unknown;
-  COMMANDS: unknown;
-};
-export const OnOffCluster: {
-  new (...args: any[]): OnOffCluster;
-  ID: 6;
-  NAME: 'onOff';
-  ATTRIBUTES: unknown;
-  COMMANDS: unknown;
-};
-export const OnOffSwitchCluster: {
-  new (...args: any[]): OnOffSwitchCluster;
-  ID: 7;
-  NAME: 'onOffSwitch';
-  ATTRIBUTES: unknown;
-  COMMANDS: unknown;
-};
-export const OTACluster: {
-  new (...args: any[]): OTACluster;
-  ID: 25;
-  NAME: 'ota';
-  ATTRIBUTES: unknown;
-  COMMANDS: unknown;
-};
-export const PollControlCluster: {
-  new (...args: any[]): PollControlCluster;
-  ID: 32;
-  NAME: 'pollControl';
-  ATTRIBUTES: unknown;
-  COMMANDS: unknown;
-};
-export const PowerConfigurationCluster: {
-  new (...args: any[]): PowerConfigurationCluster;
-  ID: 1;
-  NAME: 'powerConfiguration';
-  ATTRIBUTES: unknown;
-  COMMANDS: unknown;
-};
-export const PowerProfileCluster: {
-  new (...args: any[]): PowerProfileCluster;
-  ID: 26;
-  NAME: 'powerProfile';
-  ATTRIBUTES: unknown;
-  COMMANDS: unknown;
-};
-export const PressureMeasurementCluster: {
-  new (...args: any[]): PressureMeasurementCluster;
-  ID: 1027;
-  NAME: 'pressureMeasurement';
-  ATTRIBUTES: unknown;
-  COMMANDS: unknown;
-};
-export const PumpConfigurationAndControlCluster: {
-  new (...args: any[]): PumpConfigurationAndControlCluster;
-  ID: 512;
-  NAME: 'pumpConfigurationAndControl';
-  ATTRIBUTES: unknown;
-  COMMANDS: unknown;
-};
-export const RelativeHumidityCluster: {
-  new (...args: any[]): RelativeHumidityCluster;
-  ID: 1029;
-  NAME: 'relativeHumidity';
-  ATTRIBUTES: unknown;
-  COMMANDS: unknown;
-};
-export const ScenesCluster: {
-  new (...args: any[]): ScenesCluster;
-  ID: 5;
-  NAME: 'scenes';
-  ATTRIBUTES: unknown;
-  COMMANDS: unknown;
-};
-export const ShadeConfigurationCluster: {
-  new (...args: any[]): ShadeConfigurationCluster;
-  ID: 256;
-  NAME: 'shadeConfiguration';
-  ATTRIBUTES: unknown;
-  COMMANDS: unknown;
-};
-export const TemperatureMeasurementCluster: {
-  new (...args: any[]): TemperatureMeasurementCluster;
-  ID: 1026;
-  NAME: 'temperatureMeasurement';
-  ATTRIBUTES: unknown;
-  COMMANDS: unknown;
-};
-export const ThermostatCluster: {
-  new (...args: any[]): ThermostatCluster;
-  ID: 513;
-  NAME: 'thermostat';
-  ATTRIBUTES: unknown;
-  COMMANDS: unknown;
-};
-export const TimeCluster: {
-  new (...args: any[]): TimeCluster;
-  ID: 10;
-  NAME: 'time';
-  ATTRIBUTES: unknown;
-  COMMANDS: unknown;
-};
-export const TouchLinkCluster: {
-  new (...args: any[]): TouchLinkCluster;
-  ID: 4096;
-  NAME: 'touchlink';
-  ATTRIBUTES: unknown;
-  COMMANDS: unknown;
-};
-export const WindowCoveringCluster: {
-  new (...args: any[]): WindowCoveringCluster;
-  ID: 258;
-  NAME: 'windowCovering';
-  ATTRIBUTES: unknown;
-  COMMANDS: unknown;
-};
 
-export const ZIGBEE_PROFILE_ID: {
-  INDUSTRIAL_PLANT_MONITORING: 257;
-  HOME_AUTOMATION: 260;
-  COMMERCIAL_BUILDING_AUTOMATION: 261;
-  TELECOM_APPLICATIONS: 263;
-  PERSONAL_HOME_AND_HOSPITAL_CARE: 264;
-  ADVANCED_METERING_INITIATIVE: 265;
-};
+type AttributesFromDefinition<Definition extends AttributeDefinitions> = {
+  [attribute in keyof Definition]: FromZCLDataType<Definition[attribute]['type']>
+}
 
-export const ZIGBEE_DEVICE_ID: {
-  GENERIC: {
-    ON_OFF_SWITCH: 0;
-    LEVEL_CONTROL_SWITCH: 1;
-    ON_OFF_OUTPUT: 2;
-    LEVEL_CONTROLLABLE_OUTPUT: 3;
-    SCENE_SELECTOR: 4;
-    CONFIGURATION_TOOL: 5;
-    REMOTE_CONTROL: 6;
-    COMBINED_INTERFACE: 7;
-    RANGE_EXTENDER: 8;
-    MAINS_POWER_OUTLET: 9;
-    DOOR_LOCK: 10;
-    DOOR_LOCK_CONTROLLER: 11;
-    SIMPLE_SENSOR: 12;
-    CONSUMPTION_AWARENESS_DEVICE: 13;
-    HOME_GATEWAY: 80;
-    SMART_PLUG: 81;
-    WHITE_GOODS: 82;
-    METER_INTERFACE: 83;
-  };
-  LIGHTING: {
-    ON_OFF_LIGHT: 256;
-    DIMMABLE_LIGHT: 257;
-    COLOR_DIMMABLE_LIGHT: 258;
-    ON_OFF_LIGHT_SWITCH: 259;
-    DIMMER_SWITCH: 260;
-    COLOR_DIMMER_SWITCH: 261;
-    LIGHT_SENSOR: 262;
-    OCCUPANCY_SENSOR: 263;
-  };
-  CLOSURES: {
-    SHADE: 512;
-    SHADE_CONTROLLER: 513;
-    WINDOW_COVERING_DEVICE: 514;
-    WINDOW_COVERING_CONTROLLER: 515;
-  };
-  HVAC: {
-    HEATING_COOLING_UNIT: 768;
-    THERMOSTAT: 769;
-    TEMPERATURE_SENSOR: 770;
-    PUMP: 771;
-    PUMP_CONTROLLER: 772;
-    PRESSURE_SENSOR: 773;
-    FLOW_SENSOR: 774;
-  };
-  INTRUDER_ALARM_SYSTEMS: {
-    IAS_CONTROL_INDICATING_EQUIPMENT: 1024;
-    IAS_ANCILLARY_CONTROL_EQUIPMENT: 1025;
-    IAS_ZONE: 1026;
-    IAS_WARNING_DEVICE: 1027;
-  };
-};
+type CommandDefinition = {
+  id: number,
+  direction?: CommandDirection,
+  args?: {
+    [argName: string]: import('zigbee-clusters').ZCLDataType<any>,
+  }
+  response?: CommandDefinition,
+  frameControl?: import('zigbee-clusters').FrameControlFlag[];
+  encodeMissingFieldsBehavior?: 'default' | 'skip';
+  global?: boolean;
+}
+
+type CommandDefinitions = {
+  [commandName: string]: CommandDefinition,
+}
 
-export const IAS_ZONE_TYPE: {
-  STANDARD_CIE: 0;
-  MOTION_SENSOR: 13;
-  CONTACT_SWITCH: 21;
-  FIRE_SENSOR: 40;
-  WATER_SENSOR: 42;
-  CARBON_MONOXIDE_SENSOR: 43;
-  PERSONAL_EMERGENCY_DEVICE: 44;
-  VIBRATION_MOVEMENT_SENSOR: 45;
-  REMOTE_CONTROL: 271;
-  KEY_FOB: 277;
-  KEYPAD: 541;
-  STANDARD_WARNING_DEVICE: 549;
-  GLASS_BREAK_SENSOR: 550;
-  SECURITY_REPEATER: 553;
-  INVALID_ZONE_TYPE: 65535;
-};
+type AttributeReportingConfiguration<AttributeKey extends string> = {
+  [attribute in AttributeKey]: {
+    minInterval?: number,
+    maxInterval?: number,
+    minChange?: number
+  }
+}
 
-declare const _default: {
-  ZCLNode: typeof ZCLNode;
-  CLUSTER: typeof CLUSTER;
-  AlarmsCluster: typeof AlarmsCluster;
-  AnalogInputCluster: typeof AnalogInputCluster;
-  AnalogOutputCluster: typeof AnalogOutputCluster;
-  AnalogValueCluster: typeof AnalogValueCluster;
-  BallastConfigurationCluster: typeof BallastConfigurationCluster;
-  BasicCluster: typeof BasicCluster;
-  BinaryInputCluster: typeof BinaryInputCluster;
-  BinaryOutputCluster: typeof BinaryOutputCluster;
-  BinaryValueCluster: typeof BinaryValueCluster;
-  ColorControlCluster: typeof ColorControlCluster;
-  DehumidificationControlCluster: typeof DehumidificationControlCluster;
-  DeviceTemperatureCluster: typeof DeviceTemperatureCluster;
-  DiagnosticsCluster: typeof DiagnosticsCluster;
-  DoorLockCluster: typeof DoorLockCluster;
-  ElectricalMeasurementCluster: typeof ElectricalMeasurementCluster;
-  FanControlCluster: typeof FanControlCluster;
-  FlowMeasurementCluster: typeof FlowMeasurementCluster;
-  GroupsCluster: typeof GroupsCluster;
-  IASACECluster: typeof IASACECluster;
-  IASWDCluster: typeof IASWDCluster;
-  IASZoneCluster: typeof IASZoneCluster;
-  IdentifyCluster: typeof IdentifyCluster;
-  IlluminanceLevelSensingCluster: typeof IlluminanceLevelSensingCluster;
-  IlluminanceMeasurementCluster: typeof IlluminanceMeasurementCluster;
-  LevelControlCluster: typeof LevelControlCluster;
-  MeteringCluster: typeof MeteringCluster;
-  MultistateInputCluster: typeof MultistateInputCluster;
-  MultistateOutputCluster: typeof MultistateOutputCluster;
-  MultistateValueCluster: typeof MultistateValueCluster;
-  OccupancySensingCluster: typeof OccupancySensingCluster;
-  OnOffCluster: typeof OnOffCluster;
-  OnOffSwitchCluster: typeof OnOffSwitchCluster;
-  OTACluster: typeof OTACluster;
-  PollControlCluster: typeof PollControlCluster;
-  PowerConfigurationCluster: typeof PowerConfigurationCluster;
-  PowerProfileCluster: typeof PowerProfileCluster;
-  PressureMeasurementCluster: typeof PressureMeasurementCluster;
-  PumpConfigurationAndControlCluster: typeof PumpConfigurationAndControlCluster;
-  RelativeHumidityCluster: typeof RelativeHumidityCluster;
-  ScenesCluster: typeof ScenesCluster;
-  ShadeConfigurationCluster: typeof ShadeConfigurationCluster;
-  TemperatureMeasurementCluster: typeof TemperatureMeasurementCluster;
-  ThermostatCluster: typeof ThermostatCluster;
-  TimeCluster: typeof TimeCluster;
-  TouchLinkCluster: typeof TouchLinkCluster;
-  WindowCoveringCluster: typeof WindowCoveringCluster;
-  ZIGBEE_PROFILE_ID: typeof ZIGBEE_PROFILE_ID;
-  ZIGBEE_DEVICE_ID: typeof ZIGBEE_DEVICE_ID;
-  IAS_ZONE_TYPE: typeof IAS_ZONE_TYPE;
-};
-export default _default;
\ No newline at end of file
+type ReadReportingConfigurationResponse = {
+  status: import('zigbee-clusters').ZCLEnum8Status,
+  direction: 'reported'|'received';
+  attributeId: number;
+  attributeDataType?: number;
+  minInterval?: number;
+  maxInterval?: number;
+  minChange?: number;
+  timeoutPeriod?: number;
+}
+
+type ExtendedAttributesResponse = {
+  name?: string;
+  id: number;
+  acl: {
+    readable: boolean;
+    writable: boolean;
+    reportable: boolean;
+  }
+}
diff --git a/scripts/template.d.ts.txt b/scripts/template.d.ts.txt
index 7cc9604..d7bd402 100644
--- a/scripts/template.d.ts.txt
+++ b/scripts/template.d.ts.txt
@@ -49,13 +49,13 @@ declare module 'zigbee-clusters' {
   type ZCLFrameControlBitmap = ZCLDataType<BitMap<FrameControlFlag>>;
 
   namespace zclFrames {
-    const ZCLStandardHeader: import('@athombv/data-types').StructInstance<{
+    const ZCLStandardHeader: import('@athombv/data-types').StaticStruct<{
       frameControl: ZCLFrameControlBitmap,
       trxSequenceNumber: ZCLDataTypes["data8"],
       cmdId: ZCLDataTypes["data8"],
       data: ZCLDataTypes["buffer"],
     }>;
-    const ZCLMfgSpecificHeader: import('@athombv/data-types').StructInstance<{
+    const ZCLMfgSpecificHeader: import('@athombv/data-types').StaticStruct<{
       frameControl: ZCLFrameControlBitmap,
       manufacturerId: ZCLDataTypes["uint16"],
       trxSequenceNumber: ZCLDataTypes["data8"],
@@ -213,8 +213,6 @@ declare module 'zigbee-clusters' {
   }
 }
 
-// TODO clean up so these are not global
-
 type CommandToServerDirection = 'DIRECTION_CLIENT_TO_SERVER';
 type CommandToClientDirection = 'DIRECTION_SERVER_TO_CLIENT';
 type CommandDirection = CommandToServerDirection | CommandToClientDirection;

From 424b0fe045ab2330156af68c27f2db30c02fa71e Mon Sep 17 00:00:00 2001
From: Joost Loohuis <github@loohuis.dev>
Date: Fri, 10 Apr 2026 10:49:51 +0200
Subject: [PATCH 7/9] Improve new types

---
 index.d.ts                | 262 +++++++++++++++++++++++++++++++++++---
 scripts/template.d.ts.txt | 262 +++++++++++++++++++++++++++++++++++---
 2 files changed, 492 insertions(+), 32 deletions(-)

diff --git a/index.d.ts b/index.d.ts
index ab795c5..35a7397 100644
--- a/index.d.ts
+++ b/index.d.ts
@@ -2471,19 +2471,20 @@ declare module "zigbee-clusters" {
     }>;
     function ZCLAttributeDataRecord(withStatus: boolean, attributes: AttributeDefinitions): ZCLDataType<{
       id: number,
-      name: string,
+      name?: string,
       status?: ZCLEnum8Status
-      value: ZCLDataType<any>
+      value?: ZCLDataType<any>
     }>;
-    function ZCLConfigureReportingRecords({ withStatus }: {withStatus?: boolean}): ZCLDataType<{
+    function ZCLConfigureReportingRecords({ withStatus }: {withStatus?: boolean}): ZCLDataType<Array<{
       attributeId: number,
       status?: ZCLEnum8Status,
       direction: 'reported' | 'received',
-      attributeDataType: number,
-      minInterval: number,
-      maxInterval: number,
-      minChange: number, // TODO Check whether this is actually a number, or a buffer like the JS docs imply
-    }>
+      attributeDataType?: number,
+      minInterval?: number,
+      maxInterval?: number,
+      minChange?: number,
+      timeoutPeriod?: number,
+    }>>
   }
 
   class ZCLError extends Error {
@@ -2585,11 +2586,11 @@ declare module "zigbee-clusters" {
     discoverCommandsGenerated({startValue, maxResults}?: {startValue?: number, maxResults?: number}, opts?: {timeout?: number}): Promise<Array<number>>;
     discoverCommandsReceived({startValue, maxResults}?: {startValue?: number, maxResults?: number}, opts?: {timeout?: number}): Promise<Array<number>>;
 
-    readAttributes<K extends keyof Attributes | number>(attributes: ReadonlyArray<K>, opts?: {timeout?: number}): Promise<{[attribute in K]: AttributesFromDefinition<Attributes>[attribute]}>;
-    writeAttributes<K extends keyof Attributes>(attributes: {[attribute in K]: AttributesFromDefinition<Attributes>[attribute]}, opts?: {timeout?: number}): Promise<{[attribute in K]: {id: number, status: 'SUCCESS' | 'FAILURE'}}>
+    readAttributes<K extends keyof (Attributes & GLOBAL_ATTRIBUTES) | number>(attributes: ReadonlyArray<K>, opts?: {timeout?: number}): Promise<{[attribute in K]: AttributesFromDefinition<Attributes & GLOBAL_ATTRIBUTES>[attribute]}>;
+    writeAttributes<K extends keyof (Attributes & GLOBAL_ATTRIBUTES)>(attributes: {[attribute in K]: AttributesFromDefinition<Attributes & GLOBAL_ATTRIBUTES>[attribute]}, opts?: {timeout?: number}): Promise<{[attribute in K]: {id: number, status: 'SUCCESS' | 'FAILURE'}}>
 
-    configureReporting(attributes: AttributeReportingConfiguration<Extract<keyof Attributes, string>>, opts?: {timeout?: number}): Promise<void>;
-    readReportingConfiguration(attributes: ReadonlyArray<string | number>, opts?: {timeout?: number}): Promise<Array<ReadReportingConfigurationResponse>>;
+    configureReporting(attributes: AttributeReportingConfiguration<Extract<keyof (Attributes & GLOBAL_ATTRIBUTES), string>>, opts?: {timeout?: number}): Promise<void>;
+    readReportingConfiguration(attributes: ReadonlyArray<Extract<keyof (Attributes & GLOBAL_ATTRIBUTES), string> | number>, opts?: {timeout?: number}): Promise<Array<ReadReportingConfigurationResponse>>;
 
     discoverAttributes(opts?: {timeout?: number}): Promise<Array<string | number>>;
     discoverAttributesExtended(opts?: {timeout?: number}): Promise<Array<ExtendedAttributesResponse>>;
@@ -2604,11 +2605,11 @@ declare module "zigbee-clusters" {
     on<Event extends Extract<keyof Attributes, string>>(eventName: `attr.${Event}`, listener: (value: AttributesFromDefinition<Attributes>[Event]) => void): this;
     on<Values extends Array<any> = unknown[]>(eventName: string, listener: (...args: Values) => void): this;
 
-    attributes: Attributes;
-    attributesById: {[Attribute in keyof Attributes as Attributes[Attribute]['id']]: { name: Attribute } & Attributes[Attribute] };
+    attributes: Attributes & GLOBAL_ATTRIBUTES;
+    attributesById: {[Attribute in keyof (Attributes & GLOBAL_ATTRIBUTES) as (Attributes & GLOBAL_ATTRIBUTES)[Attribute]['id']]: { name: Attribute } & (Attributes & GLOBAL_ATTRIBUTES)[Attribute] };
 
-    commands: Commands;
-    commandsById: {[Command in keyof Commands as Commands[Command]['id']]: Array<{name: Command} & Commands[Command]>};
+    commands: Commands & GLOBAL_COMMANDS;
+    commandsById: {[Command in keyof Commands as Commands[Command]['id']]: Array<{name: Command} & Commands[Command]>}; // Adding the global commands here results in types too big for TypeScript
   }
 
   // TODO
@@ -2620,6 +2621,235 @@ declare module "zigbee-clusters" {
   }
 }
 
+type ZCLDataTypes = import('zigbee-clusters').ZCLDataTypes;
+type ZCLDataType<Value> = import('zigbee-clusters').ZCLDataType<Value>;
+type ZCLStruct<Defs extends Record<string, ZCLDataType<any>>> = import('@athombv/data-types').StructInstance<Defs>
+
+type GLOBAL_ATTRIBUTES = {
+  clusterRevision: { id: 0xfffd, type: ZCLDataTypes["uint16"] },
+  attributeReportingStatus: {
+    id: 0xfffe,
+    type: ZCLDataType<"PENDING" | "COMPLETE">
+  }
+};
+
+type GLOBAL_COMMANDS = {
+  readAttributes: {
+    id: 0x00,
+    args: {
+      attributes: ZCLDataType<Array<number>>,
+    },
+    response: {
+      id: 0x01,
+      args: {
+        attributes: ZCLDataTypes["buffer"],
+      },
+    },
+    global: true,
+  },
+
+  writeAttributes: {
+    id: 0x02,
+    args: {
+      attributes: ZCLDataTypes["buffer"],
+    },
+    response: {
+      id: 0x04,
+      args: {
+        attributes: ZCLDataType<Array<ZCLStruct<{
+          status: ZCLDataTypes["enum8Status"],
+          id: ZCLDataTypes["uint16"]
+        }>>>
+      },
+    },
+    global: true,
+  },
+
+  writeAttributesAtomic: {
+    id: 0x03,
+    args: {
+      attributes: ZCLDataTypes["buffer"],
+    },
+    response: {
+      id: 0x04,
+      args: {
+        attributes: ZCLDataType<Array<ZCLStruct<{
+          status: ZCLDataTypes["enum8Status"],
+          id: ZCLDataTypes["uint16"]
+        }>>>
+      },
+    },
+    global: true,
+  },
+
+  writeAttributesNoResponse: {
+    id: 0x05,
+    args: {
+      attributes: ZCLDataTypes["buffer"],
+    },
+    global: true,
+  },
+
+  configureReporting: {
+    id: 0x06,
+    args: {
+      reports: ReturnType<typeof import('zigbee-clusters').zclFrames.ZCLConfigureReportingRecords>,
+    },
+    response: {
+      id: 0x07,
+      args: {
+        reports: ZCLDataType<Array<ZCLStruct<{
+          status: ZCLDataTypes["enum8Status"],
+          direction: ZCLDataType<"reported" | "received">
+          attributeId: ZCLDataTypes["uint16"]
+        }>>>
+      },
+    },
+    global: true,
+  },
+
+  readReportingConfiguration: {
+    id: 0x08,
+    args: {
+      attributes: ZCLDataType<Array<ZCLStruct<{
+        direction: ZCLDataType<"reported" | "received">
+        attributeId: ZCLDataTypes["uint16"]
+      }>>>,
+    },
+    response: {
+      id: 0x09,
+      args: {
+        reports: ReturnType<typeof import('zigbee-clusters').zclFrames.ZCLConfigureReportingRecords>,
+      },
+    },
+    global: true,
+  },
+
+  reportAttributes: {
+    id: 0x0A,
+    args: {
+      attributes: ZCLDataTypes["buffer"],
+    },
+    global: true,
+  },
+
+  defaultResponse: {
+    id: 0x0B,
+    args: {
+      cmdId: ZCLDataTypes["uint8"],
+      status: ZCLDataTypes["enum8Status"],
+    },
+    global: true,
+  },
+
+  discoverAttributes: {
+    id: 0x0C,
+    args: {
+      startValue: ZCLDataTypes["uint16"],
+      maxResults: ZCLDataTypes["uint8"],
+    },
+    response: {
+      id: 0x0D,
+      args: {
+        lastResponse: ZCLDataTypes["bool"],
+        attributes: ZCLDataType<Array<ZCLStruct<{
+          id: ZCLDataTypes["uint16"],
+          dataTypeId: ZCLDataTypes["uint8"],
+        }>>>,
+      },
+    },
+    global: true,
+  },
+
+  readAttributesStructured: {
+    id: 0x0E,
+    args: {
+      attributes: ZCLDataType<Array<ZCLStruct<{
+        attributeId: ZCLDataTypes["uint16"],
+        indexPath: ZCLDataType<Array<ZCLDataTypes["uint16"]>>,
+      }>>>,
+    },
+    response: {
+      id: 0x01,
+      args: {
+        attributes: ZCLDataTypes["buffer"],
+      },
+    },
+    global: true,
+  },
+
+  writeAttributesStructured: {
+    id: 0x0F,
+    args: {
+      attributes: ZCLDataType<Array<ZCLStruct<{
+        attributeId: ZCLDataTypes["uint16"],
+        indexPath: ZCLDataType<Array<ZCLDataTypes["uint16"]>>,
+        dataTypeId: ZCLDataTypes["uint8"],
+        value: ZCLDataTypes["buffer"],
+      }>>>,
+    },
+    response: {
+      id: 0x10,
+      args: {
+        attributes: ZCLDataTypes["buffer"],
+      },
+    },
+    global: true,
+  },
+
+  discoverCommandsReceived: {
+    id: 0x11,
+    args: {
+      startValue: ZCLDataTypes["uint8"],
+      maxResults: ZCLDataTypes["uint8"],
+    },
+    response: {
+      id: 0x12,
+      args: {
+        lastResponse: ZCLDataTypes["bool"],
+        commandIds: ZCLDataType<Array<ZCLDataTypes["uint8"]>>,
+      },
+    },
+    global: true,
+  },
+
+  discoverCommandsGenerated: {
+    id: 0x13,
+    args: {
+      startValue: ZCLDataTypes["uint8"],
+      maxResults: ZCLDataTypes["uint8"],
+    },
+    response: {
+      id: 0x14,
+      args: {
+        lastResponse: ZCLDataTypes["bool"],
+        commandIds: ZCLDataType<Array<ZCLDataTypes["uint8"]>>,
+      },
+    },
+    global: true,
+  },
+
+  discoverAttributesExtended: {
+    id: 0x15,
+    args: {
+      startValue: ZCLDataTypes["uint16"],
+      maxResults: ZCLDataTypes["uint8"],
+    },
+    response: {
+      id: 0x16,
+      args: {
+        lastResponse: ZCLDataTypes["bool"],
+        attributes: ZCLDataType<Array<ZCLStruct<{
+          id: ZCLDataTypes["uint16"],
+          dataTypeId: ZCLDataTypes["uint8"],
+          acl: ZCLDataType<import('@athombv/data-types').BitMap<'readable' | 'writable' | 'reportable'>>,
+        }>>>,
+      },
+    },
+    global: true,
+  },
+};
+
 type CommandToServerDirection = 'DIRECTION_CLIENT_TO_SERVER';
 type CommandToClientDirection = 'DIRECTION_SERVER_TO_CLIENT';
 type CommandDirection = CommandToServerDirection | CommandToClientDirection;
diff --git a/scripts/template.d.ts.txt b/scripts/template.d.ts.txt
index d7bd402..31a3cef 100644
--- a/scripts/template.d.ts.txt
+++ b/scripts/template.d.ts.txt
@@ -64,19 +64,20 @@ declare module 'zigbee-clusters' {
     }>;
     function ZCLAttributeDataRecord(withStatus: boolean, attributes: AttributeDefinitions): ZCLDataType<{
       id: number,
-      name: string,
+      name?: string,
       status?: ZCLEnum8Status
-      value: ZCLDataType<any>
+      value?: ZCLDataType<any>
     }>;
-    function ZCLConfigureReportingRecords({ withStatus }: {withStatus?: boolean}): ZCLDataType<{
+    function ZCLConfigureReportingRecords({ withStatus }: {withStatus?: boolean}): ZCLDataType<Array<{
       attributeId: number,
       status?: ZCLEnum8Status,
       direction: 'reported' | 'received',
-      attributeDataType: number,
-      minInterval: number,
-      maxInterval: number,
-      minChange: number, // TODO Check whether this is actually a number, or a buffer like the JS docs imply
-    }>
+      attributeDataType?: number,
+      minInterval?: number,
+      maxInterval?: number,
+      minChange?: number,
+      timeoutPeriod?: number,
+    }>>
   }
 
   class ZCLError extends Error {
@@ -178,11 +179,11 @@ declare module 'zigbee-clusters' {
     discoverCommandsGenerated({startValue, maxResults}?: {startValue?: number, maxResults?: number}, opts?: {timeout?: number}): Promise<Array<number>>;
     discoverCommandsReceived({startValue, maxResults}?: {startValue?: number, maxResults?: number}, opts?: {timeout?: number}): Promise<Array<number>>;
 
-    readAttributes<K extends keyof Attributes | number>(attributes: ReadonlyArray<K>, opts?: {timeout?: number}): Promise<{[attribute in K]: AttributesFromDefinition<Attributes>[attribute]}>;
-    writeAttributes<K extends keyof Attributes>(attributes: {[attribute in K]: AttributesFromDefinition<Attributes>[attribute]}, opts?: {timeout?: number}): Promise<{[attribute in K]: {id: number, status: 'SUCCESS' | 'FAILURE'}}>
+    readAttributes<K extends keyof (Attributes & GLOBAL_ATTRIBUTES) | number>(attributes: ReadonlyArray<K>, opts?: {timeout?: number}): Promise<{[attribute in K]: AttributesFromDefinition<Attributes & GLOBAL_ATTRIBUTES>[attribute]}>;
+    writeAttributes<K extends keyof (Attributes & GLOBAL_ATTRIBUTES)>(attributes: {[attribute in K]: AttributesFromDefinition<Attributes & GLOBAL_ATTRIBUTES>[attribute]}, opts?: {timeout?: number}): Promise<{[attribute in K]: {id: number, status: 'SUCCESS' | 'FAILURE'}}>
 
-    configureReporting(attributes: AttributeReportingConfiguration<Extract<keyof Attributes, string>>, opts?: {timeout?: number}): Promise<void>;
-    readReportingConfiguration(attributes: ReadonlyArray<string | number>, opts?: {timeout?: number}): Promise<Array<ReadReportingConfigurationResponse>>;
+    configureReporting(attributes: AttributeReportingConfiguration<Extract<keyof (Attributes & GLOBAL_ATTRIBUTES), string>>, opts?: {timeout?: number}): Promise<void>;
+    readReportingConfiguration(attributes: ReadonlyArray<Extract<keyof (Attributes & GLOBAL_ATTRIBUTES), string> | number>, opts?: {timeout?: number}): Promise<Array<ReadReportingConfigurationResponse>>;
 
     discoverAttributes(opts?: {timeout?: number}): Promise<Array<string | number>>;
     discoverAttributesExtended(opts?: {timeout?: number}): Promise<Array<ExtendedAttributesResponse>>;
@@ -197,11 +198,11 @@ declare module 'zigbee-clusters' {
     on<Event extends Extract<keyof Attributes, string>>(eventName: `attr.${Event}`, listener: (value: AttributesFromDefinition<Attributes>[Event]) => void): this;
     on<Values extends Array<any> = unknown[]>(eventName: string, listener: (...args: Values) => void): this;
 
-    attributes: Attributes;
-    attributesById: {[Attribute in keyof Attributes as Attributes[Attribute]['id']]: { name: Attribute } & Attributes[Attribute] };
+    attributes: Attributes & GLOBAL_ATTRIBUTES;
+    attributesById: {[Attribute in keyof (Attributes & GLOBAL_ATTRIBUTES) as (Attributes & GLOBAL_ATTRIBUTES)[Attribute]['id']]: { name: Attribute } & (Attributes & GLOBAL_ATTRIBUTES)[Attribute] };
 
-    commands: Commands;
-    commandsById: {[Command in keyof Commands as Commands[Command]['id']]: Array<{name: Command} & Commands[Command]>};
+    commands: Commands & GLOBAL_COMMANDS;
+    commandsById: {[Command in keyof Commands as Commands[Command]['id']]: Array<{name: Command} & Commands[Command]>}; // Adding the global commands here results in types too big for TypeScript
   }
 
   // TODO
@@ -213,6 +214,235 @@ declare module 'zigbee-clusters' {
   }
 }
 
+type ZCLDataTypes = import('zigbee-clusters').ZCLDataTypes;
+type ZCLDataType<Value> = import('zigbee-clusters').ZCLDataType<Value>;
+type ZCLStruct<Defs extends Record<string, ZCLDataType<any>>> = import('@athombv/data-types').StructInstance<Defs>
+
+type GLOBAL_ATTRIBUTES = {
+  clusterRevision: { id: 0xfffd, type: ZCLDataTypes["uint16"] },
+  attributeReportingStatus: {
+    id: 0xfffe,
+    type: ZCLDataType<"PENDING" | "COMPLETE">
+  }
+};
+
+type GLOBAL_COMMANDS = {
+  readAttributes: {
+    id: 0x00,
+    args: {
+      attributes: ZCLDataType<Array<number>>,
+    },
+    response: {
+      id: 0x01,
+      args: {
+        attributes: ZCLDataTypes["buffer"],
+      },
+    },
+    global: true,
+  },
+
+  writeAttributes: {
+    id: 0x02,
+    args: {
+      attributes: ZCLDataTypes["buffer"],
+    },
+    response: {
+      id: 0x04,
+      args: {
+        attributes: ZCLDataType<Array<ZCLStruct<{
+          status: ZCLDataTypes["enum8Status"],
+          id: ZCLDataTypes["uint16"]
+        }>>>
+      },
+    },
+    global: true,
+  },
+
+  writeAttributesAtomic: {
+    id: 0x03,
+    args: {
+      attributes: ZCLDataTypes["buffer"],
+    },
+    response: {
+      id: 0x04,
+      args: {
+        attributes: ZCLDataType<Array<ZCLStruct<{
+          status: ZCLDataTypes["enum8Status"],
+          id: ZCLDataTypes["uint16"]
+        }>>>
+      },
+    },
+    global: true,
+  },
+
+  writeAttributesNoResponse: {
+    id: 0x05,
+    args: {
+      attributes: ZCLDataTypes["buffer"],
+    },
+    global: true,
+  },
+
+  configureReporting: {
+    id: 0x06,
+    args: {
+      reports: ReturnType<typeof import('zigbee-clusters').zclFrames.ZCLConfigureReportingRecords>,
+    },
+    response: {
+      id: 0x07,
+      args: {
+        reports: ZCLDataType<Array<ZCLStruct<{
+          status: ZCLDataTypes["enum8Status"],
+          direction: ZCLDataType<"reported" | "received">
+          attributeId: ZCLDataTypes["uint16"]
+        }>>>
+      },
+    },
+    global: true,
+  },
+
+  readReportingConfiguration: {
+    id: 0x08,
+    args: {
+      attributes: ZCLDataType<Array<ZCLStruct<{
+        direction: ZCLDataType<"reported" | "received">
+        attributeId: ZCLDataTypes["uint16"]
+      }>>>,
+    },
+    response: {
+      id: 0x09,
+      args: {
+        reports: ReturnType<typeof import('zigbee-clusters').zclFrames.ZCLConfigureReportingRecords>,
+      },
+    },
+    global: true,
+  },
+
+  reportAttributes: {
+    id: 0x0A,
+    args: {
+      attributes: ZCLDataTypes["buffer"],
+    },
+    global: true,
+  },
+
+  defaultResponse: {
+    id: 0x0B,
+    args: {
+      cmdId: ZCLDataTypes["uint8"],
+      status: ZCLDataTypes["enum8Status"],
+    },
+    global: true,
+  },
+
+  discoverAttributes: {
+    id: 0x0C,
+    args: {
+      startValue: ZCLDataTypes["uint16"],
+      maxResults: ZCLDataTypes["uint8"],
+    },
+    response: {
+      id: 0x0D,
+      args: {
+        lastResponse: ZCLDataTypes["bool"],
+        attributes: ZCLDataType<Array<ZCLStruct<{
+          id: ZCLDataTypes["uint16"],
+          dataTypeId: ZCLDataTypes["uint8"],
+        }>>>,
+      },
+    },
+    global: true,
+  },
+
+  readAttributesStructured: {
+    id: 0x0E,
+    args: {
+      attributes: ZCLDataType<Array<ZCLStruct<{
+        attributeId: ZCLDataTypes["uint16"],
+        indexPath: ZCLDataType<Array<ZCLDataTypes["uint16"]>>,
+      }>>>,
+    },
+    response: {
+      id: 0x01,
+      args: {
+        attributes: ZCLDataTypes["buffer"],
+      },
+    },
+    global: true,
+  },
+
+  writeAttributesStructured: {
+    id: 0x0F,
+    args: {
+      attributes: ZCLDataType<Array<ZCLStruct<{
+        attributeId: ZCLDataTypes["uint16"],
+        indexPath: ZCLDataType<Array<ZCLDataTypes["uint16"]>>,
+        dataTypeId: ZCLDataTypes["uint8"],
+        value: ZCLDataTypes["buffer"],
+      }>>>,
+    },
+    response: {
+      id: 0x10,
+      args: {
+        attributes: ZCLDataTypes["buffer"],
+      },
+    },
+    global: true,
+  },
+
+  discoverCommandsReceived: {
+    id: 0x11,
+    args: {
+      startValue: ZCLDataTypes["uint8"],
+      maxResults: ZCLDataTypes["uint8"],
+    },
+    response: {
+      id: 0x12,
+      args: {
+        lastResponse: ZCLDataTypes["bool"],
+        commandIds: ZCLDataType<Array<ZCLDataTypes["uint8"]>>,
+      },
+    },
+    global: true,
+  },
+
+  discoverCommandsGenerated: {
+    id: 0x13,
+    args: {
+      startValue: ZCLDataTypes["uint8"],
+      maxResults: ZCLDataTypes["uint8"],
+    },
+    response: {
+      id: 0x14,
+      args: {
+        lastResponse: ZCLDataTypes["bool"],
+        commandIds: ZCLDataType<Array<ZCLDataTypes["uint8"]>>,
+      },
+    },
+    global: true,
+  },
+
+  discoverAttributesExtended: {
+    id: 0x15,
+    args: {
+      startValue: ZCLDataTypes["uint16"],
+      maxResults: ZCLDataTypes["uint8"],
+    },
+    response: {
+      id: 0x16,
+      args: {
+        lastResponse: ZCLDataTypes["bool"],
+        attributes: ZCLDataType<Array<ZCLStruct<{
+          id: ZCLDataTypes["uint16"],
+          dataTypeId: ZCLDataTypes["uint8"],
+          acl: ZCLDataType<import('@athombv/data-types').BitMap<'readable' | 'writable' | 'reportable'>>,
+        }>>>,
+      },
+    },
+    global: true,
+  },
+};
+
 type CommandToServerDirection = 'DIRECTION_CLIENT_TO_SERVER';
 type CommandToClientDirection = 'DIRECTION_SERVER_TO_CLIENT';
 type CommandDirection = CommandToServerDirection | CommandToClientDirection;

From 48ac6632df9116bca4ac15b3114f253d2adb74c4 Mon Sep 17 00:00:00 2001
From: Joost Loohuis <github@loohuis.dev>
Date: Fri, 10 Apr 2026 11:22:28 +0200
Subject: [PATCH 8/9] Declutter helper types

---
 index.d.ts                 | 665 +++++++++++++++++++------------------
 scripts/generate-types.mts |  12 +-
 scripts/template.d.ts.txt  | 593 ++++++++++++++++-----------------
 3 files changed, 636 insertions(+), 634 deletions(-)

diff --git a/index.d.ts b/index.d.ts
index 35a7397..badc374 100644
--- a/index.d.ts
+++ b/index.d.ts
@@ -21,7 +21,7 @@ declare module "zigbee-clusters" {
   type BasicClusterCommands = {
     factoryReset: { id: 0x00, direction: "DIRECTION_SERVER_TO_CLIENT" },
   };
-  class BasicCluster<Attributes extends AttributeDefinitions = BasicClusterAttributes, Commands extends CommandDefinitions = BasicClusterCommands> extends Cluster<Attributes, Commands> {
+  class BasicCluster<Attributes extends types.AttributeDefinitions = BasicClusterAttributes, Commands extends types.CommandDefinitions = BasicClusterCommands> extends Cluster<Attributes, Commands> {
     factoryReset(
       args: {
         manufacturerId?: number,
@@ -43,7 +43,7 @@ declare module "zigbee-clusters" {
     batteryAlarmState: { id: 0x3e, type: ZCLDataType<BitMap<"batteryThresholdBatterySource1" | "batteryThreshold1BatterySource1" | "batteryThreshold2BatterySource1" | "batteryThreshold3BatterySource1" | "reserved4" | "reserved5" | "reserved6" | "reserved7" | "reserved8" | "reserved9" | "batteryThresholdBatterySource2" | "batteryThreshold1BatterySource2" | "batteryThreshold2BatterySource2" | "batteryThreshold3BatterySource2" | "reserved14" | "reserved15" | "reserved16" | "reserved17" | "reserved18" | "reserved19" | "batteryThresholdBatterySource3" | "batteryThreshold1BatterySource3" | "batteryThreshold2BatterySource3" | "batteryThreshold3BatterySource3" | "reserved24" | "reserved25" | "reserved26" | "reserved27" | "reserved28" | "reserved29" | "mainsPowerSupplyLostUnavailable">> },
   };
   type PowerConfigurationClusterCommands = Record<never, never>;
-  class PowerConfigurationCluster<Attributes extends AttributeDefinitions = PowerConfigurationClusterAttributes, Commands extends CommandDefinitions = PowerConfigurationClusterCommands> extends Cluster<Attributes, Commands> {
+  class PowerConfigurationCluster<Attributes extends types.AttributeDefinitions = PowerConfigurationClusterAttributes, Commands extends types.CommandDefinitions = PowerConfigurationClusterCommands> extends Cluster<Attributes, Commands> {
   }
   type DeviceTemperatureClusterAttributes = {
     currentTemperature: { id: 0x00, type: ZCLDataType<number> },
@@ -57,7 +57,7 @@ declare module "zigbee-clusters" {
     highTempDwellTripPoint: { id: 0x14, type: ZCLDataType<number> },
   };
   type DeviceTemperatureClusterCommands = Record<never, never>;
-  class DeviceTemperatureCluster<Attributes extends AttributeDefinitions = DeviceTemperatureClusterAttributes, Commands extends CommandDefinitions = DeviceTemperatureClusterCommands> extends Cluster<Attributes, Commands> {
+  class DeviceTemperatureCluster<Attributes extends types.AttributeDefinitions = DeviceTemperatureClusterAttributes, Commands extends types.CommandDefinitions = DeviceTemperatureClusterCommands> extends Cluster<Attributes, Commands> {
   }
   type IdentifyClusterAttributes = {
     identifyTime: { id: 0x00, type: ZCLDataType<number> },
@@ -74,7 +74,7 @@ declare module "zigbee-clusters" {
       },
     },
   };
-  class IdentifyCluster<Attributes extends AttributeDefinitions = IdentifyClusterAttributes, Commands extends CommandDefinitions = IdentifyClusterCommands> extends Cluster<Attributes, Commands> {
+  class IdentifyCluster<Attributes extends types.AttributeDefinitions = IdentifyClusterAttributes, Commands extends types.CommandDefinitions = IdentifyClusterCommands> extends Cluster<Attributes, Commands> {
     identify(
       args: {
         manufacturerId?: number,
@@ -137,7 +137,7 @@ declare module "zigbee-clusters" {
       },
     },
   };
-  class GroupsCluster<Attributes extends AttributeDefinitions = GroupsClusterAttributes, Commands extends CommandDefinitions = GroupsClusterCommands> extends Cluster<Attributes, Commands> {
+  class GroupsCluster<Attributes extends types.AttributeDefinitions = GroupsClusterAttributes, Commands extends types.CommandDefinitions = GroupsClusterCommands> extends Cluster<Attributes, Commands> {
     addGroup(
       args: {
         manufacturerId?: number,
@@ -208,7 +208,7 @@ declare module "zigbee-clusters" {
   }
   type ScenesClusterAttributes = Record<never, never>;
   type ScenesClusterCommands = Record<never, never>;
-  class ScenesCluster<Attributes extends AttributeDefinitions = ScenesClusterAttributes, Commands extends CommandDefinitions = ScenesClusterCommands> extends Cluster<Attributes, Commands> {
+  class ScenesCluster<Attributes extends types.AttributeDefinitions = ScenesClusterAttributes, Commands extends types.CommandDefinitions = ScenesClusterCommands> extends Cluster<Attributes, Commands> {
   }
   type OnOffClusterAttributes = {
     onOff: { id: 0x00, type: ZCLDataType<boolean> },
@@ -232,7 +232,7 @@ declare module "zigbee-clusters" {
       },
     },
   };
-  class OnOffCluster<Attributes extends AttributeDefinitions = OnOffClusterAttributes, Commands extends CommandDefinitions = OnOffClusterCommands> extends Cluster<Attributes, Commands> {
+  class OnOffCluster<Attributes extends types.AttributeDefinitions = OnOffClusterAttributes, Commands extends types.CommandDefinitions = OnOffClusterCommands> extends Cluster<Attributes, Commands> {
     setOff(
       args: {
         manufacturerId?: number,
@@ -301,7 +301,7 @@ declare module "zigbee-clusters" {
   }
   type OnOffSwitchClusterAttributes = Record<never, never>;
   type OnOffSwitchClusterCommands = Record<never, never>;
-  class OnOffSwitchCluster<Attributes extends AttributeDefinitions = OnOffSwitchClusterAttributes, Commands extends CommandDefinitions = OnOffSwitchClusterCommands> extends Cluster<Attributes, Commands> {
+  class OnOffSwitchCluster<Attributes extends types.AttributeDefinitions = OnOffSwitchClusterAttributes, Commands extends types.CommandDefinitions = OnOffSwitchClusterCommands> extends Cluster<Attributes, Commands> {
   }
   type LevelControlClusterAttributes = {
     currentLevel: { id: 0x00, type: ZCLDataType<number> },
@@ -348,7 +348,7 @@ declare module "zigbee-clusters" {
     },
     stopWithOnOff: { id: 0x07, direction: "DIRECTION_SERVER_TO_CLIENT" },
   };
-  class LevelControlCluster<Attributes extends AttributeDefinitions = LevelControlClusterAttributes, Commands extends CommandDefinitions = LevelControlClusterCommands> extends Cluster<Attributes, Commands> {
+  class LevelControlCluster<Attributes extends types.AttributeDefinitions = LevelControlClusterAttributes, Commands extends types.CommandDefinitions = LevelControlClusterCommands> extends Cluster<Attributes, Commands> {
     moveToLevel(
       args: {
         manufacturerId?: number,
@@ -450,7 +450,7 @@ declare module "zigbee-clusters" {
     getAlarm: { id: 0x02, direction: "DIRECTION_SERVER_TO_CLIENT", args: Record<never, never> /* TODO fix */ },
     resetAlarmLog: { id: 0x03, direction: "DIRECTION_SERVER_TO_CLIENT", args: Record<never, never> /* TODO fix */ },
   };
-  class AlarmsCluster<Attributes extends AttributeDefinitions = AlarmsClusterAttributes, Commands extends CommandDefinitions = AlarmsClusterCommands> extends Cluster<Attributes, Commands> {
+  class AlarmsCluster<Attributes extends types.AttributeDefinitions = AlarmsClusterAttributes, Commands extends types.CommandDefinitions = AlarmsClusterCommands> extends Cluster<Attributes, Commands> {
     resetAllAlarms(
       args: {
         manufacturerId?: number,
@@ -484,7 +484,7 @@ declare module "zigbee-clusters" {
   }
   type TimeClusterAttributes = Record<never, never>;
   type TimeClusterCommands = Record<never, never>;
-  class TimeCluster<Attributes extends AttributeDefinitions = TimeClusterAttributes, Commands extends CommandDefinitions = TimeClusterCommands> extends Cluster<Attributes, Commands> {
+  class TimeCluster<Attributes extends types.AttributeDefinitions = TimeClusterAttributes, Commands extends types.CommandDefinitions = TimeClusterCommands> extends Cluster<Attributes, Commands> {
   }
   type AnalogInputClusterAttributes = {
     description: { id: 0x1c, type: ZCLDataType<string> },
@@ -498,7 +498,7 @@ declare module "zigbee-clusters" {
     applicationType: { id: 0x100, type: ZCLDataType<number> },
   };
   type AnalogInputClusterCommands = Record<never, never>;
-  class AnalogInputCluster<Attributes extends AttributeDefinitions = AnalogInputClusterAttributes, Commands extends CommandDefinitions = AnalogInputClusterCommands> extends Cluster<Attributes, Commands> {
+  class AnalogInputCluster<Attributes extends types.AttributeDefinitions = AnalogInputClusterAttributes, Commands extends types.CommandDefinitions = AnalogInputClusterCommands> extends Cluster<Attributes, Commands> {
   }
   type AnalogOutputClusterAttributes = {
     description: { id: 0x1c, type: ZCLDataType<string> },
@@ -513,7 +513,7 @@ declare module "zigbee-clusters" {
     applicationType: { id: 0x100, type: ZCLDataType<number> },
   };
   type AnalogOutputClusterCommands = Record<never, never>;
-  class AnalogOutputCluster<Attributes extends AttributeDefinitions = AnalogOutputClusterAttributes, Commands extends CommandDefinitions = AnalogOutputClusterCommands> extends Cluster<Attributes, Commands> {
+  class AnalogOutputCluster<Attributes extends types.AttributeDefinitions = AnalogOutputClusterAttributes, Commands extends types.CommandDefinitions = AnalogOutputClusterCommands> extends Cluster<Attributes, Commands> {
   }
   type AnalogValueClusterAttributes = {
     description: { id: 0x1c, type: ZCLDataType<string> },
@@ -525,7 +525,7 @@ declare module "zigbee-clusters" {
     applicationType: { id: 0x100, type: ZCLDataType<number> },
   };
   type AnalogValueClusterCommands = Record<never, never>;
-  class AnalogValueCluster<Attributes extends AttributeDefinitions = AnalogValueClusterAttributes, Commands extends CommandDefinitions = AnalogValueClusterCommands> extends Cluster<Attributes, Commands> {
+  class AnalogValueCluster<Attributes extends types.AttributeDefinitions = AnalogValueClusterAttributes, Commands extends types.CommandDefinitions = AnalogValueClusterCommands> extends Cluster<Attributes, Commands> {
   }
   type BinaryInputClusterAttributes = {
     activeText: { id: 0x04, type: ZCLDataType<string> },
@@ -539,7 +539,7 @@ declare module "zigbee-clusters" {
     applicationType: { id: 0x100, type: ZCLDataType<number> },
   };
   type BinaryInputClusterCommands = Record<never, never>;
-  class BinaryInputCluster<Attributes extends AttributeDefinitions = BinaryInputClusterAttributes, Commands extends CommandDefinitions = BinaryInputClusterCommands> extends Cluster<Attributes, Commands> {
+  class BinaryInputCluster<Attributes extends types.AttributeDefinitions = BinaryInputClusterAttributes, Commands extends types.CommandDefinitions = BinaryInputClusterCommands> extends Cluster<Attributes, Commands> {
   }
   type BinaryOutputClusterAttributes = {
     activeText: { id: 0x04, type: ZCLDataType<string> },
@@ -556,7 +556,7 @@ declare module "zigbee-clusters" {
     applicationType: { id: 0x100, type: ZCLDataType<number> },
   };
   type BinaryOutputClusterCommands = Record<never, never>;
-  class BinaryOutputCluster<Attributes extends AttributeDefinitions = BinaryOutputClusterAttributes, Commands extends CommandDefinitions = BinaryOutputClusterCommands> extends Cluster<Attributes, Commands> {
+  class BinaryOutputCluster<Attributes extends types.AttributeDefinitions = BinaryOutputClusterAttributes, Commands extends types.CommandDefinitions = BinaryOutputClusterCommands> extends Cluster<Attributes, Commands> {
   }
   type BinaryValueClusterAttributes = {
     activeText: { id: 0x04, type: ZCLDataType<string> },
@@ -573,7 +573,7 @@ declare module "zigbee-clusters" {
     applicationType: { id: 0x100, type: ZCLDataType<number> },
   };
   type BinaryValueClusterCommands = Record<never, never>;
-  class BinaryValueCluster<Attributes extends AttributeDefinitions = BinaryValueClusterAttributes, Commands extends CommandDefinitions = BinaryValueClusterCommands> extends Cluster<Attributes, Commands> {
+  class BinaryValueCluster<Attributes extends types.AttributeDefinitions = BinaryValueClusterAttributes, Commands extends types.CommandDefinitions = BinaryValueClusterCommands> extends Cluster<Attributes, Commands> {
   }
   type MultistateInputClusterAttributes = {
     description: { id: 0x1c, type: ZCLDataType<string> },
@@ -585,7 +585,7 @@ declare module "zigbee-clusters" {
     applicationType: { id: 0x100, type: ZCLDataType<number> },
   };
   type MultistateInputClusterCommands = Record<never, never>;
-  class MultistateInputCluster<Attributes extends AttributeDefinitions = MultistateInputClusterAttributes, Commands extends CommandDefinitions = MultistateInputClusterCommands> extends Cluster<Attributes, Commands> {
+  class MultistateInputCluster<Attributes extends types.AttributeDefinitions = MultistateInputClusterAttributes, Commands extends types.CommandDefinitions = MultistateInputClusterCommands> extends Cluster<Attributes, Commands> {
   }
   type MultistateOutputClusterAttributes = {
     description: { id: 0x1c, type: ZCLDataType<string> },
@@ -598,7 +598,7 @@ declare module "zigbee-clusters" {
     applicationType: { id: 0x100, type: ZCLDataType<number> },
   };
   type MultistateOutputClusterCommands = Record<never, never>;
-  class MultistateOutputCluster<Attributes extends AttributeDefinitions = MultistateOutputClusterAttributes, Commands extends CommandDefinitions = MultistateOutputClusterCommands> extends Cluster<Attributes, Commands> {
+  class MultistateOutputCluster<Attributes extends types.AttributeDefinitions = MultistateOutputClusterAttributes, Commands extends types.CommandDefinitions = MultistateOutputClusterCommands> extends Cluster<Attributes, Commands> {
   }
   type MultistateValueClusterAttributes = {
     description: { id: 0x1c, type: ZCLDataType<string> },
@@ -611,7 +611,7 @@ declare module "zigbee-clusters" {
     applicationType: { id: 0x100, type: ZCLDataType<number> },
   };
   type MultistateValueClusterCommands = Record<never, never>;
-  class MultistateValueCluster<Attributes extends AttributeDefinitions = MultistateValueClusterAttributes, Commands extends CommandDefinitions = MultistateValueClusterCommands> extends Cluster<Attributes, Commands> {
+  class MultistateValueCluster<Attributes extends types.AttributeDefinitions = MultistateValueClusterAttributes, Commands extends types.CommandDefinitions = MultistateValueClusterCommands> extends Cluster<Attributes, Commands> {
   }
   type OTAClusterAttributes = {
     upgradeServerID: { id: 0x00, type: ZCLDataType<string> },
@@ -705,7 +705,7 @@ declare module "zigbee-clusters" {
       },
     },
   };
-  class OTACluster<Attributes extends AttributeDefinitions = OTAClusterAttributes, Commands extends CommandDefinitions = OTAClusterCommands> extends Cluster<Attributes, Commands> {
+  class OTACluster<Attributes extends types.AttributeDefinitions = OTAClusterAttributes, Commands extends types.CommandDefinitions = OTAClusterCommands> extends Cluster<Attributes, Commands> {
     onImageNotify(
       args: {
         manufacturerId?: number,
@@ -840,7 +840,7 @@ declare module "zigbee-clusters" {
   }
   type PowerProfileClusterAttributes = Record<never, never>;
   type PowerProfileClusterCommands = Record<never, never>;
-  class PowerProfileCluster<Attributes extends AttributeDefinitions = PowerProfileClusterAttributes, Commands extends CommandDefinitions = PowerProfileClusterCommands> extends Cluster<Attributes, Commands> {
+  class PowerProfileCluster<Attributes extends types.AttributeDefinitions = PowerProfileClusterAttributes, Commands extends types.CommandDefinitions = PowerProfileClusterCommands> extends Cluster<Attributes, Commands> {
   }
   type PollControlClusterAttributes = {
     checkInInterval: { id: 0x00, type: ZCLDataType<number> },
@@ -862,7 +862,7 @@ declare module "zigbee-clusters" {
       },
     },
   };
-  class PollControlCluster<Attributes extends AttributeDefinitions = PollControlClusterAttributes, Commands extends CommandDefinitions = PollControlClusterCommands> extends Cluster<Attributes, Commands> {
+  class PollControlCluster<Attributes extends types.AttributeDefinitions = PollControlClusterAttributes, Commands extends types.CommandDefinitions = PollControlClusterCommands> extends Cluster<Attributes, Commands> {
     fastPollStop(
       args: {
         manufacturerId?: number,
@@ -898,7 +898,7 @@ declare module "zigbee-clusters" {
   }
   type ShadeConfigurationClusterAttributes = Record<never, never>;
   type ShadeConfigurationClusterCommands = Record<never, never>;
-  class ShadeConfigurationCluster<Attributes extends AttributeDefinitions = ShadeConfigurationClusterAttributes, Commands extends CommandDefinitions = ShadeConfigurationClusterCommands> extends Cluster<Attributes, Commands> {
+  class ShadeConfigurationCluster<Attributes extends types.AttributeDefinitions = ShadeConfigurationClusterAttributes, Commands extends types.CommandDefinitions = ShadeConfigurationClusterCommands> extends Cluster<Attributes, Commands> {
   }
   type DoorLockClusterAttributes = {
     lockState: { id: 0x00, type: ZCLDataType<"notFullyLocked" | "locked" | "unlocked" | "undefined"> },
@@ -1090,7 +1090,7 @@ declare module "zigbee-clusters" {
       },
     },
   };
-  class DoorLockCluster<Attributes extends AttributeDefinitions = DoorLockClusterAttributes, Commands extends CommandDefinitions = DoorLockClusterCommands> extends Cluster<Attributes, Commands> {
+  class DoorLockCluster<Attributes extends types.AttributeDefinitions = DoorLockClusterAttributes, Commands extends types.CommandDefinitions = DoorLockClusterCommands> extends Cluster<Attributes, Commands> {
     lockDoor(
       args: {
         manufacturerId?: number,
@@ -1478,7 +1478,7 @@ declare module "zigbee-clusters" {
       },
     },
   };
-  class WindowCoveringCluster<Attributes extends AttributeDefinitions = WindowCoveringClusterAttributes, Commands extends CommandDefinitions = WindowCoveringClusterCommands> extends Cluster<Attributes, Commands> {
+  class WindowCoveringCluster<Attributes extends types.AttributeDefinitions = WindowCoveringClusterAttributes, Commands extends types.CommandDefinitions = WindowCoveringClusterCommands> extends Cluster<Attributes, Commands> {
     upOpen(
       args: {
         manufacturerId?: number,
@@ -1586,7 +1586,7 @@ declare module "zigbee-clusters" {
       },
     },
   };
-  class ThermostatCluster<Attributes extends AttributeDefinitions = ThermostatClusterAttributes, Commands extends CommandDefinitions = ThermostatClusterCommands> extends Cluster<Attributes, Commands> {
+  class ThermostatCluster<Attributes extends types.AttributeDefinitions = ThermostatClusterAttributes, Commands extends types.CommandDefinitions = ThermostatClusterCommands> extends Cluster<Attributes, Commands> {
     setSetpoint(
       args: {
         manufacturerId?: number,
@@ -1602,15 +1602,15 @@ declare module "zigbee-clusters" {
   }
   type PumpConfigurationAndControlClusterAttributes = Record<never, never>;
   type PumpConfigurationAndControlClusterCommands = Record<never, never>;
-  class PumpConfigurationAndControlCluster<Attributes extends AttributeDefinitions = PumpConfigurationAndControlClusterAttributes, Commands extends CommandDefinitions = PumpConfigurationAndControlClusterCommands> extends Cluster<Attributes, Commands> {
+  class PumpConfigurationAndControlCluster<Attributes extends types.AttributeDefinitions = PumpConfigurationAndControlClusterAttributes, Commands extends types.CommandDefinitions = PumpConfigurationAndControlClusterCommands> extends Cluster<Attributes, Commands> {
   }
   type FanControlClusterAttributes = Record<never, never>;
   type FanControlClusterCommands = Record<never, never>;
-  class FanControlCluster<Attributes extends AttributeDefinitions = FanControlClusterAttributes, Commands extends CommandDefinitions = FanControlClusterCommands> extends Cluster<Attributes, Commands> {
+  class FanControlCluster<Attributes extends types.AttributeDefinitions = FanControlClusterAttributes, Commands extends types.CommandDefinitions = FanControlClusterCommands> extends Cluster<Attributes, Commands> {
   }
   type DehumidificationControlClusterAttributes = Record<never, never>;
   type DehumidificationControlClusterCommands = Record<never, never>;
-  class DehumidificationControlCluster<Attributes extends AttributeDefinitions = DehumidificationControlClusterAttributes, Commands extends CommandDefinitions = DehumidificationControlClusterCommands> extends Cluster<Attributes, Commands> {
+  class DehumidificationControlCluster<Attributes extends types.AttributeDefinitions = DehumidificationControlClusterAttributes, Commands extends types.CommandDefinitions = DehumidificationControlClusterCommands> extends Cluster<Attributes, Commands> {
   }
   type ColorControlClusterAttributes = {
     currentHue: { id: 0x00, type: ZCLDataType<number> },
@@ -1653,7 +1653,7 @@ declare module "zigbee-clusters" {
       },
     },
   };
-  class ColorControlCluster<Attributes extends AttributeDefinitions = ColorControlClusterAttributes, Commands extends CommandDefinitions = ColorControlClusterCommands> extends Cluster<Attributes, Commands> {
+  class ColorControlCluster<Attributes extends types.AttributeDefinitions = ColorControlClusterAttributes, Commands extends types.CommandDefinitions = ColorControlClusterCommands> extends Cluster<Attributes, Commands> {
     moveToHue(
       args: {
         manufacturerId?: number,
@@ -1737,7 +1737,7 @@ declare module "zigbee-clusters" {
     lampBurnHoursTripPoint: { id: 0x35, type: ZCLDataType<number> },
   };
   type BallastConfigurationClusterCommands = Record<never, never>;
-  class BallastConfigurationCluster<Attributes extends AttributeDefinitions = BallastConfigurationClusterAttributes, Commands extends CommandDefinitions = BallastConfigurationClusterCommands> extends Cluster<Attributes, Commands> {
+  class BallastConfigurationCluster<Attributes extends types.AttributeDefinitions = BallastConfigurationClusterAttributes, Commands extends types.CommandDefinitions = BallastConfigurationClusterCommands> extends Cluster<Attributes, Commands> {
   }
   type IlluminanceMeasurementClusterAttributes = {
     measuredValue: { id: 0x00, type: ZCLDataType<number> },
@@ -1747,7 +1747,7 @@ declare module "zigbee-clusters" {
     lightSensorType: { id: 0x04, type: ZCLDataType<"photodiode" | "cmos" | "unknown"> },
   };
   type IlluminanceMeasurementClusterCommands = Record<never, never>;
-  class IlluminanceMeasurementCluster<Attributes extends AttributeDefinitions = IlluminanceMeasurementClusterAttributes, Commands extends CommandDefinitions = IlluminanceMeasurementClusterCommands> extends Cluster<Attributes, Commands> {
+  class IlluminanceMeasurementCluster<Attributes extends types.AttributeDefinitions = IlluminanceMeasurementClusterAttributes, Commands extends types.CommandDefinitions = IlluminanceMeasurementClusterCommands> extends Cluster<Attributes, Commands> {
   }
   type IlluminanceLevelSensingClusterAttributes = {
     levelStatus: { id: 0x00, type: ZCLDataType<"illuminanceOnTarget" | "illuminanceBelowTarget" | "illuminanceAboveTarget"> },
@@ -1755,7 +1755,7 @@ declare module "zigbee-clusters" {
     illuminanceTargetLevel: { id: 0x10, type: ZCLDataType<number> },
   };
   type IlluminanceLevelSensingClusterCommands = Record<never, never>;
-  class IlluminanceLevelSensingCluster<Attributes extends AttributeDefinitions = IlluminanceLevelSensingClusterAttributes, Commands extends CommandDefinitions = IlluminanceLevelSensingClusterCommands> extends Cluster<Attributes, Commands> {
+  class IlluminanceLevelSensingCluster<Attributes extends types.AttributeDefinitions = IlluminanceLevelSensingClusterAttributes, Commands extends types.CommandDefinitions = IlluminanceLevelSensingClusterCommands> extends Cluster<Attributes, Commands> {
   }
   type TemperatureMeasurementClusterAttributes = {
     measuredValue: { id: 0x00, type: ZCLDataType<number> },
@@ -1763,7 +1763,7 @@ declare module "zigbee-clusters" {
     maxMeasuredValue: { id: 0x02, type: ZCLDataType<number> },
   };
   type TemperatureMeasurementClusterCommands = Record<never, never>;
-  class TemperatureMeasurementCluster<Attributes extends AttributeDefinitions = TemperatureMeasurementClusterAttributes, Commands extends CommandDefinitions = TemperatureMeasurementClusterCommands> extends Cluster<Attributes, Commands> {
+  class TemperatureMeasurementCluster<Attributes extends types.AttributeDefinitions = TemperatureMeasurementClusterAttributes, Commands extends types.CommandDefinitions = TemperatureMeasurementClusterCommands> extends Cluster<Attributes, Commands> {
   }
   type PressureMeasurementClusterAttributes = {
     measuredValue: { id: 0x00, type: ZCLDataType<number> },
@@ -1777,7 +1777,7 @@ declare module "zigbee-clusters" {
     scale: { id: 0x14, type: ZCLDataType<number> },
   };
   type PressureMeasurementClusterCommands = Record<never, never>;
-  class PressureMeasurementCluster<Attributes extends AttributeDefinitions = PressureMeasurementClusterAttributes, Commands extends CommandDefinitions = PressureMeasurementClusterCommands> extends Cluster<Attributes, Commands> {
+  class PressureMeasurementCluster<Attributes extends types.AttributeDefinitions = PressureMeasurementClusterAttributes, Commands extends types.CommandDefinitions = PressureMeasurementClusterCommands> extends Cluster<Attributes, Commands> {
   }
   type FlowMeasurementClusterAttributes = {
     measuredValue: { id: 0x00, type: ZCLDataType<number> },
@@ -1786,7 +1786,7 @@ declare module "zigbee-clusters" {
     tolerance: { id: 0x03, type: ZCLDataType<number> },
   };
   type FlowMeasurementClusterCommands = Record<never, never>;
-  class FlowMeasurementCluster<Attributes extends AttributeDefinitions = FlowMeasurementClusterAttributes, Commands extends CommandDefinitions = FlowMeasurementClusterCommands> extends Cluster<Attributes, Commands> {
+  class FlowMeasurementCluster<Attributes extends types.AttributeDefinitions = FlowMeasurementClusterAttributes, Commands extends types.CommandDefinitions = FlowMeasurementClusterCommands> extends Cluster<Attributes, Commands> {
   }
   type RelativeHumidityClusterAttributes = {
     measuredValue: { id: 0x00, type: ZCLDataType<number> },
@@ -1795,7 +1795,7 @@ declare module "zigbee-clusters" {
     tolerance: { id: 0x03, type: ZCLDataType<number> },
   };
   type RelativeHumidityClusterCommands = Record<never, never>;
-  class RelativeHumidityCluster<Attributes extends AttributeDefinitions = RelativeHumidityClusterAttributes, Commands extends CommandDefinitions = RelativeHumidityClusterCommands> extends Cluster<Attributes, Commands> {
+  class RelativeHumidityCluster<Attributes extends types.AttributeDefinitions = RelativeHumidityClusterAttributes, Commands extends types.CommandDefinitions = RelativeHumidityClusterCommands> extends Cluster<Attributes, Commands> {
   }
   type OccupancySensingClusterAttributes = {
     occupancy: { id: 0x00, type: ZCLDataType<BitMap<"occupied">> },
@@ -1812,7 +1812,7 @@ declare module "zigbee-clusters" {
     physicalContactUnoccupiedToOccupiedThreshold: { id: 0x32, type: ZCLDataType<number> },
   };
   type OccupancySensingClusterCommands = Record<never, never>;
-  class OccupancySensingCluster<Attributes extends AttributeDefinitions = OccupancySensingClusterAttributes, Commands extends CommandDefinitions = OccupancySensingClusterCommands> extends Cluster<Attributes, Commands> {
+  class OccupancySensingCluster<Attributes extends types.AttributeDefinitions = OccupancySensingClusterAttributes, Commands extends types.CommandDefinitions = OccupancySensingClusterCommands> extends Cluster<Attributes, Commands> {
   }
   type IASZoneClusterAttributes = {
     zoneState: { id: 0x00, type: ZCLDataType<"notEnrolled" | "enrolled"> },
@@ -1841,7 +1841,7 @@ declare module "zigbee-clusters" {
     },
     initiateNormalOperationMode: { id: 0x01, direction: "DIRECTION_CLIENT_TO_SERVER" },
   };
-  class IASZoneCluster<Attributes extends AttributeDefinitions = IASZoneClusterAttributes, Commands extends CommandDefinitions = IASZoneClusterCommands> extends Cluster<Attributes, Commands> {
+  class IASZoneCluster<Attributes extends types.AttributeDefinitions = IASZoneClusterAttributes, Commands extends types.CommandDefinitions = IASZoneClusterCommands> extends Cluster<Attributes, Commands> {
     onZoneStatusChangeNotification(
       args: {
         manufacturerId?: number,
@@ -1893,11 +1893,11 @@ declare module "zigbee-clusters" {
   }
   type IASACEClusterAttributes = Record<never, never>;
   type IASACEClusterCommands = Record<never, never>;
-  class IASACECluster<Attributes extends AttributeDefinitions = IASACEClusterAttributes, Commands extends CommandDefinitions = IASACEClusterCommands> extends Cluster<Attributes, Commands> {
+  class IASACECluster<Attributes extends types.AttributeDefinitions = IASACEClusterAttributes, Commands extends types.CommandDefinitions = IASACEClusterCommands> extends Cluster<Attributes, Commands> {
   }
   type IASWDClusterAttributes = Record<never, never>;
   type IASWDClusterCommands = Record<never, never>;
-  class IASWDCluster<Attributes extends AttributeDefinitions = IASWDClusterAttributes, Commands extends CommandDefinitions = IASWDClusterCommands> extends Cluster<Attributes, Commands> {
+  class IASWDCluster<Attributes extends types.AttributeDefinitions = IASWDClusterAttributes, Commands extends types.CommandDefinitions = IASWDClusterCommands> extends Cluster<Attributes, Commands> {
   }
   type MeteringClusterAttributes = {
     currentSummationDelivered: { id: 0x00, type: ZCLDataType<number> },
@@ -2083,7 +2083,7 @@ declare module "zigbee-clusters" {
     flowMeasurementPeriod: { id: 0xb15, type: ZCLDataType<number> },
   };
   type MeteringClusterCommands = Record<never, never>;
-  class MeteringCluster<Attributes extends AttributeDefinitions = MeteringClusterAttributes, Commands extends CommandDefinitions = MeteringClusterCommands> extends Cluster<Attributes, Commands> {
+  class MeteringCluster<Attributes extends types.AttributeDefinitions = MeteringClusterAttributes, Commands extends types.CommandDefinitions = MeteringClusterCommands> extends Cluster<Attributes, Commands> {
   }
   type ElectricalMeasurementClusterAttributes = {
     measurementType: { id: 0x00, type: ZCLDataType<BitMap<"activeMeasurementAC" | "reactiveMeasurementAC" | "apparentMeasurementAC" | "phaseAMeasurement" | "phaseBMeasurement" | "phaseCMeasurement" | "dcMeasurement" | "harmonicsMeasurement" | "powerQualityMeasurement">> },
@@ -2108,11 +2108,11 @@ declare module "zigbee-clusters" {
     acActivePowerOverload: { id: 0x803, type: ZCLDataType<number> },
   };
   type ElectricalMeasurementClusterCommands = Record<never, never>;
-  class ElectricalMeasurementCluster<Attributes extends AttributeDefinitions = ElectricalMeasurementClusterAttributes, Commands extends CommandDefinitions = ElectricalMeasurementClusterCommands> extends Cluster<Attributes, Commands> {
+  class ElectricalMeasurementCluster<Attributes extends types.AttributeDefinitions = ElectricalMeasurementClusterAttributes, Commands extends types.CommandDefinitions = ElectricalMeasurementClusterCommands> extends Cluster<Attributes, Commands> {
   }
   type DiagnosticsClusterAttributes = Record<never, never>;
   type DiagnosticsClusterCommands = Record<never, never>;
-  class DiagnosticsCluster<Attributes extends AttributeDefinitions = DiagnosticsClusterAttributes, Commands extends CommandDefinitions = DiagnosticsClusterCommands> extends Cluster<Attributes, Commands> {
+  class DiagnosticsCluster<Attributes extends types.AttributeDefinitions = DiagnosticsClusterAttributes, Commands extends types.CommandDefinitions = DiagnosticsClusterCommands> extends Cluster<Attributes, Commands> {
   }
   type TouchLinkClusterAttributes = Record<never, never>;
   type TouchLinkClusterCommands = {
@@ -2121,7 +2121,7 @@ declare module "zigbee-clusters" {
       },
     },
   };
-  class TouchLinkCluster<Attributes extends AttributeDefinitions = TouchLinkClusterAttributes, Commands extends CommandDefinitions = TouchLinkClusterCommands> extends Cluster<Attributes, Commands> {
+  class TouchLinkCluster<Attributes extends types.AttributeDefinitions = TouchLinkClusterAttributes, Commands extends types.CommandDefinitions = TouchLinkClusterCommands> extends Cluster<Attributes, Commands> {
     getGroups(
       args: {
         manufacturerId?: number,
@@ -2409,9 +2409,8 @@ declare module "zigbee-clusters" {
 
   import {EventEmitter} from "events";
   import {ZigBeeNode} from "homey";
-  type ZCLEnum8Status = 'SUCCESS' | 'FAILURE' | 'NOT_AUTHORIZED' | 'RESERVED_FIELD_NOT_ZERO' | 'MALFORMED_COMMAND' | 'UNSUP_CLUSTER_COMMAND' | 'UNSUP_GENERAL_COMMAND' | 'UNSUP_MANUF_CLUSTER_COMMAND' | 'UNSUP_MANUF_GENERAL_COMMAND' | 'INVALID_FIELD' | 'UNSUPPORTED_ATTRIBUTE' | 'INVALID_VALUE' | 'READ_ONLY' | 'INSUFFICIENT_SPACE' | 'DUPLICATE_EXISTS' | 'NOT_FOUND' | 'UNREPORTABLE_ATTRIBUTE' | 'INVALID_DATA_TYPE' | 'INVALID_SELECTOR' | 'WRITE_ONLY' | 'INCONSISTENT_STARTUP_STATE' | 'DEFINED_OUT_OF_BAND' | 'INCONSISTENT' | 'ACTION_DENIED' | 'TIMEOUT' | 'ABORT' | 'INVALID_IMAGE' | 'WAIT_FOR_DATA' | 'NO_IMAGE_AVAILABLE' | 'REQUIRE_MORE_IMAGE' | 'NOTIFICATION_PENDING' | 'HARDWARE_FAILURE' | 'SOFTWARE_FAILURE' | 'CALIBRATION_ERROR' | 'UNSUPPORTED_CLUSTER';
   type ZCLDataTypes = typeof import('@athombv/data-types').DataTypes & {
-    enum8Status: ZCLDataType<ZCLEnum8Status>
+    enum8Status: ZCLDataType<types.ZCLEnum8Status>
   };
 
   function debug(flag: boolean, namespaces: string): void;
@@ -2435,7 +2434,7 @@ declare module "zigbee-clusters" {
     bind(clusterName: string, clusterImpl: BoundCluster): void;
     unbind(clusterName: string): void;
 
-    makeDefaultResponseFrame(receivedFrame: unknown, success: boolean, status: ZCLEnum8Status): typeof zclFrames.ZCLStandardHeader | typeof zclFrames.ZCLMfgSpecificHeader;
+    makeDefaultResponseFrame(receivedFrame: unknown, success: boolean, status: types.ZCLEnum8Status): typeof zclFrames.ZCLStandardHeader | typeof zclFrames.ZCLMfgSpecificHeader;
   }
 
   type ZCLDataType<Value> = import('@athombv/data-types').DataType<Value>;
@@ -2448,36 +2447,29 @@ declare module "zigbee-clusters" {
     const ZCLStruct: typeof import('@athombv/data-types').Struct;
   }
 
-  type FrameControlFlag =
-    'clusterSpecific'
-    | 'manufacturerSpecific'
-    | 'directionToClient'
-    | 'disableDefaultResponse';
-  type ZCLFrameControlBitmap = ZCLDataType<BitMap<FrameControlFlag>>;
-
   namespace zclFrames {
     const ZCLStandardHeader: import('@athombv/data-types').StaticStruct<{
-      frameControl: ZCLFrameControlBitmap,
+      frameControl: types.ZCLFrameControlBitmap,
       trxSequenceNumber: ZCLDataTypes["data8"],
       cmdId: ZCLDataTypes["data8"],
       data: ZCLDataTypes["buffer"],
     }>;
     const ZCLMfgSpecificHeader: import('@athombv/data-types').StaticStruct<{
-      frameControl: ZCLFrameControlBitmap,
+      frameControl: types.ZCLFrameControlBitmap,
       manufacturerId: ZCLDataTypes["uint16"],
       trxSequenceNumber: ZCLDataTypes["data8"],
       cmdId: ZCLDataTypes["data8"],
       data: ZCLDataTypes["buffer"],
     }>;
-    function ZCLAttributeDataRecord(withStatus: boolean, attributes: AttributeDefinitions): ZCLDataType<{
+    function ZCLAttributeDataRecord(withStatus: boolean, attributes: types.AttributeDefinitions): ZCLDataType<{
       id: number,
       name?: string,
-      status?: ZCLEnum8Status
+      status?: types.ZCLEnum8Status
       value?: ZCLDataType<any>
     }>;
     function ZCLConfigureReportingRecords({ withStatus }: {withStatus?: boolean}): ZCLDataType<Array<{
       attributeId: number,
-      status?: ZCLEnum8Status,
+      status?: types.ZCLEnum8Status,
       direction: 'reported' | 'received',
       attributeDataType?: number,
       minInterval?: number,
@@ -2488,7 +2480,7 @@ declare module "zigbee-clusters" {
   }
 
   class ZCLError extends Error {
-    zclStatus: ZCLEnum8Status;
+    zclStatus: types.ZCLEnum8Status;
   }
 
   const ZIGBEE_PROFILE_ID: {
@@ -2570,7 +2562,7 @@ declare module "zigbee-clusters" {
     INVALID_ZONE_TYPE: 0xffff,
   };
 
-  abstract class Cluster<Attributes extends AttributeDefinitions, Commands extends CommandDefinitions> extends EventEmitter {
+  abstract class Cluster<Attributes extends types.AttributeDefinitions, Commands extends types.CommandDefinitions> extends EventEmitter {
     static get ID(): number;
     static get NAME(): string;
     // @ts-expect-error Type should be defined on non-abstract inheritors
@@ -2578,37 +2570,37 @@ declare module "zigbee-clusters" {
     // @ts-expect-error Type should be defined on non-abstract inheritors
     static get COMMANDS(): Commands;
 
-    static DIRECTION_SERVER_TO_CLIENT: CommandToClientDirection;
-    static DIRECTION_CLIENT_TO_SERVER: CommandToServerDirection;
+    static DIRECTION_SERVER_TO_CLIENT: types.CommandToClientDirection;
+    static DIRECTION_CLIENT_TO_SERVER: types.CommandToServerDirection;
 
     get logId(): string;
 
     discoverCommandsGenerated({startValue, maxResults}?: {startValue?: number, maxResults?: number}, opts?: {timeout?: number}): Promise<Array<number>>;
     discoverCommandsReceived({startValue, maxResults}?: {startValue?: number, maxResults?: number}, opts?: {timeout?: number}): Promise<Array<number>>;
 
-    readAttributes<K extends keyof (Attributes & GLOBAL_ATTRIBUTES) | number>(attributes: ReadonlyArray<K>, opts?: {timeout?: number}): Promise<{[attribute in K]: AttributesFromDefinition<Attributes & GLOBAL_ATTRIBUTES>[attribute]}>;
-    writeAttributes<K extends keyof (Attributes & GLOBAL_ATTRIBUTES)>(attributes: {[attribute in K]: AttributesFromDefinition<Attributes & GLOBAL_ATTRIBUTES>[attribute]}, opts?: {timeout?: number}): Promise<{[attribute in K]: {id: number, status: 'SUCCESS' | 'FAILURE'}}>
+    readAttributes<K extends keyof (Attributes & types.GLOBAL_ATTRIBUTES) | number>(attributes: ReadonlyArray<K>, opts?: {timeout?: number}): Promise<{[attribute in K]: types.AttributesFromDefinition<Attributes & types.GLOBAL_ATTRIBUTES>[attribute]}>;
+    writeAttributes<K extends keyof (Attributes & types.GLOBAL_ATTRIBUTES)>(attributes: {[attribute in K]: types.AttributesFromDefinition<Attributes & types.GLOBAL_ATTRIBUTES>[attribute]}, opts?: {timeout?: number}): Promise<{[attribute in K]: {id: number, status: 'SUCCESS' | 'FAILURE'}}>
 
-    configureReporting(attributes: AttributeReportingConfiguration<Extract<keyof (Attributes & GLOBAL_ATTRIBUTES), string>>, opts?: {timeout?: number}): Promise<void>;
-    readReportingConfiguration(attributes: ReadonlyArray<Extract<keyof (Attributes & GLOBAL_ATTRIBUTES), string> | number>, opts?: {timeout?: number}): Promise<Array<ReadReportingConfigurationResponse>>;
+    configureReporting(attributes: types.AttributeReportingConfiguration<Extract<keyof (Attributes & types.GLOBAL_ATTRIBUTES), string>>, opts?: {timeout?: number}): Promise<void>;
+    readReportingConfiguration(attributes: ReadonlyArray<Extract<keyof (Attributes & types.GLOBAL_ATTRIBUTES), string> | number>, opts?: {timeout?: number}): Promise<Array<types.ReadReportingConfigurationResponse>>;
 
     discoverAttributes(opts?: {timeout?: number}): Promise<Array<string | number>>;
-    discoverAttributesExtended(opts?: {timeout?: number}): Promise<Array<ExtendedAttributesResponse>>;
+    discoverAttributesExtended(opts?: {timeout?: number}): Promise<Array<types.ExtendedAttributesResponse>>;
 
     sendFrame(data: object): Promise<void>;
     nextSeqNr(): number;
 
     static addCluster(clusterClass: typeof Cluster<any, any>): void;
     static removeCluster(clusterIdOrName: string | number): void;
-    static getCluster<Attributes extends AttributeDefinitions, Commands extends CommandDefinitions>(clusterIdOrName: string | number): Cluster<Attributes, Commands>;
+    static getCluster<Attributes extends types.AttributeDefinitions, Commands extends types.CommandDefinitions>(clusterIdOrName: string | number): Cluster<Attributes, Commands>;
 
-    on<Event extends Extract<keyof Attributes, string>>(eventName: `attr.${Event}`, listener: (value: AttributesFromDefinition<Attributes>[Event]) => void): this;
+    on<Event extends Extract<keyof Attributes, string>>(eventName: `attr.${Event}`, listener: (value: types.AttributesFromDefinition<Attributes>[Event]) => void): this;
     on<Values extends Array<any> = unknown[]>(eventName: string, listener: (...args: Values) => void): this;
 
-    attributes: Attributes & GLOBAL_ATTRIBUTES;
-    attributesById: {[Attribute in keyof (Attributes & GLOBAL_ATTRIBUTES) as (Attributes & GLOBAL_ATTRIBUTES)[Attribute]['id']]: { name: Attribute } & (Attributes & GLOBAL_ATTRIBUTES)[Attribute] };
+    attributes: Attributes & types.GLOBAL_ATTRIBUTES;
+    attributesById: {[Attribute in keyof (Attributes & types.GLOBAL_ATTRIBUTES) as (Attributes & types.GLOBAL_ATTRIBUTES)[Attribute]['id']]: { name: Attribute } & (Attributes & types.GLOBAL_ATTRIBUTES)[Attribute] };
 
-    commands: Commands & GLOBAL_COMMANDS;
+    commands: Commands & types.GLOBAL_COMMANDS;
     commandsById: {[Command in keyof Commands as Commands[Command]['id']]: Array<{name: Command} & Commands[Command]>}; // Adding the global commands here results in types too big for TypeScript
   }
 
@@ -2619,298 +2611,307 @@ declare module "zigbee-clusters" {
 
     get logId(): string;
   }
-}
 
-type ZCLDataTypes = import('zigbee-clusters').ZCLDataTypes;
-type ZCLDataType<Value> = import('zigbee-clusters').ZCLDataType<Value>;
-type ZCLStruct<Defs extends Record<string, ZCLDataType<any>>> = import('@athombv/data-types').StructInstance<Defs>
+  namespace types {
+    type FrameControlFlag =
+      'clusterSpecific'
+      | 'manufacturerSpecific'
+      | 'directionToClient'
+      | 'disableDefaultResponse';
+    type ZCLFrameControlBitmap = ZCLDataType<BitMap<FrameControlFlag>>;
 
-type GLOBAL_ATTRIBUTES = {
-  clusterRevision: { id: 0xfffd, type: ZCLDataTypes["uint16"] },
-  attributeReportingStatus: {
-    id: 0xfffe,
-    type: ZCLDataType<"PENDING" | "COMPLETE">
-  }
-};
+    type ZCLEnum8Status = 'SUCCESS' | 'FAILURE' | 'NOT_AUTHORIZED' | 'RESERVED_FIELD_NOT_ZERO' | 'MALFORMED_COMMAND' | 'UNSUP_CLUSTER_COMMAND' | 'UNSUP_GENERAL_COMMAND' | 'UNSUP_MANUF_CLUSTER_COMMAND' | 'UNSUP_MANUF_GENERAL_COMMAND' | 'INVALID_FIELD' | 'UNSUPPORTED_ATTRIBUTE' | 'INVALID_VALUE' | 'READ_ONLY' | 'INSUFFICIENT_SPACE' | 'DUPLICATE_EXISTS' | 'NOT_FOUND' | 'UNREPORTABLE_ATTRIBUTE' | 'INVALID_DATA_TYPE' | 'INVALID_SELECTOR' | 'WRITE_ONLY' | 'INCONSISTENT_STARTUP_STATE' | 'DEFINED_OUT_OF_BAND' | 'INCONSISTENT' | 'ACTION_DENIED' | 'TIMEOUT' | 'ABORT' | 'INVALID_IMAGE' | 'WAIT_FOR_DATA' | 'NO_IMAGE_AVAILABLE' | 'REQUIRE_MORE_IMAGE' | 'NOTIFICATION_PENDING' | 'HARDWARE_FAILURE' | 'SOFTWARE_FAILURE' | 'CALIBRATION_ERROR' | 'UNSUPPORTED_CLUSTER';
 
-type GLOBAL_COMMANDS = {
-  readAttributes: {
-    id: 0x00,
-    args: {
-      attributes: ZCLDataType<Array<number>>,
-    },
-    response: {
-      id: 0x01,
-      args: {
-        attributes: ZCLDataTypes["buffer"],
+    type GLOBAL_ATTRIBUTES = {
+      clusterRevision: { id: 0xfffd, type: ZCLDataTypes["uint16"] },
+      attributeReportingStatus: {
+        id: 0xfffe,
+        type: ZCLDataType<"PENDING" | "COMPLETE">
+      }
+    };
+
+    type GLOBAL_COMMANDS = {
+      readAttributes: {
+        id: 0x00,
+        args: {
+          attributes: ZCLDataType<Array<number>>,
+        },
+        response: {
+          id: 0x01,
+          args: {
+            attributes: ZCLDataTypes["buffer"],
+          },
+        },
+        global: true,
       },
-    },
-    global: true,
-  },
 
-  writeAttributes: {
-    id: 0x02,
-    args: {
-      attributes: ZCLDataTypes["buffer"],
-    },
-    response: {
-      id: 0x04,
-      args: {
-        attributes: ZCLDataType<Array<ZCLStruct<{
-          status: ZCLDataTypes["enum8Status"],
-          id: ZCLDataTypes["uint16"]
-        }>>>
+      writeAttributes: {
+        id: 0x02,
+        args: {
+          attributes: ZCLDataTypes["buffer"],
+        },
+        response: {
+          id: 0x04,
+          args: {
+            attributes: ZCLDataType<Array<ZCLStructInstance<{
+              status: ZCLDataTypes["enum8Status"],
+              id: ZCLDataTypes["uint16"]
+            }>>>
+          },
+        },
+        global: true,
       },
-    },
-    global: true,
-  },
 
-  writeAttributesAtomic: {
-    id: 0x03,
-    args: {
-      attributes: ZCLDataTypes["buffer"],
-    },
-    response: {
-      id: 0x04,
-      args: {
-        attributes: ZCLDataType<Array<ZCLStruct<{
-          status: ZCLDataTypes["enum8Status"],
-          id: ZCLDataTypes["uint16"]
-        }>>>
+      writeAttributesAtomic: {
+        id: 0x03,
+        args: {
+          attributes: ZCLDataTypes["buffer"],
+        },
+        response: {
+          id: 0x04,
+          args: {
+            attributes: ZCLDataType<Array<ZCLStructInstance<{
+              status: ZCLDataTypes["enum8Status"],
+              id: ZCLDataTypes["uint16"]
+            }>>>
+          },
+        },
+        global: true,
       },
-    },
-    global: true,
-  },
 
-  writeAttributesNoResponse: {
-    id: 0x05,
-    args: {
-      attributes: ZCLDataTypes["buffer"],
-    },
-    global: true,
-  },
+      writeAttributesNoResponse: {
+        id: 0x05,
+        args: {
+          attributes: ZCLDataTypes["buffer"],
+        },
+        global: true,
+      },
 
-  configureReporting: {
-    id: 0x06,
-    args: {
-      reports: ReturnType<typeof import('zigbee-clusters').zclFrames.ZCLConfigureReportingRecords>,
-    },
-    response: {
-      id: 0x07,
-      args: {
-        reports: ZCLDataType<Array<ZCLStruct<{
-          status: ZCLDataTypes["enum8Status"],
-          direction: ZCLDataType<"reported" | "received">
-          attributeId: ZCLDataTypes["uint16"]
-        }>>>
+      configureReporting: {
+        id: 0x06,
+        args: {
+          reports: ReturnType<typeof zclFrames.ZCLConfigureReportingRecords>,
+        },
+        response: {
+          id: 0x07,
+          args: {
+            reports: ZCLDataType<Array<ZCLStructInstance<{
+              status: ZCLDataTypes["enum8Status"],
+              direction: ZCLDataType<"reported" | "received">
+              attributeId: ZCLDataTypes["uint16"]
+            }>>>
+          },
+        },
+        global: true,
       },
-    },
-    global: true,
-  },
 
-  readReportingConfiguration: {
-    id: 0x08,
-    args: {
-      attributes: ZCLDataType<Array<ZCLStruct<{
-        direction: ZCLDataType<"reported" | "received">
-        attributeId: ZCLDataTypes["uint16"]
-      }>>>,
-    },
-    response: {
-      id: 0x09,
-      args: {
-        reports: ReturnType<typeof import('zigbee-clusters').zclFrames.ZCLConfigureReportingRecords>,
+      readReportingConfiguration: {
+        id: 0x08,
+        args: {
+          attributes: ZCLDataType<Array<ZCLStructInstance<{
+            direction: ZCLDataType<"reported" | "received">
+            attributeId: ZCLDataTypes["uint16"]
+          }>>>,
+        },
+        response: {
+          id: 0x09,
+          args: {
+            reports: ReturnType<typeof zclFrames.ZCLConfigureReportingRecords>,
+          },
+        },
+        global: true,
       },
-    },
-    global: true,
-  },
 
-  reportAttributes: {
-    id: 0x0A,
-    args: {
-      attributes: ZCLDataTypes["buffer"],
-    },
-    global: true,
-  },
+      reportAttributes: {
+        id: 0x0A,
+        args: {
+          attributes: ZCLDataTypes["buffer"],
+        },
+        global: true,
+      },
 
-  defaultResponse: {
-    id: 0x0B,
-    args: {
-      cmdId: ZCLDataTypes["uint8"],
-      status: ZCLDataTypes["enum8Status"],
-    },
-    global: true,
-  },
+      defaultResponse: {
+        id: 0x0B,
+        args: {
+          cmdId: ZCLDataTypes["uint8"],
+          status: ZCLDataTypes["enum8Status"],
+        },
+        global: true,
+      },
 
-  discoverAttributes: {
-    id: 0x0C,
-    args: {
-      startValue: ZCLDataTypes["uint16"],
-      maxResults: ZCLDataTypes["uint8"],
-    },
-    response: {
-      id: 0x0D,
-      args: {
-        lastResponse: ZCLDataTypes["bool"],
-        attributes: ZCLDataType<Array<ZCLStruct<{
-          id: ZCLDataTypes["uint16"],
-          dataTypeId: ZCLDataTypes["uint8"],
-        }>>>,
+      discoverAttributes: {
+        id: 0x0C,
+        args: {
+          startValue: ZCLDataTypes["uint16"],
+          maxResults: ZCLDataTypes["uint8"],
+        },
+        response: {
+          id: 0x0D,
+          args: {
+            lastResponse: ZCLDataTypes["bool"],
+            attributes: ZCLDataType<Array<ZCLStructInstance<{
+              id: ZCLDataTypes["uint16"],
+              dataTypeId: ZCLDataTypes["uint8"],
+            }>>>,
+          },
+        },
+        global: true,
       },
-    },
-    global: true,
-  },
 
-  readAttributesStructured: {
-    id: 0x0E,
-    args: {
-      attributes: ZCLDataType<Array<ZCLStruct<{
-        attributeId: ZCLDataTypes["uint16"],
-        indexPath: ZCLDataType<Array<ZCLDataTypes["uint16"]>>,
-      }>>>,
-    },
-    response: {
-      id: 0x01,
-      args: {
-        attributes: ZCLDataTypes["buffer"],
+      readAttributesStructured: {
+        id: 0x0E,
+        args: {
+          attributes: ZCLDataType<Array<ZCLStructInstance<{
+            attributeId: ZCLDataTypes["uint16"],
+            indexPath: ZCLDataType<Array<ZCLDataTypes["uint16"]>>,
+          }>>>,
+        },
+        response: {
+          id: 0x01,
+          args: {
+            attributes: ZCLDataTypes["buffer"],
+          },
+        },
+        global: true,
       },
-    },
-    global: true,
-  },
 
-  writeAttributesStructured: {
-    id: 0x0F,
-    args: {
-      attributes: ZCLDataType<Array<ZCLStruct<{
-        attributeId: ZCLDataTypes["uint16"],
-        indexPath: ZCLDataType<Array<ZCLDataTypes["uint16"]>>,
-        dataTypeId: ZCLDataTypes["uint8"],
-        value: ZCLDataTypes["buffer"],
-      }>>>,
-    },
-    response: {
-      id: 0x10,
-      args: {
-        attributes: ZCLDataTypes["buffer"],
+      writeAttributesStructured: {
+        id: 0x0F,
+        args: {
+          attributes: ZCLDataType<Array<ZCLStructInstance<{
+            attributeId: ZCLDataTypes["uint16"],
+            indexPath: ZCLDataType<Array<ZCLDataTypes["uint16"]>>,
+            dataTypeId: ZCLDataTypes["uint8"],
+            value: ZCLDataTypes["buffer"],
+          }>>>,
+        },
+        response: {
+          id: 0x10,
+          args: {
+            attributes: ZCLDataTypes["buffer"],
+          },
+        },
+        global: true,
       },
-    },
-    global: true,
-  },
 
-  discoverCommandsReceived: {
-    id: 0x11,
-    args: {
-      startValue: ZCLDataTypes["uint8"],
-      maxResults: ZCLDataTypes["uint8"],
-    },
-    response: {
-      id: 0x12,
-      args: {
-        lastResponse: ZCLDataTypes["bool"],
-        commandIds: ZCLDataType<Array<ZCLDataTypes["uint8"]>>,
+      discoverCommandsReceived: {
+        id: 0x11,
+        args: {
+          startValue: ZCLDataTypes["uint8"],
+          maxResults: ZCLDataTypes["uint8"],
+        },
+        response: {
+          id: 0x12,
+          args: {
+            lastResponse: ZCLDataTypes["bool"],
+            commandIds: ZCLDataType<Array<ZCLDataTypes["uint8"]>>,
+          },
+        },
+        global: true,
       },
-    },
-    global: true,
-  },
 
-  discoverCommandsGenerated: {
-    id: 0x13,
-    args: {
-      startValue: ZCLDataTypes["uint8"],
-      maxResults: ZCLDataTypes["uint8"],
-    },
-    response: {
-      id: 0x14,
-      args: {
-        lastResponse: ZCLDataTypes["bool"],
-        commandIds: ZCLDataType<Array<ZCLDataTypes["uint8"]>>,
+      discoverCommandsGenerated: {
+        id: 0x13,
+        args: {
+          startValue: ZCLDataTypes["uint8"],
+          maxResults: ZCLDataTypes["uint8"],
+        },
+        response: {
+          id: 0x14,
+          args: {
+            lastResponse: ZCLDataTypes["bool"],
+            commandIds: ZCLDataType<Array<ZCLDataTypes["uint8"]>>,
+          },
+        },
+        global: true,
       },
-    },
-    global: true,
-  },
 
-  discoverAttributesExtended: {
-    id: 0x15,
-    args: {
-      startValue: ZCLDataTypes["uint16"],
-      maxResults: ZCLDataTypes["uint8"],
-    },
-    response: {
-      id: 0x16,
-      args: {
-        lastResponse: ZCLDataTypes["bool"],
-        attributes: ZCLDataType<Array<ZCLStruct<{
-          id: ZCLDataTypes["uint16"],
-          dataTypeId: ZCLDataTypes["uint8"],
-          acl: ZCLDataType<import('@athombv/data-types').BitMap<'readable' | 'writable' | 'reportable'>>,
-        }>>>,
-      },
-    },
-    global: true,
-  },
-};
+      discoverAttributesExtended: {
+        id: 0x15,
+        args: {
+          startValue: ZCLDataTypes["uint16"],
+          maxResults: ZCLDataTypes["uint8"],
+        },
+        response: {
+          id: 0x16,
+          args: {
+            lastResponse: ZCLDataTypes["bool"],
+            attributes: ZCLDataType<Array<ZCLStructInstance<{
+              id: ZCLDataTypes["uint16"],
+              dataTypeId: ZCLDataTypes["uint8"],
+              acl: ZCLDataType<import('@athombv/data-types').BitMap<'readable' | 'writable' | 'reportable'>>,
+            }>>>,
+          },
+        },
+        global: true,
+      },
+    };
 
-type CommandToServerDirection = 'DIRECTION_CLIENT_TO_SERVER';
-type CommandToClientDirection = 'DIRECTION_SERVER_TO_CLIENT';
-type CommandDirection = CommandToServerDirection | CommandToClientDirection;
+    type ZCLStructInstance<Defs extends Record<string, ZCLDataType<any>>> = import('@athombv/data-types').StructInstance<Defs>
 
-type FromZCLDataType<DataType> = DataType extends import('zigbee-clusters').ZCLDataType<infer InferredValue>? InferredValue : DataType;
+    type CommandToServerDirection = 'DIRECTION_CLIENT_TO_SERVER';
+    type CommandToClientDirection = 'DIRECTION_SERVER_TO_CLIENT';
+    type CommandDirection = CommandToServerDirection | CommandToClientDirection;
 
-type AttributeDefinition = {
-  id: number,
-  type: import('zigbee-clusters').ZCLDataType<any>,
-  manufacturerId?: number,
-}
+    type FromZCLDataType<DataType> = DataType extends ZCLDataType<infer InferredValue>? InferredValue : DataType;
 
-type AttributeDefinitions = {
-  [attributeName: string]: AttributeDefinition,
-}
+    type AttributeDefinition = {
+      id: number,
+      type: ZCLDataType<any>,
+      manufacturerId?: number,
+    }
 
-type AttributesFromDefinition<Definition extends AttributeDefinitions> = {
-  [attribute in keyof Definition]: FromZCLDataType<Definition[attribute]['type']>
-}
+    type AttributeDefinitions = {
+      [attributeName: string]: AttributeDefinition,
+    }
 
-type CommandDefinition = {
-  id: number,
-  direction?: CommandDirection,
-  args?: {
-    [argName: string]: import('zigbee-clusters').ZCLDataType<any>,
-  }
-  response?: CommandDefinition,
-  frameControl?: import('zigbee-clusters').FrameControlFlag[];
-  encodeMissingFieldsBehavior?: 'default' | 'skip';
-  global?: boolean;
-}
+    type AttributesFromDefinition<Definition extends AttributeDefinitions> = {
+      [attribute in keyof Definition]: FromZCLDataType<Definition[attribute]['type']>
+    }
 
-type CommandDefinitions = {
-  [commandName: string]: CommandDefinition,
-}
+    type CommandDefinition = {
+      id: number,
+      direction?: CommandDirection,
+      args?: {
+        [argName: string]: ZCLDataType<any>,
+      }
+      response?: CommandDefinition,
+      frameControl?: FrameControlFlag[];
+      encodeMissingFieldsBehavior?: 'default' | 'skip';
+      global?: boolean;
+    }
 
-type AttributeReportingConfiguration<AttributeKey extends string> = {
-  [attribute in AttributeKey]: {
-    minInterval?: number,
-    maxInterval?: number,
-    minChange?: number
-  }
-}
+    type CommandDefinitions = {
+      [commandName: string]: CommandDefinition,
+    }
 
-type ReadReportingConfigurationResponse = {
-  status: import('zigbee-clusters').ZCLEnum8Status,
-  direction: 'reported'|'received';
-  attributeId: number;
-  attributeDataType?: number;
-  minInterval?: number;
-  maxInterval?: number;
-  minChange?: number;
-  timeoutPeriod?: number;
-}
+    type AttributeReportingConfiguration<AttributeKey extends string> = {
+      [attribute in AttributeKey]: {
+        minInterval?: number,
+        maxInterval?: number,
+        minChange?: number
+      }
+    }
+
+    type ReadReportingConfigurationResponse = {
+      status: ZCLEnum8Status,
+      direction: 'reported'|'received';
+      attributeId: number;
+      attributeDataType?: number;
+      minInterval?: number;
+      maxInterval?: number;
+      minChange?: number;
+      timeoutPeriod?: number;
+    }
 
-type ExtendedAttributesResponse = {
-  name?: string;
-  id: number;
-  acl: {
-    readable: boolean;
-    writable: boolean;
-    reportable: boolean;
+    type ExtendedAttributesResponse = {
+      name?: string;
+      id: number;
+      acl: {
+        readable: boolean;
+        writable: boolean;
+        reportable: boolean;
+      }
+    }
   }
 }
diff --git a/scripts/generate-types.mts b/scripts/generate-types.mts
index 8faca6f..f33ab05 100644
--- a/scripts/generate-types.mts
+++ b/scripts/generate-types.mts
@@ -1,7 +1,7 @@
-import {Cluster} from "zigbee-clusters";
+import type {Cluster, types} from "zigbee-clusters";
 import path from "node:path";
 import * as fs from "node:fs/promises";
-import {DataType, DataTypes} from "@athombv/data-types";
+import type {DataType, DataTypes} from "@athombv/data-types";
 
 const INDENTATION_SPACES = 2;
 
@@ -156,7 +156,7 @@ async function formatCluster(className: string, classDefinition: typeof Cluster)
   }
 
   // Open class
-  stringBuilder.printLine(`class ${className}<Attributes extends AttributeDefinitions = ${className}Attributes, Commands extends CommandDefinitions = ${className}Commands> extends Cluster<Attributes, Commands> {`);
+  stringBuilder.printLine(`class ${className}<Attributes extends types.AttributeDefinitions = ${className}Attributes, Commands extends types.CommandDefinitions = ${className}Commands> extends Cluster<Attributes, Commands> {`);
 
   stringBuilder.increaseIndent();
   for (const command in classDefinition.COMMANDS) {
@@ -172,7 +172,7 @@ async function formatCluster(className: string, classDefinition: typeof Cluster)
 }
 
 
-function formatAttribute(stringBuilder: StringBuilder, className: string, name: string, definition: AttributeDefinition): void {
+function formatAttribute(stringBuilder: StringBuilder, className: string, name: string, definition: types.AttributeDefinition): void {
   stringBuilder.startLine();
   stringBuilder.print(`${name}: { id: 0x${definition.id.toString(16).padStart(2, "0")}`);
   stringBuilder.print(', type: ZCLDataType<');
@@ -182,7 +182,7 @@ function formatAttribute(stringBuilder: StringBuilder, className: string, name:
 }
 
 
-function formatCommand(stringBuilder: StringBuilder, className: string, name: string, definition: CommandDefinition): void {
+function formatCommand(stringBuilder: StringBuilder, className: string, name: string, definition: types.CommandDefinition): void {
   stringBuilder.startLine();
   stringBuilder.print(`${name}: { id: 0x${definition.id.toString(16).padStart(2, "0")}`);
   stringBuilder.print(`, direction: ${JSON.stringify(definition.direction ?? "DIRECTION_SERVER_TO_CLIENT")}`);
@@ -232,7 +232,7 @@ function formatCommand(stringBuilder: StringBuilder, className: string, name: st
 }
 
 
-function formatCommandMethod(stringBuilder: StringBuilder, className: string, name: string, definition: CommandDefinition): void {
+function formatCommandMethod(stringBuilder: StringBuilder, className: string, name: string, definition: types.CommandDefinition): void {
   // Method name
   stringBuilder.startLine();
   if (definition.direction === 'DIRECTION_SERVER_TO_CLIENT') {
diff --git a/scripts/template.d.ts.txt b/scripts/template.d.ts.txt
index 31a3cef..74382ea 100644
--- a/scripts/template.d.ts.txt
+++ b/scripts/template.d.ts.txt
@@ -2,9 +2,8 @@
 declare module 'zigbee-clusters' {
   import {EventEmitter} from "events";
   import {ZigBeeNode} from "homey";
-  type ZCLEnum8Status = 'SUCCESS' | 'FAILURE' | 'NOT_AUTHORIZED' | 'RESERVED_FIELD_NOT_ZERO' | 'MALFORMED_COMMAND' | 'UNSUP_CLUSTER_COMMAND' | 'UNSUP_GENERAL_COMMAND' | 'UNSUP_MANUF_CLUSTER_COMMAND' | 'UNSUP_MANUF_GENERAL_COMMAND' | 'INVALID_FIELD' | 'UNSUPPORTED_ATTRIBUTE' | 'INVALID_VALUE' | 'READ_ONLY' | 'INSUFFICIENT_SPACE' | 'DUPLICATE_EXISTS' | 'NOT_FOUND' | 'UNREPORTABLE_ATTRIBUTE' | 'INVALID_DATA_TYPE' | 'INVALID_SELECTOR' | 'WRITE_ONLY' | 'INCONSISTENT_STARTUP_STATE' | 'DEFINED_OUT_OF_BAND' | 'INCONSISTENT' | 'ACTION_DENIED' | 'TIMEOUT' | 'ABORT' | 'INVALID_IMAGE' | 'WAIT_FOR_DATA' | 'NO_IMAGE_AVAILABLE' | 'REQUIRE_MORE_IMAGE' | 'NOTIFICATION_PENDING' | 'HARDWARE_FAILURE' | 'SOFTWARE_FAILURE' | 'CALIBRATION_ERROR' | 'UNSUPPORTED_CLUSTER';
   type ZCLDataTypes = typeof import('@athombv/data-types').DataTypes & {
-    enum8Status: ZCLDataType<ZCLEnum8Status>
+    enum8Status: ZCLDataType<types.ZCLEnum8Status>
   };
 
   function debug(flag: boolean, namespaces: string): void;
@@ -28,7 +27,7 @@ declare module 'zigbee-clusters' {
     bind(clusterName: string, clusterImpl: BoundCluster): void;
     unbind(clusterName: string): void;
 
-    makeDefaultResponseFrame(receivedFrame: unknown, success: boolean, status: ZCLEnum8Status): typeof zclFrames.ZCLStandardHeader | typeof zclFrames.ZCLMfgSpecificHeader;
+    makeDefaultResponseFrame(receivedFrame: unknown, success: boolean, status: types.ZCLEnum8Status): typeof zclFrames.ZCLStandardHeader | typeof zclFrames.ZCLMfgSpecificHeader;
   }
 
   type ZCLDataType<Value> = import('@athombv/data-types').DataType<Value>;
@@ -41,36 +40,29 @@ declare module 'zigbee-clusters' {
     const ZCLStruct: typeof import('@athombv/data-types').Struct;
   }
 
-  type FrameControlFlag =
-    'clusterSpecific'
-    | 'manufacturerSpecific'
-    | 'directionToClient'
-    | 'disableDefaultResponse';
-  type ZCLFrameControlBitmap = ZCLDataType<BitMap<FrameControlFlag>>;
-
   namespace zclFrames {
     const ZCLStandardHeader: import('@athombv/data-types').StaticStruct<{
-      frameControl: ZCLFrameControlBitmap,
+      frameControl: types.ZCLFrameControlBitmap,
       trxSequenceNumber: ZCLDataTypes["data8"],
       cmdId: ZCLDataTypes["data8"],
       data: ZCLDataTypes["buffer"],
     }>;
     const ZCLMfgSpecificHeader: import('@athombv/data-types').StaticStruct<{
-      frameControl: ZCLFrameControlBitmap,
+      frameControl: types.ZCLFrameControlBitmap,
       manufacturerId: ZCLDataTypes["uint16"],
       trxSequenceNumber: ZCLDataTypes["data8"],
       cmdId: ZCLDataTypes["data8"],
       data: ZCLDataTypes["buffer"],
     }>;
-    function ZCLAttributeDataRecord(withStatus: boolean, attributes: AttributeDefinitions): ZCLDataType<{
+    function ZCLAttributeDataRecord(withStatus: boolean, attributes: types.AttributeDefinitions): ZCLDataType<{
       id: number,
       name?: string,
-      status?: ZCLEnum8Status
+      status?: types.ZCLEnum8Status
       value?: ZCLDataType<any>
     }>;
     function ZCLConfigureReportingRecords({ withStatus }: {withStatus?: boolean}): ZCLDataType<Array<{
       attributeId: number,
-      status?: ZCLEnum8Status,
+      status?: types.ZCLEnum8Status,
       direction: 'reported' | 'received',
       attributeDataType?: number,
       minInterval?: number,
@@ -81,7 +73,7 @@ declare module 'zigbee-clusters' {
   }
 
   class ZCLError extends Error {
-    zclStatus: ZCLEnum8Status;
+    zclStatus: types.ZCLEnum8Status;
   }
 
   const ZIGBEE_PROFILE_ID: {
@@ -163,7 +155,7 @@ declare module 'zigbee-clusters' {
     INVALID_ZONE_TYPE: 0xffff,
   };
 
-  abstract class Cluster<Attributes extends AttributeDefinitions, Commands extends CommandDefinitions> extends EventEmitter {
+  abstract class Cluster<Attributes extends types.AttributeDefinitions, Commands extends types.CommandDefinitions> extends EventEmitter {
     static get ID(): number;
     static get NAME(): string;
     // @ts-expect-error Type should be defined on non-abstract inheritors
@@ -171,37 +163,37 @@ declare module 'zigbee-clusters' {
     // @ts-expect-error Type should be defined on non-abstract inheritors
     static get COMMANDS(): Commands;
 
-    static DIRECTION_SERVER_TO_CLIENT: CommandToClientDirection;
-    static DIRECTION_CLIENT_TO_SERVER: CommandToServerDirection;
+    static DIRECTION_SERVER_TO_CLIENT: types.CommandToClientDirection;
+    static DIRECTION_CLIENT_TO_SERVER: types.CommandToServerDirection;
 
     get logId(): string;
 
     discoverCommandsGenerated({startValue, maxResults}?: {startValue?: number, maxResults?: number}, opts?: {timeout?: number}): Promise<Array<number>>;
     discoverCommandsReceived({startValue, maxResults}?: {startValue?: number, maxResults?: number}, opts?: {timeout?: number}): Promise<Array<number>>;
 
-    readAttributes<K extends keyof (Attributes & GLOBAL_ATTRIBUTES) | number>(attributes: ReadonlyArray<K>, opts?: {timeout?: number}): Promise<{[attribute in K]: AttributesFromDefinition<Attributes & GLOBAL_ATTRIBUTES>[attribute]}>;
-    writeAttributes<K extends keyof (Attributes & GLOBAL_ATTRIBUTES)>(attributes: {[attribute in K]: AttributesFromDefinition<Attributes & GLOBAL_ATTRIBUTES>[attribute]}, opts?: {timeout?: number}): Promise<{[attribute in K]: {id: number, status: 'SUCCESS' | 'FAILURE'}}>
+    readAttributes<K extends keyof (Attributes & types.GLOBAL_ATTRIBUTES) | number>(attributes: ReadonlyArray<K>, opts?: {timeout?: number}): Promise<{[attribute in K]: types.AttributesFromDefinition<Attributes & types.GLOBAL_ATTRIBUTES>[attribute]}>;
+    writeAttributes<K extends keyof (Attributes & types.GLOBAL_ATTRIBUTES)>(attributes: {[attribute in K]: types.AttributesFromDefinition<Attributes & types.GLOBAL_ATTRIBUTES>[attribute]}, opts?: {timeout?: number}): Promise<{[attribute in K]: {id: number, status: 'SUCCESS' | 'FAILURE'}}>
 
-    configureReporting(attributes: AttributeReportingConfiguration<Extract<keyof (Attributes & GLOBAL_ATTRIBUTES), string>>, opts?: {timeout?: number}): Promise<void>;
-    readReportingConfiguration(attributes: ReadonlyArray<Extract<keyof (Attributes & GLOBAL_ATTRIBUTES), string> | number>, opts?: {timeout?: number}): Promise<Array<ReadReportingConfigurationResponse>>;
+    configureReporting(attributes: types.AttributeReportingConfiguration<Extract<keyof (Attributes & types.GLOBAL_ATTRIBUTES), string>>, opts?: {timeout?: number}): Promise<void>;
+    readReportingConfiguration(attributes: ReadonlyArray<Extract<keyof (Attributes & types.GLOBAL_ATTRIBUTES), string> | number>, opts?: {timeout?: number}): Promise<Array<types.ReadReportingConfigurationResponse>>;
 
     discoverAttributes(opts?: {timeout?: number}): Promise<Array<string | number>>;
-    discoverAttributesExtended(opts?: {timeout?: number}): Promise<Array<ExtendedAttributesResponse>>;
+    discoverAttributesExtended(opts?: {timeout?: number}): Promise<Array<types.ExtendedAttributesResponse>>;
 
     sendFrame(data: object): Promise<void>;
     nextSeqNr(): number;
 
     static addCluster(clusterClass: typeof Cluster<any, any>): void;
     static removeCluster(clusterIdOrName: string | number): void;
-    static getCluster<Attributes extends AttributeDefinitions, Commands extends CommandDefinitions>(clusterIdOrName: string | number): Cluster<Attributes, Commands>;
+    static getCluster<Attributes extends types.AttributeDefinitions, Commands extends types.CommandDefinitions>(clusterIdOrName: string | number): Cluster<Attributes, Commands>;
 
-    on<Event extends Extract<keyof Attributes, string>>(eventName: `attr.${Event}`, listener: (value: AttributesFromDefinition<Attributes>[Event]) => void): this;
+    on<Event extends Extract<keyof Attributes, string>>(eventName: `attr.${Event}`, listener: (value: types.AttributesFromDefinition<Attributes>[Event]) => void): this;
     on<Values extends Array<any> = unknown[]>(eventName: string, listener: (...args: Values) => void): this;
 
-    attributes: Attributes & GLOBAL_ATTRIBUTES;
-    attributesById: {[Attribute in keyof (Attributes & GLOBAL_ATTRIBUTES) as (Attributes & GLOBAL_ATTRIBUTES)[Attribute]['id']]: { name: Attribute } & (Attributes & GLOBAL_ATTRIBUTES)[Attribute] };
+    attributes: Attributes & types.GLOBAL_ATTRIBUTES;
+    attributesById: {[Attribute in keyof (Attributes & types.GLOBAL_ATTRIBUTES) as (Attributes & types.GLOBAL_ATTRIBUTES)[Attribute]['id']]: { name: Attribute } & (Attributes & types.GLOBAL_ATTRIBUTES)[Attribute] };
 
-    commands: Commands & GLOBAL_COMMANDS;
+    commands: Commands & types.GLOBAL_COMMANDS;
     commandsById: {[Command in keyof Commands as Commands[Command]['id']]: Array<{name: Command} & Commands[Command]>}; // Adding the global commands here results in types too big for TypeScript
   }
 
@@ -212,298 +204,307 @@ declare module 'zigbee-clusters' {
 
     get logId(): string;
   }
-}
 
-type ZCLDataTypes = import('zigbee-clusters').ZCLDataTypes;
-type ZCLDataType<Value> = import('zigbee-clusters').ZCLDataType<Value>;
-type ZCLStruct<Defs extends Record<string, ZCLDataType<any>>> = import('@athombv/data-types').StructInstance<Defs>
-
-type GLOBAL_ATTRIBUTES = {
-  clusterRevision: { id: 0xfffd, type: ZCLDataTypes["uint16"] },
-  attributeReportingStatus: {
-    id: 0xfffe,
-    type: ZCLDataType<"PENDING" | "COMPLETE">
-  }
-};
-
-type GLOBAL_COMMANDS = {
-  readAttributes: {
-    id: 0x00,
-    args: {
-      attributes: ZCLDataType<Array<number>>,
-    },
-    response: {
-      id: 0x01,
-      args: {
-        attributes: ZCLDataTypes["buffer"],
+  namespace types {
+    type FrameControlFlag =
+      'clusterSpecific'
+      | 'manufacturerSpecific'
+      | 'directionToClient'
+      | 'disableDefaultResponse';
+    type ZCLFrameControlBitmap = ZCLDataType<BitMap<FrameControlFlag>>;
+
+    type ZCLEnum8Status = 'SUCCESS' | 'FAILURE' | 'NOT_AUTHORIZED' | 'RESERVED_FIELD_NOT_ZERO' | 'MALFORMED_COMMAND' | 'UNSUP_CLUSTER_COMMAND' | 'UNSUP_GENERAL_COMMAND' | 'UNSUP_MANUF_CLUSTER_COMMAND' | 'UNSUP_MANUF_GENERAL_COMMAND' | 'INVALID_FIELD' | 'UNSUPPORTED_ATTRIBUTE' | 'INVALID_VALUE' | 'READ_ONLY' | 'INSUFFICIENT_SPACE' | 'DUPLICATE_EXISTS' | 'NOT_FOUND' | 'UNREPORTABLE_ATTRIBUTE' | 'INVALID_DATA_TYPE' | 'INVALID_SELECTOR' | 'WRITE_ONLY' | 'INCONSISTENT_STARTUP_STATE' | 'DEFINED_OUT_OF_BAND' | 'INCONSISTENT' | 'ACTION_DENIED' | 'TIMEOUT' | 'ABORT' | 'INVALID_IMAGE' | 'WAIT_FOR_DATA' | 'NO_IMAGE_AVAILABLE' | 'REQUIRE_MORE_IMAGE' | 'NOTIFICATION_PENDING' | 'HARDWARE_FAILURE' | 'SOFTWARE_FAILURE' | 'CALIBRATION_ERROR' | 'UNSUPPORTED_CLUSTER';
+
+    type GLOBAL_ATTRIBUTES = {
+      clusterRevision: { id: 0xfffd, type: ZCLDataTypes["uint16"] },
+      attributeReportingStatus: {
+        id: 0xfffe,
+        type: ZCLDataType<"PENDING" | "COMPLETE">
+      }
+    };
+
+    type GLOBAL_COMMANDS = {
+      readAttributes: {
+        id: 0x00,
+        args: {
+          attributes: ZCLDataType<Array<number>>,
+        },
+        response: {
+          id: 0x01,
+          args: {
+            attributes: ZCLDataTypes["buffer"],
+          },
+        },
+        global: true,
       },
-    },
-    global: true,
-  },
 
-  writeAttributes: {
-    id: 0x02,
-    args: {
-      attributes: ZCLDataTypes["buffer"],
-    },
-    response: {
-      id: 0x04,
-      args: {
-        attributes: ZCLDataType<Array<ZCLStruct<{
-          status: ZCLDataTypes["enum8Status"],
-          id: ZCLDataTypes["uint16"]
-        }>>>
+      writeAttributes: {
+        id: 0x02,
+        args: {
+          attributes: ZCLDataTypes["buffer"],
+        },
+        response: {
+          id: 0x04,
+          args: {
+            attributes: ZCLDataType<Array<ZCLStructInstance<{
+              status: ZCLDataTypes["enum8Status"],
+              id: ZCLDataTypes["uint16"]
+            }>>>
+          },
+        },
+        global: true,
       },
-    },
-    global: true,
-  },
 
-  writeAttributesAtomic: {
-    id: 0x03,
-    args: {
-      attributes: ZCLDataTypes["buffer"],
-    },
-    response: {
-      id: 0x04,
-      args: {
-        attributes: ZCLDataType<Array<ZCLStruct<{
-          status: ZCLDataTypes["enum8Status"],
-          id: ZCLDataTypes["uint16"]
-        }>>>
+      writeAttributesAtomic: {
+        id: 0x03,
+        args: {
+          attributes: ZCLDataTypes["buffer"],
+        },
+        response: {
+          id: 0x04,
+          args: {
+            attributes: ZCLDataType<Array<ZCLStructInstance<{
+              status: ZCLDataTypes["enum8Status"],
+              id: ZCLDataTypes["uint16"]
+            }>>>
+          },
+        },
+        global: true,
       },
-    },
-    global: true,
-  },
-
-  writeAttributesNoResponse: {
-    id: 0x05,
-    args: {
-      attributes: ZCLDataTypes["buffer"],
-    },
-    global: true,
-  },
 
-  configureReporting: {
-    id: 0x06,
-    args: {
-      reports: ReturnType<typeof import('zigbee-clusters').zclFrames.ZCLConfigureReportingRecords>,
-    },
-    response: {
-      id: 0x07,
-      args: {
-        reports: ZCLDataType<Array<ZCLStruct<{
-          status: ZCLDataTypes["enum8Status"],
-          direction: ZCLDataType<"reported" | "received">
-          attributeId: ZCLDataTypes["uint16"]
-        }>>>
+      writeAttributesNoResponse: {
+        id: 0x05,
+        args: {
+          attributes: ZCLDataTypes["buffer"],
+        },
+        global: true,
       },
-    },
-    global: true,
-  },
-
-  readReportingConfiguration: {
-    id: 0x08,
-    args: {
-      attributes: ZCLDataType<Array<ZCLStruct<{
-        direction: ZCLDataType<"reported" | "received">
-        attributeId: ZCLDataTypes["uint16"]
-      }>>>,
-    },
-    response: {
-      id: 0x09,
-      args: {
-        reports: ReturnType<typeof import('zigbee-clusters').zclFrames.ZCLConfigureReportingRecords>,
+
+      configureReporting: {
+        id: 0x06,
+        args: {
+          reports: ReturnType<typeof zclFrames.ZCLConfigureReportingRecords>,
+        },
+        response: {
+          id: 0x07,
+          args: {
+            reports: ZCLDataType<Array<ZCLStructInstance<{
+              status: ZCLDataTypes["enum8Status"],
+              direction: ZCLDataType<"reported" | "received">
+              attributeId: ZCLDataTypes["uint16"]
+            }>>>
+          },
+        },
+        global: true,
       },
-    },
-    global: true,
-  },
 
-  reportAttributes: {
-    id: 0x0A,
-    args: {
-      attributes: ZCLDataTypes["buffer"],
-    },
-    global: true,
-  },
-
-  defaultResponse: {
-    id: 0x0B,
-    args: {
-      cmdId: ZCLDataTypes["uint8"],
-      status: ZCLDataTypes["enum8Status"],
-    },
-    global: true,
-  },
-
-  discoverAttributes: {
-    id: 0x0C,
-    args: {
-      startValue: ZCLDataTypes["uint16"],
-      maxResults: ZCLDataTypes["uint8"],
-    },
-    response: {
-      id: 0x0D,
-      args: {
-        lastResponse: ZCLDataTypes["bool"],
-        attributes: ZCLDataType<Array<ZCLStruct<{
-          id: ZCLDataTypes["uint16"],
-          dataTypeId: ZCLDataTypes["uint8"],
-        }>>>,
+      readReportingConfiguration: {
+        id: 0x08,
+        args: {
+          attributes: ZCLDataType<Array<ZCLStructInstance<{
+            direction: ZCLDataType<"reported" | "received">
+            attributeId: ZCLDataTypes["uint16"]
+          }>>>,
+        },
+        response: {
+          id: 0x09,
+          args: {
+            reports: ReturnType<typeof zclFrames.ZCLConfigureReportingRecords>,
+          },
+        },
+        global: true,
       },
-    },
-    global: true,
-  },
-
-  readAttributesStructured: {
-    id: 0x0E,
-    args: {
-      attributes: ZCLDataType<Array<ZCLStruct<{
-        attributeId: ZCLDataTypes["uint16"],
-        indexPath: ZCLDataType<Array<ZCLDataTypes["uint16"]>>,
-      }>>>,
-    },
-    response: {
-      id: 0x01,
-      args: {
-        attributes: ZCLDataTypes["buffer"],
+
+      reportAttributes: {
+        id: 0x0A,
+        args: {
+          attributes: ZCLDataTypes["buffer"],
+        },
+        global: true,
       },
-    },
-    global: true,
-  },
-
-  writeAttributesStructured: {
-    id: 0x0F,
-    args: {
-      attributes: ZCLDataType<Array<ZCLStruct<{
-        attributeId: ZCLDataTypes["uint16"],
-        indexPath: ZCLDataType<Array<ZCLDataTypes["uint16"]>>,
-        dataTypeId: ZCLDataTypes["uint8"],
-        value: ZCLDataTypes["buffer"],
-      }>>>,
-    },
-    response: {
-      id: 0x10,
-      args: {
-        attributes: ZCLDataTypes["buffer"],
+
+      defaultResponse: {
+        id: 0x0B,
+        args: {
+          cmdId: ZCLDataTypes["uint8"],
+          status: ZCLDataTypes["enum8Status"],
+        },
+        global: true,
       },
-    },
-    global: true,
-  },
-
-  discoverCommandsReceived: {
-    id: 0x11,
-    args: {
-      startValue: ZCLDataTypes["uint8"],
-      maxResults: ZCLDataTypes["uint8"],
-    },
-    response: {
-      id: 0x12,
-      args: {
-        lastResponse: ZCLDataTypes["bool"],
-        commandIds: ZCLDataType<Array<ZCLDataTypes["uint8"]>>,
+
+      discoverAttributes: {
+        id: 0x0C,
+        args: {
+          startValue: ZCLDataTypes["uint16"],
+          maxResults: ZCLDataTypes["uint8"],
+        },
+        response: {
+          id: 0x0D,
+          args: {
+            lastResponse: ZCLDataTypes["bool"],
+            attributes: ZCLDataType<Array<ZCLStructInstance<{
+              id: ZCLDataTypes["uint16"],
+              dataTypeId: ZCLDataTypes["uint8"],
+            }>>>,
+          },
+        },
+        global: true,
       },
-    },
-    global: true,
-  },
-
-  discoverCommandsGenerated: {
-    id: 0x13,
-    args: {
-      startValue: ZCLDataTypes["uint8"],
-      maxResults: ZCLDataTypes["uint8"],
-    },
-    response: {
-      id: 0x14,
-      args: {
-        lastResponse: ZCLDataTypes["bool"],
-        commandIds: ZCLDataType<Array<ZCLDataTypes["uint8"]>>,
+
+      readAttributesStructured: {
+        id: 0x0E,
+        args: {
+          attributes: ZCLDataType<Array<ZCLStructInstance<{
+            attributeId: ZCLDataTypes["uint16"],
+            indexPath: ZCLDataType<Array<ZCLDataTypes["uint16"]>>,
+          }>>>,
+        },
+        response: {
+          id: 0x01,
+          args: {
+            attributes: ZCLDataTypes["buffer"],
+          },
+        },
+        global: true,
       },
-    },
-    global: true,
-  },
-
-  discoverAttributesExtended: {
-    id: 0x15,
-    args: {
-      startValue: ZCLDataTypes["uint16"],
-      maxResults: ZCLDataTypes["uint8"],
-    },
-    response: {
-      id: 0x16,
-      args: {
-        lastResponse: ZCLDataTypes["bool"],
-        attributes: ZCLDataType<Array<ZCLStruct<{
-          id: ZCLDataTypes["uint16"],
-          dataTypeId: ZCLDataTypes["uint8"],
-          acl: ZCLDataType<import('@athombv/data-types').BitMap<'readable' | 'writable' | 'reportable'>>,
-        }>>>,
+
+      writeAttributesStructured: {
+        id: 0x0F,
+        args: {
+          attributes: ZCLDataType<Array<ZCLStructInstance<{
+            attributeId: ZCLDataTypes["uint16"],
+            indexPath: ZCLDataType<Array<ZCLDataTypes["uint16"]>>,
+            dataTypeId: ZCLDataTypes["uint8"],
+            value: ZCLDataTypes["buffer"],
+          }>>>,
+        },
+        response: {
+          id: 0x10,
+          args: {
+            attributes: ZCLDataTypes["buffer"],
+          },
+        },
+        global: true,
       },
-    },
-    global: true,
-  },
-};
 
-type CommandToServerDirection = 'DIRECTION_CLIENT_TO_SERVER';
-type CommandToClientDirection = 'DIRECTION_SERVER_TO_CLIENT';
-type CommandDirection = CommandToServerDirection | CommandToClientDirection;
+      discoverCommandsReceived: {
+        id: 0x11,
+        args: {
+          startValue: ZCLDataTypes["uint8"],
+          maxResults: ZCLDataTypes["uint8"],
+        },
+        response: {
+          id: 0x12,
+          args: {
+            lastResponse: ZCLDataTypes["bool"],
+            commandIds: ZCLDataType<Array<ZCLDataTypes["uint8"]>>,
+          },
+        },
+        global: true,
+      },
 
-type FromZCLDataType<DataType> = DataType extends import('zigbee-clusters').ZCLDataType<infer InferredValue>? InferredValue : DataType;
+      discoverCommandsGenerated: {
+        id: 0x13,
+        args: {
+          startValue: ZCLDataTypes["uint8"],
+          maxResults: ZCLDataTypes["uint8"],
+        },
+        response: {
+          id: 0x14,
+          args: {
+            lastResponse: ZCLDataTypes["bool"],
+            commandIds: ZCLDataType<Array<ZCLDataTypes["uint8"]>>,
+          },
+        },
+        global: true,
+      },
 
-type AttributeDefinition = {
-  id: number,
-  type: import('zigbee-clusters').ZCLDataType<any>,
-  manufacturerId?: number,
-}
+      discoverAttributesExtended: {
+        id: 0x15,
+        args: {
+          startValue: ZCLDataTypes["uint16"],
+          maxResults: ZCLDataTypes["uint8"],
+        },
+        response: {
+          id: 0x16,
+          args: {
+            lastResponse: ZCLDataTypes["bool"],
+            attributes: ZCLDataType<Array<ZCLStructInstance<{
+              id: ZCLDataTypes["uint16"],
+              dataTypeId: ZCLDataTypes["uint8"],
+              acl: ZCLDataType<import('@athombv/data-types').BitMap<'readable' | 'writable' | 'reportable'>>,
+            }>>>,
+          },
+        },
+        global: true,
+      },
+    };
 
-type AttributeDefinitions = {
-  [attributeName: string]: AttributeDefinition,
-}
+    type ZCLStructInstance<Defs extends Record<string, ZCLDataType<any>>> = import('@athombv/data-types').StructInstance<Defs>
 
-type AttributesFromDefinition<Definition extends AttributeDefinitions> = {
-  [attribute in keyof Definition]: FromZCLDataType<Definition[attribute]['type']>
-}
+    type CommandToServerDirection = 'DIRECTION_CLIENT_TO_SERVER';
+    type CommandToClientDirection = 'DIRECTION_SERVER_TO_CLIENT';
+    type CommandDirection = CommandToServerDirection | CommandToClientDirection;
 
-type CommandDefinition = {
-  id: number,
-  direction?: CommandDirection,
-  args?: {
-    [argName: string]: import('zigbee-clusters').ZCLDataType<any>,
-  }
-  response?: CommandDefinition,
-  frameControl?: import('zigbee-clusters').FrameControlFlag[];
-  encodeMissingFieldsBehavior?: 'default' | 'skip';
-  global?: boolean;
-}
+    type FromZCLDataType<DataType> = DataType extends ZCLDataType<infer InferredValue>? InferredValue : DataType;
 
-type CommandDefinitions = {
-  [commandName: string]: CommandDefinition,
-}
+    type AttributeDefinition = {
+      id: number,
+      type: ZCLDataType<any>,
+      manufacturerId?: number,
+    }
 
-type AttributeReportingConfiguration<AttributeKey extends string> = {
-  [attribute in AttributeKey]: {
-    minInterval?: number,
-    maxInterval?: number,
-    minChange?: number
-  }
-}
+    type AttributeDefinitions = {
+      [attributeName: string]: AttributeDefinition,
+    }
 
-type ReadReportingConfigurationResponse = {
-  status: import('zigbee-clusters').ZCLEnum8Status,
-  direction: 'reported'|'received';
-  attributeId: number;
-  attributeDataType?: number;
-  minInterval?: number;
-  maxInterval?: number;
-  minChange?: number;
-  timeoutPeriod?: number;
-}
+    type AttributesFromDefinition<Definition extends AttributeDefinitions> = {
+      [attribute in keyof Definition]: FromZCLDataType<Definition[attribute]['type']>
+    }
 
-type ExtendedAttributesResponse = {
-  name?: string;
-  id: number;
-  acl: {
-    readable: boolean;
-    writable: boolean;
-    reportable: boolean;
+    type CommandDefinition = {
+      id: number,
+      direction?: CommandDirection,
+      args?: {
+        [argName: string]: ZCLDataType<any>,
+      }
+      response?: CommandDefinition,
+      frameControl?: FrameControlFlag[];
+      encodeMissingFieldsBehavior?: 'default' | 'skip';
+      global?: boolean;
+    }
+
+    type CommandDefinitions = {
+      [commandName: string]: CommandDefinition,
+    }
+
+    type AttributeReportingConfiguration<AttributeKey extends string> = {
+      [attribute in AttributeKey]: {
+        minInterval?: number,
+        maxInterval?: number,
+        minChange?: number
+      }
+    }
+
+    type ReadReportingConfigurationResponse = {
+      status: ZCLEnum8Status,
+      direction: 'reported'|'received';
+      attributeId: number;
+      attributeDataType?: number;
+      minInterval?: number;
+      maxInterval?: number;
+      minChange?: number;
+      timeoutPeriod?: number;
+    }
+
+    type ExtendedAttributesResponse = {
+      name?: string;
+      id: number;
+      acl: {
+        readable: boolean;
+        writable: boolean;
+        reportable: boolean;
+      }
+    }
   }
 }

From e7ab90f24569c38991e1ac783ad38b115ab3893a Mon Sep 17 00:00:00 2001
From: Joost Loohuis <github@loohuis.dev>
Date: Fri, 10 Apr 2026 12:26:26 +0200
Subject: [PATCH 9/9] Fix linting errors

---
 lib/clusters/metering.js | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/lib/clusters/metering.js b/lib/clusters/metering.js
index d0a24a7..1027cb1 100644
--- a/lib/clusters/metering.js
+++ b/lib/clusters/metering.js
@@ -63,18 +63,21 @@ const ATTRIBUTES = {
   // meteringDeviceType: { id: 0x0306, type: ZCLDataTypes.map8() }, // 774, Mandatory
   siteId: { id: 0x0307, type: ZCLDataTypes.octstr }, // 775, Optional
   meterSerialNumber: { id: 0x0308, type: ZCLDataTypes.octstr }, // 776, Optional
-  energyCarrierUnitOfMeasure: { id: 0x0309, type: ZCLDataTypes.enum8({/* TODO fix */}) }, // 777, Optional
+  /* 777, Optional */
+  energyCarrierUnitOfMeasure: { id: 0x0309, type: ZCLDataTypes.enum8({/* TODO fix */}) },
   // TODO: map8 packed fields — bits 0-2: right digits, 3-6: left digits, 7: suppress zeros
   // energyCarrierSummationFormatting: { id: 0x030A, type: ZCLDataTypes.map8() }, // 778, Optional
   // energyCarrierDemandFormatting: { id: 0x030B, type: ZCLDataTypes.map8() }, // 779, Optional
-  temperatureUnitOfMeasure: { id: 0x030C, type: ZCLDataTypes.enum8({/* TODO fix */}) }, // 780, Optional
+  /* 780, Optional */
+  temperatureUnitOfMeasure: { id: 0x030C, type: ZCLDataTypes.enum8({/* TODO fix */}) },
   // TODO: map8 packed fields — bits 0-2: right digits, 3-6: left digits, 7: suppress zeros
   // temperatureFormatting: { id: 0x030D, type: ZCLDataTypes.map8() }, // 781, Optional
   moduleSerialNumber: { id: 0x030E, type: ZCLDataTypes.octstr }, // 782, Optional
   operatingTariffLabelDelivered: { id: 0x030F, type: ZCLDataTypes.octstr }, // 783, Optional
   operatingTariffLabelReceived: { id: 0x0310, type: ZCLDataTypes.octstr }, // 784, Optional
   customerIdNumber: { id: 0x0311, type: ZCLDataTypes.octstr }, // 785, Optional
-  alternativeUnitOfMeasure: { id: 0x0312, type: ZCLDataTypes.enum8({/* TODO fix */}) }, // 786, Optional
+  /* 786, Optional */
+  alternativeUnitOfMeasure: { id: 0x0312, type: ZCLDataTypes.enum8({/* TODO fix */}) },
   // TODO: map8 packed fields — bits 0-2: right digits, 3-6: left digits, 7: suppress zeros
   // alternativeDemandFormatting: { id: 0x0313, type: ZCLDataTypes.map8() }, // 787, Optional
   // alternativeConsumptionFormatting: { id: 0x0314, type: ZCLDataTypes.map8() }, // 788, Optional
@@ -258,7 +261,8 @@ const ATTRIBUTES = {
     id: 0x0B00, // 2816
     type: ZCLDataTypes.uint32,
   },
-  proposedChangeSupplyStatus: { id: 0x0B01, type: ZCLDataTypes.enum8({/* TODO fix */}) }, // 2817, Optional
+  /* 2817, Optional */
+  proposedChangeSupplyStatus: { id: 0x0B01, type: ZCLDataTypes.enum8({/* TODO fix */}) },
   uncontrolledFlowThreshold: { id: 0x0B10, type: ZCLDataTypes.uint16 }, // 2832, Optional
   uncontrolledFlowThresholdUnitOfMeasure: { // Optional
     id: 0x0B11, // 2833