@matterbridge/core 3.8.1-dev-20260609-77be5ba → 3.8.1-dev-20260609-f3c25c0

package/dist/clusters/closure-control.d.ts

@@ -151,9 +151,6 @@ export declare const ClosureControl: ClusterType.Concrete & {
     readonly EngageStateChangedEvent: new (value?: Partial<ClosureControl.EngageStateChangedEvent>) => ClosureControl.EngageStateChangedEvent;
     readonly SecureStateChangedEvent: new (value?: Partial<ClosureControl.SecureStateChangedEvent>) => ClosureControl.SecureStateChangedEvent;
     readonly Typing: ClosureControl;
-    readonly Cluster: ClusterType.WithCompat<typeof ClosureControl, ClosureControl>;
-    readonly Complete: typeof ClosureControl;
-    with(...features: ClosureControl.Feature[]): typeof ClosureControl;
 };
 export interface ClosureControl extends ClusterTyping {
     Attributes: ClosureControl.Attributes;

package/dist/clusters/closure-dimension.d.ts

@@ -170,9 +170,6 @@ export declare const ClosureDimension: ClusterType.Concrete & {
     readonly SetTargetRequest: new (value?: Partial<ClosureDimension.SetTargetRequest>) => ClosureDimension.SetTargetRequest;
     readonly StepRequest: new (value?: Partial<ClosureDimension.StepRequest>) => ClosureDimension.StepRequest;
     readonly Typing: ClosureDimension;
-    readonly Cluster: ClusterType.WithCompat<typeof ClosureDimension, ClosureDimension>;
-    readonly Complete: typeof ClosureDimension;
-    with(...features: ClosureDimension.Feature[]): typeof ClosureDimension;
 };
 export interface ClosureDimension extends ClusterTyping {
     Attributes: ClosureDimension.Attributes;

package/dist/clusters/soil-measurement.d.ts

@@ -30,8 +30,6 @@ export declare const SoilMeasurement: ClusterType.Concrete & {
     readonly attributes: ClusterType.AttributeObjects<SoilMeasurement.Attributes>;
     readonly features: Record<string, never>;
     readonly Typing: SoilMeasurement;
-    readonly Cluster: ClusterType.WithCompat<typeof SoilMeasurement, SoilMeasurement>;
-    readonly Complete: typeof SoilMeasurement;
 };
 export interface SoilMeasurement extends ClusterTyping {
     Attributes: SoilMeasurement.Attributes;

package/dist/devices/airConditioner.js

@@ -1,11 +1,11 @@
 import { FanControl } from '@matter/types/clusters/fan-control';
 import { ThermostatUserInterfaceConfiguration } from '@matter/types/clusters/thermostat-user-interface-configuration';
-import { airConditioner, powerSource } from '../matterbridgeDeviceTypes.js';
+import { powerSource, roomAirConditioner } from '../matterbridgeDeviceTypes.js';
 import { MatterbridgeEndpoint } from '../matterbridgeEndpoint.js';
 export class AirConditioner extends MatterbridgeEndpoint {
     constructor(name, serial, options = {}) {
         const { localTemperature = 23, occupiedHeatingSetpoint = 21, occupiedCoolingSetpoint = 25, minSetpointDeadBand = 1, minHeatSetpointLimit = 0, maxHeatSetpointLimit = 50, minCoolSetpointLimit = 0, maxCoolSetpointLimit = 50, temperatureDisplayMode = ThermostatUserInterfaceConfiguration.TemperatureDisplayMode.Celsius, keypadLockout = ThermostatUserInterfaceConfiguration.KeypadLockout.NoLockout, scheduleProgrammingVisibility = ThermostatUserInterfaceConfiguration.ScheduleProgrammingVisibility.ScheduleProgrammingPermitted, fanMode = FanControl.FanMode.Off, fanModeSequence = FanControl.FanModeSequence.OffLowMedHighAuto, percentSetting = 0, percentCurrent = 0, } = options;
-        super([airConditioner, powerSource], { id: `${name.replaceAll(' ', '')}-${serial.replaceAll(' ', '')}` });
+        super([roomAirConditioner, powerSource], { id: `${name.replaceAll(' ', '')}-${serial.replaceAll(' ', '')}` });
         this.createDefaultIdentifyClusterServer();
         this.createDefaultBasicInformationClusterServer(name, serial, 0xfff1, 'Matterbridge', 0x8000, 'Matterbridge Air Conditioner');
         this.createDefaultPowerSourceWiredClusterServer();

package/dist/devices/extractorHood.js

@@ -11,23 +11,23 @@ export class ExtractorHood extends MatterbridgeEndpoint {
         this.createDefaultHepaFilterMonitoringClusterServer(hepaCondition, hepaChangeIndication, hepaInPlaceIndicator, hepaLastChangedTime, hepaReplacementProductList);
         this.createDefaultActivatedCarbonFilterMonitoringClusterServer(activatedCarbonCondition, activatedCarbonChangeIndication, activatedCarbonInPlaceIndicator, activatedCarbonLastChangedTime, activatedCarbonReplacementProductList);
         this.subscribeAttribute('fanControl', 'fanMode', (newValue, oldValue, context) => {
-            if (context.offline === true)
+            if (context.fabric === undefined)
                 return;
             this.log.info(`Fan control fanMode attribute changed: ${newValue}`);
         });
         this.subscribeAttribute('fanControl', 'percentSetting', (newValue, oldValue, context) => {
-            if (context.offline === true)
+            if (context.fabric === undefined)
                 return;
             this.log.info(`Fan control percentSetting attribute changed: ${newValue}`);
             void this.setAttribute('fanControl', 'percentCurrent', newValue, this.log).catch(() => { });
         });
         this.subscribeAttribute('hepaFilterMonitoring', 'lastChangedTime', (newValue, oldValue, context) => {
-            if (context.offline === true)
+            if (context.fabric === undefined)
                 return;
             this.log.info(`Hepa filter monitoring lastChangedTime attribute changed: ${newValue}`);
         });
         this.subscribeAttribute('activatedCarbonFilterMonitoring', 'lastChangedTime', (newValue, oldValue, context) => {
-            if (context.offline === true)
+            if (context.fabric === undefined)
                 return;
             this.log.info(`Activated carbon filter monitoring lastChangedTime attribute changed: ${newValue}`);
         });

package/dist/devices/heatPump.js

@@ -1,6 +1,6 @@
 import { CommonAreaNamespaceTag, CommonNumberTag, PowerSourceTag } from '@matter/node';
 import { DeviceEnergyManagement } from '@matter/types/clusters/device-energy-management';
-import { deviceEnergyManagement, electricalSensor, heatPump, powerSource, temperatureSensor, thermostatDevice } from '../matterbridgeDeviceTypes.js';
+import { deviceEnergyManagement, electricalSensor, heatPump, powerSource, temperatureSensor, thermostat } from '../matterbridgeDeviceTypes.js';
 import { MatterbridgeEndpoint } from '../matterbridgeEndpoint.js';
 import { getSemtag } from '../matterbridgeEndpointHelpers.js';
 export class HeatPump extends MatterbridgeEndpoint {
@@ -28,14 +28,14 @@ export class HeatPump extends MatterbridgeEndpoint {
         })
             .createDefaultTemperatureMeasurementClusterServer(3500)
             .addRequiredClusterServers();
-        this.addChildDeviceType('LivingThermostat', thermostatDevice, {
+        this.addChildDeviceType('LivingThermostat', thermostat, {
             tagList: [getSemtag(CommonNumberTag.One, 'LivingThermostat'), getSemtag(CommonAreaNamespaceTag.LivingRoom)],
         })
             .createDefaultThermostatClusterServer()
             .addRequiredClusterServers()
             .addUserLabel('room', 'Living Room')
             .catch(() => { });
-        this.addChildDeviceType('BedroomThermostat', thermostatDevice, {
+        this.addChildDeviceType('BedroomThermostat', thermostat, {
             tagList: [getSemtag(CommonNumberTag.Two, 'BedroomThermostat'), getSemtag(CommonAreaNamespaceTag.Bedroom)],
         })
             .createDefaultThermostatClusterServer()

package/dist/devices/speaker.js

@@ -1,6 +1,6 @@
 import { LevelControl } from '@matter/types/clusters/level-control';
 import { OnOff } from '@matter/types/clusters/on-off';
-import { speakerDevice } from '../matterbridgeDeviceTypes.js';
+import { speaker } from '../matterbridgeDeviceTypes.js';
 import { MatterbridgeEndpoint } from '../matterbridgeEndpoint.js';
 export class Speaker extends MatterbridgeEndpoint {
     constructor(name, serial, muted = false, volume = 128) {
@@ -10,16 +10,16 @@ export class Speaker extends MatterbridgeEndpoint {
             volume = 1;
         if (volume > 254)
             volume = 254;
-        super([speakerDevice], { id: `${name.replaceAll(' ', '')}-${serial.replaceAll(' ', '')}` });
+        super([speaker], { id: `${name.replaceAll(' ', '')}-${serial.replaceAll(' ', '')}` });
         this.createDefaultBasicInformationClusterServer(name, serial, 0xfff1, 'Matterbridge', 0x8000, 'Matterbridge Speaker');
         this.createOnOffClusterServer(!muted);
         this.createLevelControlClusterServer(volume);
     }
     async setMuted(muted) {
-        await this.setAttribute(OnOff.Cluster.id, 'onOff', !muted);
+        await this.setAttribute(OnOff.id, 'onOff', !muted);
     }
     isMuted() {
-        return !this.getAttribute(OnOff.Cluster.id, 'onOff');
+        return !this.getAttribute(OnOff.id, 'onOff');
     }
     async setVolume(level) {
         if (!Number.isFinite(level))
@@ -28,9 +28,9 @@ export class Speaker extends MatterbridgeEndpoint {
             level = 1;
         if (level > 254)
             level = 254;
-        await this.setAttribute(LevelControl.Cluster, 'currentLevel', level);
+        await this.setAttribute(LevelControl, 'currentLevel', level);
     }
     getVolume() {
-        return this.getAttribute(LevelControl.Cluster, 'currentLevel');
+        return this.getAttribute(LevelControl, 'currentLevel');
     }
 }

package/dist/frontend.js

@@ -959,8 +959,8 @@ export class Frontend extends EventEmitter {
             return false;
         if (!device.lifecycle.isReady || device.construction.status !== Lifecycle.Status.Active)
             return false;
-        if (device.hasClusterServer(BridgedDeviceBasicInformation.Cluster.id))
-            return device.getAttribute(BridgedDeviceBasicInformation.Cluster.id, 'reachable');
+        if (device.hasClusterServer(BridgedDeviceBasicInformation.id))
+            return device.getAttribute(BridgedDeviceBasicInformation.id, 'reachable');
         if (device.mode === 'server' && device.serverNode && device.serverNode.state.basicInformation.reachable !== undefined)
             return device.serverNode.state.basicInformation.reachable;
         if (this.matterbridge.bridgeMode === 'childbridge')
@@ -973,21 +973,21 @@ export class Frontend extends EventEmitter {
         if (!endpoint.lifecycle.isReady || endpoint.construction.status !== Lifecycle.Status.Active)
             return undefined;
         const powerSource = (device) => {
-            const featureMap = device.getAttribute(PowerSource.Cluster.id, 'featureMap');
+            const featureMap = device.getAttribute(PowerSource.id, 'featureMap');
             if (featureMap.wired) {
-                const wiredCurrentType = device.getAttribute(PowerSource.Cluster.id, 'wiredCurrentType');
+                const wiredCurrentType = device.getAttribute(PowerSource.id, 'wiredCurrentType');
                 return ['ac', 'dc'][wiredCurrentType];
             }
             if (featureMap.battery) {
-                const batChargeLevel = device.getAttribute(PowerSource.Cluster.id, 'batChargeLevel');
+                const batChargeLevel = device.getAttribute(PowerSource.id, 'batChargeLevel');
                 return ['ok', 'warning', 'critical'][batChargeLevel];
             }
             return;
         };
-        if (endpoint.hasClusterServer(PowerSource.Cluster.id))
+        if (endpoint.hasClusterServer(PowerSource.id))
             return powerSource(endpoint);
         for (const child of endpoint.getChildEndpoints()) {
-            if (child.hasClusterServer(PowerSource.Cluster.id))
+            if (child.hasClusterServer(PowerSource.id))
                 return powerSource(child);
         }
     }
@@ -997,17 +997,17 @@ export class Frontend extends EventEmitter {
         if (!endpoint.lifecycle.isReady || endpoint.construction.status !== Lifecycle.Status.Active)
             return undefined;
         const batteryLevel = (device) => {
-            const featureMap = device.getAttribute(PowerSource.Cluster.id, 'featureMap');
+            const featureMap = device.getAttribute(PowerSource.id, 'featureMap');
             if (featureMap.battery) {
-                const batChargeLevel = device.getAttribute(PowerSource.Cluster.id, 'batPercentRemaining');
+                const batChargeLevel = device.getAttribute(PowerSource.id, 'batPercentRemaining');
                 return isValidNumber(batChargeLevel) ? batChargeLevel / 2 : undefined;
             }
             return undefined;
         };
-        if (endpoint.hasClusterServer(PowerSource.Cluster.id))
+        if (endpoint.hasClusterServer(PowerSource.id))
             return batteryLevel(endpoint);
         for (const child of endpoint.getChildEndpoints()) {
-            if (child.hasClusterServer(PowerSource.Cluster.id))
+            if (child.hasClusterServer(PowerSource.id))
                 return batteryLevel(child);
         }
     }

package/dist/helpers.js

@@ -11,7 +11,7 @@ import { OnOffLightSwitchDevice } from '@matter/node/devices/on-off-light-switch
 import { OnOffPlugInUnitDevice } from '@matter/node/devices/on-off-plug-in-unit';
 import { VendorId } from '@matter/types/datatype';
 import { hasParameter } from '@matterbridge/utils/cli';
-import { doorLockDevice } from './matterbridgeDeviceTypes.js';
+import { doorLock } from './matterbridgeDeviceTypes.js';
 import { MatterbridgeEndpoint } from './matterbridgeEndpoint.js';
 export async function addVirtualDevice(aggregatorEndpoint, name, type, callback) {
     let deviceType;
@@ -60,7 +60,7 @@ export async function addVirtualDevice(aggregatorEndpoint, name, type, callback)
 }
 export async function addVirtualDevices(matterbridge, aggregatorEndpoint) {
     if (hasParameter('experimental') && matterbridge.bridgeMode === 'bridge' && aggregatorEndpoint) {
-        const lockUserPin = new MatterbridgeEndpoint(doorLockDevice, { id: 'door_lock_user_pin' });
+        const lockUserPin = new MatterbridgeEndpoint(doorLock, { id: 'door_lock_user_pin' });
         lockUserPin.createDefaultBridgedDeviceBasicInformationClusterServer('Matterbridge User Pin Lock', 'sn_system_lock', 0xfff1, 'Matterbridge', 'Matterbridge Virtual Device', 20000, '2.0.0');
         lockUserPin.createUserPinDoorLockClusterServer();
         lockUserPin.addRequiredClusterServers();

package/dist/matterbridgeDeviceTypes.js

@@ -281,7 +281,7 @@ export const extendedColorLight = DeviceTypeDefinition({
 });
 export const onOffPlugInUnit = DeviceTypeDefinition({
     name: 'MA-onOffPlugInUnit',
-    deviceName: 'OnOff Plugin Unit',
+    deviceName: 'OnOff PlugIn Unit',
     code: 0x010a,
     deviceClass: DeviceClasses.Simple,
     deviceScope: DeviceScopes.Endpoint,
@@ -294,7 +294,7 @@ export const onOffPlugInUnit = DeviceTypeDefinition({
 export const onOffOutlet = onOffPlugInUnit;
 export const dimmablePlugInUnit = DeviceTypeDefinition({
     name: 'MA-dimmablePlugInUnit',
-    deviceName: 'Dimmable Plugin Unit',
+    deviceName: 'Dimmable PlugIn Unit',
     code: 0x010b,
     deviceClass: DeviceClasses.Simple,
     deviceScope: DeviceScopes.Endpoint,

package/dist/matterbridgeEndpoint.d.ts

@@ -1,6 +1,6 @@
 import { AtLeastOne } from '@matter/general';
 import { ActionContext, Behavior, Endpoint, ServerNode } from '@matter/node';
-import { ClusterType, type ClusterTyping } from '@matter/types/cluster';
+import { type ClusterType, type ClusterTyping } from '@matter/types/cluster';
 import { AirQuality } from '@matter/types/clusters/air-quality';
 import { ColorControl } from '@matter/types/clusters/color-control';
 import { ConcentrationMeasurement } from '@matter/types/clusters/concentration-measurement';

package/dist/matterbridgeEndpoint.js

@@ -335,7 +335,7 @@ export class MatterbridgeEndpoint extends Endpoint {
     addChildDeviceType(endpointName, definition, options = {}, debug = false) {
         this.log.debug(`addChildDeviceType: ${CYAN}${endpointName}${db}`);
         let alreadyAdded = false;
-        let child = this.getChildEndpointByName(endpointName);
+        let child = this.getChildEndpointById(endpointName);
         if (child) {
             this.log.debug(`****- endpoint ${CYAN}${endpointName}${db} already added!`);
             alreadyAdded = true;
@@ -379,7 +379,7 @@ export class MatterbridgeEndpoint extends Endpoint {
     addChildDeviceTypeWithClusterServer(endpointName, definition, serverList = [], options = {}, debug = false) {
         this.log.debug(`addChildDeviceTypeWithClusterServer: ${CYAN}${endpointName}${db}`);
         let alreadyAdded = false;
-        let child = this.getChildEndpointByName(endpointName);
+        let child = this.getChildEndpointById(endpointName);
         if (child) {
             this.log.debug(`****- endpoint ${CYAN}${endpointName}${db} already added!`);
             alreadyAdded = true;
@@ -477,9 +477,9 @@ export class MatterbridgeEndpoint extends Endpoint {
         };
         Object.keys(device.behaviors.supported).forEach((behaviorName) => {
             if (behaviorName === 'bridgedDeviceBasicInformation')
-                serialized.clusterServersId.push(BridgedDeviceBasicInformation.Cluster.id);
+                serialized.clusterServersId.push(BridgedDeviceBasicInformation.id);
             if (behaviorName === 'powerSource')
-                serialized.clusterServersId.push(PowerSource.Cluster.id);
+                serialized.clusterServersId.push(PowerSource.id);
         });
         return serialized;
     }
@@ -494,9 +494,9 @@ export class MatterbridgeEndpoint extends Endpoint {
         device.productId = serializedDevice.productId;
         device.productName = serializedDevice.productName;
         for (const clusterId of serializedDevice.clusterServersId) {
-            if (clusterId === BridgedDeviceBasicInformation.Cluster.id)
+            if (clusterId === BridgedDeviceBasicInformation.id)
                 device.createDefaultBridgedDeviceBasicInformationClusterServer(serializedDevice.deviceName, serializedDevice.serialNumber, serializedDevice.vendorId ?? 0xfff1, serializedDevice.vendorName ?? 'Matterbridge', serializedDevice.productName ?? 'Matterbridge device');
-            else if (clusterId === PowerSource.Cluster.id)
+            else if (clusterId === PowerSource.id)
                 device.createDefaultPowerSourceWiredClusterServer();
         }
         return device;
@@ -766,14 +766,14 @@ export class MatterbridgeEndpoint extends Endpoint {
     }
     async configureColorControlMode(colorMode) {
         if (isValidNumber(colorMode, ColorControl.ColorMode.CurrentHueAndCurrentSaturation, ColorControl.ColorMode.ColorTemperatureMireds)) {
-            await this.setAttribute(ColorControl.Cluster.id, 'colorMode', colorMode, this.log);
-            await this.setAttribute(ColorControl.Cluster.id, 'enhancedColorMode', colorMode, this.log);
+            await this.setAttribute(ColorControl.id, 'colorMode', colorMode, this.log);
+            await this.setAttribute(ColorControl.id, 'enhancedColorMode', colorMode, this.log);
         }
     }
     async configureEnhancedColorControlMode(colorMode) {
         if (isValidNumber(colorMode, ColorControl.EnhancedColorMode.CurrentHueAndCurrentSaturation, ColorControl.EnhancedColorMode.EnhancedCurrentHueAndCurrentSaturation)) {
-            await this.setAttribute(ColorControl.Cluster.id, 'colorMode', colorMode === ColorControl.EnhancedColorMode.EnhancedCurrentHueAndCurrentSaturation ? ColorControl.ColorMode.CurrentHueAndCurrentSaturation : colorMode, this.log);
-            await this.setAttribute(ColorControl.Cluster.id, 'enhancedColorMode', colorMode, this.log);
+            await this.setAttribute(ColorControl.id, 'colorMode', colorMode === ColorControl.EnhancedColorMode.EnhancedCurrentHueAndCurrentSaturation ? ColorControl.ColorMode.CurrentHueAndCurrentSaturation : colorMode, this.log);
+            await this.setAttribute(ColorControl.id, 'enhancedColorMode', colorMode, this.log);
         }
     }
     createDefaultWindowCoveringClusterServer(positionPercent100ths, type = WindowCovering.WindowCoveringType.Rollershade, endProductType = WindowCovering.EndProductType.RollerShade) {
@@ -1275,57 +1275,57 @@ export class MatterbridgeEndpoint extends Endpoint {
             return false;
         }
         if (['Single', 'Double', 'Long'].includes(event)) {
-            if (!this.hasClusterServer(Switch.Cluster.id) || this.getAttribute(Switch.Cluster.id, 'featureMap').momentarySwitch === false) {
+            if (!this.hasClusterServer(Switch.id) || this.getAttribute(Switch.id, 'featureMap').momentarySwitch === false) {
                 this.log.error(`triggerSwitchEvent ${event} error: Switch cluster with MomentarySwitch not found on endpoint ${this.maybeId}:${this.maybeNumber}`);
                 return false;
             }
             if (event === 'Single') {
                 log?.info(`${db}Trigger endpoint ${or}${this.id}:${this.number}${db} event ${hk}Switch.SinglePress${db}`);
-                await this.setAttribute(Switch.Cluster.id, 'currentPosition', 1, log);
-                await this.triggerEvent(Switch.Cluster.id, 'initialPress', { newPosition: 1 }, log);
-                await this.setAttribute(Switch.Cluster.id, 'currentPosition', 0, log);
+                await this.setAttribute(Switch.id, 'currentPosition', 1, log);
+                await this.triggerEvent(Switch.id, 'initialPress', { newPosition: 1 }, log);
+                await this.setAttribute(Switch.id, 'currentPosition', 0, log);
                 if (featuresFor(this, 'Switch').momentarySwitchRelease) {
-                    await this.triggerEvent(Switch.Cluster.id, 'shortRelease', { previousPosition: 1 }, log);
-                    await this.setAttribute(Switch.Cluster.id, 'currentPosition', 0, log);
-                    await this.triggerEvent(Switch.Cluster.id, 'multiPressComplete', { previousPosition: 1, totalNumberOfPressesCounted: 1 }, log);
+                    await this.triggerEvent(Switch.id, 'shortRelease', { previousPosition: 1 }, log);
+                    await this.setAttribute(Switch.id, 'currentPosition', 0, log);
+                    await this.triggerEvent(Switch.id, 'multiPressComplete', { previousPosition: 1, totalNumberOfPressesCounted: 1 }, log);
                 }
             }
             if (event === 'Double') {
                 log?.info(`${db}Trigger endpoint ${or}${this.id}:${this.number}${db} event ${hk}Switch.DoublePress${db}`);
-                await this.setAttribute(Switch.Cluster.id, 'currentPosition', 1, log);
-                await this.triggerEvent(Switch.Cluster.id, 'initialPress', { newPosition: 1 }, log);
-                await this.setAttribute(Switch.Cluster.id, 'currentPosition', 0, log);
-                await this.triggerEvent(Switch.Cluster.id, 'shortRelease', { previousPosition: 1 }, log);
-                await this.setAttribute(Switch.Cluster.id, 'currentPosition', 1, log);
-                await this.triggerEvent(Switch.Cluster.id, 'initialPress', { newPosition: 1 }, log);
-                await this.triggerEvent(Switch.Cluster.id, 'multiPressOngoing', { newPosition: 1, currentNumberOfPressesCounted: 2 }, log);
-                await this.setAttribute(Switch.Cluster.id, 'currentPosition', 0, log);
-                await this.triggerEvent(Switch.Cluster.id, 'shortRelease', { previousPosition: 1 }, log);
-                await this.triggerEvent(Switch.Cluster.id, 'multiPressComplete', { previousPosition: 1, totalNumberOfPressesCounted: 2 }, log);
+                await this.setAttribute(Switch.id, 'currentPosition', 1, log);
+                await this.triggerEvent(Switch.id, 'initialPress', { newPosition: 1 }, log);
+                await this.setAttribute(Switch.id, 'currentPosition', 0, log);
+                await this.triggerEvent(Switch.id, 'shortRelease', { previousPosition: 1 }, log);
+                await this.setAttribute(Switch.id, 'currentPosition', 1, log);
+                await this.triggerEvent(Switch.id, 'initialPress', { newPosition: 1 }, log);
+                await this.triggerEvent(Switch.id, 'multiPressOngoing', { newPosition: 1, currentNumberOfPressesCounted: 2 }, log);
+                await this.setAttribute(Switch.id, 'currentPosition', 0, log);
+                await this.triggerEvent(Switch.id, 'shortRelease', { previousPosition: 1 }, log);
+                await this.triggerEvent(Switch.id, 'multiPressComplete', { previousPosition: 1, totalNumberOfPressesCounted: 2 }, log);
             }
             if (event === 'Long') {
                 log?.info(`${db}Trigger endpoint ${or}${this.id}:${this.number}${db} event ${hk}Switch.LongPress${db}`);
-                await this.setAttribute(Switch.Cluster.id, 'currentPosition', 1, log);
-                await this.triggerEvent(Switch.Cluster.id, 'initialPress', { newPosition: 1 }, log);
-                await this.triggerEvent(Switch.Cluster.id, 'longPress', { newPosition: 1 }, log);
-                await this.setAttribute(Switch.Cluster.id, 'currentPosition', 0, log);
-                await this.triggerEvent(Switch.Cluster.id, 'longRelease', { previousPosition: 1 }, log);
+                await this.setAttribute(Switch.id, 'currentPosition', 1, log);
+                await this.triggerEvent(Switch.id, 'initialPress', { newPosition: 1 }, log);
+                await this.triggerEvent(Switch.id, 'longPress', { newPosition: 1 }, log);
+                await this.setAttribute(Switch.id, 'currentPosition', 0, log);
+                await this.triggerEvent(Switch.id, 'longRelease', { previousPosition: 1 }, log);
             }
         }
         if (['Press', 'Release'].includes(event)) {
-            if (!this.hasClusterServer(Switch.Cluster.id) || this.getAttribute(Switch.Cluster.id, 'featureMap').latchingSwitch === false) {
+            if (!this.hasClusterServer(Switch.id) || this.getAttribute(Switch.id, 'featureMap').latchingSwitch === false) {
                 this.log.error(`triggerSwitchEvent ${event} error: Switch cluster with LatchingSwitch not found on endpoint ${this.maybeId}:${this.maybeNumber}`);
                 return false;
             }
             if (event === 'Press') {
                 log?.info(`${db}Trigger endpoint ${or}${this.id}:${this.number}${db} event ${hk}Switch.Press${db}`);
-                await this.setAttribute(Switch.Cluster.id, 'currentPosition', 1, log);
-                await this.triggerEvent(Switch.Cluster.id, 'switchLatched', { newPosition: 1 }, log);
+                await this.setAttribute(Switch.id, 'currentPosition', 1, log);
+                await this.triggerEvent(Switch.id, 'switchLatched', { newPosition: 1 }, log);
             }
             if (event === 'Release') {
                 log?.info(`${db}Trigger endpoint ${or}${this.id}:${this.number}${db} event ${hk}Switch.Release${db}`);
-                await this.setAttribute(Switch.Cluster.id, 'currentPosition', 0, log);
-                await this.triggerEvent(Switch.Cluster.id, 'switchLatched', { newPosition: 0 }, log);
+                await this.setAttribute(Switch.id, 'currentPosition', 0, log);
+                await this.triggerEvent(Switch.id, 'switchLatched', { newPosition: 0 }, log);
             }
         }
         return true;

package/dist/matterbridgeEndpointCommandHandler.d.ts

@@ -140,14 +140,14 @@ export type CommandHandlerDataMap = {
         command: 'identify';
         request: Identify.IdentifyRequest;
         cluster: 'identify';
-        attributes: ClusterAttributeValues<(typeof Identify.Complete)['attributes']>;
+        attributes: ClusterAttributeValues<(typeof Identify)['attributes']>;
         endpoint: MatterbridgeEndpoint;
     };
     'Identify.triggerEffect': {
         command: 'triggerEffect';
         request: Identify.TriggerEffectRequest;
         cluster: 'identify';
-        attributes: ClusterAttributeValues<(typeof Identify.Complete)['attributes']>;
+        attributes: ClusterAttributeValues<(typeof Identify)['attributes']>;
         endpoint: MatterbridgeEndpoint;
     };
     'on': CommandHandlerData<'OnOff.on'>;
@@ -158,28 +158,28 @@ export type CommandHandlerDataMap = {
         command: 'on';
         request: {};
         cluster: 'onOff';
-        attributes: ClusterAttributeValues<(typeof OnOff.Complete)['attributes']>;
+        attributes: ClusterAttributeValues<(typeof OnOff)['attributes']>;
         endpoint: MatterbridgeEndpoint;
     };
     'OnOff.off': {
         command: 'off';
         request: {};
         cluster: 'onOff';
-        attributes: ClusterAttributeValues<(typeof OnOff.Complete)['attributes']>;
+        attributes: ClusterAttributeValues<(typeof OnOff)['attributes']>;
         endpoint: MatterbridgeEndpoint;
     };
     'OnOff.toggle': {
         command: 'toggle';
         request: {};
         cluster: 'onOff';
-        attributes: ClusterAttributeValues<(typeof OnOff.Complete)['attributes']>;
+        attributes: ClusterAttributeValues<(typeof OnOff)['attributes']>;
         endpoint: MatterbridgeEndpoint;
     };
     'OnOff.offWithEffect': {
         command: 'offWithEffect';
         request: OnOff.OffWithEffectRequest;
         cluster: 'onOff';
-        attributes: ClusterAttributeValues<(typeof OnOff.Complete)['attributes']>;
+        attributes: ClusterAttributeValues<(typeof OnOff)['attributes']>;
         endpoint: MatterbridgeEndpoint;
     };
     'moveToLevel': CommandHandlerData<'LevelControl.moveToLevel'>;
@@ -188,14 +188,14 @@ export type CommandHandlerDataMap = {
         command: 'moveToLevel';
         request: LevelControl.MoveToLevelRequest;
         cluster: 'levelControl';
-        attributes: ClusterAttributeValues<(typeof LevelControl.Complete)['attributes']>;
+        attributes: ClusterAttributeValues<(typeof LevelControl)['attributes']>;
         endpoint: MatterbridgeEndpoint;
     };
     'LevelControl.moveToLevelWithOnOff': {
         command: 'moveToLevelWithOnOff';
         request: LevelControl.MoveToLevelRequest;
         cluster: 'levelControl';
-        attributes: ClusterAttributeValues<(typeof LevelControl.Complete)['attributes']>;
+        attributes: ClusterAttributeValues<(typeof LevelControl)['attributes']>;
         endpoint: MatterbridgeEndpoint;
     };
     'moveToColor': CommandHandlerData<'ColorControl.moveToColor'>;
@@ -217,105 +217,105 @@ export type CommandHandlerDataMap = {
         command: 'moveToColor';
         request: ColorControl.MoveToColorRequest;
         cluster: 'colorControl';
-        attributes: ClusterAttributeValues<(typeof ColorControl.Complete)['attributes']>;
+        attributes: ClusterAttributeValues<(typeof ColorControl)['attributes']>;
         endpoint: MatterbridgeEndpoint;
     };
     'ColorControl.moveColor': {
         command: 'moveColor';
         request: ColorControl.MoveColorRequest;
         cluster: 'colorControl';
-        attributes: ClusterAttributeValues<(typeof ColorControl.Complete)['attributes']>;
+        attributes: ClusterAttributeValues<(typeof ColorControl)['attributes']>;
         endpoint: MatterbridgeEndpoint;
     };
     'ColorControl.stepColor': {
         command: 'stepColor';
         request: ColorControl.StepColorRequest;
         cluster: 'colorControl';
-        attributes: ClusterAttributeValues<(typeof ColorControl.Complete)['attributes']>;
+        attributes: ClusterAttributeValues<(typeof ColorControl)['attributes']>;
         endpoint: MatterbridgeEndpoint;
     };
     'ColorControl.moveToHue': {
         command: 'moveToHue';
         request: ColorControl.MoveToHueRequest;
         cluster: 'colorControl';
-        attributes: ClusterAttributeValues<(typeof ColorControl.Complete)['attributes']>;
+        attributes: ClusterAttributeValues<(typeof ColorControl)['attributes']>;
         endpoint: MatterbridgeEndpoint;
     };
     'ColorControl.moveHue': {
         command: 'moveHue';
         request: ColorControl.MoveHueRequest;
         cluster: 'colorControl';
-        attributes: ClusterAttributeValues<(typeof ColorControl.Complete)['attributes']>;
+        attributes: ClusterAttributeValues<(typeof ColorControl)['attributes']>;
         endpoint: MatterbridgeEndpoint;
     };
     'ColorControl.stepHue': {
         command: 'stepHue';
         request: ColorControl.StepHueRequest;
         cluster: 'colorControl';
-        attributes: ClusterAttributeValues<(typeof ColorControl.Complete)['attributes']>;
+        attributes: ClusterAttributeValues<(typeof ColorControl)['attributes']>;
         endpoint: MatterbridgeEndpoint;
     };
     'ColorControl.enhancedMoveToHue': {
         command: 'enhancedMoveToHue';
         request: ColorControl.EnhancedMoveToHueRequest;
         cluster: 'colorControl';
-        attributes: ClusterAttributeValues<(typeof ColorControl.Complete)['attributes']>;
+        attributes: ClusterAttributeValues<(typeof ColorControl)['attributes']>;
         endpoint: MatterbridgeEndpoint;
     };
     'ColorControl.enhancedMoveHue': {
         command: 'enhancedMoveHue';
         request: ColorControl.EnhancedMoveHueRequest;
         cluster: 'colorControl';
-        attributes: ClusterAttributeValues<(typeof ColorControl.Complete)['attributes']>;
+        attributes: ClusterAttributeValues<(typeof ColorControl)['attributes']>;
         endpoint: MatterbridgeEndpoint;
     };
     'ColorControl.enhancedStepHue': {
         command: 'enhancedStepHue';
         request: ColorControl.EnhancedStepHueRequest;
         cluster: 'colorControl';
-        attributes: ClusterAttributeValues<(typeof ColorControl.Complete)['attributes']>;
+        attributes: ClusterAttributeValues<(typeof ColorControl)['attributes']>;
         endpoint: MatterbridgeEndpoint;
     };
     'ColorControl.moveToSaturation': {
         command: 'moveToSaturation';
         request: ColorControl.MoveToSaturationRequest;
         cluster: 'colorControl';
-        attributes: ClusterAttributeValues<(typeof ColorControl.Complete)['attributes']>;
+        attributes: ClusterAttributeValues<(typeof ColorControl)['attributes']>;
         endpoint: MatterbridgeEndpoint;
     };
     'ColorControl.moveSaturation': {
         command: 'moveSaturation';
         request: ColorControl.MoveSaturationRequest;
         cluster: 'colorControl';
-        attributes: ClusterAttributeValues<(typeof ColorControl.Complete)['attributes']>;
+        attributes: ClusterAttributeValues<(typeof ColorControl)['attributes']>;
         endpoint: MatterbridgeEndpoint;
     };
     'ColorControl.stepSaturation': {
         command: 'stepSaturation';
         request: ColorControl.StepSaturationRequest;
         cluster: 'colorControl';
-        attributes: ClusterAttributeValues<(typeof ColorControl.Complete)['attributes']>;
+        attributes: ClusterAttributeValues<(typeof ColorControl)['attributes']>;
         endpoint: MatterbridgeEndpoint;
     };
     'ColorControl.moveToHueAndSaturation': {
         command: 'moveToHueAndSaturation';
         request: ColorControl.MoveToHueAndSaturationRequest;
         cluster: 'colorControl';
-        attributes: ClusterAttributeValues<(typeof ColorControl.Complete)['attributes']>;
+        attributes: ClusterAttributeValues<(typeof ColorControl)['attributes']>;
         endpoint: MatterbridgeEndpoint;
     };
     'ColorControl.enhancedMoveToHueAndSaturation': {
         command: 'enhancedMoveToHueAndSaturation';
         request: ColorControl.EnhancedMoveToHueAndSaturationRequest;
         cluster: 'colorControl';
-        attributes: ClusterAttributeValues<(typeof ColorControl.Complete)['attributes']>;
+        attributes: ClusterAttributeValues<(typeof ColorControl)['attributes']>;
         endpoint: MatterbridgeEndpoint;
     };
     'ColorControl.moveToColorTemperature': {
         command: 'moveToColorTemperature';
         request: ColorControl.MoveToColorTemperatureRequest;
         cluster: 'colorControl';
-        attributes: ClusterAttributeValues<(typeof ColorControl.Complete)['attributes']>;
+        attributes: ClusterAttributeValues<(typeof ColorControl)['attributes']>;
         endpoint: MatterbridgeEndpoint;
     };
     'upOrOpen': CommandHandlerData<'WindowCovering.upOrOpen'>;
@@ -327,35 +327,35 @@ export type CommandHandlerDataMap = {
         command: 'upOrOpen';
         request: {};
         cluster: 'windowCovering';
-        attributes: ClusterAttributeValues<(typeof WindowCovering.Complete)['attributes']>;
+        attributes: ClusterAttributeValues<(typeof WindowCovering)['attributes']>;
         endpoint: MatterbridgeEndpoint;
     };
     'WindowCovering.downOrClose': {
         command: 'downOrClose';
         request: {};
         cluster: 'windowCovering';
-        attributes: ClusterAttributeValues<(typeof WindowCovering.Complete)['attributes']>;
+        attributes: ClusterAttributeValues<(typeof WindowCovering)['attributes']>;
         endpoint: MatterbridgeEndpoint;
     };
     'WindowCovering.stopMotion': {
         command: 'stopMotion';
         request: {};
         cluster: 'windowCovering';
-        attributes: ClusterAttributeValues<(typeof WindowCovering.Complete)['attributes']>;
+        attributes: ClusterAttributeValues<(typeof WindowCovering)['attributes']>;
         endpoint: MatterbridgeEndpoint;
     };
     'WindowCovering.goToLiftPercentage': {
         command: 'goToLiftPercentage';
         request: WindowCovering.GoToLiftPercentageRequest;
         cluster: 'windowCovering';
-        attributes: ClusterAttributeValues<(typeof WindowCovering.Complete)['attributes']>;
+        attributes: ClusterAttributeValues<(typeof WindowCovering)['attributes']>;
         endpoint: MatterbridgeEndpoint;
     };
     'WindowCovering.goToTiltPercentage': {
         command: 'goToTiltPercentage';
         request: WindowCovering.GoToTiltPercentageRequest;
         cluster: 'windowCovering';
-        attributes: ClusterAttributeValues<(typeof WindowCovering.Complete)['attributes']>;
+        attributes: ClusterAttributeValues<(typeof WindowCovering)['attributes']>;
         endpoint: MatterbridgeEndpoint;
     };
     'moveTo': CommandHandlerData<'ClosureControl.moveTo'>;
@@ -363,14 +363,14 @@ export type CommandHandlerDataMap = {
         command: 'moveTo';
         request: ClosureControl.MoveToRequest;
         cluster: 'closureControl';
-        attributes: ClusterAttributeValues<(typeof ClosureControl.Complete)['attributes']>;
+        attributes: ClusterAttributeValues<(typeof ClosureControl)['attributes']>;
         endpoint: MatterbridgeEndpoint;
     };
     'ClosureControl.stop': {
         command: 'stop';
         request: {};
         cluster: 'closureControl';
-        attributes: ClusterAttributeValues<(typeof ClosureControl.Complete)['attributes']>;
+        attributes: ClusterAttributeValues<(typeof ClosureControl)['attributes']>;
         endpoint: MatterbridgeEndpoint;
     };
     'setTarget': CommandHandlerData<'ClosureDimension.setTarget'>;
@@ -378,14 +378,14 @@ export type CommandHandlerDataMap = {
         command: 'setTarget';
         request: ClosureDimension.SetTargetRequest;
         cluster: 'closureDimension';
-        attributes: ClusterAttributeValues<(typeof ClosureDimension.Complete)['attributes']>;
+        attributes: ClusterAttributeValues<(typeof ClosureDimension)['attributes']>;
         endpoint: MatterbridgeEndpoint;
     };
     'ClosureDimension.step': {
         command: 'step';
         request: ClosureDimension.StepRequest;
         cluster: 'closureDimension';
-        attributes: ClusterAttributeValues<(typeof ClosureDimension.Complete)['attributes']>;
+        attributes: ClusterAttributeValues<(typeof ClosureDimension)['attributes']>;
         endpoint: MatterbridgeEndpoint;
     };
     'lockDoor': CommandHandlerData<'DoorLock.lockDoor'>;
@@ -394,63 +394,63 @@ export type CommandHandlerDataMap = {
         command: 'lockDoor';
         request: DoorLock.LockDoorRequest;
         cluster: 'doorLock';
-        attributes: ClusterAttributeValues<(typeof DoorLock.Complete)['attributes']>;
+        attributes: ClusterAttributeValues<(typeof DoorLock)['attributes']>;
         endpoint: MatterbridgeEndpoint;
     };
     'DoorLock.unlockDoor': {
         command: 'unlockDoor';
         request: DoorLock.UnlockDoorRequest;
         cluster: 'doorLock';
-        attributes: ClusterAttributeValues<(typeof DoorLock.Complete)['attributes']>;
+        attributes: ClusterAttributeValues<(typeof DoorLock)['attributes']>;
         endpoint: MatterbridgeEndpoint;
     };
     'DoorLock.unlockWithTimeout': {
         command: 'unlockWithTimeout';
         request: DoorLock.UnlockWithTimeoutRequest;
         cluster: 'doorLock';
-        attributes: ClusterAttributeValues<(typeof DoorLock.Complete)['attributes']>;
+        attributes: ClusterAttributeValues<(typeof DoorLock)['attributes']>;
         endpoint: MatterbridgeEndpoint;
     };
     'DoorLock.setUser': {
         command: 'setUser';
         request: DoorLock.SetUserRequest;
         cluster: 'doorLock';
-        attributes: ClusterAttributeValues<(typeof DoorLock.Complete)['attributes']>;
+        attributes: ClusterAttributeValues<(typeof DoorLock)['attributes']>;
         endpoint: MatterbridgeEndpoint;
     };
     'DoorLock.getUser': {
         command: 'getUser';
         request: DoorLock.GetUserRequest;
         cluster: 'doorLock';
-        attributes: ClusterAttributeValues<(typeof DoorLock.Complete)['attributes']>;
+        attributes: ClusterAttributeValues<(typeof DoorLock)['attributes']>;
         endpoint: MatterbridgeEndpoint;
     };
     'DoorLock.clearUser': {
         command: 'clearUser';
         request: DoorLock.ClearUserRequest;
         cluster: 'doorLock';
-        attributes: ClusterAttributeValues<(typeof DoorLock.Complete)['attributes']>;
+        attributes: ClusterAttributeValues<(typeof DoorLock)['attributes']>;
         endpoint: MatterbridgeEndpoint;
     };
     'DoorLock.setCredential': {
         command: 'setCredential';
         request: DoorLock.SetCredentialRequest;
         cluster: 'doorLock';
-        attributes: ClusterAttributeValues<(typeof DoorLock.Complete)['attributes']>;
+        attributes: ClusterAttributeValues<(typeof DoorLock)['attributes']>;
         endpoint: MatterbridgeEndpoint;
     };
     'DoorLock.getCredentialStatus': {
         command: 'getCredentialStatus';
         request: DoorLock.GetCredentialStatusRequest;
         cluster: 'doorLock';
-        attributes: ClusterAttributeValues<(typeof DoorLock.Complete)['attributes']>;
+        attributes: ClusterAttributeValues<(typeof DoorLock)['attributes']>;
         endpoint: MatterbridgeEndpoint;
     };
     'DoorLock.clearCredential': {
         command: 'clearCredential';
         request: DoorLock.ClearCredentialRequest;
         cluster: 'doorLock';
-        attributes: ClusterAttributeValues<(typeof DoorLock.Complete)['attributes']>;
+        attributes: ClusterAttributeValues<(typeof DoorLock)['attributes']>;
         endpoint: MatterbridgeEndpoint;
     };
     'setpointRaiseLower': CommandHandlerData<'Thermostat.setpointRaiseLower'>;
@@ -459,14 +459,14 @@ export type CommandHandlerDataMap = {
         command: 'setpointRaiseLower';
         request: Thermostat.SetpointRaiseLowerRequest;
         cluster: 'thermostat';
-        attributes: ClusterAttributeValues<(typeof Thermostat.Complete)['attributes']>;
+        attributes: ClusterAttributeValues<(typeof Thermostat)['attributes']>;
         endpoint: MatterbridgeEndpoint;
     };
     'Thermostat.setActivePresetRequest': {
         command: 'setActivePresetRequest';
         request: Thermostat.SetActivePresetRequest;
         cluster: 'thermostat';
-        attributes: ClusterAttributeValues<(typeof Thermostat.Complete)['attributes']>;
+        attributes: ClusterAttributeValues<(typeof Thermostat)['attributes']>;
         endpoint: MatterbridgeEndpoint;
     };
     'step': CommandHandlerData<'FanControl.step'>;
@@ -474,7 +474,7 @@ export type CommandHandlerDataMap = {
         command: 'step';
         request: FanControl.StepRequest;
         cluster: 'fanControl';
-        attributes: ClusterAttributeValues<(typeof FanControl.Complete)['attributes']>;
+        attributes: ClusterAttributeValues<(typeof FanControl)['attributes']>;
         endpoint: MatterbridgeEndpoint;
     };
     'changeToMode': CommandHandlerData<'ModeSelect.changeToMode'>;
@@ -482,56 +482,56 @@ export type CommandHandlerDataMap = {
         command: 'changeToMode';
         request: ModeSelect.ChangeToModeRequest;
         cluster: 'modeSelect';
-        attributes: ClusterAttributeValues<(typeof ModeSelect.Complete)['attributes']>;
+        attributes: ClusterAttributeValues<(typeof ModeSelect)['attributes']>;
         endpoint: MatterbridgeEndpoint;
     };
     'DishwasherMode.changeToMode': {
         command: 'changeToMode';
         request: ModeBase.ChangeToModeRequest;
         cluster: 'dishwasherMode';
-        attributes: ClusterAttributeValues<(typeof DishwasherMode.Complete)['attributes']>;
+        attributes: ClusterAttributeValues<(typeof DishwasherMode)['attributes']>;
         endpoint: MatterbridgeEndpoint;
     };
     'LaundryWasherMode.changeToMode': {
         command: 'changeToMode';
         request: ModeBase.ChangeToModeRequest;
         cluster: 'laundryWasherMode';
-        attributes: ClusterAttributeValues<(typeof LaundryWasherMode.Complete)['attributes']>;
+        attributes: ClusterAttributeValues<(typeof LaundryWasherMode)['attributes']>;
         endpoint: MatterbridgeEndpoint;
     };
     'EnergyEvseMode.changeToMode': {
         command: 'changeToMode';
         request: ModeBase.ChangeToModeRequest;
         cluster: 'energyEvseMode';
-        attributes: ClusterAttributeValues<(typeof EnergyEvseMode.Complete)['attributes']>;
+        attributes: ClusterAttributeValues<(typeof EnergyEvseMode)['attributes']>;
         endpoint: MatterbridgeEndpoint;
     };
     'RvcRunMode.changeToMode': {
         command: 'changeToMode';
         request: ModeBase.ChangeToModeRequest;
         cluster: 'rvcRunMode';
-        attributes: ClusterAttributeValues<(typeof RvcRunMode.Complete)['attributes']>;
+        attributes: ClusterAttributeValues<(typeof RvcRunMode)['attributes']>;
         endpoint: MatterbridgeEndpoint;
     };
     'RvcCleanMode.changeToMode': {
         command: 'changeToMode';
         request: ModeBase.ChangeToModeRequest;
         cluster: 'rvcCleanMode';
-        attributes: ClusterAttributeValues<(typeof RvcCleanMode.Complete)['attributes']>;
+        attributes: ClusterAttributeValues<(typeof RvcCleanMode)['attributes']>;
         endpoint: MatterbridgeEndpoint;
     };
     'WaterHeaterMode.changeToMode': {
         command: 'changeToMode';
         request: ModeBase.ChangeToModeRequest;
         cluster: 'waterHeaterMode';
-        attributes: ClusterAttributeValues<(typeof WaterHeaterMode.Complete)['attributes']>;
+        attributes: ClusterAttributeValues<(typeof WaterHeaterMode)['attributes']>;
         endpoint: MatterbridgeEndpoint;
     };
     'DeviceEnergyManagementMode.changeToMode': {
         command: 'changeToMode';
         request: ModeBase.ChangeToModeRequest;
         cluster: 'deviceEnergyManagementMode';
-        attributes: ClusterAttributeValues<(typeof DeviceEnergyManagementMode.Complete)['attributes']>;
+        attributes: ClusterAttributeValues<(typeof DeviceEnergyManagementMode)['attributes']>;
         endpoint: MatterbridgeEndpoint;
     };
     'open': CommandHandlerData<'ValveConfigurationAndControl.open'>;
@@ -540,14 +540,14 @@ export type CommandHandlerDataMap = {
         command: 'open';
         request: ValveConfigurationAndControl.OpenRequest;
         cluster: 'valveConfigurationAndControl';
-        attributes: ClusterAttributeValues<(typeof ValveConfigurationAndControl.Complete)['attributes']>;
+        attributes: ClusterAttributeValues<(typeof ValveConfigurationAndControl)['attributes']>;
         endpoint: MatterbridgeEndpoint;
     };
     'ValveConfigurationAndControl.close': {
         command: 'close';
         request: {};
         cluster: 'valveConfigurationAndControl';
-        attributes: ClusterAttributeValues<(typeof ValveConfigurationAndControl.Complete)['attributes']>;
+        attributes: ClusterAttributeValues<(typeof ValveConfigurationAndControl)['attributes']>;
         endpoint: MatterbridgeEndpoint;
     };
     'suppressAlarm': CommandHandlerData<'BooleanStateConfiguration.suppressAlarm'>;
@@ -556,14 +556,14 @@ export type CommandHandlerDataMap = {
         command: 'suppressAlarm';
         request: BooleanStateConfiguration.SuppressAlarmRequest;
         cluster: 'booleanStateConfiguration';
-        attributes: ClusterAttributeValues<(typeof BooleanStateConfiguration.Complete)['attributes']>;
+        attributes: ClusterAttributeValues<(typeof BooleanStateConfiguration)['attributes']>;
         endpoint: MatterbridgeEndpoint;
     };
     'BooleanStateConfiguration.enableDisableAlarm': {
         command: 'enableDisableAlarm';
         request: BooleanStateConfiguration.EnableDisableAlarmRequest;
         cluster: 'booleanStateConfiguration';
-        attributes: ClusterAttributeValues<(typeof BooleanStateConfiguration.Complete)['attributes']>;
+        attributes: ClusterAttributeValues<(typeof BooleanStateConfiguration)['attributes']>;
         endpoint: MatterbridgeEndpoint;
     };
     'selfTestRequest': CommandHandlerData<'SmokeCoAlarm.selfTestRequest'>;
@@ -571,7 +571,7 @@ export type CommandHandlerDataMap = {
         command: 'selfTestRequest';
         request: {};
         cluster: 'smokeCoAlarm';
-        attributes: ClusterAttributeValues<(typeof SmokeCoAlarm.Complete)['attributes']>;
+        attributes: ClusterAttributeValues<(typeof SmokeCoAlarm)['attributes']>;
         endpoint: MatterbridgeEndpoint;
     };
     'resetCounts': CommandHandlerData<'ThreadNetworkDiagnostics.resetCounts'>;
@@ -579,7 +579,7 @@ export type CommandHandlerDataMap = {
         command: 'resetCounts';
         request: {};
         cluster: 'threadNetworkDiagnostics';
-        attributes: ClusterAttributeValues<(typeof ThreadNetworkDiagnostics.Complete)['attributes']>;
+        attributes: ClusterAttributeValues<(typeof ThreadNetworkDiagnostics)['attributes']>;
         endpoint: MatterbridgeEndpoint;
     };
     'setUtcTime': CommandHandlerData<'TimeSynchronization.setUtcTime'>;
@@ -589,21 +589,21 @@ export type CommandHandlerDataMap = {
         command: 'setUtcTime';
         request: TimeSynchronization.SetUtcTimeRequest;
         cluster: 'timeSynchronization';
-        attributes: ClusterAttributeValues<(typeof TimeSynchronization.Complete)['attributes']>;
+        attributes: ClusterAttributeValues<(typeof TimeSynchronization)['attributes']>;
         endpoint: MatterbridgeEndpoint;
     };
     'TimeSynchronization.setTimeZone': {
         command: 'setTimeZone';
         request: TimeSynchronization.SetTimeZoneRequest;
         cluster: 'timeSynchronization';
-        attributes: ClusterAttributeValues<(typeof TimeSynchronization.Complete)['attributes']>;
+        attributes: ClusterAttributeValues<(typeof TimeSynchronization)['attributes']>;
         endpoint: MatterbridgeEndpoint;
     };
     'TimeSynchronization.setDstOffset': {
         command: 'setDstOffset';
         request: TimeSynchronization.SetDstOffsetRequest;
         cluster: 'timeSynchronization';
-        attributes: ClusterAttributeValues<(typeof TimeSynchronization.Complete)['attributes']>;
+        attributes: ClusterAttributeValues<(typeof TimeSynchronization)['attributes']>;
         endpoint: MatterbridgeEndpoint;
     };
     'pauseRequest': CommandHandlerData<'DeviceEnergyManagement.pauseRequest'>;
@@ -614,28 +614,28 @@ export type CommandHandlerDataMap = {
         command: 'pauseRequest';
         request: DeviceEnergyManagement.PauseRequest;
         cluster: 'deviceEnergyManagement';
-        attributes: ClusterAttributeValues<(typeof DeviceEnergyManagement.Complete)['attributes']>;
+        attributes: ClusterAttributeValues<(typeof DeviceEnergyManagement)['attributes']>;
         endpoint: MatterbridgeEndpoint;
     };
     'DeviceEnergyManagement.resumeRequest': {
         command: 'resumeRequest';
         request: {};
         cluster: 'deviceEnergyManagement';
-        attributes: ClusterAttributeValues<(typeof DeviceEnergyManagement.Complete)['attributes']>;
+        attributes: ClusterAttributeValues<(typeof DeviceEnergyManagement)['attributes']>;
         endpoint: MatterbridgeEndpoint;
     };
     'DeviceEnergyManagement.powerAdjustRequest': {
         command: 'powerAdjustRequest';
         request: DeviceEnergyManagement.PowerAdjustRequest;
         cluster: 'deviceEnergyManagement';
-        attributes: ClusterAttributeValues<(typeof DeviceEnergyManagement.Complete)['attributes']>;
+        attributes: ClusterAttributeValues<(typeof DeviceEnergyManagement)['attributes']>;
         endpoint: MatterbridgeEndpoint;
     };
     'DeviceEnergyManagement.cancelPowerAdjustRequest': {
         command: 'cancelPowerAdjustRequest';
         request: {};
         cluster: 'deviceEnergyManagement';
-        attributes: ClusterAttributeValues<(typeof DeviceEnergyManagement.Complete)['attributes']>;
+        attributes: ClusterAttributeValues<(typeof DeviceEnergyManagement)['attributes']>;
         endpoint: MatterbridgeEndpoint;
     };
     'pause': CommandHandlerData<'OperationalState.pause'>;
@@ -646,28 +646,28 @@ export type CommandHandlerDataMap = {
         command: 'pause';
         request: {};
         cluster: 'operationalState';
-        attributes: ClusterAttributeValues<(typeof OperationalState.Complete)['attributes']>;
+        attributes: ClusterAttributeValues<(typeof OperationalState)['attributes']>;
         endpoint: MatterbridgeEndpoint;
     };
     'OperationalState.stop': {
         command: 'stop';
         request: {};
         cluster: 'operationalState';
-        attributes: ClusterAttributeValues<(typeof OperationalState.Complete)['attributes']>;
+        attributes: ClusterAttributeValues<(typeof OperationalState)['attributes']>;
         endpoint: MatterbridgeEndpoint;
     };
     'OperationalState.start': {
         command: 'start';
         request: {};
         cluster: 'operationalState';
-        attributes: ClusterAttributeValues<(typeof OperationalState.Complete)['attributes']>;
+        attributes: ClusterAttributeValues<(typeof OperationalState)['attributes']>;
         endpoint: MatterbridgeEndpoint;
     };
     'OperationalState.resume': {
         command: 'resume';
         request: {};
         cluster: 'operationalState';
-        attributes: ClusterAttributeValues<(typeof OperationalState.Complete)['attributes']>;
+        attributes: ClusterAttributeValues<(typeof OperationalState)['attributes']>;
         endpoint: MatterbridgeEndpoint;
     };
     'goHome': CommandHandlerData<'RvcOperationalState.goHome'>;
@@ -675,21 +675,21 @@ export type CommandHandlerDataMap = {
         command: 'pause';
         request: {};
         cluster: 'rvcOperationalState';
-        attributes: ClusterAttributeValues<(typeof RvcOperationalState.Complete)['attributes']>;
+        attributes: ClusterAttributeValues<(typeof RvcOperationalState)['attributes']>;
         endpoint: MatterbridgeEndpoint;
     };
     'RvcOperationalState.resume': {
         command: 'resume';
         request: {};
         cluster: 'rvcOperationalState';
-        attributes: ClusterAttributeValues<(typeof RvcOperationalState.Complete)['attributes']>;
+        attributes: ClusterAttributeValues<(typeof RvcOperationalState)['attributes']>;
         endpoint: MatterbridgeEndpoint;
     };
     'RvcOperationalState.goHome': {
         command: 'goHome';
         request: {};
         cluster: 'rvcOperationalState';
-        attributes: ClusterAttributeValues<(typeof RvcOperationalState.Complete)['attributes']>;
+        attributes: ClusterAttributeValues<(typeof RvcOperationalState)['attributes']>;
         endpoint: MatterbridgeEndpoint;
     };
     'selectAreas': CommandHandlerData<'ServiceArea.selectAreas'>;
@@ -697,7 +697,7 @@ export type CommandHandlerDataMap = {
         command: 'selectAreas';
         request: ServiceArea.SelectAreasRequest;
         cluster: 'serviceArea';
-        attributes: ClusterAttributeValues<(typeof ServiceArea.Complete)['attributes']>;
+        attributes: ClusterAttributeValues<(typeof ServiceArea)['attributes']>;
         endpoint: MatterbridgeEndpoint;
     };
     'boost': CommandHandlerData<'WaterHeaterManagement.boost'>;
@@ -706,14 +706,14 @@ export type CommandHandlerDataMap = {
         command: 'boost';
         request: WaterHeaterManagement.BoostRequest;
         cluster: 'waterHeaterManagement';
-        attributes: ClusterAttributeValues<(typeof WaterHeaterManagement.Complete)['attributes']>;
+        attributes: ClusterAttributeValues<(typeof WaterHeaterManagement)['attributes']>;
         endpoint: MatterbridgeEndpoint;
     };
     'WaterHeaterManagement.cancelBoost': {
         command: 'cancelBoost';
         request: {};
         cluster: 'waterHeaterManagement';
-        attributes: ClusterAttributeValues<(typeof WaterHeaterManagement.Complete)['attributes']>;
+        attributes: ClusterAttributeValues<(typeof WaterHeaterManagement)['attributes']>;
         endpoint: MatterbridgeEndpoint;
     };
     'enableCharging': CommandHandlerData<'EnergyEvse.enableCharging'>;
@@ -725,35 +725,35 @@ export type CommandHandlerDataMap = {
         command: 'enableCharging';
         request: EnergyEvse.EnableChargingRequest;
         cluster: 'energyEvse';
-        attributes: ClusterAttributeValues<(typeof EnergyEvse.Complete)['attributes']>;
+        attributes: ClusterAttributeValues<(typeof EnergyEvse)['attributes']>;
         endpoint: MatterbridgeEndpoint;
     };
     'EnergyEvse.disable': {
         command: 'disable';
         request: {};
         cluster: 'energyEvse';
-        attributes: ClusterAttributeValues<(typeof EnergyEvse.Complete)['attributes']>;
+        attributes: ClusterAttributeValues<(typeof EnergyEvse)['attributes']>;
         endpoint: MatterbridgeEndpoint;
     };
     'EnergyEvse.setTargets': {
         command: 'setTargets';
         request: EnergyEvse.SetTargetsRequest;
         cluster: 'energyEvse';
-        attributes: ClusterAttributeValues<(typeof EnergyEvse.Complete)['attributes']>;
+        attributes: ClusterAttributeValues<(typeof EnergyEvse)['attributes']>;
         endpoint: MatterbridgeEndpoint;
     };
     'EnergyEvse.getTargets': {
         command: 'getTargets';
         request: {};
         cluster: 'energyEvse';
-        attributes: ClusterAttributeValues<(typeof EnergyEvse.Complete)['attributes']>;
+        attributes: ClusterAttributeValues<(typeof EnergyEvse)['attributes']>;
         endpoint: MatterbridgeEndpoint;
     };
     'EnergyEvse.clearTargets': {
         command: 'clearTargets';
         request: {};
         cluster: 'energyEvse';
-        attributes: ClusterAttributeValues<(typeof EnergyEvse.Complete)['attributes']>;
+        attributes: ClusterAttributeValues<(typeof EnergyEvse)['attributes']>;
         endpoint: MatterbridgeEndpoint;
     };
     'setTemperature': CommandHandlerData<'TemperatureControl.setTemperature'>;
@@ -761,7 +761,7 @@ export type CommandHandlerDataMap = {
         command: 'setTemperature';
         request: TemperatureControl.SetTemperatureRequest;
         cluster: 'temperatureControl';
-        attributes: ClusterAttributeValues<(typeof TemperatureControl.Complete)['attributes']>;
+        attributes: ClusterAttributeValues<(typeof TemperatureControl)['attributes']>;
         endpoint: MatterbridgeEndpoint;
     };
     'setCookingParameters': CommandHandlerData<'MicrowaveOvenControl.setCookingParameters'>;
@@ -770,14 +770,14 @@ export type CommandHandlerDataMap = {
         command: 'setCookingParameters';
         request: MicrowaveOvenControl.SetCookingParametersRequest;
         cluster: 'microwaveOvenControl';
-        attributes: ClusterAttributeValues<(typeof MicrowaveOvenControl.Complete)['attributes']>;
+        attributes: ClusterAttributeValues<(typeof MicrowaveOvenControl)['attributes']>;
         endpoint: MatterbridgeEndpoint;
     };
     'MicrowaveOvenControl.addMoreTime': {
         command: 'addMoreTime';
         request: MicrowaveOvenControl.AddMoreTimeRequest;
         cluster: 'microwaveOvenControl';
-        attributes: ClusterAttributeValues<(typeof MicrowaveOvenControl.Complete)['attributes']>;
+        attributes: ClusterAttributeValues<(typeof MicrowaveOvenControl)['attributes']>;
         endpoint: MatterbridgeEndpoint;
     };
     'play': CommandHandlerData<'MediaPlayback.play'>;
@@ -789,49 +789,49 @@ export type CommandHandlerDataMap = {
         command: 'pause';
         request: {};
         cluster: 'mediaPlayback';
-        attributes: ClusterAttributeValues<(typeof MediaPlayback.Complete)['attributes']>;
+        attributes: ClusterAttributeValues<(typeof MediaPlayback)['attributes']>;
         endpoint: MatterbridgeEndpoint;
     };
     'MediaPlayback.stop': {
         command: 'stop';
         request: {};
         cluster: 'mediaPlayback';
-        attributes: ClusterAttributeValues<(typeof MediaPlayback.Complete)['attributes']>;
+        attributes: ClusterAttributeValues<(typeof MediaPlayback)['attributes']>;
         endpoint: MatterbridgeEndpoint;
     };
     'MediaPlayback.play': {
         command: 'play';
         request: {};
         cluster: 'mediaPlayback';
-        attributes: ClusterAttributeValues<(typeof MediaPlayback.Complete)['attributes']>;
+        attributes: ClusterAttributeValues<(typeof MediaPlayback)['attributes']>;
         endpoint: MatterbridgeEndpoint;
     };
     'MediaPlayback.previous': {
         command: 'previous';
         request: {};
         cluster: 'mediaPlayback';
-        attributes: ClusterAttributeValues<(typeof MediaPlayback.Complete)['attributes']>;
+        attributes: ClusterAttributeValues<(typeof MediaPlayback)['attributes']>;
         endpoint: MatterbridgeEndpoint;
     };
     'MediaPlayback.next': {
         command: 'next';
         request: {};
         cluster: 'mediaPlayback';
-        attributes: ClusterAttributeValues<(typeof MediaPlayback.Complete)['attributes']>;
+        attributes: ClusterAttributeValues<(typeof MediaPlayback)['attributes']>;
         endpoint: MatterbridgeEndpoint;
     };
     'MediaPlayback.skipForward': {
         command: 'skipForward';
         request: MediaPlayback.SkipForwardRequest;
         cluster: 'mediaPlayback';
-        attributes: ClusterAttributeValues<(typeof MediaPlayback.Complete)['attributes']>;
+        attributes: ClusterAttributeValues<(typeof MediaPlayback)['attributes']>;
         endpoint: MatterbridgeEndpoint;
     };
     'MediaPlayback.skipBackward': {
         command: 'skipBackward';
         request: MediaPlayback.SkipBackwardRequest;
         cluster: 'mediaPlayback';
-        attributes: ClusterAttributeValues<(typeof MediaPlayback.Complete)['attributes']>;
+        attributes: ClusterAttributeValues<(typeof MediaPlayback)['attributes']>;
         endpoint: MatterbridgeEndpoint;
     };
     'sendKey': CommandHandlerData<'KeypadInput.sendKey'>;
@@ -847,21 +847,21 @@ export type CommandHandlerDataMap = {
         command: 'resetCondition';
         request: {};
         cluster: 'resourceMonitoring';
-        attributes: ClusterAttributeValues<(typeof ResourceMonitoring.Complete)['attributes']>;
+        attributes: ClusterAttributeValues<(typeof ResourceMonitoring)['attributes']>;
         endpoint: MatterbridgeEndpoint;
     };
     'HepaFilterMonitoring.resetCondition': {
         command: 'resetCondition';
         request: {};
         cluster: 'hepaFilterMonitoring';
-        attributes: ClusterAttributeValues<(typeof HepaFilterMonitoring.Complete)['attributes']>;
+        attributes: ClusterAttributeValues<(typeof HepaFilterMonitoring)['attributes']>;
         endpoint: MatterbridgeEndpoint;
     };
     'ActivatedCarbonFilterMonitoring.resetCondition': {
         command: 'resetCondition';
         request: {};
         cluster: 'activatedCarbonFilterMonitoring';
-        attributes: ClusterAttributeValues<(typeof ActivatedCarbonFilterMonitoring.Complete)['attributes']>;
+        attributes: ClusterAttributeValues<(typeof ActivatedCarbonFilterMonitoring)['attributes']>;
         endpoint: MatterbridgeEndpoint;
     };
 };

package/dist/matterbridgeEndpointHelpers.d.ts

@@ -2,7 +2,7 @@ import { ActionContext, Behavior, ClusterBehavior, Endpoint } from '@matter/node
 import { ElectricalEnergyMeasurementServer } from '@matter/node/behaviors/electrical-energy-measurement';
 import { ElectricalPowerMeasurementServer } from '@matter/node/behaviors/electrical-power-measurement';
 import { OccupancySensingServer } from '@matter/node/behaviors/occupancy-sensing';
-import { ClusterType } from '@matter/types/cluster';
+import { type ClusterType } from '@matter/types/cluster';
 import { DeviceEnergyManagement } from '@matter/types/clusters/device-energy-management';
 import { DeviceEnergyManagementMode } from '@matter/types/clusters/device-energy-management-mode';
 import { ElectricalEnergyMeasurement } from '@matter/types/clusters/electrical-energy-measurement';

package/dist/matterbridgePlatform.js

@@ -237,7 +237,7 @@ export class MatterbridgePlatform {
             if (!device.deviceTypes.has(bridgedNode.code)) {
                 this.log.debug(`Device with name ${CYAN}${device.deviceName}${db} has no bridgedNode device type. Adding it...`);
                 device.deviceTypes.set(bridgedNode.code, bridgedNode);
-                const options = device.getClusterServerOptions(Descriptor.Cluster.id);
+                const options = device.getClusterServerOptions(Descriptor.id);
                 if (options) {
                     const deviceTypeList = options.deviceTypeList;
                     if (!deviceTypeList.find((dt) => dt.deviceType === bridgedNode.code)) {
@@ -245,7 +245,7 @@ export class MatterbridgePlatform {
                     }
                 }
             }
-            if (!device.hasClusterServer(BridgedDeviceBasicInformation.Cluster.id)) {
+            if (!device.hasClusterServer(BridgedDeviceBasicInformation.id)) {
                 this.log.debug(`Device with name ${CYAN}${device.deviceName}${db} has no BridgedDeviceBasicInformation cluster. Adding it...`);
                 device.createDefaultBridgedDeviceBasicInformationClusterServer(device.deviceName, device.serialNumber, device.vendorId, device.vendorName, device.productName, device.softwareVersion, device.softwareVersionString, device.hardwareVersion, device.hardwareVersionString);
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@matterbridge/core",
-  "version": "3.8.1-dev-20260609-77be5ba",
+  "version": "3.8.1-dev-20260609-f3c25c0",
   "description": "Matterbridge core library",
   "author": "https://github.com/Luligu",
   "homepage": "https://matterbridge.io/",
@@ -130,10 +130,10 @@
   ],
   "dependencies": {
     "@matter/main": "0.17.2-alpha.0-20260609-97109a2d3",
-    "@matterbridge/dgram": "3.8.1-dev-20260609-77be5ba",
-    "@matterbridge/thread": "3.8.1-dev-20260609-77be5ba",
-    "@matterbridge/types": "3.8.1-dev-20260609-77be5ba",
-    "@matterbridge/utils": "3.8.1-dev-20260609-77be5ba",
+    "@matterbridge/dgram": "3.8.1-dev-20260609-f3c25c0",
+    "@matterbridge/thread": "3.8.1-dev-20260609-f3c25c0",
+    "@matterbridge/types": "3.8.1-dev-20260609-f3c25c0",
+    "@matterbridge/utils": "3.8.1-dev-20260609-f3c25c0",
     "escape-html": "1.0.3",
     "express": "5.2.1",
     "express-rate-limit": "8.5.2",