matterbridge-example-dynamic-platform 1.1.4-dev.1 → 1.1.5-dev.1

package/CHANGELOG.md

@@ -4,15 +4,36 @@ All notable changes to this project will be documented in this file.
 
 If you like this project and find it useful, please consider giving it a star on GitHub at https://github.com/Luligu/matterbridge-example-dynamic-platform and sponsoring it.
 
-## [1.1.4-dev.1] - 2024-12-17
+## [1.1.5] - 2025-02-01
 
-- [package]: Added thermostat Heat only with two external temperature sensors (tagged like Indoor and Outdoor).
-- [package]: Added thermostat Cool only.
-- [package]: Added an airPurifier device with temperature and humidity sensor (supported by Apple Home).
-- [package]: Added a pumpDevice device.
-- [package]: Added a waterValve device.
-- [package]: Require matterbridge 1.6.7.
+### Added
+
+### Changed
+
+- [package]: Require matterbridge 2.1.0.
 - [package]: Updated dependencies.
+- [package]: Updated package.
+
+### Fixed
+
+<a href="https://www.buymeacoffee.com/luligugithub">
+  <img src="./yellow-button.png" alt="Buy me a coffee" width="120">
+</a>
+
+## [1.1.4] - 2024-12-21
+
+### Added
+
+- [platform]: Added call to super.OnConfigure() and super.OnShutDown() to check endpoints numbers.
+
+### Changed
+
+- [package]: Updated dependencies.
+- [package]: Updated package.
+
+### Fixed
+
+- [thermostat]: Fixed temperature
 
 <a href="https://www.buymeacoffee.com/luligugithub">
   <img src="./yellow-button.png" alt="Buy me a coffee" width="120">
@@ -20,11 +41,16 @@ If you like this project and find it useful, please consider giving it a star on
 
 ## [1.1.3] - 2024-12-16
 
+### Added
+
 - [package]: Added thermostat Heat only with two external temperature sensors (tagged like Indoor and Outdoor).
 - [package]: Added thermostat Cool only.
 - [package]: Added an airPurifier device with temperature and humidity sensor (supported by Apple Home).
 - [package]: Added a pumpDevice device.
 - [package]: Added a waterValve device.
+
+### Changed
+
 - [package]: Require matterbridge 1.6.7.
 - [package]: Updated dependencies.
 
@@ -34,9 +60,14 @@ If you like this project and find it useful, please consider giving it a star on
 
 ## [1.1.2] - 2024-12-12
 
+### Added
+
 - [package]: Added the Matter 1.3 airConditioner device (not supported by Apple Home).
 - [package]: Require matterbridge 1.6.6.
 - [package]: Added Jest test with 100% coverage.
+
+### Changed
+
 - [package]: Updated package.
 - [package]: Updated dependencies.
 

package/dist/platform.js

@@ -1,5 +1,5 @@
-import { AirQuality, AirQualityCluster, BooleanStateCluster, BooleanStateConfiguration, CarbonDioxideConcentrationMeasurement, CarbonMonoxideConcentrationMeasurement, ColorControl, ColorControlCluster, DoorLock, DoorLockCluster, FanControl, FanControlCluster, FlowMeasurement, FlowMeasurementCluster, FormaldehydeConcentrationMeasurement, LevelControlCluster, MatterbridgeEndpoint, NitrogenDioxideConcentrationMeasurement, OnOffCluster, OzoneConcentrationMeasurement, Pm10ConcentrationMeasurement, Pm1ConcentrationMeasurement, Pm25ConcentrationMeasurement, RadonConcentrationMeasurement, RelativeHumidityMeasurement, RelativeHumidityMeasurementCluster, SmokeCoAlarm, SmokeCoAlarmCluster, TemperatureMeasurement, TemperatureMeasurementCluster, Thermostat, ThermostatCluster, TotalVolatileOrganicCompoundsConcentrationMeasurement, WindowCovering, WindowCoveringCluster, airConditioner, airQualitySensor, bridgedNode, colorTemperatureLight, coverDevice, dimmableLight, doorLockDevice, fanDevice, flowSensor, humiditySensor, onOffLight, onOffOutlet, onOffSwitch, powerSource, rainSensor, smokeCoAlarm, temperatureSensor, thermostatDevice, waterFreezeDetector, waterLeakDetector, LocationTag, airPurifier, pumpDevice, waterValve, } from 'matterbridge';
-import { MatterbridgeDevice, MatterbridgeDynamicPlatform } from 'matterbridge';
+import { AirQuality, AirQualityCluster, BooleanStateCluster, CarbonDioxideConcentrationMeasurement, CarbonMonoxideConcentrationMeasurement, ColorControl, ColorControlCluster, DoorLock, DoorLockCluster, FanControl, FanControlCluster, FlowMeasurementCluster, FormaldehydeConcentrationMeasurement, LevelControlCluster, NitrogenDioxideConcentrationMeasurement, OnOffCluster, OzoneConcentrationMeasurement, Pm10ConcentrationMeasurement, Pm1ConcentrationMeasurement, Pm25ConcentrationMeasurement, RadonConcentrationMeasurement, RelativeHumidityMeasurement, RelativeHumidityMeasurementCluster, SmokeCoAlarm, SmokeCoAlarmCluster, TemperatureMeasurement, TemperatureMeasurementCluster, Thermostat, ThermostatCluster, TotalVolatileOrganicCompoundsConcentrationMeasurement, WindowCovering, WindowCoveringCluster, airConditioner, airQualitySensor, bridgedNode, colorTemperatureLight, coverDevice, dimmableLight, doorLockDevice, fanDevice, flowSensor, humiditySensor, onOffLight, onOffOutlet, onOffSwitch, powerSource, rainSensor, smokeCoAlarm, temperatureSensor, thermostatDevice, waterFreezeDetector, waterLeakDetector, LocationTag, airPurifier, pumpDevice, waterValve, } from 'matterbridge';
+import { MatterbridgeEndpoint, MatterbridgeDynamicPlatform } from 'matterbridge';
 import { isValidBoolean, isValidNumber } from 'matterbridge/utils';
 export class ExampleMatterbridgeDynamicPlatform extends MatterbridgeDynamicPlatform {
     switch;
@@ -40,31 +40,21 @@ export class ExampleMatterbridgeDynamicPlatform extends MatterbridgeDynamicPlatf
     airConditionerInterval;
     bridgedDevices = new Map();
     fanModeLookup = ['Off', 'Low', 'Medium', 'High', 'On', 'Auto', 'Smart'];
-    async createMutableDevice(definition, options = {}, debug = false) {
-        let device;
-        if (this.matterbridge.edge === true)
-            device = new MatterbridgeEndpoint(definition, options, debug);
-        else
-            device = new MatterbridgeDevice(definition, options, debug);
-        return device;
-    }
     constructor(matterbridge, log, config) {
         super(matterbridge, log, config);
-        if (this.verifyMatterbridgeVersion === undefined || typeof this.verifyMatterbridgeVersion !== 'function' || !this.verifyMatterbridgeVersion('1.6.7')) {
-            throw new Error(`This plugin requires Matterbridge version >= "1.6.7". Please update Matterbridge from ${this.matterbridge.matterbridgeVersion} to the latest version in the frontend.`);
+        if (this.verifyMatterbridgeVersion === undefined || typeof this.verifyMatterbridgeVersion !== 'function' || !this.verifyMatterbridgeVersion('2.1.0')) {
+            throw new Error(`This plugin requires Matterbridge version >= "2.1.0". Please update Matterbridge from ${this.matterbridge.matterbridgeVersion} to the latest version in the frontend.`);
         }
         this.log.info('Initializing platform:', this.config.name);
     }
     async onStart(reason) {
         this.log.info('onStart called with reason:', reason ?? 'none');
-        this.switch = await this.createMutableDevice([onOffSwitch, bridgedNode], { uniqueStorageKey: 'Switch' }, this.config.debug);
+        this.switch = new MatterbridgeEndpoint([onOffSwitch, bridgedNode, powerSource], { uniqueStorageKey: 'Switch' }, this.config.debug);
         this.switch.log.logName = 'Switch';
         this.switch.createDefaultIdentifyClusterServer();
         this.switch.createDefaultGroupsClusterServer();
-        this.switch.createDefaultScenesClusterServer();
         this.switch.createDefaultBridgedDeviceBasicInformationClusterServer('Switch', '0x23452164', 0xfff1, 'Matterbridge', 'Matterbridge Switch', parseInt(this.version.replace(/\D/g, '')), this.version === '' ? 'Unknown' : this.version, parseInt(this.matterbridge.matterbridgeVersion.replace(/\D/g, '')), this.matterbridge.matterbridgeVersion);
         this.switch.createDefaultOnOffClusterServer();
-        this.switch.addDeviceType(powerSource);
         this.switch.createDefaultPowerSourceRechargeableBatteryClusterServer(70);
         await this.registerDevice(this.switch);
         this.bridgedDevices.set(this.switch.deviceName ?? '', this.switch);
@@ -72,21 +62,19 @@ export class ExampleMatterbridgeDynamicPlatform extends MatterbridgeDynamicPlatf
             this.log.info(`Command identify called identifyTime:${identifyTime}`);
         });
         this.switch.addCommandHandler('on', async () => {
-            await this.switch?.setAttribute(OnOffCluster.id, 'onOff', true, this.switch.log, this.switch);
+            await this.switch?.setAttribute(OnOffCluster.id, 'onOff', true, this.switch.log);
             this.switch?.log.info('Command on called');
         });
         this.switch.addCommandHandler('off', async () => {
-            await this.switch?.setAttribute(OnOffCluster.id, 'onOff', false, this.switch.log, this.switch);
+            await this.switch?.setAttribute(OnOffCluster.id, 'onOff', false, this.switch.log);
             this.switch?.log.info('Command off called');
         });
-        this.lightOnOff = await this.createMutableDevice([onOffLight, bridgedNode], { uniqueStorageKey: 'Light (on/off)' }, this.config.debug);
+        this.lightOnOff = new MatterbridgeEndpoint([onOffLight, bridgedNode, powerSource], { uniqueStorageKey: 'Light (on/off)' }, this.config.debug);
         this.lightOnOff.log.logName = 'Light (on/off)';
         this.lightOnOff.createDefaultIdentifyClusterServer();
         this.lightOnOff.createDefaultGroupsClusterServer();
-        this.lightOnOff.createDefaultScenesClusterServer();
         this.lightOnOff.createDefaultBridgedDeviceBasicInformationClusterServer('Light (on/off)', '0x2342375564', 0xfff1, 'Matterbridge', 'Matterbridge Light on/off', parseInt(this.version.replace(/\D/g, '')), this.version === '' ? 'Unknown' : this.version, parseInt(this.matterbridge.matterbridgeVersion.replace(/\D/g, '')), this.matterbridge.matterbridgeVersion);
         this.lightOnOff.createDefaultOnOffClusterServer();
-        this.lightOnOff.addDeviceType(powerSource);
         this.lightOnOff.createDefaultPowerSourceWiredClusterServer();
         await this.registerDevice(this.lightOnOff);
         this.bridgedDevices.set(this.lightOnOff.deviceName ?? '', this.lightOnOff);
@@ -94,22 +82,20 @@ export class ExampleMatterbridgeDynamicPlatform extends MatterbridgeDynamicPlatf
             this.lightOnOff?.log.info(`Command identify called identifyTime:${identifyTime}`);
         });
         this.lightOnOff.addCommandHandler('on', async () => {
-            await this.light?.setAttribute(OnOffCluster.id, 'onOff', true, this.lightOnOff?.log, this.lightOnOff);
+            await this.lightOnOff?.setAttribute(OnOffCluster.id, 'onOff', true, this.lightOnOff?.log);
             this.lightOnOff?.log.info('Command on called');
         });
         this.lightOnOff.addCommandHandler('off', async () => {
-            await this.light?.setAttribute(OnOffCluster.id, 'onOff', false, this.lightOnOff?.log, this.lightOnOff);
+            await this.lightOnOff?.setAttribute(OnOffCluster.id, 'onOff', false, this.lightOnOff?.log);
             this.lightOnOff?.log.info('Command off called');
         });
-        this.dimmer = await this.createMutableDevice([dimmableLight, bridgedNode], { uniqueStorageKey: 'Dimmer' }, this.config.debug);
+        this.dimmer = new MatterbridgeEndpoint([dimmableLight, bridgedNode, powerSource], { uniqueStorageKey: 'Dimmer' }, this.config.debug);
         this.dimmer.log.logName = 'Dimmer';
         this.dimmer.createDefaultIdentifyClusterServer();
         this.dimmer.createDefaultGroupsClusterServer();
-        this.dimmer.createDefaultScenesClusterServer();
         this.dimmer.createDefaultBridgedDeviceBasicInformationClusterServer('Dimmer', '0x234554564', 0xfff1, 'Matterbridge', 'Matterbridge Dimmer', parseInt(this.version.replace(/\D/g, '')), this.version === '' ? 'Unknown' : this.version, parseInt(this.matterbridge.matterbridgeVersion.replace(/\D/g, '')), this.matterbridge.matterbridgeVersion);
         this.dimmer.createDefaultOnOffClusterServer();
         this.dimmer.createDefaultLevelControlClusterServer();
-        this.dimmer.addDeviceType(powerSource);
         this.dimmer.createDefaultPowerSourceReplaceableBatteryClusterServer(70);
         await this.registerDevice(this.dimmer);
         this.bridgedDevices.set(this.dimmer.deviceName ?? '', this.dimmer);
@@ -117,31 +103,29 @@ export class ExampleMatterbridgeDynamicPlatform extends MatterbridgeDynamicPlatf
             this.dimmer?.log.info(`Command identify called identifyTime:${identifyTime}`);
         });
         this.dimmer.addCommandHandler('on', async () => {
-            await this.dimmer?.setAttribute(OnOffCluster.id, 'onOff', true, this.dimmer.log, this.dimmer);
+            await this.dimmer?.setAttribute(OnOffCluster.id, 'onOff', true, this.dimmer.log);
             this.dimmer?.log.info('Command on called');
         });
         this.dimmer.addCommandHandler('off', async () => {
-            await this.dimmer?.setAttribute(OnOffCluster.id, 'onOff', false, this.dimmer.log, this.dimmer);
+            await this.dimmer?.setAttribute(OnOffCluster.id, 'onOff', false, this.dimmer.log);
             this.dimmer?.log.info('Command off called');
         });
         this.dimmer.addCommandHandler('moveToLevel', async ({ request: { level } }) => {
-            await this.dimmer?.setAttribute(LevelControlCluster.id, 'currentLevel', level, this.dimmer.log, this.dimmer);
+            await this.dimmer?.setAttribute(LevelControlCluster.id, 'currentLevel', level, this.dimmer.log);
             this.dimmer?.log.debug(`Command moveToLevel called request: ${level}`);
         });
         this.dimmer.addCommandHandler('moveToLevelWithOnOff', async ({ request: { level } }) => {
-            await this.dimmer?.setAttribute(LevelControlCluster.id, 'currentLevel', level, this.dimmer.log, this.dimmer);
+            await this.dimmer?.setAttribute(LevelControlCluster.id, 'currentLevel', level, this.dimmer.log);
             this.dimmer?.log.debug(`Command moveToLevelWithOnOff called request: ${level}`);
         });
-        this.light = await this.createMutableDevice([colorTemperatureLight, bridgedNode], { uniqueStorageKey: 'Light (XY, HS and CT)' }, this.config.debug);
+        this.light = new MatterbridgeEndpoint([colorTemperatureLight, bridgedNode, powerSource], { uniqueStorageKey: 'Light (XY, HS and CT)' }, this.config.debug);
         this.light.log.logName = 'Light (XY, HS and CT)';
         this.light.createDefaultIdentifyClusterServer();
         this.light.createDefaultGroupsClusterServer();
-        this.light.createDefaultScenesClusterServer();
         this.light.createDefaultBridgedDeviceBasicInformationClusterServer('Light (XY, HS and CT)', '0x23480564', 0xfff1, 'Matterbridge', 'Matterbridge Light', parseInt(this.version.replace(/\D/g, '')), this.version === '' ? 'Unknown' : this.version, parseInt(this.matterbridge.matterbridgeVersion.replace(/\D/g, '')), this.matterbridge.matterbridgeVersion);
         this.light.createDefaultOnOffClusterServer();
         this.light.createDefaultLevelControlClusterServer();
         this.light.createDefaultColorControlClusterServer();
-        this.light.addDeviceType(powerSource);
         this.light.createDefaultPowerSourceReplaceableBatteryClusterServer(70);
         await this.registerDevice(this.light);
         this.bridgedDevices.set(this.light.deviceName ?? '', this.light);
@@ -149,53 +133,51 @@ export class ExampleMatterbridgeDynamicPlatform extends MatterbridgeDynamicPlatf
             this.light?.log.info(`Command identify called identifyTime:${identifyTime}`);
         });
         this.light.addCommandHandler('on', async () => {
-            await this.light?.setAttribute(OnOffCluster.id, 'onOff', true, this.light?.log, this.light);
+            await this.light?.setAttribute(OnOffCluster.id, 'onOff', true, this.light?.log);
             this.light?.log.info('Command on called');
         });
         this.light.addCommandHandler('off', async () => {
-            await this.light?.setAttribute(OnOffCluster.id, 'onOff', false, this.light?.log, this.light);
+            await this.light?.setAttribute(OnOffCluster.id, 'onOff', false, this.light?.log);
             this.light?.log.info('Command off called');
         });
         this.light.addCommandHandler('moveToLevel', async ({ request: { level } }) => {
-            await this.light?.setAttribute(LevelControlCluster.id, 'currentLevel', level, this.light?.log, this.light);
+            await this.light?.setAttribute(LevelControlCluster.id, 'currentLevel', level, this.light?.log);
             this.light?.log.debug(`Command moveToLevel called request: ${level}`);
         });
         this.light.addCommandHandler('moveToLevelWithOnOff', async ({ request: { level } }) => {
-            await this.light?.setAttribute(LevelControlCluster.id, 'currentLevel', level, this.light?.log, this.light);
+            await this.light?.setAttribute(LevelControlCluster.id, 'currentLevel', level, this.light?.log);
             this.light?.log.debug(`Command moveToLevelWithOnOff called request: ${level}`);
         });
         this.light.addCommandHandler('moveToColor', async ({ request: { colorX, colorY } }) => {
-            await this.light?.setAttribute(ColorControlCluster.id, 'currentX', colorX, this.light?.log, this.light);
-            await this.light?.setAttribute(ColorControlCluster.id, 'currentY', colorY, this.light?.log, this.light);
+            await this.light?.setAttribute(ColorControlCluster.id, 'currentX', colorX, this.light?.log);
+            await this.light?.setAttribute(ColorControlCluster.id, 'currentY', colorY, this.light?.log);
             this.light?.log.debug(`Command moveToColor called request: X ${colorX / 65536} Y ${colorY / 65536}`);
         });
-        this.light.addCommandHandler('moveToHueAndSaturation', async ({ request: { hue, saturation }, attributes: { currentHue, currentSaturation } }) => {
-            await this.light?.setAttribute(ColorControlCluster.id, 'currentHue', hue, this.light?.log, this.light);
-            await this.light?.setAttribute(ColorControlCluster.id, 'currentSaturation', saturation, this.light?.log, this.light);
-            this.light?.log.debug(`Command moveToHueAndSaturation called request: hue ${hue} saturation ${saturation} attributes: hue ${currentHue?.getLocal()} saturation ${currentSaturation?.getLocal()}`);
+        this.light.addCommandHandler('moveToHueAndSaturation', async ({ request: { hue, saturation } }) => {
+            await this.light?.setAttribute(ColorControlCluster.id, 'currentHue', hue, this.light?.log);
+            await this.light?.setAttribute(ColorControlCluster.id, 'currentSaturation', saturation, this.light?.log);
+            this.light?.log.debug(`Command moveToHueAndSaturation called request: hue ${hue} saturation ${saturation}`);
         });
-        this.light.addCommandHandler('moveToHue', async ({ request: { hue }, attributes: { currentHue, currentSaturation } }) => {
-            await this.light?.setAttribute(ColorControlCluster.id, 'currentHue', hue, this.light?.log, this.light);
-            this.light?.log.debug(`Command moveToHue called request: hue ${hue} attributes: hue ${currentHue?.getLocal()} saturation ${currentSaturation?.getLocal()}`);
+        this.light.addCommandHandler('moveToHue', async ({ request: { hue } }) => {
+            await this.light?.setAttribute(ColorControlCluster.id, 'currentHue', hue, this.light?.log);
+            this.light?.log.debug(`Command moveToHue called request: hue ${hue}`);
         });
-        this.light.addCommandHandler('moveToSaturation', async ({ request: { saturation }, attributes: { currentHue, currentSaturation } }) => {
-            await this.light?.setAttribute(ColorControlCluster.id, 'currentSaturation', saturation, this.light?.log, this.light);
-            this.light?.log.debug(`Command moveToSaturation called request: saturation ${saturation} attributes: hue ${currentHue?.getLocal()} saturation ${currentSaturation?.getLocal()}`);
+        this.light.addCommandHandler('moveToSaturation', async ({ request: { saturation } }) => {
+            await this.light?.setAttribute(ColorControlCluster.id, 'currentSaturation', saturation, this.light?.log);
+            this.light?.log.debug(`Command moveToSaturation called request: saturation ${saturation}}`);
         });
-        this.light.addCommandHandler('moveToColorTemperature', async ({ request, attributes }) => {
-            await this.light?.setAttribute(ColorControlCluster.id, 'colorTemperatureMireds', request.colorTemperatureMireds, this.light?.log, this.light);
-            this.light?.log.debug(`Command moveToColorTemperature called request: ${request.colorTemperatureMireds} attributes: ${attributes.colorTemperatureMireds?.getLocal()}`);
+        this.light.addCommandHandler('moveToColorTemperature', async ({ request: { colorTemperatureMireds } }) => {
+            await this.light?.setAttribute(ColorControlCluster.id, 'colorTemperatureMireds', colorTemperatureMireds, this.light?.log);
+            this.light?.log.debug(`Command moveToColorTemperature called request: ${colorTemperatureMireds}`);
         });
-        this.lightHS = await this.createMutableDevice([colorTemperatureLight, bridgedNode], { uniqueStorageKey: 'Light (HS)' }, this.config.debug);
+        this.lightHS = new MatterbridgeEndpoint([colorTemperatureLight, bridgedNode, powerSource], { uniqueStorageKey: 'Light (HS, CT)' }, this.config.debug);
         this.lightHS.log.logName = 'Light (HS, CT)';
         this.lightHS.createDefaultIdentifyClusterServer();
         this.lightHS.createDefaultGroupsClusterServer();
-        this.lightHS.createDefaultScenesClusterServer();
         this.lightHS.createDefaultBridgedDeviceBasicInformationClusterServer('Light (HS, CT)', '0x25097564', 0xfff1, 'Matterbridge', 'Matterbridge Light', parseInt(this.version.replace(/\D/g, '')), this.version === '' ? 'Unknown' : this.version, parseInt(this.matterbridge.matterbridgeVersion.replace(/\D/g, '')), this.matterbridge.matterbridgeVersion);
         this.lightHS.createDefaultOnOffClusterServer();
         this.lightHS.createDefaultLevelControlClusterServer();
         this.lightHS.createHsColorControlClusterServer();
-        this.lightHS.addDeviceType(powerSource);
         this.lightHS.createDefaultPowerSourceWiredClusterServer();
         await this.registerDevice(this.lightHS);
         this.bridgedDevices.set(this.lightHS.deviceName ?? '', this.lightHS);
@@ -203,48 +185,45 @@ export class ExampleMatterbridgeDynamicPlatform extends MatterbridgeDynamicPlatf
             this.lightHS?.log.info(`Command identify called identifyTime:${identifyTime}`);
         });
         this.lightHS.addCommandHandler('on', async () => {
-            await this.lightHS?.setAttribute(OnOffCluster.id, 'onOff', true, this.lightHS?.log, this.lightHS);
+            await this.lightHS?.setAttribute(OnOffCluster.id, 'onOff', true, this.lightHS?.log);
             this.lightHS?.log.info('Command on called');
         });
         this.lightHS.addCommandHandler('off', async () => {
-            await this.lightHS?.setAttribute(OnOffCluster.id, 'onOff', false, this.lightHS?.log, this.lightHS);
+            await this.lightHS?.setAttribute(OnOffCluster.id, 'onOff', false, this.lightHS?.log);
             this.lightHS?.log.info('Command off called');
         });
-        this.lightHS.addCommandHandler('moveToLevel', async ({ request: { level }, attributes: { currentLevel } }) => {
-            await this.lightHS?.setAttribute(LevelControlCluster.id, 'currentLevel', level, this.lightHS?.log, this.lightHS);
-            this.lightHS?.log.debug(`Command moveToLevel called request: ${level} attributes: ${currentLevel?.getLocal()}`);
+        this.lightHS.addCommandHandler('moveToLevel', async ({ request: { level } }) => {
+            await this.lightHS?.setAttribute(LevelControlCluster.id, 'currentLevel', level, this.lightHS?.log);
+            this.lightHS?.log.debug(`Command moveToLevel called request: ${level}`);
         });
-        this.lightHS.addCommandHandler('moveToLevelWithOnOff', async ({ request: { level }, attributes: { currentLevel } }) => {
-            await this.lightHS?.setAttribute(LevelControlCluster.id, 'currentLevel', level, this.lightHS?.log, this.lightHS);
-            this.lightHS?.log.debug(`Command moveToLevelWithOnOff called request: ${level} attributes: ${currentLevel?.getLocal()}`);
+        this.lightHS.addCommandHandler('moveToLevelWithOnOff', async ({ request: { level } }) => {
+            await this.lightHS?.setAttribute(LevelControlCluster.id, 'currentLevel', level, this.lightHS?.log);
+            this.lightHS?.log.debug(`Command moveToLevelWithOnOff called request: ${level}`);
         });
-        this.lightHS.addCommandHandler('moveToHueAndSaturation', async ({ request: { hue, saturation }, attributes: { currentHue, currentSaturation } }) => {
-            await this.lightHS?.setAttribute(ColorControlCluster.id, 'currentHue', hue, this.lightHS?.log, this.lightHS);
-            await this.lightHS?.setAttribute(ColorControlCluster.id, 'currentSaturation', saturation, this.lightHS?.log, this.lightHS);
-            this.lightHS?.log.debug(`Command moveToHueAndSaturation called request: hue ${hue} saturation ${saturation} attributes: hue ${currentHue?.getLocal()} saturation ${currentSaturation?.getLocal()}`);
+        this.lightHS.addCommandHandler('moveToHueAndSaturation', async ({ request: { hue, saturation } }) => {
+            await this.lightHS?.setAttribute(ColorControlCluster.id, 'currentHue', hue, this.lightHS?.log);
+            await this.lightHS?.setAttribute(ColorControlCluster.id, 'currentSaturation', saturation, this.lightHS?.log);
+            this.lightHS?.log.debug(`Command moveToHueAndSaturation called request: hue ${hue} saturation ${saturation}}`);
         });
-        this.lightHS.addCommandHandler('moveToHue', async ({ request: { hue }, attributes: { currentHue, currentSaturation } }) => {
-            await this.lightHS?.setAttribute(ColorControlCluster.id, 'currentHue', hue, this.lightHS?.log, this.lightHS);
-            this.lightHS?.log.debug(`Command moveToHue called request: hue ${hue} attributes: hue ${currentHue?.getLocal()} saturation ${currentSaturation?.getLocal()}`);
+        this.lightHS.addCommandHandler('moveToHue', async ({ request: { hue } }) => {
+            await this.lightHS?.setAttribute(ColorControlCluster.id, 'currentHue', hue, this.lightHS?.log);
+            this.lightHS?.log.debug(`Command moveToHue called request: hue ${hue}`);
         });
-        this.lightHS.addCommandHandler('moveToSaturation', async ({ request: { saturation }, attributes: { currentHue, currentSaturation } }) => {
-            await this.lightHS?.setAttribute(ColorControlCluster.id, 'currentSaturation', saturation, this.lightHS?.log, this.lightHS);
-            this.lightHS?.log.debug(`Command moveToSaturation called request: saturation ${saturation} attributes: hue ${currentHue?.getLocal()} saturation ${currentSaturation?.getLocal()}`);
+        this.lightHS.addCommandHandler('moveToSaturation', async ({ request: { saturation } }) => {
+            await this.lightHS?.setAttribute(ColorControlCluster.id, 'currentSaturation', saturation, this.lightHS?.log);
+            this.lightHS?.log.debug(`Command moveToSaturation called request: saturation ${saturation}`);
         });
-        this.lightHS.addCommandHandler('moveToColorTemperature', async ({ request, attributes }) => {
-            await this.light?.setAttribute(ColorControlCluster.id, 'colorTemperatureMireds', request.colorTemperatureMireds, this.light?.log, this.light);
-            this.light?.log.debug(`Command moveToColorTemperature called request: ${request.colorTemperatureMireds} attributes: ${attributes.colorTemperatureMireds?.getLocal()}`);
+        this.lightHS.addCommandHandler('moveToColorTemperature', async ({ request: colorTemperatureMireds }) => {
+            this.lightHS?.log.debug(`Command moveToColorTemperature called request: ${colorTemperatureMireds}`);
         });
-        this.lightXY = await this.createMutableDevice([colorTemperatureLight, bridgedNode], { uniqueStorageKey: 'Light (XY)' }, this.config.debug);
+        this.lightXY = new MatterbridgeEndpoint([colorTemperatureLight, bridgedNode, powerSource], { uniqueStorageKey: 'Light (XY, CT)' }, this.config.debug);
         this.lightXY.log.logName = 'Light (XY, CT)';
         this.lightXY.createDefaultIdentifyClusterServer();
         this.lightXY.createDefaultGroupsClusterServer();
-        this.lightXY.createDefaultScenesClusterServer();
         this.lightXY.createDefaultBridgedDeviceBasicInformationClusterServer('Light (XY, CT)', '0x23497564', 0xfff1, 'Matterbridge', 'Matterbridge Light', parseInt(this.version.replace(/\D/g, '')), this.version === '' ? 'Unknown' : this.version, parseInt(this.matterbridge.matterbridgeVersion.replace(/\D/g, '')), this.matterbridge.matterbridgeVersion);
         this.lightXY.createDefaultOnOffClusterServer();
         this.lightXY.createDefaultLevelControlClusterServer();
         this.lightXY.createXyColorControlClusterServer();
-        this.lightXY.addDeviceType(powerSource);
         this.lightXY.createDefaultPowerSourceWiredClusterServer();
         await this.registerDevice(this.lightXY);
         this.bridgedDevices.set(this.lightXY.deviceName ?? '', this.lightXY);
@@ -252,40 +231,38 @@ export class ExampleMatterbridgeDynamicPlatform extends MatterbridgeDynamicPlatf
             this.lightXY?.log.info(`Command identify called identifyTime:${identifyTime}`);
         });
         this.lightXY.addCommandHandler('on', async () => {
-            await this.lightXY?.setAttribute(OnOffCluster.id, 'onOff', true, this.lightXY?.log, this.lightXY);
+            await this.lightXY?.setAttribute(OnOffCluster.id, 'onOff', true, this.lightXY?.log);
             this.lightXY?.log.info('Command on called');
         });
         this.lightXY.addCommandHandler('off', async () => {
-            await this.lightXY?.setAttribute(OnOffCluster.id, 'onOff', false, this.lightXY?.log, this.lightXY);
+            await this.lightXY?.setAttribute(OnOffCluster.id, 'onOff', false, this.lightXY?.log);
             this.lightXY?.log.info('Command off called');
         });
         this.lightXY.addCommandHandler('moveToLevel', async ({ request: { level } }) => {
-            await this.lightXY?.setAttribute(LevelControlCluster.id, 'currentLevel', level, this.lightXY?.log, this.lightXY);
+            await this.lightXY?.setAttribute(LevelControlCluster.id, 'currentLevel', level, this.lightXY?.log);
             this.lightXY?.log.debug(`Command moveToLevel called request: ${level}`);
         });
         this.lightXY.addCommandHandler('moveToLevelWithOnOff', async ({ request: { level } }) => {
-            await this.lightXY?.setAttribute(LevelControlCluster.id, 'currentLevel', level, this.lightXY?.log, this.lightXY);
+            await this.lightXY?.setAttribute(LevelControlCluster.id, 'currentLevel', level, this.lightXY?.log);
             this.lightXY?.log.debug(`Command moveToLevelWithOnOff called request: ${level}`);
         });
         this.lightXY.addCommandHandler('moveToColor', async ({ request: { colorX, colorY } }) => {
-            await this.lightXY?.setAttribute(ColorControlCluster.id, 'currentX', colorX, this.light?.log, this.light);
-            await this.lightXY?.setAttribute(ColorControlCluster.id, 'currentY', colorY, this.light?.log, this.light);
+            await this.lightXY?.setAttribute(ColorControlCluster.id, 'currentX', colorX, this.lightXY?.log);
+            await this.lightXY?.setAttribute(ColorControlCluster.id, 'currentY', colorY, this.lightXY?.log);
             this.lightXY?.log.debug(`Command moveToColor called request: X ${colorX / 65536} Y ${colorY / 65536}`);
         });
-        this.lightXY.addCommandHandler('moveToColorTemperature', async ({ request, attributes }) => {
-            await this.light?.setAttribute(ColorControlCluster.id, 'colorTemperatureMireds', request.colorTemperatureMireds, this.light?.log, this.light);
-            this.light?.log.debug(`Command moveToColorTemperature called request: ${request.colorTemperatureMireds} attributes: ${attributes.colorTemperatureMireds?.getLocal()}`);
+        this.lightXY.addCommandHandler('moveToColorTemperature', async ({ request: { colorTemperatureMireds } }) => {
+            await this.lightXY?.setAttribute(ColorControlCluster.id, 'colorTemperatureMireds', colorTemperatureMireds, this.lightXY?.log);
+            this.lightXY?.log.debug(`Command moveToColorTemperature called request: ${colorTemperatureMireds}`);
         });
-        this.lightCT = await this.createMutableDevice([colorTemperatureLight, bridgedNode], { uniqueStorageKey: 'Light (CT)' }, this.config.debug);
+        this.lightCT = new MatterbridgeEndpoint([colorTemperatureLight, bridgedNode, powerSource], { uniqueStorageKey: 'Light (CT)' }, this.config.debug);
         this.lightCT.log.logName = 'Light (CT)';
         this.lightCT.createDefaultIdentifyClusterServer();
         this.lightCT.createDefaultGroupsClusterServer();
-        this.lightCT.createDefaultScenesClusterServer();
         this.lightCT.createDefaultBridgedDeviceBasicInformationClusterServer('Light (CT)', '0x23480749', 0xfff1, 'Matterbridge', 'Matterbridge Light', parseInt(this.version.replace(/\D/g, '')), this.version === '' ? 'Unknown' : this.version, parseInt(this.matterbridge.matterbridgeVersion.replace(/\D/g, '')), this.matterbridge.matterbridgeVersion);
         this.lightCT.createDefaultOnOffClusterServer();
         this.lightCT.createDefaultLevelControlClusterServer();
         this.lightCT.createCtColorControlClusterServer();
-        this.lightCT.addDeviceType(powerSource);
         this.lightCT.createDefaultPowerSourceReplaceableBatteryClusterServer(70);
         await this.registerDevice(this.lightCT);
         this.bridgedDevices.set(this.lightCT.deviceName ?? '', this.lightCT);
@@ -293,33 +270,31 @@ export class ExampleMatterbridgeDynamicPlatform extends MatterbridgeDynamicPlatf
             this.lightCT?.log.info(`Command identify called identifyTime:${identifyTime}`);
         });
         this.lightCT.addCommandHandler('on', async () => {
-            await this.lightCT?.setAttribute(OnOffCluster.id, 'onOff', true, this.lightCT?.log, this.lightCT);
+            await this.lightCT?.setAttribute(OnOffCluster.id, 'onOff', true, this.lightCT?.log);
             this.lightCT?.log.info('Command on called');
         });
         this.lightCT.addCommandHandler('off', async () => {
-            await this.lightCT?.setAttribute(OnOffCluster.id, 'onOff', false, this.lightCT?.log, this.lightCT);
+            await this.lightCT?.setAttribute(OnOffCluster.id, 'onOff', false, this.lightCT?.log);
             this.lightCT?.log.info('Command off called');
         });
         this.lightCT.addCommandHandler('moveToLevel', async ({ request: { level } }) => {
-            await this.lightCT?.setAttribute(LevelControlCluster.id, 'currentLevel', level, this.lightCT?.log, this.lightCT);
+            await this.lightCT?.setAttribute(LevelControlCluster.id, 'currentLevel', level, this.lightCT?.log);
             this.lightCT?.log.debug(`Command moveToLevel called request: ${level}`);
         });
         this.lightCT.addCommandHandler('moveToLevelWithOnOff', async ({ request: { level } }) => {
-            await this.lightCT?.setAttribute(LevelControlCluster.id, 'currentLevel', level, this.lightCT?.log, this.lightCT);
+            await this.lightCT?.setAttribute(LevelControlCluster.id, 'currentLevel', level, this.lightCT?.log);
             this.lightCT?.log.debug(`Command moveToLevelWithOnOff called request: ${level}`);
         });
-        this.lightCT.addCommandHandler('moveToColorTemperature', async ({ request }) => {
-            await this.lightCT?.setAttribute(ColorControlCluster.id, 'colorTemperatureMireds', request.colorTemperatureMireds, this.lightCT?.log, this.lightCT);
-            this.lightCT?.log.debug(`Command moveToColorTemperature called request: ${request.colorTemperatureMireds}`);
+        this.lightCT.addCommandHandler('moveToColorTemperature', async ({ request: { colorTemperatureMireds } }) => {
+            await this.lightCT?.setAttribute(ColorControlCluster.id, 'colorTemperatureMireds', colorTemperatureMireds, this.lightCT?.log);
+            this.lightCT?.log.debug(`Command moveToColorTemperature called request: ${colorTemperatureMireds}`);
         });
-        this.outlet = await this.createMutableDevice([onOffOutlet, bridgedNode], { uniqueStorageKey: 'Outlet' }, this.config.debug);
+        this.outlet = new MatterbridgeEndpoint([onOffOutlet, bridgedNode, powerSource], { uniqueStorageKey: 'Outlet' }, this.config.debug);
         this.outlet.log.logName = 'Outlet';
         this.outlet.createDefaultIdentifyClusterServer();
         this.outlet.createDefaultGroupsClusterServer();
-        this.outlet.createDefaultScenesClusterServer();
         this.outlet.createDefaultBridgedDeviceBasicInformationClusterServer('Outlet', '0x29252164', 0xfff1, 'Matterbridge', 'Matterbridge Outlet', parseInt(this.version.replace(/\D/g, '')), this.version === '' ? 'Unknown' : this.version, parseInt(this.matterbridge.matterbridgeVersion.replace(/\D/g, '')), this.matterbridge.matterbridgeVersion);
         this.outlet.createDefaultOnOffClusterServer();
-        this.outlet.addDeviceType(powerSource);
         this.outlet.createDefaultPowerSourceWiredClusterServer();
         await this.registerDevice(this.outlet);
         this.bridgedDevices.set(this.outlet.deviceName ?? '', this.outlet);
@@ -327,21 +302,19 @@ export class ExampleMatterbridgeDynamicPlatform extends MatterbridgeDynamicPlatf
             this.outlet?.log.info(`Command identify called identifyTime:${identifyTime}`);
         });
         this.outlet.addCommandHandler('on', async () => {
-            await this.outlet?.setAttribute(OnOffCluster.id, 'onOff', true, this.outlet?.log, this.outlet);
+            await this.outlet?.setAttribute(OnOffCluster.id, 'onOff', true, this.outlet?.log);
             this.outlet?.log.info('Command on called');
         });
         this.outlet.addCommandHandler('off', async () => {
-            await this.outlet?.setAttribute(OnOffCluster.id, 'onOff', false, this.outlet?.log, this.outlet);
+            await this.outlet?.setAttribute(OnOffCluster.id, 'onOff', false, this.outlet?.log);
             this.outlet?.log.info('Command off called');
         });
-        this.cover = await this.createMutableDevice([coverDevice, bridgedNode], { uniqueStorageKey: 'Cover' }, this.config.debug);
+        this.cover = new MatterbridgeEndpoint([coverDevice, bridgedNode, powerSource], { uniqueStorageKey: 'Cover' }, this.config.debug);
         this.cover.log.logName = 'Cover';
         this.cover.createDefaultIdentifyClusterServer();
         this.cover.createDefaultGroupsClusterServer();
-        this.cover.createDefaultScenesClusterServer();
         this.cover.createDefaultBridgedDeviceBasicInformationClusterServer('Cover', '0x01020564', 0xfff1, 'Matterbridge', 'Matterbridge Cover', parseInt(this.version.replace(/\D/g, '')), this.version === '' ? 'Unknown' : this.version, parseInt(this.matterbridge.matterbridgeVersion.replace(/\D/g, '')), this.matterbridge.matterbridgeVersion);
         this.cover.createDefaultWindowCoveringClusterServer();
-        this.cover.addDeviceType(powerSource);
         this.cover.createDefaultPowerSourceRechargeableBatteryClusterServer(86);
         await this.registerDevice(this.cover);
         this.bridgedDevices.set(this.cover.deviceName ?? '', this.cover);
@@ -367,12 +340,11 @@ export class ExampleMatterbridgeDynamicPlatform extends MatterbridgeDynamicPlatf
             await this.cover?.setWindowCoveringCurrentTargetStatus(liftPercent100thsValue, liftPercent100thsValue, WindowCovering.MovementStatus.Stopped);
             this.cover?.log.info(`Command goToLiftPercentage ${liftPercent100thsValue} called`);
         });
-        this.lock = await this.createMutableDevice([doorLockDevice, bridgedNode], { uniqueStorageKey: 'Lock' }, this.config.debug);
+        this.lock = new MatterbridgeEndpoint([doorLockDevice, bridgedNode, powerSource], { uniqueStorageKey: 'Lock' }, this.config.debug);
         this.lock.log.logName = 'Lock';
         this.lock.createDefaultIdentifyClusterServer();
         this.lock.createDefaultBridgedDeviceBasicInformationClusterServer('Lock', '0x96352164', 0xfff1, 'Matterbridge', 'Matterbridge Lock', parseInt(this.version.replace(/\D/g, '')), this.version === '' ? 'Unknown' : this.version, parseInt(this.matterbridge.matterbridgeVersion.replace(/\D/g, '')), this.matterbridge.matterbridgeVersion);
         this.lock.createDefaultDoorLockClusterServer();
-        this.lock.addDeviceType(powerSource);
         this.lock.createDefaultPowerSourceRechargeableBatteryClusterServer(30);
         await this.registerDevice(this.lock);
         this.bridgedDevices.set(this.lock.deviceName ?? '', this.lock);
@@ -380,28 +352,29 @@ export class ExampleMatterbridgeDynamicPlatform extends MatterbridgeDynamicPlatf
             this.lock?.log.info(`Command identify called identifyTime:${identifyTime}`);
         });
         this.lock.addCommandHandler('lockDoor', async () => {
-            await this.lock?.setAttribute(DoorLockCluster.id, 'lockState', DoorLock.LockState.Locked, this.lock?.log, this.lock);
+            await this.lock?.setAttribute(DoorLockCluster.id, 'lockState', DoorLock.LockState.Locked, this.lock?.log);
             this.lock?.log.info('Command lockDoor called');
         });
         this.lock.addCommandHandler('unlockDoor', async () => {
-            await this.lock?.setAttribute(DoorLockCluster.id, 'lockState', DoorLock.LockState.Unlocked, this.lock?.log, this.lock);
+            await this.lock?.setAttribute(DoorLockCluster.id, 'lockState', DoorLock.LockState.Unlocked, this.lock?.log);
             this.lock?.log.info('Command unlockDoor called');
         });
-        this.thermoAuto = await this.createMutableDevice([thermostatDevice, bridgedNode], { uniqueStorageKey: 'ThermostatAuto' }, this.config.debug);
+        this.thermoAuto = new MatterbridgeEndpoint([thermostatDevice, bridgedNode, powerSource], { uniqueStorageKey: 'Thermostat (AutoMode)' }, this.config.debug);
         this.thermoAuto.log.logName = 'Thermostat (AutoMode)';
         this.thermoAuto.createDefaultIdentifyClusterServer();
         this.thermoAuto.createDefaultGroupsClusterServer();
-        this.thermoAuto.createDefaultScenesClusterServer();
         this.thermoAuto.createDefaultBridgedDeviceBasicInformationClusterServer('Thermostat (AutoMode)', '0x96382164A', 0xfff1, 'Matterbridge', 'Matterbridge Thermostat', parseInt(this.version.replace(/\D/g, '')), this.version === '' ? 'Unknown' : this.version, parseInt(this.matterbridge.matterbridgeVersion.replace(/\D/g, '')), this.matterbridge.matterbridgeVersion);
         this.thermoAuto.createDefaultThermostatClusterServer(20, 18, 22);
-        this.thermoAuto.addDeviceType(powerSource);
         this.thermoAuto.createDefaultPowerSourceRechargeableBatteryClusterServer(70);
-        const flowChild = this.thermoAuto.addChildDeviceTypeWithClusterServer('Flow', [flowSensor], [FlowMeasurement.Cluster.id]);
-        flowChild.getClusterServer(FlowMeasurement.Cluster)?.setMeasuredValueAttribute(1 * 10);
-        const tempChild = this.thermoAuto.addChildDeviceTypeWithClusterServer('Temperature', [temperatureSensor], [TemperatureMeasurement.Cluster.id]);
-        tempChild.getClusterServer(TemperatureMeasurement.Cluster)?.setMeasuredValueAttribute(41 * 100);
-        const humidityChild = this.thermoAuto.addChildDeviceTypeWithClusterServer('Humidity', [humiditySensor], [RelativeHumidityMeasurement.Cluster.id]);
-        humidityChild.getClusterServer(RelativeHumidityMeasurement.Cluster)?.setMeasuredValueAttribute(80 * 100);
+        const flowChild = this.thermoAuto.addChildDeviceType('Flow', flowSensor);
+        flowChild.createDefaultFlowMeasurementClusterServer(1 * 10);
+        flowChild.addRequiredClusterServers();
+        const tempChild = this.thermoAuto.addChildDeviceType('Temperature', temperatureSensor);
+        tempChild.createDefaultTemperatureMeasurementClusterServer(21 * 100);
+        tempChild.addRequiredClusterServers();
+        const humidityChild = this.thermoAuto.addChildDeviceType('Humidity', humiditySensor);
+        humidityChild.createDefaultRelativeHumidityMeasurementClusterServer(50 * 100);
+        humidityChild.addRequiredClusterServers();
         await this.registerDevice(this.thermoAuto);
         this.bridgedDevices.set(this.thermoAuto.deviceName ?? '', this.thermoAuto);
         this.thermoAuto.addCommandHandler('identify', async ({ request: { identifyTime } }) => {
@@ -427,21 +400,19 @@ export class ExampleMatterbridgeDynamicPlatform extends MatterbridgeDynamicPlatf
         this.thermoAuto.subscribeAttribute(ThermostatCluster.id, 'systemMode', async (value) => {
             const lookupSystemMode = ['Off', 'Auto', '', 'Cool', 'Heat', 'EmergencyHeat', 'Precooling', 'FanOnly', 'Dry', 'Sleep'];
             this.thermoAuto?.log.info('Subscribe systemMode called with:', lookupSystemMode[value]);
-        }, this.thermoAuto.log, this.thermoAuto);
+        }, this.thermoAuto.log);
         this.thermoAuto.subscribeAttribute(ThermostatCluster.id, 'occupiedHeatingSetpoint', async (value) => {
             this.thermoAuto?.log.info('Subscribe occupiedHeatingSetpoint called with:', value / 100);
-        }, this.thermoAuto.log, this.thermoAuto);
+        }, this.thermoAuto.log);
         this.thermoAuto.subscribeAttribute(ThermostatCluster.id, 'occupiedCoolingSetpoint', async (value) => {
             this.thermoAuto?.log.info('Subscribe occupiedCoolingSetpoint called with:', value / 100);
-        }, this.thermoAuto.log, this.thermoAuto);
-        this.thermoHeat = await this.createMutableDevice([thermostatDevice, bridgedNode], { uniqueStorageKey: 'ThermostatHeat' }, this.config.debug);
+        }, this.thermoAuto.log);
+        this.thermoHeat = new MatterbridgeEndpoint([thermostatDevice, bridgedNode, powerSource], { uniqueStorageKey: 'Thermostat (Heat)' }, this.config.debug);
         this.thermoHeat.log.logName = 'Thermostat (Heat)';
         this.thermoHeat.createDefaultIdentifyClusterServer();
         this.thermoHeat.createDefaultGroupsClusterServer();
-        this.thermoHeat.createDefaultScenesClusterServer();
         this.thermoHeat.createDefaultBridgedDeviceBasicInformationClusterServer('Thermostat (Heat)', '0x96382164H', 0xfff1, 'Matterbridge', 'Matterbridge Thermostat', parseInt(this.version.replace(/\D/g, '')), this.version === '' ? 'Unknown' : this.version, parseInt(this.matterbridge.matterbridgeVersion.replace(/\D/g, '')), this.matterbridge.matterbridgeVersion);
         this.thermoHeat.createDefaultHeatingThermostatClusterServer(20, 18, 5, 35);
-        this.thermoHeat.addDeviceType(powerSource);
         this.thermoHeat.createDefaultPowerSourceRechargeableBatteryClusterServer(70);
         const heatTempIN = this.thermoHeat.addChildDeviceType('TemperatureIN', [temperatureSensor], {
             tagList: [{ mfgCode: null, namespaceId: LocationTag.Indoor.namespaceId, tag: LocationTag.Indoor.tag, label: null }],
@@ -468,14 +439,12 @@ export class ExampleMatterbridgeDynamicPlatform extends MatterbridgeDynamicPlatf
         this.thermoHeat.subscribeAttribute(ThermostatCluster.id, 'occupiedHeatingSetpoint', async (value) => {
             this.thermoHeat?.log.info('Subscribe occupiedHeatingSetpoint called with:', value / 100);
         }, this.thermoHeat.log);
-        this.thermoCool = await this.createMutableDevice([thermostatDevice, bridgedNode], { uniqueStorageKey: 'ThermostatCool' }, this.config.debug);
+        this.thermoCool = new MatterbridgeEndpoint([thermostatDevice, bridgedNode, powerSource], { uniqueStorageKey: 'Thermostat (Cool)' }, this.config.debug);
         this.thermoCool.log.logName = 'Thermostat (Cool)';
         this.thermoCool.createDefaultIdentifyClusterServer();
         this.thermoCool.createDefaultGroupsClusterServer();
-        this.thermoCool.createDefaultScenesClusterServer();
         this.thermoCool.createDefaultBridgedDeviceBasicInformationClusterServer('Thermostat (Cool)', '0x96382164C', 0xfff1, 'Matterbridge', 'Matterbridge Thermostat', parseInt(this.version.replace(/\D/g, '')), this.version === '' ? 'Unknown' : this.version, parseInt(this.matterbridge.matterbridgeVersion.replace(/\D/g, '')), this.matterbridge.matterbridgeVersion);
         this.thermoCool.createDefaultCoolingThermostatClusterServer(20, 18, 5, 35);
-        this.thermoCool.addDeviceType(powerSource);
         this.thermoCool.createDefaultPowerSourceRechargeableBatteryClusterServer(70);
         await this.registerDevice(this.thermoCool);
         this.bridgedDevices.set(this.thermoCool.deviceName ?? '', this.thermoCool);
@@ -492,14 +461,13 @@ export class ExampleMatterbridgeDynamicPlatform extends MatterbridgeDynamicPlatf
         this.thermoCool.subscribeAttribute(ThermostatCluster.id, 'occupiedCoolingSetpoint', async (value) => {
             this.thermoCool?.log.info('Subscribe occupiedCoolingSetpoint called with:', value / 100);
         }, this.thermoCool.log);
-        this.airPurifier = await this.createMutableDevice([airPurifier, temperatureSensor, humiditySensor, bridgedNode], { uniqueStorageKey: 'Air purifier' }, this.config.debug);
+        this.airPurifier = new MatterbridgeEndpoint([airPurifier, temperatureSensor, humiditySensor, bridgedNode, powerSource], { uniqueStorageKey: 'Air purifier' }, this.config.debug);
         this.airPurifier.log.logName = 'Air purifier';
         this.airPurifier.createDefaultBridgedDeviceBasicInformationClusterServer('Air purifier', '0x96584864AP', 0xfff1, 'Matterbridge', 'Matterbridge Air purifier', parseInt(this.version.replace(/\D/g, '')), this.version === '' ? 'Unknown' : this.version, parseInt(this.matterbridge.matterbridgeVersion.replace(/\D/g, '')), this.matterbridge.matterbridgeVersion);
         this.airPurifier.createDefaultIdentifyClusterServer();
         this.airPurifier.createDefaultFanControlClusterServer();
         this.airPurifier.createDefaultTemperatureMeasurementClusterServer(20 * 100);
         this.airPurifier.createDefaultRelativeHumidityMeasurementClusterServer(50 * 100);
-        this.airPurifier.addDeviceType(powerSource);
         this.airPurifier.createDefaultPowerSourceWiredClusterServer();
         await this.registerDevice(this.airPurifier);
         this.bridgedDevices.set(this.airPurifier.deviceName ?? '', this.airPurifier);
@@ -532,7 +500,7 @@ export class ExampleMatterbridgeDynamicPlatform extends MatterbridgeDynamicPlatf
             if (isValidNumber(newValue, 0, 100))
                 await this.airPurifier?.setAttribute(FanControlCluster.id, 'percentCurrent', newValue, this.airPurifier?.log);
         }, this.airPurifier.log);
-        this.airConditioner = await this.createMutableDevice([airConditioner, bridgedNode], { uniqueStorageKey: 'Air conditioner' }, this.config.debug);
+        this.airConditioner = new MatterbridgeEndpoint([airConditioner, bridgedNode, powerSource], { uniqueStorageKey: 'Air conditioner' }, this.config.debug);
         this.airConditioner.log.logName = 'Air conditioner';
         this.airConditioner.createDefaultBridgedDeviceBasicInformationClusterServer('Air conditioner', '0x96382864AC', 0xfff1, 'Matterbridge', 'Matterbridge Air conditioner', parseInt(this.version.replace(/\D/g, '')), this.version === '' ? 'Unknown' : this.version, parseInt(this.matterbridge.matterbridgeVersion.replace(/\D/g, '')), this.matterbridge.matterbridgeVersion);
         this.airConditioner.createDefaultIdentifyClusterServer();
@@ -541,18 +509,17 @@ export class ExampleMatterbridgeDynamicPlatform extends MatterbridgeDynamicPlatf
         this.airConditioner.createDefaultFanControlClusterServer(FanControl.FanMode.Auto);
         this.airConditioner.createDefaultTemperatureMeasurementClusterServer(20 * 100);
         this.airConditioner.createDefaultRelativeHumidityMeasurementClusterServer(50 * 100);
-        this.airConditioner.addDeviceType(powerSource);
         this.airConditioner.createDefaultPowerSourceWiredClusterServer();
-        this.airConditioner.addRequiredClusterServers(this.airConditioner);
+        this.airConditioner.addRequiredClusterServers();
         await this.registerDevice(this.airConditioner);
         this.bridgedDevices.set(this.airConditioner.deviceName ?? '', this.airConditioner);
         this.airConditioner.addCommandHandler('identify', async ({ request: { identifyTime } }) => {
             this.airConditioner?.log.info(`Command identify called identifyTime:${identifyTime}`);
         });
         this.airConditioner.addCommandHandler('on', async () => {
-            await this.airConditioner?.setAttribute(OnOffCluster.id, 'onOff', true, this.airConditioner?.log);
             this.airConditioner?.log.info('Command on called');
             await this.airConditioner?.setAttribute(OnOffCluster.id, 'onOff', true, this.airConditioner?.log);
+            await this.airConditioner?.setAttribute(OnOffCluster.id, 'onOff', true, this.airConditioner?.log);
             await this.airConditioner?.setAttribute(ThermostatCluster.id, 'localTemperature', 20 * 100, this.airConditioner?.log);
             await this.airConditioner?.setAttribute(TemperatureMeasurementCluster.id, 'measuredValue', 20 * 100, this.airConditioner?.log);
             await this.airConditioner?.setAttribute(RelativeHumidityMeasurementCluster.id, 'measuredValue', 50 * 100, this.airConditioner?.log);
@@ -560,21 +527,20 @@ export class ExampleMatterbridgeDynamicPlatform extends MatterbridgeDynamicPlatf
             await this.airConditioner?.setAttribute(FanControlCluster.id, 'percentSetting', 50, this.airConditioner?.log);
         });
         this.airConditioner.addCommandHandler('off', async () => {
+            this.airConditioner?.log.info('Command off called');
             await this.airConditioner?.setAttribute(OnOffCluster.id, 'onOff', false, this.airConditioner?.log);
             await this.airConditioner?.setAttribute(ThermostatCluster.id, 'localTemperature', null, this.airConditioner?.log);
             await this.airConditioner?.setAttribute(TemperatureMeasurementCluster.id, 'measuredValue', null, this.airConditioner?.log);
             await this.airConditioner?.setAttribute(RelativeHumidityMeasurementCluster.id, 'measuredValue', null, this.airConditioner?.log);
             await this.airConditioner?.setAttribute(FanControlCluster.id, 'speedSetting', null, this.airConditioner?.log);
             await this.airConditioner?.setAttribute(FanControlCluster.id, 'percentSetting', null, this.airConditioner?.log);
-            this.airConditioner?.log.info('Command off called');
         });
-        this.pump = await this.createMutableDevice([pumpDevice, bridgedNode], { uniqueStorageKey: 'Pump' }, this.config.debug);
+        this.pump = new MatterbridgeEndpoint([pumpDevice, bridgedNode, powerSource], { uniqueStorageKey: 'Pump' }, this.config.debug);
         this.pump.log.logName = 'Pump';
         this.pump.createDefaultBridgedDeviceBasicInformationClusterServer('Pump', '0x96382864PUMP', 0xfff1, 'Matterbridge', 'Matterbridge Pump', parseInt(this.version.replace(/\D/g, '')), this.version === '' ? 'Unknown' : this.version, parseInt(this.matterbridge.matterbridgeVersion.replace(/\D/g, '')), this.matterbridge.matterbridgeVersion);
         this.pump.createDefaultIdentifyClusterServer();
         this.pump.createDefaultOnOffClusterServer(true);
         this.pump.createDefaultPumpConfigurationAndControlClusterServer();
-        this.pump.addDeviceType(powerSource);
         this.pump.createDefaultPowerSourceWiredClusterServer();
         await this.registerDevice(this.pump);
         this.bridgedDevices.set(this.pump.deviceName ?? '', this.pump);
@@ -582,29 +548,28 @@ export class ExampleMatterbridgeDynamicPlatform extends MatterbridgeDynamicPlatf
             this.pump?.log.info(`Command identify called identifyTime:${identifyTime}`);
         });
         this.pump.addCommandHandler('on', async () => {
-            await this.pump?.setAttribute(OnOffCluster.id, 'onOff', true, this.pump?.log);
             this.pump?.log.info('Command on called');
+            await this.pump?.setAttribute(OnOffCluster.id, 'onOff', true, this.pump?.log);
         });
         this.pump.addCommandHandler('off', async () => {
-            await this.pump?.setAttribute(OnOffCluster.id, 'onOff', false, this.pump?.log);
             this.pump?.log.info('Command off called');
+            await this.pump?.setAttribute(OnOffCluster.id, 'onOff', false, this.pump?.log);
         });
-        this.valve = await this.createMutableDevice([waterValve, bridgedNode], { uniqueStorageKey: 'Water valve' }, this.config.debug);
+        this.valve = new MatterbridgeEndpoint([waterValve, bridgedNode, powerSource], { uniqueStorageKey: 'Water valve' }, this.config.debug);
         this.valve.log.logName = 'Water valve';
         this.valve.createDefaultBridgedDeviceBasicInformationClusterServer('Water valve', '0x96382864WV', 0xfff1, 'Matterbridge', 'Matterbridge Water valve', parseInt(this.version.replace(/\D/g, '')), this.version === '' ? 'Unknown' : this.version, parseInt(this.matterbridge.matterbridgeVersion.replace(/\D/g, '')), this.matterbridge.matterbridgeVersion);
         this.valve.createDefaultIdentifyClusterServer();
         this.valve.createDefaultValveConfigurationAndControlClusterServer();
-        this.valve.addDeviceType(powerSource);
         this.valve.createDefaultPowerSourceWiredClusterServer();
         await this.registerDevice(this.valve);
         this.bridgedDevices.set(this.valve.deviceName ?? '', this.valve);
         this.valve.addCommandHandler('identify', async ({ request: { identifyTime } }) => {
             this.valve?.log.info(`Command identify called identifyTime:${identifyTime}`);
         });
-        this.fan = await this.createMutableDevice([fanDevice, bridgedNode], { uniqueStorageKey: 'Fan' }, this.config.debug);
+        this.fan = new MatterbridgeEndpoint([fanDevice, bridgedNode], { uniqueStorageKey: 'Fan' }, this.config.debug);
         this.fan.log.logName = 'Fan';
         this.fan.createDefaultBridgedDeviceBasicInformationClusterServer('Fan', 'serial_980545631228', 0xfff1, 'Matterbridge', 'Matterbridge Fan', parseInt(this.version.replace(/\D/g, '')), this.version === '' ? 'Unknown' : this.version, parseInt(this.matterbridge.matterbridgeVersion.replace(/\D/g, '')), this.matterbridge.matterbridgeVersion);
-        this.fan.addDeviceTypeWithClusterServer([fanDevice], []);
+        this.fan.addRequiredClusterServers();
         await this.registerDevice(this.fan);
         this.bridgedDevices.set(this.fan.deviceName ?? '', this.fan);
         this.fan.subscribeAttribute(FanControlCluster.id, 'fanMode', async (newValue, oldValue) => {
@@ -627,7 +592,7 @@ export class ExampleMatterbridgeDynamicPlatform extends MatterbridgeDynamicPlatf
             else if (newValue === FanControl.FanMode.Auto) {
                 await this.fan?.setAttribute(FanControlCluster.id, 'percentCurrent', 50, this.fan?.log);
             }
-        }, this.fan.log, this.fan);
+        }, this.fan.log);
         this.fan.subscribeAttribute(FanControlCluster.id, 'percentSetting', async (newValue, oldValue) => {
             this.fan?.log.info(`Percent setting changed from ${oldValue} to ${newValue}`);
             if (isValidNumber(newValue, 0, 100))
@@ -638,40 +603,43 @@ export class ExampleMatterbridgeDynamicPlatform extends MatterbridgeDynamicPlatf
             if (isValidNumber(newValue, 0, 100))
                 await this.fan?.setAttribute(FanControlCluster.id, 'speedCurrent', newValue, this.fan?.log);
         }, this.fan.log);
-        this.waterLeak = await this.createMutableDevice([waterLeakDetector, bridgedNode], { uniqueStorageKey: 'Water leak detector' }, this.config.debug);
+        this.waterLeak = new MatterbridgeEndpoint([waterLeakDetector, bridgedNode], { uniqueStorageKey: 'Water leak detector' }, this.config.debug);
         this.waterLeak.log.logName = 'Water leak detector';
         this.waterLeak.createDefaultBridgedDeviceBasicInformationClusterServer('Water leak detector', 'serial_98745631222', 0xfff1, 'Matterbridge', 'Matterbridge WaterLeakDetector', parseInt(this.version.replace(/\D/g, '')), this.version === '' ? 'Unknown' : this.version, parseInt(this.matterbridge.matterbridgeVersion.replace(/\D/g, '')), this.matterbridge.matterbridgeVersion);
-        this.waterLeak.addDeviceTypeWithClusterServer([waterLeakDetector], [BooleanStateConfiguration.Cluster.id]);
+        this.waterLeak.addRequiredClusterServers();
+        this.waterLeak.addOptionalClusterServers();
         await this.registerDevice(this.waterLeak);
         this.bridgedDevices.set(this.waterLeak.deviceName ?? '', this.waterLeak);
         await this.waterLeak.setAttribute(BooleanStateCluster.id, 'stateValue', false, this.waterLeak.log);
-        this.waterFreeze = await this.createMutableDevice([waterFreezeDetector, bridgedNode], { uniqueStorageKey: 'Water freeze detector' }, this.config.debug);
+        this.waterFreeze = new MatterbridgeEndpoint([waterFreezeDetector, bridgedNode], { uniqueStorageKey: 'Water freeze detector' }, this.config.debug);
         this.waterFreeze.log.logName = 'Water freeze detector';
         this.waterFreeze.createDefaultBridgedDeviceBasicInformationClusterServer('Water freeze detector', 'serial_98745631223', 0xfff1, 'Matterbridge', 'Matterbridge WaterFreezeDetector', parseInt(this.version.replace(/\D/g, '')), this.version === '' ? 'Unknown' : this.version, parseInt(this.matterbridge.matterbridgeVersion.replace(/\D/g, '')), this.matterbridge.matterbridgeVersion);
-        this.waterFreeze.addDeviceTypeWithClusterServer([waterFreezeDetector], [BooleanStateConfiguration.Cluster.id]);
+        this.waterFreeze.addRequiredClusterServers();
+        this.waterFreeze.addOptionalClusterServers();
         await this.registerDevice(this.waterFreeze);
         this.bridgedDevices.set(this.waterFreeze.deviceName ?? '', this.waterFreeze);
         await this.waterFreeze.setAttribute(BooleanStateCluster.id, 'stateValue', false, this.waterFreeze.log);
-        this.rain = await this.createMutableDevice([rainSensor, bridgedNode], { uniqueStorageKey: 'Rain sensor' }, this.config.debug);
+        this.rain = new MatterbridgeEndpoint([rainSensor, bridgedNode], { uniqueStorageKey: 'Rain sensor' }, this.config.debug);
         this.rain.log.logName = 'Rain sensor';
         this.rain.createDefaultBridgedDeviceBasicInformationClusterServer('Rain sensor', 'serial_98745631224', 0xfff1, 'Matterbridge', 'Matterbridge RainSensor', parseInt(this.version.replace(/\D/g, '')), this.version === '' ? 'Unknown' : this.version, parseInt(this.matterbridge.matterbridgeVersion.replace(/\D/g, '')), this.matterbridge.matterbridgeVersion);
-        this.rain.addDeviceTypeWithClusterServer([rainSensor], [BooleanStateConfiguration.Cluster.id]);
+        this.rain.createDefaultIdentifyClusterServer();
+        this.rain.createDefaultBooleanStateClusterServer(false);
+        this.rain.createDefaultBooleanStateConfigurationClusterServer();
         await this.registerDevice(this.rain);
         this.bridgedDevices.set(this.rain.deviceName ?? '', this.rain);
-        await this.rain.setAttribute(BooleanStateCluster.id, 'stateValue', false, this.rain.log);
-        this.smoke = await this.createMutableDevice([smokeCoAlarm, bridgedNode], { uniqueStorageKey: 'Smoke alarm sensor' }, this.config.debug);
+        this.smoke = new MatterbridgeEndpoint([smokeCoAlarm, bridgedNode], { uniqueStorageKey: 'Smoke alarm sensor' }, this.config.debug);
         this.smoke.log.logName = 'Smoke alarm sensor';
         this.smoke.createDefaultBridgedDeviceBasicInformationClusterServer('Smoke alarm sensor', 'serial_94745631225', 0xfff1, 'Matterbridge', 'Matterbridge SmokeCoAlarm', parseInt(this.version.replace(/\D/g, '')), this.version === '' ? 'Unknown' : this.version, parseInt(this.matterbridge.matterbridgeVersion.replace(/\D/g, '')), this.matterbridge.matterbridgeVersion);
-        this.smoke.addDeviceTypeWithClusterServer([smokeCoAlarm], [CarbonMonoxideConcentrationMeasurement.Cluster.id]);
+        this.smoke.createDefaultIdentifyClusterServer();
+        this.smoke.createDefaultSmokeCOAlarmClusterServer(SmokeCoAlarm.AlarmState.Normal, SmokeCoAlarm.AlarmState.Normal);
+        this.smoke.createDefaultCarbonMonoxideConcentrationMeasurementClusterServer(100);
         await this.registerDevice(this.smoke);
         this.bridgedDevices.set(this.smoke.deviceName ?? '', this.smoke);
-        await this.smoke.setAttribute(SmokeCoAlarmCluster.id, 'smokeState', SmokeCoAlarm.AlarmState.Normal, this.smoke.log);
-        await this.smoke.setAttribute(SmokeCoAlarmCluster.id, 'coState', SmokeCoAlarm.AlarmState.Normal, this.smoke.log);
-        await this.smoke.setAttribute(CarbonMonoxideConcentrationMeasurement.Cluster.id, 'measuredValue', 100, this.smoke.log);
-        this.airQuality = await this.createMutableDevice([airQualitySensor, bridgedNode], { uniqueStorageKey: 'Air quality sensor' }, this.config.debug);
+        this.airQuality = new MatterbridgeEndpoint([airQualitySensor, bridgedNode], { uniqueStorageKey: 'Air quality sensor' }, this.config.debug);
         this.airQuality.log.logName = 'Air quality Sensor';
         this.airQuality.createDefaultBridgedDeviceBasicInformationClusterServer('Air quality sensor', 'serial_987484318322', 0xfff1, 'Matterbridge', 'Matterbridge Air Quality Sensor', parseInt(this.version.replace(/\D/g, '')), this.version === '' ? 'Unknown' : this.version, parseInt(this.matterbridge.matterbridgeVersion.replace(/\D/g, '')), this.matterbridge.matterbridgeVersion);
-        this.airQuality.addDeviceTypeWithClusterServer([airQualitySensor], [
+        this.airQuality.addRequiredClusterServers();
+        this.airQuality.addClusterServers([
             TemperatureMeasurement.Cluster.id,
             RelativeHumidityMeasurement.Cluster.id,
             CarbonMonoxideConcentrationMeasurement.Cluster.id,
@@ -702,6 +670,7 @@ export class ExampleMatterbridgeDynamicPlatform extends MatterbridgeDynamicPlatf
         await this.airQuality.setAttribute(TotalVolatileOrganicCompoundsConcentrationMeasurement.Cluster.id, 'measuredValue', 100, this.airQuality.log);
     }
     async onConfigure() {
+        await super.onConfigure();
         this.log.info('onConfigure called');
         await this.switch?.setAttribute(OnOffCluster.id, 'onOff', false, this.switch.log);
         this.switch?.log.info('Set switch initial onOff to false');
@@ -745,7 +714,7 @@ export class ExampleMatterbridgeDynamicPlatform extends MatterbridgeDynamicPlatf
             let level = this.light?.getAttribute(LevelControlCluster.id, 'currentLevel', this.light.log);
             if (isValidBoolean(state) && isValidNumber(level, 0, 254)) {
                 level += 10;
-                if (level >= 250) {
+                if (level >= 230) {
                     level = 1;
                     await this.lightOnOff?.setAttribute(OnOffCluster.id, 'onOff', false, this.lightOnOff.log);
                     await this.dimmer?.setAttribute(OnOffCluster.id, 'onOff', false, this.dimmer.log);
@@ -777,9 +746,6 @@ export class ExampleMatterbridgeDynamicPlatform extends MatterbridgeDynamicPlatf
                     this.log.info(`Set lights currentLevel to ${level}`);
                 }
             }
-            else {
-                this.log.error(`Invalid state ${state} or level ${level}`);
-            }
         }, 60 * 1000 + 200);
         await this.outlet?.setAttribute(OnOffCluster.id, 'onOff', false, this.outlet.log);
         this.outlet?.log.info('Set outlet initial onOff to false');
@@ -815,11 +781,11 @@ export class ExampleMatterbridgeDynamicPlatform extends MatterbridgeDynamicPlatf
         await this.thermoAuto?.setAttribute(ThermostatCluster.id, 'systemMode', Thermostat.SystemMode.Auto, this.thermoAuto.log);
         this.thermoAuto?.log.info('Set thermostat initial localTemperature to 16°C and mode Auto');
         const temperature = this.thermoAuto?.getChildEndpointByName('Temperature');
-        await this.thermoAuto?.setAttribute(TemperatureMeasurementCluster.id, 'measuredValue', 16 * 100, this.thermoAuto.log, temperature);
+        await temperature?.setAttribute(TemperatureMeasurementCluster.id, 'measuredValue', 16 * 100, this.thermoAuto?.log);
         const humidity = this.thermoAuto?.getChildEndpointByName('Humidity');
-        await this.thermoAuto?.setAttribute(RelativeHumidityMeasurementCluster.id, 'measuredValue', 50 * 100, this.thermoAuto.log, humidity);
+        await humidity?.setAttribute(RelativeHumidityMeasurementCluster.id, 'measuredValue', 50 * 100, this.thermoAuto?.log);
         const flow = this.thermoAuto?.getChildEndpointByName('Flow');
-        await this.thermoAuto?.setAttribute(FlowMeasurementCluster.id, 'measuredValue', 10, this.thermoAuto.log, flow);
+        await flow?.setAttribute(FlowMeasurementCluster.id, 'measuredValue', 10, this.thermoAuto?.log);
         this.thermoAuto?.log.info('Set thermostat ext temperature to 16°C, ext humidity to 50% and ext valve flow to 10');
         this.thermoInterval = setInterval(async () => {
             let temperature = this.thermoAuto?.getAttribute(ThermostatCluster.id, 'localTemperature', this.thermoAuto.log);
@@ -832,18 +798,19 @@ export class ExampleMatterbridgeDynamicPlatform extends MatterbridgeDynamicPlatf
                 const tempOut = this.thermoHeat?.getChildEndpointByName('TemperatureOUT');
                 await tempOut?.setAttribute(TemperatureMeasurementCluster.id, 'measuredValue', temperature - 400, this.thermoHeat?.log);
                 await this.thermoCool?.setAttribute(ThermostatCluster.id, 'localTemperature', temperature, this.thermoCool.log);
-                const temp = this.thermoAuto?.getChildEndpointByName('Temperature');
-                await this.thermoAuto?.setAttribute(TemperatureMeasurementCluster.id, 'measuredValue', temperature, this.thermoAuto.log, temp);
-                const humidity = this.thermoAuto?.getChildEndpointByName('Humidity');
-                await this.thermoAuto?.setAttribute(RelativeHumidityMeasurementCluster.id, 'measuredValue', 50 * 100, this.thermoAuto.log, humidity);
-                const flow = this.thermoAuto?.getChildEndpointByName('Flow');
-                await this.thermoAuto?.setAttribute(FlowMeasurementCluster.id, 'measuredValue', 10, this.thermoAuto.log, flow);
+                const temp = this.thermoCool?.getChildEndpointByName('Temperature');
+                await temp?.setAttribute(TemperatureMeasurementCluster.id, 'measuredValue', temperature, this.thermoCool?.log);
+                const humidity = this.thermoCool?.getChildEndpointByName('Humidity');
+                await humidity?.setAttribute(RelativeHumidityMeasurementCluster.id, 'measuredValue', 50 * 100, this.thermoCool?.log);
+                const flow = this.thermoCool?.getChildEndpointByName('Flow');
+                await flow?.setAttribute(FlowMeasurementCluster.id, 'measuredValue', 10, this.thermoCool?.log);
                 this.thermoAuto?.log.info(`Set thermostat localTemperature to ${temperature / 100}°C`);
                 this.thermoHeat?.log.info(`Set thermostat localTemperature to ${temperature / 100}°C`);
                 this.thermoCool?.log.info(`Set thermostat localTemperature to ${temperature / 100}°C`);
             }
         }, 60 * 1000 + 600);
         await this.airConditioner?.setAttribute(OnOffCluster.id, 'onOff', true, this.airConditioner.log);
+        await this.airConditioner?.setAttribute(ThermostatCluster.id, 'localTemperature', 2000, this.airConditioner.log);
         this.airConditionerInterval = setInterval(async () => {
             let temperature = this.airConditioner?.getAttribute(ThermostatCluster.id, 'localTemperature', this.airConditioner.log);
             if (isValidNumber(temperature, 1600, 2400)) {
@@ -919,7 +886,6 @@ export class ExampleMatterbridgeDynamicPlatform extends MatterbridgeDynamicPlatf
         }, 60 * 1000 + 1100);
     }
     async onShutdown(reason) {
-        this.log.info('onShutdown called with reason:', reason ?? 'none');
         clearInterval(this.switchInterval);
         clearInterval(this.lightInterval);
         clearInterval(this.outletInterval);
@@ -933,6 +899,8 @@ export class ExampleMatterbridgeDynamicPlatform extends MatterbridgeDynamicPlatf
         clearInterval(this.smokeInterval);
         clearInterval(this.airQualityInterval);
         clearInterval(this.airConditionerInterval);
+        await super.onShutdown(reason);
+        this.log.info('onShutdown called with reason:', reason ?? 'none');
         if (this.config.unregisterOnShutdown === true)
             await this.unregisterAllDevices();
     }

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "matterbridge-example-dynamic-platform",
-  "version": "1.1.4-dev.1",
+  "version": "1.1.5-dev.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "matterbridge-example-dynamic-platform",
-      "version": "1.1.4-dev.1",
+      "version": "1.1.5-dev.1",
       "license": "MIT",
       "dependencies": {
         "node-ansi-logger": "3.0.0",
@@ -34,10 +34,13 @@
       }
     },
     "node_modules/node-persist": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/node-persist/-/node-persist-4.0.3.tgz",
-      "integrity": "sha512-0gDy86TNShzfbpUKFbH8KJFjoovuUgVh/FqL4jrJWYz0cET76Uohl118utG/Ft6wl4sHOPXdRSY7eXH5kVY06w==",
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/node-persist/-/node-persist-4.0.4.tgz",
+      "integrity": "sha512-8sPAz/7tw1mCCc8xBG4f0wi+flHkSSgQeX998iQ75Pu27evA6UUWCjSE7xnrYTg2q33oU5leJ061EKPDv6BocQ==",
       "license": "MIT",
+      "dependencies": {
+        "p-limit": "^3.1.0"
+      },
       "engines": {
         "node": ">=10.12.0"
       }
@@ -57,6 +60,33 @@
         "type": "buymeacoffee",
         "url": "https://www.buymeacoffee.com/luligugithub"
       }
+    },
+    "node_modules/p-limit": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
+      "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
+      "license": "MIT",
+      "dependencies": {
+        "yocto-queue": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/yocto-queue": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
+      "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
     }
   }
 }

package/package.json

@@ -1,12 +1,11 @@
 {
   "name": "matterbridge-example-dynamic-platform",
-  "version": "1.1.4-dev.1",
+  "version": "1.1.5-dev.1",
   "description": "Matterbridge dynamic plugin",
   "author": "https://github.com/Luligu",
   "license": "MIT",
   "type": "module",
   "main": "dist/index.js",
-  "types": "dist/index.d.ts",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/Luligu/matterbridge-example-dynamic-platform.git"