matterbridge-example-dynamic-platform 1.3.4-dev-20250720-e338589 → 1.3.5-dev-20250722-a63fdf7

package/CHANGELOG.md

@@ -23,11 +23,13 @@ If you like this project and find it useful, please consider giving it a star on
   <img src="bmc-button.svg" alt="Buy me a coffee" width="120">
 </a>
 
-## [1.3.4] - 2025-07-22
+## [1.3.5] - 2025-07-22
 
 ### Added
 
 - [platform]: Changed to the new ExtratorHood() and Dishwasher() from Matterbridge.
+- [platform]: Added a Fan with on Off Low Med High.
+- [platform]: Added a Fan with complete set of features.
 
 ### Changed
 

package/README.md

@@ -17,7 +17,7 @@
 
 Matterbridge dynamic platform example plugin is a template to develop your own plugin using the dynamic platform.
 
-It exposes 44 virtual devices:
+It exposes 46 virtual devices:
 
 - a switch with onOff cluster
 - a light with onOff
@@ -34,7 +34,9 @@ It exposes 44 virtual devices:
   and relativeHumidityMeasurement cluster (to show how to create a composed device with sub endpoints)
 - a thermo heat only with two external temperature sensors (tagged like Indoor and Outdoor)
 - a thermo cool only
-- a fan with FanControl cluster
+- a fan with Off Low Med High presets
+- a fan with Off Low Med High Auto presets and step
+- a fan with all the features
 - a rainSensor device
 - a waterFreezeDetector device
 - a waterLeakDetector device

package/dist/platform.js

@@ -1,6 +1,7 @@
 import { MatterbridgeEndpoint, MatterbridgeDynamicPlatform, airQualitySensor, bridgedNode, colorTemperatureLight, coverDevice, dimmableLight, doorLockDevice, fanDevice, flowSensor, humiditySensor, onOffLight, onOffOutlet, onOffSwitch, powerSource, rainSensor, smokeCoAlarm, temperatureSensor, thermostatDevice, waterFreezeDetector, waterLeakDetector, airPurifier, pumpDevice, waterValve, genericSwitch, airConditioner, cooktop, microwaveOven, oven, refrigerator, onOffMountedSwitch, dimmableMountedSwitch, extendedColorLight, } from 'matterbridge';
 import { RoboticVacuumCleaner, LaundryWasher, WaterHeater, Evse, SolarPower, BatteryStorage, LaundryDryer, HeatPump, Dishwasher, ExtractorHood } from 'matterbridge/devices';
 import { isValidBoolean, isValidNumber } from 'matterbridge/utils';
+import { debugStringify } from 'matterbridge/logger';
 import { AreaNamespaceTag, LocationTag, NumberTag, PositionTag } from 'matterbridge/matter';
 import { PowerSource, BooleanState, OnOff, LevelControl, AirQuality, CarbonDioxideConcentrationMeasurement, CarbonMonoxideConcentrationMeasurement, FlowMeasurement, ColorControl, DoorLock, FanControl, FormaldehydeConcentrationMeasurement, NitrogenDioxideConcentrationMeasurement, OzoneConcentrationMeasurement, Pm10ConcentrationMeasurement, Pm1ConcentrationMeasurement, Pm25ConcentrationMeasurement, RadonConcentrationMeasurement, RelativeHumidityMeasurement, RelativeHumidityMeasurementCluster, SmokeCoAlarm, TemperatureMeasurement, Thermostat, ThermostatCluster, TotalVolatileOrganicCompoundsConcentrationMeasurement, WindowCovering, EnergyEvseMode, EnergyEvse, RvcRunMode, RvcCleanMode, } from 'matterbridge/matter/clusters';
 import { Appliances } from './appliances.js';
@@ -22,6 +23,8 @@ export class ExampleMatterbridgeDynamicPlatform extends MatterbridgeDynamicPlatf
     thermoHeat;
     thermoCool;
     fan;
+    fanauto;
+    fanComplete;
     waterLeak;
     waterFreeze;
     rain;
@@ -36,6 +39,7 @@ export class ExampleMatterbridgeDynamicPlatform extends MatterbridgeDynamicPlatf
     momentarySwitch;
     latchingSwitch;
     vacuum;
+    roboticVacuum;
     waterHeater;
     evse;
     laundryWasher;
@@ -65,6 +69,7 @@ export class ExampleMatterbridgeDynamicPlatform extends MatterbridgeDynamicPlatf
     intervalColorTemperature = 147;
     bridgedDevices = new Map();
     fanModeLookup = ['Off', 'Low', 'Medium', 'High', 'On', 'Auto', 'Smart'];
+    fanDirectionLookup = ['Forward', 'Reverse'];
     constructor(matterbridge, log, config) {
         super(matterbridge, log, config);
         if (this.verifyMatterbridgeVersion === undefined || typeof this.verifyMatterbridgeVersion !== 'function' || !this.verifyMatterbridgeVersion('3.1.6')) {
@@ -90,14 +95,7 @@ export class ExampleMatterbridgeDynamicPlatform extends MatterbridgeDynamicPlatf
             .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)
             .createDefaultOnOffClusterServer()
             .createDefaultPowerSourceRechargeableBatteryClusterServer(70);
-        this.setSelectDevice(this.switch.serialNumber ?? '', this.switch.deviceName ?? '', undefined, 'hub');
-        if (this.validateDevice(this.switch.deviceName ?? '')) {
-            await this.registerDevice(this.switch);
-            this.bridgedDevices.set(this.switch.deviceName ?? '', this.switch);
-        }
-        else {
-            this.switch = undefined;
-        }
+        this.switch = await this.addDevice(this.switch);
         this.switch?.addCommandHandler('identify', async ({ request: { identifyTime } }) => {
             this.log.info(`Command identify called identifyTime:${identifyTime}`);
         });
@@ -115,14 +113,7 @@ export class ExampleMatterbridgeDynamicPlatform extends MatterbridgeDynamicPlatf
             .createDefaultBridgedDeviceBasicInformationClusterServer('OnOff Mounted Switch', '0x298242164', 0xfff1, 'Matterbridge', 'Matterbridge OnOff Mounted Switch', parseInt(this.version.replace(/\D/g, '')), this.version === '' ? 'Unknown' : this.version, parseInt(this.matterbridge.matterbridgeVersion.replace(/\D/g, '')), this.matterbridge.matterbridgeVersion)
             .createDefaultOnOffClusterServer()
             .createDefaultPowerSourceRechargeableBatteryClusterServer(70);
-        this.setSelectDevice(this.mountedOnOffSwitch.serialNumber ?? '', this.mountedOnOffSwitch.deviceName ?? '', undefined, 'hub');
-        if (this.validateDevice(this.mountedOnOffSwitch.deviceName ?? '')) {
-            await this.registerDevice(this.mountedOnOffSwitch);
-            this.bridgedDevices.set(this.mountedOnOffSwitch.deviceName ?? '', this.mountedOnOffSwitch);
-        }
-        else {
-            this.mountedOnOffSwitch = undefined;
-        }
+        this.mountedOnOffSwitch = await this.addDevice(this.mountedOnOffSwitch);
         this.mountedOnOffSwitch?.addCommandHandler('identify', async ({ request: { identifyTime } }) => {
             this.mountedOnOffSwitch?.log.info(`Command identify called identifyTime:${identifyTime}`);
         });
@@ -142,14 +133,7 @@ export class ExampleMatterbridgeDynamicPlatform extends MatterbridgeDynamicPlatf
             .createDefaultLevelControlClusterServer()
             .createDefaultPowerSourceWiredClusterServer()
             .addRequiredClusterServers();
-        this.setSelectDevice(this.mountedDimmerSwitch.serialNumber ?? '', this.mountedDimmerSwitch.deviceName ?? '', undefined, 'hub');
-        if (this.validateDevice(this.mountedDimmerSwitch.deviceName ?? '')) {
-            await this.registerDevice(this.mountedDimmerSwitch);
-            this.bridgedDevices.set(this.mountedDimmerSwitch.deviceName ?? '', this.mountedDimmerSwitch);
-        }
-        else {
-            this.mountedDimmerSwitch = undefined;
-        }
+        this.mountedDimmerSwitch = await this.addDevice(this.mountedDimmerSwitch);
         this.mountedDimmerSwitch?.addCommandHandler('identify', async ({ request: { identifyTime } }) => {
             this.mountedDimmerSwitch?.log.info(`Command identify called identifyTime:${identifyTime}`);
         });
@@ -175,14 +159,7 @@ export class ExampleMatterbridgeDynamicPlatform extends MatterbridgeDynamicPlatf
             .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)
             .createDefaultOnOffClusterServer()
             .createDefaultPowerSourceWiredClusterServer();
-        this.setSelectDevice(this.lightOnOff.serialNumber ?? '', this.lightOnOff.deviceName ?? '', undefined, 'hub');
-        if (this.validateDevice(this.lightOnOff.deviceName ?? '')) {
-            await this.registerDevice(this.lightOnOff);
-            this.bridgedDevices.set(this.lightOnOff.deviceName ?? '', this.lightOnOff);
-        }
-        else {
-            this.lightOnOff = undefined;
-        }
+        this.lightOnOff = await this.addDevice(this.lightOnOff);
         this.lightOnOff?.addCommandHandler('identify', async ({ request: { identifyTime } }) => {
             this.lightOnOff?.log.info(`Command identify called identifyTime:${identifyTime}`);
         });
@@ -201,14 +178,7 @@ export class ExampleMatterbridgeDynamicPlatform extends MatterbridgeDynamicPlatf
             .createDefaultOnOffClusterServer()
             .createDefaultLevelControlClusterServer()
             .createDefaultPowerSourceReplaceableBatteryClusterServer(70, PowerSource.BatChargeLevel.Ok, 2990, '2 x AA', 2);
-        this.setSelectDevice(this.dimmer.serialNumber ?? '', this.dimmer.deviceName ?? '', undefined, 'hub');
-        if (this.validateDevice(this.dimmer.deviceName ?? '')) {
-            await this.registerDevice(this.dimmer);
-            this.bridgedDevices.set(this.dimmer.deviceName ?? '', this.dimmer);
-        }
-        else {
-            this.dimmer = undefined;
-        }
+        this.dimmer = await this.addDevice(this.dimmer);
         this.dimmer?.addCommandHandler('identify', async ({ request: { identifyTime } }) => {
             this.dimmer?.log.info(`Command identify called identifyTime:${identifyTime}`);
         });
@@ -236,14 +206,7 @@ export class ExampleMatterbridgeDynamicPlatform extends MatterbridgeDynamicPlatf
             .createDefaultLevelControlClusterServer()
             .createDefaultColorControlClusterServer()
             .createDefaultPowerSourceReplaceableBatteryClusterServer(70);
-        this.setSelectDevice(this.light.serialNumber ?? '', this.light.deviceName ?? '', undefined, 'hub');
-        if (this.validateDevice(this.light.deviceName ?? '')) {
-            await this.registerDevice(this.light);
-            this.bridgedDevices.set(this.light.deviceName ?? '', this.light);
-        }
-        else {
-            this.light = undefined;
-        }
+        this.light = await this.addDevice(this.light);
         this.light?.addCommandHandler('identify', async ({ request: { identifyTime } }) => {
             this.light?.log.info(`Command identify called identifyTime:${identifyTime}`);
         });
@@ -293,14 +256,7 @@ export class ExampleMatterbridgeDynamicPlatform extends MatterbridgeDynamicPlatf
             .createDefaultLevelControlClusterServer()
             .createHsColorControlClusterServer()
             .createDefaultPowerSourceWiredClusterServer();
-        this.setSelectDevice(this.lightHS.serialNumber ?? '', this.lightHS.deviceName ?? '', undefined, 'hub');
-        if (this.validateDevice(this.lightHS.deviceName ?? '')) {
-            await this.registerDevice(this.lightHS);
-            this.bridgedDevices.set(this.lightHS.deviceName ?? '', this.lightHS);
-        }
-        else {
-            this.lightHS = undefined;
-        }
+        this.lightHS = await this.addDevice(this.lightHS);
         this.lightHS?.addCommandHandler('identify', async ({ request: { identifyTime } }) => {
             this.lightHS?.log.info(`Command identify called identifyTime:${identifyTime}`);
         });
@@ -345,14 +301,7 @@ export class ExampleMatterbridgeDynamicPlatform extends MatterbridgeDynamicPlatf
             .createDefaultLevelControlClusterServer()
             .createXyColorControlClusterServer()
             .createDefaultPowerSourceWiredClusterServer();
-        this.setSelectDevice(this.lightXY.serialNumber ?? '', this.lightXY.deviceName ?? '', undefined, 'hub');
-        if (this.validateDevice(this.lightXY.deviceName ?? '')) {
-            await this.registerDevice(this.lightXY);
-            this.bridgedDevices.set(this.lightXY.deviceName ?? '', this.lightXY);
-        }
-        else {
-            this.lightXY = undefined;
-        }
+        this.lightXY = await this.addDevice(this.lightXY);
         this.lightXY?.addCommandHandler('identify', async ({ request: { identifyTime } }) => {
             this.lightXY?.log.info(`Command identify called identifyTime:${identifyTime}`);
         });
@@ -389,14 +338,7 @@ export class ExampleMatterbridgeDynamicPlatform extends MatterbridgeDynamicPlatf
             .createDefaultLevelControlClusterServer()
             .createCtColorControlClusterServer()
             .createDefaultPowerSourceReplaceableBatteryClusterServer(70);
-        this.setSelectDevice(this.lightCT.serialNumber ?? '', this.lightCT.deviceName ?? '', undefined, 'hub');
-        if (this.validateDevice(this.lightCT.deviceName ?? '')) {
-            await this.registerDevice(this.lightCT);
-            this.bridgedDevices.set(this.lightCT.deviceName ?? '', this.lightCT);
-        }
-        else {
-            this.lightCT = undefined;
-        }
+        this.lightCT = await this.addDevice(this.lightCT);
         this.lightCT?.addCommandHandler('identify', async ({ request: { identifyTime } }) => {
             this.lightCT?.log.info(`Command identify called identifyTime:${identifyTime}`);
         });
@@ -426,14 +368,7 @@ export class ExampleMatterbridgeDynamicPlatform extends MatterbridgeDynamicPlatf
             .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)
             .createDefaultOnOffClusterServer()
             .createDefaultPowerSourceWiredClusterServer();
-        this.setSelectDevice(this.outlet.serialNumber ?? '', this.outlet.deviceName ?? '', undefined, 'hub');
-        if (this.validateDevice(this.outlet.deviceName ?? '')) {
-            await this.registerDevice(this.outlet);
-            this.bridgedDevices.set(this.outlet.deviceName ?? '', this.outlet);
-        }
-        else {
-            this.outlet = undefined;
-        }
+        this.outlet = await this.addDevice(this.outlet);
         this.outlet?.addCommandHandler('identify', async ({ request: { identifyTime } }) => {
             this.outlet?.log.info(`Command identify called identifyTime:${identifyTime}`);
         });
@@ -451,14 +386,7 @@ export class ExampleMatterbridgeDynamicPlatform extends MatterbridgeDynamicPlatf
             .createDefaultBridgedDeviceBasicInformationClusterServer('Cover lift', 'CL01020564', 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)
             .createDefaultWindowCoveringClusterServer()
             .createDefaultPowerSourceRechargeableBatteryClusterServer(86);
-        this.setSelectDevice(this.coverLift.serialNumber ?? '', this.coverLift.deviceName ?? '', undefined, 'hub');
-        if (this.validateDevice(this.coverLift.deviceName ?? '')) {
-            await this.registerDevice(this.coverLift);
-            this.bridgedDevices.set(this.coverLift.deviceName ?? '', this.coverLift);
-        }
-        else {
-            this.coverLift = undefined;
-        }
+        this.coverLift = await this.addDevice(this.coverLift);
         this.coverLift?.addCommandHandler('identify', async ({ request: { identifyTime } }) => {
             this.coverLift?.log.info(`Command identify called identifyTime:${identifyTime}`);
         });
@@ -484,14 +412,7 @@ export class ExampleMatterbridgeDynamicPlatform extends MatterbridgeDynamicPlatf
             .createDefaultBridgedDeviceBasicInformationClusterServer('Cover lift and tilt', 'CLT01020554', 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)
             .createDefaultLiftTiltWindowCoveringClusterServer()
             .createDefaultPowerSourceRechargeableBatteryClusterServer(86);
-        this.setSelectDevice(this.coverLiftTilt.serialNumber ?? '', this.coverLiftTilt.deviceName ?? '', undefined, 'hub');
-        if (this.validateDevice(this.coverLiftTilt.deviceName ?? '')) {
-            await this.registerDevice(this.coverLiftTilt);
-            this.bridgedDevices.set(this.coverLiftTilt.deviceName ?? '', this.coverLiftTilt);
-        }
-        else {
-            this.coverLiftTilt = undefined;
-        }
+        this.coverLiftTilt = await this.addDevice(this.coverLiftTilt);
         this.coverLiftTilt?.addCommandHandler('identify', async ({ request: { identifyTime } }) => {
             this.coverLiftTilt?.log.info(`Command identify called identifyTime:${identifyTime}`);
         });
@@ -521,14 +442,7 @@ export class ExampleMatterbridgeDynamicPlatform extends MatterbridgeDynamicPlatf
             .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)
             .createDefaultDoorLockClusterServer()
             .createDefaultPowerSourceRechargeableBatteryClusterServer(30);
-        this.setSelectDevice(this.lock.serialNumber ?? '', this.lock.deviceName ?? '', undefined, 'hub');
-        if (this.validateDevice(this.lock.deviceName ?? '')) {
-            await this.registerDevice(this.lock);
-            this.bridgedDevices.set(this.lock.deviceName ?? '', this.lock);
-        }
-        else {
-            this.lock = undefined;
-        }
+        this.lock = await this.addDevice(this.lock);
         this.lock?.addCommandHandler('identify', async ({ request: { identifyTime } }) => {
             this.lock?.log.info(`Command identify called identifyTime:${identifyTime}`);
         });
@@ -558,14 +472,7 @@ export class ExampleMatterbridgeDynamicPlatform extends MatterbridgeDynamicPlatf
             .addChildDeviceType('Humidity', humiditySensor)
             .createDefaultRelativeHumidityMeasurementClusterServer(50 * 100)
             .addRequiredClusterServers();
-        this.setSelectDevice(this.thermoAuto.serialNumber ?? '', this.thermoAuto.deviceName ?? '', undefined, 'hub');
-        if (this.validateDevice(this.thermoAuto.deviceName ?? '')) {
-            await this.registerDevice(this.thermoAuto);
-            this.bridgedDevices.set(this.thermoAuto.deviceName ?? '', this.thermoAuto);
-        }
-        else {
-            this.thermoAuto = undefined;
-        }
+        this.thermoAuto = await this.addDevice(this.thermoAuto);
         this.thermoAuto?.addCommandHandler('identify', async ({ request: { identifyTime } }) => {
             this.thermoAuto?.log.info(`Command identify called identifyTime ${identifyTime}`);
         });
@@ -614,14 +521,7 @@ export class ExampleMatterbridgeDynamicPlatform extends MatterbridgeDynamicPlatf
         })
             .createDefaultIdentifyClusterServer()
             .createDefaultTemperatureMeasurementClusterServer(15 * 100);
-        this.setSelectDevice(this.thermoHeat.serialNumber ?? '', this.thermoHeat.deviceName ?? '', undefined, 'hub');
-        if (this.validateDevice(this.thermoHeat.deviceName ?? '')) {
-            await this.registerDevice(this.thermoHeat);
-            this.bridgedDevices.set(this.thermoHeat.deviceName ?? '', this.thermoHeat);
-        }
-        else {
-            this.thermoHeat = undefined;
-        }
+        this.thermoHeat = await this.addDevice(this.thermoHeat);
         this.thermoHeat?.addCommandHandler('identify', async ({ request: { identifyTime } }) => {
             this.thermoHeat?.log.info(`Command identify called identifyTime ${identifyTime}`);
         });
@@ -641,14 +541,7 @@ export class ExampleMatterbridgeDynamicPlatform extends MatterbridgeDynamicPlatf
             .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)
             .createDefaultCoolingThermostatClusterServer(20, 18, 5, 35)
             .createDefaultPowerSourceReplaceableBatteryClusterServer(40, PowerSource.BatChargeLevel.Ok, 5080, 'AA 1.5V', 4);
-        this.setSelectDevice(this.thermoCool.serialNumber ?? '', this.thermoCool.deviceName ?? '', undefined, 'hub');
-        if (this.validateDevice(this.thermoCool.deviceName ?? '')) {
-            await this.registerDevice(this.thermoCool);
-            this.bridgedDevices.set(this.thermoCool.deviceName ?? '', this.thermoCool);
-        }
-        else {
-            this.thermoCool = undefined;
-        }
+        this.thermoCool = await this.addDevice(this.thermoCool);
         this.thermoCool?.addCommandHandler('identify', async ({ request: { identifyTime } }) => {
             this.thermoCool?.log.info(`Command identify called identifyTime ${identifyTime}`);
         });
@@ -671,14 +564,7 @@ export class ExampleMatterbridgeDynamicPlatform extends MatterbridgeDynamicPlatf
             .createDefaultPowerSourceWiredClusterServer()
             .createDefaultActivatedCarbonFilterMonitoringClusterServer()
             .createDefaultHepaFilterMonitoringClusterServer();
-        this.setSelectDevice(this.airPurifier.serialNumber ?? '', this.airPurifier.deviceName ?? '', undefined, 'hub');
-        if (this.validateDevice(this.airPurifier.deviceName ?? '')) {
-            await this.registerDevice(this.airPurifier);
-            this.bridgedDevices.set(this.airPurifier.deviceName ?? '', this.airPurifier);
-        }
-        else {
-            this.airPurifier = undefined;
-        }
+        this.airPurifier = await this.addDevice(this.airPurifier);
         this.airPurifier?.addCommandHandler('identify', async ({ request: { identifyTime } }) => {
             this.airPurifier?.log.info(`Command identify called identifyTime:${identifyTime}`);
         });
@@ -725,14 +611,7 @@ export class ExampleMatterbridgeDynamicPlatform extends MatterbridgeDynamicPlatf
             .createDefaultRelativeHumidityMeasurementClusterServer(50 * 100)
             .createDefaultPowerSourceWiredClusterServer()
             .addRequiredClusterServers();
-        this.setSelectDevice(this.airConditioner.serialNumber ?? '', this.airConditioner.deviceName ?? '', undefined, 'hub');
-        if (this.validateDevice(this.airConditioner.deviceName ?? '')) {
-            await this.registerDevice(this.airConditioner);
-            this.bridgedDevices.set(this.airConditioner.deviceName ?? '', this.airConditioner);
-        }
-        else {
-            this.airConditioner = undefined;
-        }
+        this.airConditioner = await this.addDevice(this.airConditioner);
         this.airConditioner?.addCommandHandler('identify', async ({ request: { identifyTime } }) => {
             this.airConditioner?.log.info(`Command identify called identifyTime:${identifyTime}`);
         });
@@ -757,14 +636,7 @@ export class ExampleMatterbridgeDynamicPlatform extends MatterbridgeDynamicPlatf
             .createLevelControlClusterServer()
             .createDefaultPumpConfigurationAndControlClusterServer()
             .createDefaultPowerSourceWiredClusterServer();
-        this.setSelectDevice(this.pump.serialNumber ?? '', this.pump.deviceName ?? '', undefined, 'hub');
-        if (this.validateDevice(this.pump.deviceName ?? '')) {
-            await this.registerDevice(this.pump);
-            this.bridgedDevices.set(this.pump.deviceName ?? '', this.pump);
-        }
-        else {
-            this.pump = undefined;
-        }
+        this.pump = await this.addDevice(this.pump);
         this.pump?.addCommandHandler('identify', async ({ request: { identifyTime } }) => {
             this.pump?.log.info(`Command identify called identifyTime:${identifyTime}`);
         });
@@ -785,29 +657,16 @@ export class ExampleMatterbridgeDynamicPlatform extends MatterbridgeDynamicPlatf
             .createDefaultIdentifyClusterServer()
             .createDefaultValveConfigurationAndControlClusterServer()
             .createDefaultPowerSourceWiredClusterServer();
-        this.setSelectDevice(this.valve.serialNumber ?? '', this.valve.deviceName ?? '', undefined, 'hub');
-        if (this.validateDevice(this.valve.deviceName ?? '')) {
-            await this.registerDevice(this.valve);
-            this.bridgedDevices.set(this.valve.deviceName ?? '', this.valve);
-        }
-        else {
-            this.valve = undefined;
-        }
+        this.valve = await this.addDevice(this.valve);
         this.valve?.addCommandHandler('identify', async ({ request: { identifyTime } }) => {
             this.valve?.log.info(`Command identify called identifyTime:${identifyTime}`);
         });
-        this.fan = new MatterbridgeEndpoint([fanDevice, bridgedNode, powerSource], { uniqueStorageKey: 'Fan off low medium high auto' }, this.config.debug)
-            .createDefaultBridgedDeviceBasicInformationClusterServer('Fan auto', '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 = new MatterbridgeEndpoint([fanDevice, bridgedNode, powerSource], { uniqueStorageKey: 'Fan off low medium high' }, this.config.debug)
+            .createDefaultBridgedDeviceBasicInformationClusterServer('Fan', 'FNB_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)
             .createDefaultPowerSourceWiredClusterServer()
+            .createBaseFanControlClusterServer()
             .addRequiredClusterServers();
-        this.setSelectDevice(this.fan.serialNumber ?? '', this.fan.deviceName ?? '', undefined, 'hub');
-        if (this.validateDevice(this.fan.deviceName ?? '')) {
-            await this.registerDevice(this.fan);
-            this.bridgedDevices.set(this.fan.deviceName ?? '', this.fan);
-        }
-        else {
-            this.fan = undefined;
-        }
+        this.fan = await this.addDevice(this.fan);
         await this.fan?.subscribeAttribute(FanControl.Cluster.id, 'fanMode', (newValue, oldValue, context) => {
             this.fan?.log.info(`Fan mode changed from ${this.fanModeLookup[oldValue]} to ${this.fanModeLookup[newValue]} context: ${context.offline === true ? 'offline' : 'online'}`);
             if (context.offline === true)
@@ -844,89 +703,139 @@ export class ExampleMatterbridgeDynamicPlatform extends MatterbridgeDynamicPlatf
             if (isValidNumber(newValue, 0, 100))
                 this.fan?.setAttribute(FanControl.Cluster.id, 'percentCurrent', newValue, this.fan?.log);
         }, this.fan.log);
+        this.fanauto = new MatterbridgeEndpoint([fanDevice, bridgedNode, powerSource], { uniqueStorageKey: 'Fan off low medium high auto' }, this.config.debug)
+            .createDefaultBridgedDeviceBasicInformationClusterServer('Fan auto', 'FNA_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)
+            .createDefaultPowerSourceWiredClusterServer()
+            .addRequiredClusterServers();
+        this.fanauto = await this.addDevice(this.fanauto);
+        await this.fanauto?.subscribeAttribute(FanControl.Cluster.id, 'fanMode', (newValue, oldValue, context) => {
+            this.fanauto?.log.info(`Fan mode changed from ${this.fanModeLookup[oldValue]} to ${this.fanModeLookup[newValue]} context: ${context.offline === true ? 'offline' : 'online'}`);
+            if (context.offline === true)
+                return;
+            if (newValue === FanControl.FanMode.Off) {
+                this.fanauto?.setAttribute(FanControl.Cluster.id, 'percentSetting', 0, this.fanauto?.log);
+                this.fanauto?.setAttribute(FanControl.Cluster.id, 'percentCurrent', 0, this.fanauto?.log);
+            }
+            else if (newValue === FanControl.FanMode.Low) {
+                this.fanauto?.setAttribute(FanControl.Cluster.id, 'percentSetting', 33, this.fanauto?.log);
+                this.fanauto?.setAttribute(FanControl.Cluster.id, 'percentCurrent', 33, this.fanauto?.log);
+            }
+            else if (newValue === FanControl.FanMode.Medium) {
+                this.fanauto?.setAttribute(FanControl.Cluster.id, 'percentSetting', 66, this.fanauto?.log);
+                this.fanauto?.setAttribute(FanControl.Cluster.id, 'percentCurrent', 66, this.fanauto?.log);
+            }
+            else if (newValue === FanControl.FanMode.High) {
+                this.fanauto?.setAttribute(FanControl.Cluster.id, 'percentSetting', 100, this.fanauto?.log);
+                this.fanauto?.setAttribute(FanControl.Cluster.id, 'percentCurrent', 100, this.fanauto?.log);
+            }
+            else if (newValue === FanControl.FanMode.On) {
+                this.fanauto?.setAttribute(FanControl.Cluster.id, 'percentSetting', 100, this.fanauto?.log);
+                this.fanauto?.setAttribute(FanControl.Cluster.id, 'percentCurrent', 100, this.fanauto?.log);
+            }
+            else if (newValue === FanControl.FanMode.Auto) {
+                this.fanauto?.setAttribute(FanControl.Cluster.id, 'percentSetting', 50, this.fanauto?.log);
+                this.fanauto?.setAttribute(FanControl.Cluster.id, 'percentCurrent', 50, this.fanauto?.log);
+            }
+        }, this.fanauto.log);
+        await this.fanauto?.subscribeAttribute(FanControl.Cluster.id, 'percentSetting', (newValue, oldValue, context) => {
+            this.fanauto?.log.info(`Percent setting changed from ${oldValue} to ${newValue} context: ${context.offline === true ? 'offline' : 'online'}`);
+            if (context.offline === true)
+                return;
+            if (isValidNumber(newValue, 0, 100))
+                this.fanauto?.setAttribute(FanControl.Cluster.id, 'percentCurrent', newValue, this.fanauto?.log);
+        }, this.fanauto.log);
+        this.fanComplete = new MatterbridgeEndpoint([fanDevice, bridgedNode, powerSource], { uniqueStorageKey: 'Fan complete' }, this.config.debug)
+            .createDefaultBridgedDeviceBasicInformationClusterServer('Fan complete', 'FNC_980995631228', 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)
+            .createDefaultPowerSourceWiredClusterServer()
+            .createCompleteFanControlClusterServer()
+            .addRequiredClusterServers();
+        this.fanComplete = await this.addDevice(this.fanComplete);
+        await this.fanComplete?.subscribeAttribute(FanControl.Cluster.id, 'fanMode', (newValue, oldValue, context) => {
+            this.fanComplete?.log.info(`Fan mode changed from ${this.fanModeLookup[oldValue]} to ${this.fanModeLookup[newValue]} context: ${context.offline === true ? 'offline' : 'online'}`);
+            if (context.offline === true)
+                return;
+            if (newValue === FanControl.FanMode.Off) {
+                this.fanComplete?.setAttribute(FanControl.Cluster.id, 'percentSetting', 0, this.fanComplete?.log);
+                this.fanComplete?.setAttribute(FanControl.Cluster.id, 'percentCurrent', 0, this.fanComplete?.log);
+            }
+            else if (newValue === FanControl.FanMode.Low) {
+                this.fanComplete?.setAttribute(FanControl.Cluster.id, 'percentSetting', 33, this.fanComplete?.log);
+                this.fanComplete?.setAttribute(FanControl.Cluster.id, 'percentCurrent', 33, this.fanComplete?.log);
+            }
+            else if (newValue === FanControl.FanMode.Medium) {
+                this.fanComplete?.setAttribute(FanControl.Cluster.id, 'percentSetting', 66, this.fanComplete?.log);
+                this.fanComplete?.setAttribute(FanControl.Cluster.id, 'percentCurrent', 66, this.fanComplete?.log);
+            }
+            else if (newValue === FanControl.FanMode.High) {
+                this.fanComplete?.setAttribute(FanControl.Cluster.id, 'percentSetting', 100, this.fanComplete?.log);
+                this.fanComplete?.setAttribute(FanControl.Cluster.id, 'percentCurrent', 100, this.fanComplete?.log);
+            }
+            else if (newValue === FanControl.FanMode.On) {
+                this.fanComplete?.setAttribute(FanControl.Cluster.id, 'percentSetting', 100, this.fanComplete?.log);
+                this.fanComplete?.setAttribute(FanControl.Cluster.id, 'percentCurrent', 100, this.fanComplete?.log);
+            }
+            else if (newValue === FanControl.FanMode.Auto) {
+                this.fanComplete?.setAttribute(FanControl.Cluster.id, 'percentSetting', 50, this.fanComplete?.log);
+                this.fanComplete?.setAttribute(FanControl.Cluster.id, 'percentCurrent', 50, this.fanComplete?.log);
+            }
+        }, this.fanComplete?.log);
+        await this.fanComplete?.subscribeAttribute(FanControl.Cluster.id, 'percentSetting', (newValue, oldValue, context) => {
+            this.fanComplete?.log.info(`Percent setting changed from ${oldValue} to ${newValue} context: ${context.offline === true ? 'offline' : 'online'}`);
+            if (context.offline === true)
+                return;
+            if (isValidNumber(newValue, 0, 100))
+                this.fanComplete?.setAttribute(FanControl.Cluster.id, 'percentCurrent', newValue, this.fanComplete?.log);
+        }, this.fanComplete?.log);
+        await this.fanComplete?.subscribeAttribute(FanControl.Cluster.id, 'rockSetting', (newValue, oldValue, context) => {
+            this.fanComplete?.log.info(`Rock setting changed from ${debugStringify(oldValue)} to ${debugStringify(newValue)} context: ${context.offline === true ? 'offline' : 'online'}`);
+        }, this.fanComplete?.log);
+        await this.fanComplete?.subscribeAttribute(FanControl.Cluster.id, 'windSetting', (newValue, oldValue, context) => {
+            this.fanComplete?.log.info(`Wind setting changed from ${debugStringify(oldValue)} to ${debugStringify(newValue)} context: ${context.offline === true ? 'offline' : 'online'}`);
+        }, this.fanComplete?.log);
+        await this.fanComplete?.subscribeAttribute(FanControl.Cluster.id, 'airflowDirection', (newValue, oldValue, context) => {
+            this.fanComplete?.log.info(`Airflow direction changed from ${this.fanDirectionLookup[oldValue]} to ${this.fanDirectionLookup[newValue]} context: ${context.offline === true ? 'offline' : 'online'}`);
+        }, this.fanComplete?.log);
         this.waterLeak = new MatterbridgeEndpoint([waterLeakDetector, bridgedNode, powerSource], { uniqueStorageKey: 'Water leak detector' }, this.config.debug)
             .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)
             .createDefaultPowerSourceRechargeableBatteryClusterServer()
             .createDefaultBooleanStateClusterServer(false)
             .addRequiredClusterServers()
             .addOptionalClusterServers();
-        this.setSelectDevice(this.waterLeak.serialNumber ?? '', this.waterLeak.deviceName ?? '', undefined, 'hub');
-        if (this.validateDevice(this.waterLeak.deviceName ?? '')) {
-            await this.registerDevice(this.waterLeak);
-            this.bridgedDevices.set(this.waterLeak.deviceName ?? '', this.waterLeak);
-        }
-        else {
-            this.waterLeak = undefined;
-        }
+        this.waterLeak = await this.addDevice(this.waterLeak);
         this.waterFreeze = new MatterbridgeEndpoint([waterFreezeDetector, bridgedNode, powerSource], { uniqueStorageKey: 'Water freeze detector' }, this.config.debug)
             .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)
             .createDefaultPowerSourceRechargeableBatteryClusterServer()
             .createDefaultBooleanStateClusterServer(false)
             .addRequiredClusterServers()
             .addOptionalClusterServers();
-        this.setSelectDevice(this.waterFreeze.serialNumber ?? '', this.waterFreeze.deviceName ?? '', undefined, 'hub');
-        if (this.validateDevice(this.waterFreeze.deviceName ?? '')) {
-            await this.registerDevice(this.waterFreeze);
-            this.bridgedDevices.set(this.waterFreeze.deviceName ?? '', this.waterFreeze);
-        }
-        else {
-            this.waterFreeze = undefined;
-        }
+        this.waterFreeze = await this.addDevice(this.waterFreeze);
         this.rain = new MatterbridgeEndpoint([rainSensor, bridgedNode, powerSource], { uniqueStorageKey: 'Rain sensor' }, this.config.debug)
             .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)
             .createDefaultPowerSourceRechargeableBatteryClusterServer()
             .createDefaultIdentifyClusterServer()
             .createDefaultBooleanStateClusterServer(false)
             .createDefaultBooleanStateConfigurationClusterServer();
-        this.setSelectDevice(this.rain.serialNumber ?? '', this.rain.deviceName ?? '', undefined, 'hub');
-        if (this.validateDevice(this.rain.deviceName ?? '')) {
-            await this.registerDevice(this.rain);
-            this.bridgedDevices.set(this.rain.deviceName ?? '', this.rain);
-        }
-        else {
-            this.rain = undefined;
-        }
+        this.rain = await this.addDevice(this.rain);
         this.smokeCo = new MatterbridgeEndpoint([smokeCoAlarm, bridgedNode, powerSource], { uniqueStorageKey: 'SmokeCo alarm sensor' }, this.config.debug)
             .createDefaultBridgedDeviceBasicInformationClusterServer('SmokeCo 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)
             .createDefaultIdentifyClusterServer()
             .createDefaultSmokeCOAlarmClusterServer(SmokeCoAlarm.AlarmState.Normal, SmokeCoAlarm.AlarmState.Normal)
             .createDefaultPowerSourceReplaceableBatteryClusterServer()
             .createDefaultCarbonMonoxideConcentrationMeasurementClusterServer(100);
-        this.setSelectDevice(this.smokeCo.serialNumber ?? '', this.smokeCo.deviceName ?? '', undefined, 'hub');
-        if (this.validateDevice(this.smokeCo.deviceName ?? '')) {
-            await this.registerDevice(this.smokeCo);
-            this.bridgedDevices.set(this.smokeCo.deviceName ?? '', this.smokeCo);
-        }
-        else {
-            this.smokeCo = undefined;
-        }
+        this.smokeCo = await this.addDevice(this.smokeCo);
         this.smokeOnly = new MatterbridgeEndpoint([smokeCoAlarm, bridgedNode, powerSource], { uniqueStorageKey: 'Smoke alarm sensor' }, this.config.debug)
             .createDefaultBridgedDeviceBasicInformationClusterServer('Smoke alarm sensor', 'serial_94755661225', 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)
             .createDefaultIdentifyClusterServer()
             .createSmokeOnlySmokeCOAlarmClusterServer(SmokeCoAlarm.AlarmState.Normal)
             .createDefaultPowerSourceReplaceableBatteryClusterServer();
-        this.setSelectDevice(this.smokeOnly.serialNumber ?? '', this.smokeOnly.deviceName ?? '', undefined, 'hub');
-        if (this.validateDevice(this.smokeOnly.deviceName ?? '')) {
-            await this.registerDevice(this.smokeOnly);
-            this.bridgedDevices.set(this.smokeOnly.deviceName ?? '', this.smokeOnly);
-        }
-        else {
-            this.smokeOnly = undefined;
-        }
+        this.smokeOnly = await this.addDevice(this.smokeOnly);
         this.coOnly = new MatterbridgeEndpoint([smokeCoAlarm, bridgedNode, powerSource], { uniqueStorageKey: 'Co alarm sensor' }, this.config.debug)
             .createDefaultBridgedDeviceBasicInformationClusterServer('Co alarm sensor', 'serial_947456317488', 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)
             .createDefaultIdentifyClusterServer()
             .createCoOnlySmokeCOAlarmClusterServer(SmokeCoAlarm.AlarmState.Normal)
             .createDefaultPowerSourceReplaceableBatteryClusterServer()
             .createDefaultCarbonMonoxideConcentrationMeasurementClusterServer(100);
-        this.setSelectDevice(this.coOnly.serialNumber ?? '', this.coOnly.deviceName ?? '', undefined, 'hub');
-        if (this.validateDevice(this.coOnly.deviceName ?? '')) {
-            await this.registerDevice(this.coOnly);
-            this.bridgedDevices.set(this.coOnly.deviceName ?? '', this.coOnly);
-        }
-        else {
-            this.coOnly = undefined;
-        }
+        this.coOnly = await this.addDevice(this.coOnly);
         this.airQuality = new MatterbridgeEndpoint([airQualitySensor, bridgedNode, powerSource], { uniqueStorageKey: 'Air quality sensor' }, this.config.debug)
             .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)
             .createDefaultPowerSourceReplaceableBatteryClusterServer(50, PowerSource.BatChargeLevel.Warning, 2900, 'CR2450', 1)
@@ -942,14 +851,7 @@ export class ExampleMatterbridgeDynamicPlatform extends MatterbridgeDynamicPlatf
             .createDefaultPm10ConcentrationMeasurementClusterServer(100)
             .createDefaultRadonConcentrationMeasurementClusterServer(100)
             .createDefaultTvocMeasurementClusterServer(100);
-        this.setSelectDevice(this.airQuality.serialNumber ?? '', this.airQuality.deviceName ?? '', undefined, 'hub');
-        if (this.validateDevice(this.airQuality.deviceName ?? '')) {
-            await this.registerDevice(this.airQuality);
-            this.bridgedDevices.set(this.airQuality.deviceName ?? '', this.airQuality);
-        }
-        else {
-            this.airQuality = undefined;
-        }
+        this.airQuality = await this.addDevice(this.airQuality);
         this.momentarySwitch = new MatterbridgeEndpoint([bridgedNode, powerSource], { uniqueStorageKey: 'Momentary switch composed' }, this.config.debug)
             .createDefaultBridgedDeviceBasicInformationClusterServer('Momentary switch  (Top-1 Middle-2 Bottom-3)', 'serial_947942331225', 0xfff1, 'Matterbridge', 'Matterbridge MomentarySwitch', parseInt(this.version.replace(/\D/g, '')), this.version === '' ? 'Unknown' : this.version, parseInt(this.matterbridge.matterbridgeVersion.replace(/\D/g, '')), this.matterbridge.matterbridgeVersion)
             .createDefaultIdentifyClusterServer()
@@ -981,28 +883,14 @@ export class ExampleMatterbridgeDynamicPlatform extends MatterbridgeDynamicPlatf
         })
             .createDefaultIdentifyClusterServer()
             .createDefaultSwitchClusterServer();
-        this.setSelectDevice(this.momentarySwitch.serialNumber ?? '', this.momentarySwitch.deviceName ?? '', undefined, 'hub');
-        if (this.validateDevice(this.momentarySwitch.deviceName ?? '')) {
-            await this.registerDevice(this.momentarySwitch);
-            this.bridgedDevices.set(this.momentarySwitch.deviceName ?? '', this.momentarySwitch);
-        }
-        else {
-            this.momentarySwitch = undefined;
-        }
+        this.momentarySwitch = await this.addDevice(this.momentarySwitch);
         this.latchingSwitch = new MatterbridgeEndpoint([genericSwitch, bridgedNode, powerSource], { uniqueStorageKey: 'Latching switch' }, this.config.debug)
             .createDefaultBridgedDeviceBasicInformationClusterServer('Latching switch', 'serial_947442331225', 0xfff1, 'Matterbridge', 'Matterbridge LatchingSwitch', parseInt(this.version.replace(/\D/g, '')), this.version === '' ? 'Unknown' : this.version, parseInt(this.matterbridge.matterbridgeVersion.replace(/\D/g, '')), this.matterbridge.matterbridgeVersion)
             .createDefaultIdentifyClusterServer()
             .createDefaultLatchingSwitchClusterServer()
             .createDefaultPowerSourceReplaceableBatteryClusterServer(10, PowerSource.BatChargeLevel.Critical, 2850, 'CR2032', 1);
-        this.setSelectDevice(this.latchingSwitch.serialNumber ?? '', this.latchingSwitch.deviceName ?? '', undefined, 'hub');
-        if (this.validateDevice(this.latchingSwitch.deviceName ?? '')) {
-            await this.registerDevice(this.latchingSwitch);
-            this.bridgedDevices.set(this.latchingSwitch.deviceName ?? '', this.latchingSwitch);
-        }
-        else {
-            this.latchingSwitch = undefined;
-        }
-        const robot = new RoboticVacuumCleaner('Robot Vacuum', 'RVC1238777820', this.config.enableServerRvc === true ? 'server' : undefined, 1, [
+        this.latchingSwitch = await this.addDevice(this.latchingSwitch);
+        this.roboticVacuum = new RoboticVacuumCleaner('Robot Vacuum', 'RVC1238777820', this.config.enableServerRvc === true ? 'server' : undefined, 1, [
             { label: 'Idle', mode: 1, modeTags: [{ value: RvcRunMode.ModeTag.Idle }] },
             { label: 'Cleaning', mode: 2, modeTags: [{ value: RvcRunMode.ModeTag.Cleaning }] },
             { label: 'Mapping', mode: 3, modeTags: [{ value: RvcRunMode.ModeTag.Mapping }] },
@@ -1053,96 +941,40 @@ export class ExampleMatterbridgeDynamicPlatform extends MatterbridgeDynamicPlatf
         if (this.config.enableServerRvc === true) {
             this.log.notice('RVC is in server mode');
         }
-        this.setSelectDevice(robot.serialNumber ?? '', robot.deviceName ?? '', undefined, 'hub');
-        if (this.validateDevice(robot.deviceName ?? '')) {
-            await this.registerDevice(robot);
-            this.bridgedDevices.set(robot.deviceName ?? '', robot);
-        }
+        this.roboticVacuum = await this.addDevice(this.roboticVacuum);
         this.waterHeater = new WaterHeater('Water Heater', 'WH3456177820', 50, 60, 20, 80, undefined, 85, 220_000, 1_000, 220_000, 12_000_000, 500_000, 3_000_000);
-        this.setSelectDevice(this.waterHeater.serialNumber ?? '', this.waterHeater.deviceName ?? '', undefined, 'hub');
-        if (this.validateDevice(this.waterHeater.deviceName ?? '')) {
-            await this.registerDevice(this.waterHeater);
-            this.bridgedDevices.set(this.waterHeater.deviceName ?? '', this.waterHeater);
-        }
+        this.waterHeater = await this.addDevice(this.waterHeater);
         this.evse = new Evse('Evse', 'EV3456127820', 1, [
             { label: 'On demand', mode: 1, modeTags: [{ value: EnergyEvseMode.ModeTag.Manual }] },
             { label: 'Scheduled', mode: 2, modeTags: [{ value: EnergyEvseMode.ModeTag.TimeOfUse }] },
             { label: 'Solar Charging', mode: 3, modeTags: [{ value: EnergyEvseMode.ModeTag.SolarCharging }] },
             { label: 'Solar Charging Scheduled', mode: 4, modeTags: [{ value: EnergyEvseMode.ModeTag.SolarCharging }, { value: EnergyEvseMode.ModeTag.TimeOfUse }] },
         ], EnergyEvse.State.PluggedInCharging, EnergyEvse.SupplyState.ChargingEnabled, EnergyEvse.FaultState.NoError, 220_000, 10_000, 2_200_000, 1_000_000, 500_000, 32_000_000);
-        this.setSelectDevice(this.evse.serialNumber ?? '', this.evse.deviceName ?? '', undefined, 'hub');
-        if (this.validateDevice(this.evse.deviceName ?? '')) {
-            await this.registerDevice(this.evse);
-            this.bridgedDevices.set(this.evse.deviceName ?? '', this.evse);
-        }
+        this.evse = await this.addDevice(this.evse);
         this.solarPower = new SolarPower('Solar Power', 'SP3456127821', 220_000, 10_000, 2200_000, 2_200_000, -10_000_000, 500_000);
-        this.setSelectDevice(this.solarPower.serialNumber ?? '', this.solarPower.deviceName ?? '', undefined, 'hub');
-        if (this.validateDevice(this.solarPower.deviceName ?? '')) {
-            await this.registerDevice(this.solarPower);
-            this.bridgedDevices.set(this.solarPower.deviceName ?? '', this.solarPower);
-        }
+        this.solarPower = await this.addDevice(this.solarPower);
         this.batteryStorage = new BatteryStorage('Battery Storage', 'BS3456127822', 75, PowerSource.BatChargeLevel.Ok, 220_000, 10_000, 2_200_000, 1_000_000, 2_000_000, -2_000_000, 3_000_000);
-        this.setSelectDevice(this.batteryStorage.serialNumber ?? '', this.batteryStorage.deviceName ?? '', undefined, 'hub');
-        if (this.validateDevice(this.batteryStorage.deviceName ?? '')) {
-            await this.registerDevice(this.batteryStorage);
-            this.bridgedDevices.set(this.batteryStorage.deviceName ?? '', this.batteryStorage);
-        }
+        this.batteryStorage = await this.addDevice(this.batteryStorage);
         this.heatPump = new HeatPump('Heat Pump', 'HP1234567890', 220_000, 10_000, 2_200_000, 1_000_000, 500_000, 3_000_000);
-        this.setSelectDevice(this.heatPump.serialNumber ?? '', this.heatPump.deviceName ?? '', undefined, 'hub');
-        if (this.validateDevice(this.heatPump.deviceName ?? '')) {
-            await this.registerDevice(this.heatPump);
-            this.bridgedDevices.set(this.heatPump.deviceName ?? '', this.heatPump);
-        }
+        this.heatPump = await this.addDevice(this.heatPump);
         this.laundryWasher = new LaundryWasher('Laundry Washer', 'LW1234567890');
-        this.setSelectDevice(this.laundryWasher.serialNumber ?? '', this.laundryWasher.deviceName ?? '', undefined, 'hub');
-        if (this.validateDevice(this.laundryWasher.deviceName ?? '')) {
-            await this.registerDevice(this.laundryWasher);
-            this.bridgedDevices.set(this.laundryWasher.deviceName ?? '', this.laundryWasher);
-        }
+        this.laundryWasher = await this.addDevice(this.laundryWasher);
         this.laundryDryer = new LaundryDryer('Laundry Dryer', 'LDW1235227890');
-        this.setSelectDevice(this.laundryDryer.serialNumber ?? '', this.laundryDryer.deviceName ?? '', undefined, 'hub');
-        if (this.validateDevice(this.laundryDryer.deviceName ?? '')) {
-            await this.registerDevice(this.laundryDryer);
-            this.bridgedDevices.set(this.laundryDryer.deviceName ?? '', this.laundryDryer);
-        }
+        this.laundryDryer = await this.addDevice(this.laundryDryer);
         this.dishwasher = new Dishwasher('Dishwasher', 'DW1234567890');
-        this.setSelectDevice(this.dishwasher.serialNumber ?? '', this.dishwasher.deviceName ?? '', undefined, 'hub');
-        if (this.validateDevice(this.dishwasher.deviceName ?? '')) {
-            await this.registerDevice(this.dishwasher);
-            this.bridgedDevices.set(this.dishwasher.deviceName ?? '', this.dishwasher);
-        }
+        this.dishwasher = await this.addDevice(this.dishwasher);
         this.extractorHood = new ExtractorHood('Extractor Hood', 'EH1234567893');
-        this.setSelectDevice(this.extractorHood.serialNumber ?? '', this.extractorHood.deviceName ?? '', undefined, 'hub');
-        if (this.validateDevice(this.extractorHood.deviceName ?? '')) {
-            await this.registerDevice(this.extractorHood);
-            this.bridgedDevices.set(this.extractorHood.deviceName ?? '', this.extractorHood);
-        }
+        this.extractorHood = await this.addDevice(this.extractorHood);
         const refrigeratorDevice = new Appliances(refrigerator, 'Refrigerator', 'RE9987654322');
         refrigeratorDevice.addFixedLabel('composed', 'Refrigerator');
-        this.setSelectDevice(refrigeratorDevice.serialNumber ?? '', refrigeratorDevice.deviceName ?? '', undefined, 'hub');
-        if (this.validateDevice(refrigeratorDevice.deviceName ?? '')) {
-            await this.registerDevice(refrigeratorDevice);
-            this.bridgedDevices.set(refrigeratorDevice.deviceName ?? '', refrigeratorDevice);
-        }
+        await this.addDevice(refrigeratorDevice);
         const ovenDevice = new Appliances(oven, 'Oven', 'OV1298867891');
         ovenDevice.addFixedLabel('composed', 'Oven');
-        this.setSelectDevice(ovenDevice.serialNumber ?? '', ovenDevice.deviceName ?? '', undefined, 'hub');
-        if (this.validateDevice(ovenDevice.deviceName ?? '')) {
-            await this.registerDevice(ovenDevice);
-            this.bridgedDevices.set(ovenDevice.deviceName ?? '', ovenDevice);
-        }
+        await this.addDevice(ovenDevice);
         const microwaveOvenDevice = new Appliances(microwaveOven, 'Microwave Oven', 'MO1234567892');
-        this.setSelectDevice(microwaveOvenDevice.serialNumber ?? '', microwaveOvenDevice.deviceName ?? '', undefined, 'hub');
-        if (this.validateDevice(microwaveOvenDevice.deviceName ?? '')) {
-            await this.registerDevice(microwaveOvenDevice);
-            this.bridgedDevices.set(microwaveOvenDevice.deviceName ?? '', microwaveOvenDevice);
-        }
+        await this.addDevice(microwaveOvenDevice);
         const cooktopDevice = new Appliances(cooktop, 'Cooktop', 'CT1255887894');
-        this.setSelectDevice(cooktopDevice.serialNumber ?? '', cooktopDevice.deviceName ?? '', undefined, 'hub');
-        if (this.validateDevice(cooktopDevice.deviceName ?? '')) {
-            await this.registerDevice(cooktopDevice);
-            this.bridgedDevices.set(cooktopDevice.deviceName ?? '', cooktopDevice);
-        }
+        await this.addDevice(cooktopDevice);
     }
     async onConfigure() {
         await super.onConfigure();
@@ -1266,7 +1098,7 @@ export class ExampleMatterbridgeDynamicPlatform extends MatterbridgeDynamicPlatf
                 const status = this.lock?.getAttribute(DoorLock.Cluster.id, 'lockState', this.lock.log);
                 if (isValidNumber(status, DoorLock.LockState.Locked, DoorLock.LockState.Unlocked)) {
                     await this.lock?.setAttribute(DoorLock.Cluster.id, 'lockState', status === DoorLock.LockState.Locked ? DoorLock.LockState.Unlocked : DoorLock.LockState.Locked, this.lock.log);
-                    this.lock?.log.info(`Set lock lockState to ${status === DoorLock.LockState.Locked ? 'Unlocked' : 'Locked'}`);
+                    this.lock?.log.info(`Set lock lockState to ${status === DoorLock.LockState.Locked ? 'Locked' : 'Unlocked'}`);
                 }
             }, 60 * 1000 + 500);
         }
@@ -1318,19 +1150,35 @@ export class ExampleMatterbridgeDynamicPlatform extends MatterbridgeDynamicPlatf
                 }
             }, 60 * 1000 + 550);
         }
-        this.fan?.log.info('Set fan initial fanMode to Auto, percentCurrent and percentSetting to 50');
-        await this.fan?.setAttribute(FanControl.Cluster.id, 'fanMode', FanControl.FanMode.Auto, this.fan.log);
-        await this.fan?.setAttribute(FanControl.Cluster.id, 'percentCurrent', 50, this.fan.log);
-        await this.fan?.setAttribute(FanControl.Cluster.id, 'percentSetting', 50, this.fan.log);
+        this.fan?.log.info('Set fan initial fanMode to Off, percentCurrent and percentSetting to 0');
+        await this.fan?.setAttribute(FanControl.Cluster.id, 'fanMode', FanControl.FanMode.Off, this.fan.log);
+        await this.fan?.setAttribute(FanControl.Cluster.id, 'percentCurrent', 0, this.fan.log);
+        await this.fan?.setAttribute(FanControl.Cluster.id, 'percentSetting', 0, this.fan.log);
+        await this.fanauto?.setAttribute(FanControl.Cluster.id, 'fanMode', FanControl.FanMode.Auto, this.fanauto.log);
+        await this.fanauto?.setAttribute(FanControl.Cluster.id, 'percentCurrent', 0, this.fanauto.log);
+        await this.fanauto?.setAttribute(FanControl.Cluster.id, 'percentSetting', 0, this.fanauto.log);
+        await this.fanComplete?.setAttribute(FanControl.Cluster.id, 'fanMode', FanControl.FanMode.Auto, this.fanComplete.log);
+        await this.fanComplete?.setAttribute(FanControl.Cluster.id, 'percentCurrent', 0, this.fanComplete.log);
+        await this.fanComplete?.setAttribute(FanControl.Cluster.id, 'percentSetting', 0, this.fanComplete.log);
         if (this.config.useInterval) {
             this.fanInterval = setInterval(async () => {
-                const mode = this.fan?.getAttribute(FanControl.Cluster.id, 'fanMode', this.fan.log);
+                let mode = this.fan?.getAttribute(FanControl.Cluster.id, 'fanMode', this.fan.log);
                 let value = this.fan?.getAttribute(FanControl.Cluster.id, 'percentCurrent', this.fan.log);
+                mode = this.fanauto?.getAttribute(FanControl.Cluster.id, 'fanMode', this.fanauto.log);
+                value = this.fanauto?.getAttribute(FanControl.Cluster.id, 'percentCurrent', this.fanauto.log);
                 if (isValidNumber(mode, FanControl.FanMode.Off, FanControl.FanMode.Auto) && mode === FanControl.FanMode.Auto && isValidNumber(value, 0, 100)) {
                     value = value + 10 >= 100 ? 0 : value + 10;
-                    await this.fan?.setAttribute(FanControl.Cluster.id, 'percentCurrent', value, this.fan.log);
-                    await this.fan?.setAttribute(FanControl.Cluster.id, 'percentSetting', value, this.fan.log);
-                    this.fan?.log.info(`Set fan percentCurrent and percentSetting to ${value}`);
+                    await this.fanauto?.setAttribute(FanControl.Cluster.id, 'percentCurrent', value, this.fanauto.log);
+                    await this.fanauto?.setAttribute(FanControl.Cluster.id, 'percentSetting', value, this.fanauto.log);
+                    this.fanauto?.log.info(`Set fan percentCurrent and percentSetting to ${value}`);
+                }
+                mode = this.fanComplete?.getAttribute(FanControl.Cluster.id, 'fanMode', this.fanComplete.log);
+                value = this.fanComplete?.getAttribute(FanControl.Cluster.id, 'percentCurrent', this.fanComplete.log);
+                if (isValidNumber(mode, FanControl.FanMode.Off, FanControl.FanMode.Auto) && mode === FanControl.FanMode.Auto && isValidNumber(value, 0, 100)) {
+                    value = value + 10 >= 100 ? 0 : value + 10;
+                    await this.fanComplete?.setAttribute(FanControl.Cluster.id, 'percentCurrent', value, this.fanComplete.log);
+                    await this.fanComplete?.setAttribute(FanControl.Cluster.id, 'percentSetting', value, this.fanComplete.log);
+                    this.fanComplete?.log.info(`Set fan percentCurrent and percentSetting to ${value}`);
                 }
             }, 60 * 1000 + 700);
         }
@@ -1387,18 +1235,16 @@ export class ExampleMatterbridgeDynamicPlatform extends MatterbridgeDynamicPlatf
         await this.airQuality?.setAttribute(AirQuality.Cluster.id, 'airQuality', AirQuality.AirQualityEnum.Good, this.airQuality.log);
         await this.airQuality?.setAttribute(TemperatureMeasurement.Cluster.id, 'measuredValue', 2150, this.airQuality.log);
         await this.airQuality?.setAttribute(RelativeHumidityMeasurement.Cluster.id, 'measuredValue', 5500, this.airQuality.log);
-        if (this.config.enableConcentrationMeasurements === true) {
-            await this.airQuality?.setAttribute(CarbonMonoxideConcentrationMeasurement.Cluster.id, 'measuredValue', 10, this.airQuality.log);
-            await this.airQuality?.setAttribute(CarbonDioxideConcentrationMeasurement.Cluster.id, 'measuredValue', 400, this.airQuality.log);
-            await this.airQuality?.setAttribute(NitrogenDioxideConcentrationMeasurement.Cluster.id, 'measuredValue', 1, this.airQuality.log);
-            await this.airQuality?.setAttribute(OzoneConcentrationMeasurement.Cluster.id, 'measuredValue', 1, this.airQuality.log);
-            await this.airQuality?.setAttribute(FormaldehydeConcentrationMeasurement.Cluster.id, 'measuredValue', 1, this.airQuality.log);
-            await this.airQuality?.setAttribute(Pm1ConcentrationMeasurement.Cluster.id, 'measuredValue', 100, this.airQuality.log);
-            await this.airQuality?.setAttribute(Pm25ConcentrationMeasurement.Cluster.id, 'measuredValue', 100, this.airQuality.log);
-            await this.airQuality?.setAttribute(Pm10ConcentrationMeasurement.Cluster.id, 'measuredValue', 100, this.airQuality.log);
-            await this.airQuality?.setAttribute(RadonConcentrationMeasurement.Cluster.id, 'measuredValue', 100, this.airQuality.log);
-            await this.airQuality?.setAttribute(TotalVolatileOrganicCompoundsConcentrationMeasurement.Cluster.id, 'measuredValue', 100, this.airQuality.log);
-        }
+        await this.airQuality?.setAttribute(CarbonMonoxideConcentrationMeasurement.Cluster.id, 'measuredValue', 10, this.airQuality.log);
+        await this.airQuality?.setAttribute(CarbonDioxideConcentrationMeasurement.Cluster.id, 'measuredValue', 400, this.airQuality.log);
+        await this.airQuality?.setAttribute(NitrogenDioxideConcentrationMeasurement.Cluster.id, 'measuredValue', 1, this.airQuality.log);
+        await this.airQuality?.setAttribute(OzoneConcentrationMeasurement.Cluster.id, 'measuredValue', 1, this.airQuality.log);
+        await this.airQuality?.setAttribute(FormaldehydeConcentrationMeasurement.Cluster.id, 'measuredValue', 1, this.airQuality.log);
+        await this.airQuality?.setAttribute(Pm1ConcentrationMeasurement.Cluster.id, 'measuredValue', 100, this.airQuality.log);
+        await this.airQuality?.setAttribute(Pm25ConcentrationMeasurement.Cluster.id, 'measuredValue', 100, this.airQuality.log);
+        await this.airQuality?.setAttribute(Pm10ConcentrationMeasurement.Cluster.id, 'measuredValue', 100, this.airQuality.log);
+        await this.airQuality?.setAttribute(RadonConcentrationMeasurement.Cluster.id, 'measuredValue', 100, this.airQuality.log);
+        await this.airQuality?.setAttribute(TotalVolatileOrganicCompoundsConcentrationMeasurement.Cluster.id, 'measuredValue', 100, this.airQuality.log);
         if (this.config.useInterval) {
             this.airQualityInterval = setInterval(async () => {
                 let value = this.airQuality?.getAttribute(AirQuality.Cluster.id, 'airQuality', this.airQuality?.log);
@@ -1479,4 +1325,17 @@ export class ExampleMatterbridgeDynamicPlatform extends MatterbridgeDynamicPlatf
         if (this.config.unregisterOnShutdown === true)
             await this.unregisterAllDevices(500);
     }
+    async addDevice(device) {
+        if (!device.serialNumber || !device.deviceName)
+            return;
+        this.setSelectDevice(device.serialNumber, device.deviceName, undefined, 'hub');
+        if (this.validateDevice(device.deviceName)) {
+            await this.registerDevice(device);
+            this.bridgedDevices.set(device.deviceName, device);
+            return device;
+        }
+        else {
+            return undefined;
+        }
+    }
 }

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "matterbridge-example-dynamic-platform",
-  "version": "1.3.4-dev-20250720-e338589",
+  "version": "1.3.5-dev-20250722-a63fdf7",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "matterbridge-example-dynamic-platform",
-      "version": "1.3.4-dev-20250720-e338589",
+      "version": "1.3.5-dev-20250722-a63fdf7",
       "license": "Apache-2.0",
       "dependencies": {
         "node-ansi-logger": "3.1.1",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "matterbridge-example-dynamic-platform",
-  "version": "1.3.4-dev-20250720-e338589",
+  "version": "1.3.5-dev-20250722-a63fdf7",
   "description": "Matterbridge dynamic plugin",
   "author": "https://github.com/Luligu",
   "license": "Apache-2.0",