matterbridge 2.2.8-dev.1 → 3.0.0-edge.2

package/dist/matterbridgeDeviceTypes.js

@@ -10,7 +10,6 @@ import { DoorLock } from '@matter/main/clusters/door-lock';
 import { ElectricalEnergyMeasurement } from '@matter/main/clusters/electrical-energy-measurement';
 import { ElectricalPowerMeasurement } from '@matter/main/clusters/electrical-power-measurement';
 import { FanControl } from '@matter/main/clusters/fan-control';
-import { FixedLabel } from '@matter/main/clusters/fixed-label';
 import { FlowMeasurement } from '@matter/main/clusters/flow-measurement';
 import { FormaldehydeConcentrationMeasurement } from '@matter/main/clusters/formaldehyde-concentration-measurement';
 import { Groups } from '@matter/main/clusters/groups';
@@ -32,10 +31,9 @@ import { PumpConfigurationAndControl } from '@matter/main/clusters/pump-configur
 import { RadonConcentrationMeasurement } from '@matter/main/clusters/radon-concentration-measurement';
 import { RelativeHumidityMeasurement } from '@matter/main/clusters/relative-humidity-measurement';
 import { SmokeCoAlarm } from '@matter/main/clusters/smoke-co-alarm';
-import { SwitchCluster } from '@matter/main/clusters/switch';
+import { Switch } from '@matter/main/clusters/switch';
 import { TemperatureMeasurement } from '@matter/main/clusters/temperature-measurement';
 import { Thermostat } from '@matter/main/clusters/thermostat';
-import { TimeSynchronization } from '@matter/main/clusters/time-synchronization';
 import { TotalVolatileOrganicCompoundsConcentrationMeasurement } from '@matter/main/clusters/total-volatile-organic-compounds-concentration-measurement';
 import { ValveConfigurationAndControl } from '@matter/main/clusters/valve-configuration-and-control';
 import { WindowCovering } from '@matter/main/clusters/window-covering';
@@ -50,6 +48,11 @@ import { ScenesManagement } from '@matter/main/clusters/scenes-management';
 import { HepaFilterMonitoring } from '@matter/main/clusters/hepa-filter-monitoring';
 import { ActivatedCarbonFilterMonitoring } from '@matter/main/clusters/activated-carbon-filter-monitoring';
 import { DeviceEnergyManagementMode } from '@matter/main/clusters/device-energy-management-mode';
+import { AdministratorCommissioning } from '@matter/main/clusters/administrator-commissioning';
+import { EcosystemInformation } from '@matter/main/clusters/ecosystem-information';
+import { AccessControl } from '@matter/main/clusters/access-control';
+import { CommissionerControl } from '@matter/main/clusters/commissioner-control';
+import { ServiceArea } from '@matter/main/clusters';
 export var DeviceClasses;
 (function (DeviceClasses) {
     DeviceClasses["Node"] = "Node";
@@ -77,20 +80,6 @@ export const DeviceTypeDefinition = ({ name, code, deviceClass, superSet, revisi
     optionalClientClusters,
     unknown,
 });
-export const bridge = DeviceTypeDefinition({
-    name: 'MA-aggregator',
-    code: 0x000e,
-    deviceClass: DeviceClasses.Dynamic,
-    revision: 1,
-    optionalServerClusters: [Identify.Cluster.id, Actions.Cluster.id],
-});
-export const aggregator = DeviceTypeDefinition({
-    name: 'MA-aggregator',
-    code: 0x000e,
-    deviceClass: DeviceClasses.Dynamic,
-    revision: 1,
-    optionalServerClusters: [Identify.Cluster.id, Actions.Cluster.id],
-});
 export const powerSource = DeviceTypeDefinition({
     name: 'MA-powerSource',
     code: 0x0011,
@@ -103,17 +92,25 @@ export const bridgedNode = DeviceTypeDefinition({
     name: 'MA-bridgedNode',
     code: 0x0013,
     deviceClass: DeviceClasses.Utility,
-    revision: 2,
+    revision: 3,
     requiredServerClusters: [BridgedDeviceBasicInformation.Cluster.id],
-    optionalServerClusters: [PowerSource.Cluster.id],
+    optionalServerClusters: [PowerSource.Cluster.id, EcosystemInformation.Cluster.id, AdministratorCommissioning.Cluster.id],
 });
-export const genericSwitch = DeviceTypeDefinition({
-    name: 'MA-genericswitch',
-    code: 0x000f,
-    deviceClass: DeviceClasses.Simple,
+export const electricalSensor = DeviceTypeDefinition({
+    name: 'MA-electricalSensor',
+    code: 0x0510,
+    deviceClass: DeviceClasses.Utility,
     revision: 1,
-    requiredServerClusters: [Identify.Cluster.id, SwitchCluster.id],
-    optionalServerClusters: [FixedLabel.Cluster.id],
+    requiredServerClusters: [PowerTopology.Cluster.id],
+    optionalServerClusters: [ElectricalPowerMeasurement.Cluster.id, ElectricalEnergyMeasurement.Cluster.id],
+});
+export const deviceEnergyManagement = DeviceTypeDefinition({
+    name: 'MA-deviceEnergyManagement',
+    code: 0x050d,
+    deviceClass: DeviceClasses.Utility,
+    revision: 2,
+    requiredServerClusters: [DeviceEnergyManagement.Cluster.id, DeviceEnergyManagementMode.Cluster.id],
+    optionalServerClusters: [],
 });
 export const onOffLight = DeviceTypeDefinition({
     name: 'MA-onofflight',
@@ -121,7 +118,7 @@ export const onOffLight = DeviceTypeDefinition({
     deviceClass: DeviceClasses.Simple,
     revision: 3,
     requiredServerClusters: [Identify.Cluster.id, Groups.Cluster.id, OnOff.Cluster.id],
-    optionalServerClusters: [LevelControl.Cluster.id, ColorControl.Cluster.id],
+    optionalServerClusters: [LevelControl.Cluster.id],
 });
 export const dimmableLight = DeviceTypeDefinition({
     name: 'MA-dimmablelight',
@@ -129,7 +126,7 @@ export const dimmableLight = DeviceTypeDefinition({
     deviceClass: DeviceClasses.Simple,
     revision: 3,
     requiredServerClusters: [Identify.Cluster.id, Groups.Cluster.id, OnOff.Cluster.id, LevelControl.Cluster.id],
-    optionalServerClusters: [ColorControl.Cluster.id],
+    optionalServerClusters: [],
 });
 export const colorTemperatureLight = DeviceTypeDefinition({
     name: 'MA-colortemperaturelight',
@@ -139,6 +136,14 @@ export const colorTemperatureLight = DeviceTypeDefinition({
     requiredServerClusters: [Identify.Cluster.id, Groups.Cluster.id, OnOff.Cluster.id, LevelControl.Cluster.id, ColorControl.Cluster.id],
     optionalServerClusters: [],
 });
+export const extendedColorLight = DeviceTypeDefinition({
+    name: 'MA-extendedcolorlight',
+    code: 0x010d,
+    deviceClass: DeviceClasses.Simple,
+    revision: 4,
+    requiredServerClusters: [Identify.Cluster.id, Groups.Cluster.id, OnOff.Cluster.id, LevelControl.Cluster.id, ColorControl.Cluster.id],
+    optionalServerClusters: [],
+});
 export const onOffOutlet = DeviceTypeDefinition({
     name: 'MA-onoffpluginunit',
     code: 0x010a,
@@ -151,41 +156,73 @@ export const dimmableOutlet = DeviceTypeDefinition({
     name: 'MA-dimmablepluginunit',
     code: 0x010b,
     deviceClass: DeviceClasses.Simple,
-    revision: 3,
+    revision: 4,
     requiredServerClusters: [Identify.Cluster.id, Groups.Cluster.id, OnOff.Cluster.id, LevelControl.Cluster.id],
     optionalServerClusters: [],
 });
-export const doorLockDevice = DeviceTypeDefinition({
-    name: 'MA-doorLock',
-    code: 0xa,
+export const onOffMountedSwitch = DeviceTypeDefinition({
+    name: 'MA-onoffswitch',
+    code: 0x010f,
+    deviceClass: DeviceClasses.Simple,
+    revision: 1,
+    requiredServerClusters: [Identify.Cluster.id, Groups.Cluster.id, OnOff.Cluster.id],
+    optionalServerClusters: [LevelControl.Cluster.id],
+});
+export const dimmableMountedSwitch = DeviceTypeDefinition({
+    name: 'MA-dimmableswitch',
+    code: 0x0110,
+    deviceClass: DeviceClasses.Simple,
+    revision: 1,
+    requiredServerClusters: [Identify.Cluster.id, Groups.Cluster.id, OnOff.Cluster.id, LevelControl.Cluster.id],
+    optionalServerClusters: [],
+});
+export const pumpDevice = DeviceTypeDefinition({
+    name: 'MA-pump',
+    code: 0x303,
     deviceClass: DeviceClasses.Simple,
     revision: 3,
-    requiredServerClusters: [Identify.Cluster.id, DoorLock.Cluster.id],
-    optionalServerClusters: [Groups.Cluster.id],
+    requiredServerClusters: [OnOff.Cluster.id, PumpConfigurationAndControl.Cluster.id, Identify.Cluster.id],
+    optionalServerClusters: [LevelControl.Cluster.id, Groups.Cluster.id, ScenesManagement.Cluster.id, TemperatureMeasurement.Cluster.id, PressureMeasurement.Cluster.id, FlowMeasurement.Cluster.id],
 });
-export const coverDevice = DeviceTypeDefinition({
-    name: 'MA-windowCovering',
-    code: 0x202,
+export const waterValve = DeviceTypeDefinition({
+    name: 'MA-waterValve',
+    code: 0x42,
+    deviceClass: DeviceClasses.Simple,
+    revision: 1,
+    requiredServerClusters: [Identify.Cluster.id, ValveConfigurationAndControl.Cluster.id],
+    optionalServerClusters: [FlowMeasurement.Cluster.id],
+});
+export const onOffSwitch = DeviceTypeDefinition({
+    name: 'MA-onoffswitch',
+    code: 0x0103,
     deviceClass: DeviceClasses.Simple,
     revision: 3,
-    requiredServerClusters: [Identify.Cluster.id, WindowCovering.Cluster.id],
-    optionalServerClusters: [Groups.Cluster.id],
+    requiredServerClusters: [Identify.Cluster.id, OnOff.Cluster.id],
+    optionalServerClusters: [Groups.Cluster.id, ScenesManagement.Cluster.id],
 });
-export const fanDevice = DeviceTypeDefinition({
-    name: 'MA-fan',
-    code: 0x2b,
+export const dimmableSwitch = DeviceTypeDefinition({
+    name: 'MA-dimmableswitch',
+    code: 0x0104,
     deviceClass: DeviceClasses.Simple,
-    revision: 2,
-    requiredServerClusters: [Identify.Cluster.id, Groups.Cluster.id, FanControl.Cluster.id],
-    optionalServerClusters: [],
+    revision: 3,
+    requiredServerClusters: [Identify.Cluster.id, OnOff.Cluster.id, LevelControl.Cluster.id],
+    optionalServerClusters: [Groups.Cluster.id, ScenesManagement.Cluster.id],
 });
-export const thermostatDevice = DeviceTypeDefinition({
-    name: 'MA-thermostat',
-    code: 0x301,
+export const colorTemperatureSwitch = DeviceTypeDefinition({
+    name: 'MA-colortemperatureswitch',
+    code: 0x0105,
     deviceClass: DeviceClasses.Simple,
     revision: 3,
-    requiredServerClusters: [Identify.Cluster.id, Thermostat.Cluster.id],
-    optionalServerClusters: [Groups.Cluster.id, ThermostatUserInterfaceConfiguration.Cluster.id, EnergyPreference.Cluster.id, TimeSynchronization.Cluster.id],
+    requiredServerClusters: [Identify.Cluster.id, Groups.Cluster.id, OnOff.Cluster.id, LevelControl.Cluster.id, ColorControl.Cluster.id],
+    optionalServerClusters: [Groups.Cluster.id, ScenesManagement.Cluster.id],
+});
+export const genericSwitch = DeviceTypeDefinition({
+    name: 'MA-genericswitch',
+    code: 0x000f,
+    deviceClass: DeviceClasses.Simple,
+    revision: 3,
+    requiredServerClusters: [Identify.Cluster.id, Switch.Cluster.id],
+    optionalServerClusters: [],
 });
 export const contactSensor = DeviceTypeDefinition({
     name: 'MA-contactsensor',
@@ -193,6 +230,7 @@ export const contactSensor = DeviceTypeDefinition({
     deviceClass: DeviceClasses.Simple,
     revision: 2,
     requiredServerClusters: [Identify.Cluster.id, BooleanState.Cluster.id],
+    optionalServerClusters: [BooleanStateConfiguration.Cluster.id],
 });
 export const lightSensor = DeviceTypeDefinition({
     name: 'MA-lightsensor',
@@ -205,8 +243,9 @@ export const occupancySensor = DeviceTypeDefinition({
     name: 'MA-occupancysensor',
     code: 0x0107,
     deviceClass: DeviceClasses.Simple,
-    revision: 3,
+    revision: 4,
     requiredServerClusters: [Identify.Cluster.id, OccupancySensing.Cluster.id],
+    optionalServerClusters: [BooleanStateConfiguration.Cluster.id],
 });
 export const temperatureSensor = DeviceTypeDefinition({
     name: 'MA-tempsensor',
@@ -236,44 +275,13 @@ export const humiditySensor = DeviceTypeDefinition({
     revision: 2,
     requiredServerClusters: [Identify.Cluster.id, RelativeHumidityMeasurement.Cluster.id],
 });
-export const modeSelect = DeviceTypeDefinition({
-    name: 'MA-modeselect',
-    code: 0x27,
+export const smokeCoAlarm = DeviceTypeDefinition({
+    name: 'MA-smokeCoAlarm',
+    code: 0x0076,
     deviceClass: DeviceClasses.Simple,
     revision: 1,
-    requiredServerClusters: [ModeSelect.Cluster.id],
-});
-export const roboticVacuumCleaner = DeviceTypeDefinition({
-    name: 'MA-roboticvacuumcleaner',
-    code: 0x74,
-    deviceClass: DeviceClasses.Simple,
-    revision: 2,
-    requiredServerClusters: [Identify.Cluster.id, RvcRunMode.Cluster.id, RvcOperationalState.Cluster.id],
-    optionalServerClusters: [RvcCleanMode.Cluster.id],
-});
-export const onOffSwitch = DeviceTypeDefinition({
-    name: 'MA-onoffswitch',
-    code: 0x0103,
-    deviceClass: DeviceClasses.Simple,
-    revision: 3,
-    requiredServerClusters: [Identify.Cluster.id, Groups.Cluster.id, OnOff.Cluster.id],
-    optionalServerClusters: [LevelControl.Cluster.id, ColorControl.Cluster.id],
-});
-export const dimmableSwitch = DeviceTypeDefinition({
-    name: 'MA-dimmableswitch',
-    code: 0x0104,
-    deviceClass: DeviceClasses.Simple,
-    revision: 3,
-    requiredServerClusters: [Identify.Cluster.id, Groups.Cluster.id, OnOff.Cluster.id, LevelControl.Cluster.id],
-    optionalServerClusters: [ColorControl.Cluster.id],
-});
-export const colorTemperatureSwitch = DeviceTypeDefinition({
-    name: 'MA-colortemperatureswitch',
-    code: 0x0105,
-    deviceClass: DeviceClasses.Simple,
-    revision: 3,
-    requiredServerClusters: [Identify.Cluster.id, Groups.Cluster.id, OnOff.Cluster.id, LevelControl.Cluster.id, ColorControl.Cluster.id],
-    optionalServerClusters: [],
+    requiredServerClusters: [Identify.Cluster.id, SmokeCoAlarm.Cluster.id],
+    optionalServerClusters: [Groups.Cluster.id, TemperatureMeasurement.Cluster.id, RelativeHumidityMeasurement.Cluster.id, CarbonMonoxideConcentrationMeasurement.Cluster.id],
 });
 export const airQualitySensor = DeviceTypeDefinition({
     name: 'MA-airQualitySensor',
@@ -320,37 +328,69 @@ export const rainSensor = DeviceTypeDefinition({
     requiredServerClusters: [Identify.Cluster.id, BooleanState.Cluster.id],
     optionalServerClusters: [BooleanStateConfiguration.Cluster.id],
 });
-export const smokeCoAlarm = DeviceTypeDefinition({
-    name: 'MA-smokeCoAlarm',
-    code: 0x0076,
+export const doorLockDevice = DeviceTypeDefinition({
+    name: 'MA-doorLock',
+    code: 0xa,
     deviceClass: DeviceClasses.Simple,
-    revision: 1,
-    requiredServerClusters: [Identify.Cluster.id, SmokeCoAlarm.Cluster.id],
-    optionalServerClusters: [Groups.Cluster.id, TemperatureMeasurement.Cluster.id, RelativeHumidityMeasurement.Cluster.id, CarbonMonoxideConcentrationMeasurement.Cluster.id],
+    revision: 3,
+    requiredServerClusters: [Identify.Cluster.id, DoorLock.Cluster.id, AccessControl.Cluster.id],
+    optionalServerClusters: [],
 });
-export const pumpDevice = DeviceTypeDefinition({
-    name: 'MA-pump',
-    code: 0x303,
+export const coverDevice = DeviceTypeDefinition({
+    name: 'MA-windowCovering',
+    code: 0x202,
     deviceClass: DeviceClasses.Simple,
     revision: 3,
-    requiredServerClusters: [OnOff.Cluster.id, PumpConfigurationAndControl.Cluster.id, Identify.Cluster.id],
-    optionalServerClusters: [LevelControl.Cluster.id, Groups.Cluster.id, ScenesManagement.Cluster.id, TemperatureMeasurement.Cluster.id, PressureMeasurement.Cluster.id, FlowMeasurement.Cluster.id],
+    requiredServerClusters: [Identify.Cluster.id, WindowCovering.Cluster.id],
+    optionalServerClusters: [Groups.Cluster.id],
 });
-export const waterValve = DeviceTypeDefinition({
-    name: 'MA-waterValve',
-    code: 0x42,
+export const thermostatDevice = DeviceTypeDefinition({
+    name: 'MA-thermostat',
+    code: 0x301,
     deviceClass: DeviceClasses.Simple,
-    revision: 1,
-    requiredServerClusters: [Identify.Cluster.id, ValveConfigurationAndControl.Cluster.id],
-    optionalServerClusters: [FlowMeasurement.Cluster.id],
+    revision: 4,
+    requiredServerClusters: [Identify.Cluster.id, Thermostat.Cluster.id],
+    optionalServerClusters: [Groups.Cluster.id, ThermostatUserInterfaceConfiguration.Cluster.id, EnergyPreference.Cluster.id],
+});
+export const fanDevice = DeviceTypeDefinition({
+    name: 'MA-fan',
+    code: 0x2b,
+    deviceClass: DeviceClasses.Simple,
+    revision: 3,
+    requiredServerClusters: [Identify.Cluster.id, Groups.Cluster.id, FanControl.Cluster.id],
+    optionalServerClusters: [OnOff.Cluster.id],
 });
 export const airPurifier = DeviceTypeDefinition({
     name: 'MA-airPurifier',
     code: 0x2d,
     deviceClass: DeviceClasses.Simple,
-    revision: 1,
+    revision: 2,
     requiredServerClusters: [Identify.Cluster.id, FanControl.Cluster.id],
-    optionalServerClusters: [Groups.Cluster.id, HepaFilterMonitoring.Cluster.id, ActivatedCarbonFilterMonitoring.Cluster.id],
+    optionalServerClusters: [Groups.Cluster.id, OnOff.Cluster.id, HepaFilterMonitoring.Cluster.id, ActivatedCarbonFilterMonitoring.Cluster.id],
+});
+export const modeSelect = DeviceTypeDefinition({
+    name: 'MA-modeselect',
+    code: 0x27,
+    deviceClass: DeviceClasses.Simple,
+    revision: 1,
+    requiredServerClusters: [ModeSelect.Cluster.id],
+});
+export const bridge = DeviceTypeDefinition({
+    name: 'MA-aggregator',
+    code: 0x000e,
+    deviceClass: DeviceClasses.Dynamic,
+    revision: 2,
+    requiredServerClusters: [],
+    optionalServerClusters: [Actions.Cluster.id, Identify.Cluster.id, CommissionerControl.Cluster.id],
+});
+export const aggregator = bridge;
+export const roboticVacuumCleaner = DeviceTypeDefinition({
+    name: 'MA-roboticvacuumcleaner',
+    code: 0x74,
+    deviceClass: DeviceClasses.Simple,
+    revision: 3,
+    requiredServerClusters: [Identify.Cluster.id, RvcRunMode.Cluster.id, RvcOperationalState.Cluster.id],
+    optionalServerClusters: [RvcCleanMode.Cluster.id, ServiceArea.Cluster.id],
 });
 export const airConditioner = DeviceTypeDefinition({
     name: 'MA-airConditioner',
@@ -360,19 +400,3 @@ export const airConditioner = DeviceTypeDefinition({
     requiredServerClusters: [Identify.Cluster.id, OnOff.Cluster.id, Thermostat.Cluster.id],
     optionalServerClusters: [Groups.Cluster.id, ScenesManagement.Cluster.id, FanControl.Cluster.id, ThermostatUserInterfaceConfiguration.Cluster.id, TemperatureMeasurement.Cluster.id, RelativeHumidityMeasurement.Cluster.id],
 });
-export const electricalSensor = DeviceTypeDefinition({
-    name: 'MA-electricalSensor',
-    code: 0x0510,
-    deviceClass: DeviceClasses.Utility,
-    revision: 1,
-    requiredServerClusters: [PowerTopology.Cluster.id],
-    optionalServerClusters: [ElectricalPowerMeasurement.Cluster.id, ElectricalEnergyMeasurement.Cluster.id],
-});
-export const deviceEnergyManagement = DeviceTypeDefinition({
-    name: 'MA-deviceEnergyManagement',
-    code: 0x050d,
-    deviceClass: DeviceClasses.Utility,
-    revision: 1,
-    requiredServerClusters: [DeviceEnergyManagement.Cluster.id, DeviceEnergyManagementMode.Cluster.id],
-    optionalServerClusters: [],
-});

package/dist/matterbridgeEndpoint.js

@@ -1,7 +1,7 @@
 import { AnsiLogger, BLUE, CYAN, YELLOW, db, debugStringify, er, hk, or, zb } from './logger/export.js';
 import { bridgedNode } from './matterbridgeDeviceTypes.js';
 import { isValidNumber, isValidObject } from './utils/export.js';
-import { MatterbridgeBehavior, MatterbridgeBehaviorDevice, MatterbridgeIdentifyServer, MatterbridgeOnOffServer, MatterbridgeLevelControlServer, MatterbridgeColorControlServer, MatterbridgeWindowCoveringServer, MatterbridgeThermostatServer, MatterbridgeFanControlServer, MatterbridgeDoorLockServer, MatterbridgeModeSelectServer, MatterbridgeValveConfigurationAndControlServer, MatterbridgeSmokeCoAlarmServer, MatterbridgeBooleanStateConfigurationServer, MatterbridgeSwitchServer, } from './matterbridgeBehaviors.js';
+import { MatterbridgeBehavior, MatterbridgeBehaviorDevice, MatterbridgeIdentifyServer, MatterbridgeOnOffServer, MatterbridgeLevelControlServer, MatterbridgeColorControlServer, MatterbridgeWindowCoveringServer, MatterbridgeThermostatServer, MatterbridgeFanControlServer, MatterbridgeDoorLockServer, MatterbridgeModeSelectServer, MatterbridgeValveConfigurationAndControlServer, MatterbridgeSmokeCoAlarmServer, MatterbridgeBooleanStateConfigurationServer, MatterbridgeSwitchServer, MatterbridgeRvcRunModeServer, MatterbridgeRvcCleanModeServer, MatterbridgeRvcOperationalStateServer, } from './matterbridgeBehaviors.js';
 import { addClusterServers, addFixedLabel, addOptionalClusterServers, addRequiredClusterServers, addUserLabel, capitalizeFirstLetter, createUniqueId, getBehavior, getBehaviourTypesFromClusterClientIds, getBehaviourTypesFromClusterServerIds, getDefaultFlowMeasurementClusterServer, getDefaultIlluminanceMeasurementClusterServer, getDefaultPressureMeasurementClusterServer, getDefaultRelativeHumidityMeasurementClusterServer, getDefaultTemperatureMeasurementClusterServer, getDefaultOccupancySensingClusterServer, lowercaseFirstLetter, updateAttribute, getClusterId, getAttributeId, setAttribute, getAttribute, checkNotLatinCharacters, generateUniqueId, subscribeAttribute, } from './matterbridgeEndpointHelpers.js';
 import { Endpoint, Lifecycle, MutableEndpoint, NamedHandler, SupportedBehaviors, VendorId } from '@matter/main';
 import { ClusterType, getClusterNameById, MeasurementType } from '@matter/main/types';
@@ -26,6 +26,9 @@ import { ElectricalPowerMeasurement } from '@matter/main/clusters/electrical-pow
 import { ElectricalEnergyMeasurement } from '@matter/main/clusters/electrical-energy-measurement';
 import { AirQuality } from '@matter/main/clusters/air-quality';
 import { ConcentrationMeasurement } from '@matter/main/clusters/concentration-measurement';
+import { RvcRunMode } from '@matter/main/clusters/rvc-run-mode';
+import { RvcOperationalState } from '@matter/main/clusters/rvc-operational-state';
+import { OccupancySensing } from '@matter/main/clusters/occupancy-sensing';
 import { DescriptorServer } from '@matter/main/behaviors/descriptor';
 import { PowerSourceServer } from '@matter/main/behaviors/power-source';
 import { BridgedDeviceBasicInformationServer } from '@matter/main/behaviors/bridged-device-basic-information';
@@ -54,6 +57,7 @@ import { Pm25ConcentrationMeasurementServer } from '@matter/main/behaviors/pm25-
 import { Pm10ConcentrationMeasurementServer } from '@matter/main/behaviors/pm10-concentration-measurement';
 import { RadonConcentrationMeasurementServer } from '@matter/main/behaviors/radon-concentration-measurement';
 import { TotalVolatileOrganicCompoundsConcentrationMeasurementServer } from '@matter/main/behaviors/total-volatile-organic-compounds-concentration-measurement';
+import { RvcCleanMode } from '@matter/main/clusters/rvc-clean-mode';
 export class MatterbridgeEndpoint extends Endpoint {
     static bridgeMode = '';
     static logLevel = "info";
@@ -752,11 +756,12 @@ export class MatterbridgeEndpoint extends Endpoint {
     }
     createDefaultDoorLockClusterServer(lockState = DoorLock.LockState.Locked, lockType = DoorLock.LockType.DeadBolt) {
         this.behaviors.require(MatterbridgeDoorLockServer.enable({ events: { doorLockAlarm: true, lockOperation: true, lockOperationError: true } }), {
-            operatingMode: DoorLock.OperatingMode.Normal,
             lockState,
             lockType,
             actuatorEnabled: false,
-            supportedOperatingModes: { normal: false, vacation: true, privacy: true, noRemoteLockUnlock: true, passage: true },
+            operatingMode: DoorLock.OperatingMode.Normal,
+            supportedOperatingModes: { normal: false, vacation: true, privacy: true, noRemoteLockUnlock: true, passage: true, alwaysSet: 2047 },
+            alarmMask: { lockJammed: false, lockFactoryReset: false, lockRadioPowerCycled: false, wrongCodeEntryLimit: false, frontEscutcheonRemoved: false, doorForcedOpen: false },
         });
         return this;
     }
@@ -779,6 +784,9 @@ export class MatterbridgeEndpoint extends Endpoint {
             openDuration: null,
             defaultOpenDuration: null,
             remainingDuration: null,
+            defaultOpenLevel: 100,
+            valveFault: { generalFault: false, blocked: false, leaking: false, notConnected: false, shortCircuit: false, currentExceeded: false },
+            levelStep: 1,
         });
         return this;
     }
@@ -999,28 +1007,28 @@ export class MatterbridgeEndpoint extends Endpoint {
         });
         return this;
     }
-    createDefaultTemperatureMeasurementClusterServer(measuredValue = 0) {
-        this.behaviors.require(TemperatureMeasurementServer, getDefaultTemperatureMeasurementClusterServer(measuredValue));
+    createDefaultTemperatureMeasurementClusterServer(measuredValue = null, minMeasuredValue = null, maxMeasuredValue = null) {
+        this.behaviors.require(TemperatureMeasurementServer, getDefaultTemperatureMeasurementClusterServer(measuredValue, minMeasuredValue, maxMeasuredValue));
         return this;
     }
-    createDefaultRelativeHumidityMeasurementClusterServer(measuredValue = 0) {
-        this.behaviors.require(RelativeHumidityMeasurementServer, getDefaultRelativeHumidityMeasurementClusterServer(measuredValue));
+    createDefaultRelativeHumidityMeasurementClusterServer(measuredValue = null, minMeasuredValue = null, maxMeasuredValue = null) {
+        this.behaviors.require(RelativeHumidityMeasurementServer, getDefaultRelativeHumidityMeasurementClusterServer(measuredValue, minMeasuredValue, maxMeasuredValue));
         return this;
     }
-    createDefaultPressureMeasurementClusterServer(measuredValue = 1000) {
-        this.behaviors.require(PressureMeasurementServer, getDefaultPressureMeasurementClusterServer(measuredValue));
+    createDefaultPressureMeasurementClusterServer(measuredValue = null, minMeasuredValue = null, maxMeasuredValue = null) {
+        this.behaviors.require(PressureMeasurementServer, getDefaultPressureMeasurementClusterServer(measuredValue, minMeasuredValue, maxMeasuredValue));
         return this;
     }
-    createDefaultIlluminanceMeasurementClusterServer(measuredValue = 0) {
-        this.behaviors.require(IlluminanceMeasurementServer, getDefaultIlluminanceMeasurementClusterServer(measuredValue));
+    createDefaultIlluminanceMeasurementClusterServer(measuredValue = null, minMeasuredValue = null, maxMeasuredValue = null) {
+        this.behaviors.require(IlluminanceMeasurementServer, getDefaultIlluminanceMeasurementClusterServer(measuredValue, minMeasuredValue, maxMeasuredValue));
         return this;
     }
-    createDefaultFlowMeasurementClusterServer(measuredValue = 0) {
-        this.behaviors.require(FlowMeasurementServer, getDefaultFlowMeasurementClusterServer(measuredValue));
+    createDefaultFlowMeasurementClusterServer(measuredValue = null, minMeasuredValue = null, maxMeasuredValue = null) {
+        this.behaviors.require(FlowMeasurementServer, getDefaultFlowMeasurementClusterServer(measuredValue, minMeasuredValue, maxMeasuredValue));
         return this;
     }
-    createDefaultOccupancySensingClusterServer(occupied = false) {
-        this.behaviors.require(OccupancySensingServer, getDefaultOccupancySensingClusterServer(occupied));
+    createDefaultOccupancySensingClusterServer(occupied = false, holdTime = 30, holdTimeMin = 1, holdTimeMax = 300) {
+        this.behaviors.require(OccupancySensingServer.with(OccupancySensing.Feature.PassiveInfrared), getDefaultOccupancySensingClusterServer(occupied, holdTime, holdTimeMin, holdTimeMax));
         return this;
     }
     createDefaultAirQualityClusterServer(airQuality = AirQuality.AirQualityEnum.Unknown) {
@@ -1029,7 +1037,7 @@ export class MatterbridgeEndpoint extends Endpoint {
         });
         return this;
     }
-    createDefaultTvocMeasurementClusterServer(measuredValue = 0, measurementUnit = ConcentrationMeasurement.MeasurementUnit.Ppm, measurementMedium = ConcentrationMeasurement.MeasurementMedium.Air, uncertainty) {
+    createDefaultTvocMeasurementClusterServer(measuredValue = null, measurementUnit = ConcentrationMeasurement.MeasurementUnit.Ppm, measurementMedium = ConcentrationMeasurement.MeasurementMedium.Air, uncertainty) {
         this.behaviors.require(TotalVolatileOrganicCompoundsConcentrationMeasurementServer.with(ConcentrationMeasurement.Feature.NumericMeasurement), {
             measuredValue,
             minMeasuredValue: null,
@@ -1047,7 +1055,7 @@ export class MatterbridgeEndpoint extends Endpoint {
         });
         return this;
     }
-    createDefaultCarbonMonoxideConcentrationMeasurementClusterServer(measuredValue = 0, measurementUnit = ConcentrationMeasurement.MeasurementUnit.Ppm, measurementMedium = ConcentrationMeasurement.MeasurementMedium.Air) {
+    createDefaultCarbonMonoxideConcentrationMeasurementClusterServer(measuredValue = null, measurementUnit = ConcentrationMeasurement.MeasurementUnit.Ppm, measurementMedium = ConcentrationMeasurement.MeasurementMedium.Air) {
         this.behaviors.require(CarbonMonoxideConcentrationMeasurementServer.with(ConcentrationMeasurement.Feature.NumericMeasurement), {
             measuredValue,
             minMeasuredValue: null,
@@ -1058,7 +1066,7 @@ export class MatterbridgeEndpoint extends Endpoint {
         });
         return this;
     }
-    createDefaultCarbonDioxideConcentrationMeasurementClusterServer(measuredValue = 0, measurementUnit = ConcentrationMeasurement.MeasurementUnit.Ppm, measurementMedium = ConcentrationMeasurement.MeasurementMedium.Air) {
+    createDefaultCarbonDioxideConcentrationMeasurementClusterServer(measuredValue = null, measurementUnit = ConcentrationMeasurement.MeasurementUnit.Ppm, measurementMedium = ConcentrationMeasurement.MeasurementMedium.Air) {
         this.behaviors.require(CarbonDioxideConcentrationMeasurementServer.with(ConcentrationMeasurement.Feature.NumericMeasurement), {
             measuredValue,
             minMeasuredValue: null,
@@ -1069,7 +1077,7 @@ export class MatterbridgeEndpoint extends Endpoint {
         });
         return this;
     }
-    createDefaultFormaldehydeConcentrationMeasurementClusterServer(measuredValue = 0, measurementUnit = ConcentrationMeasurement.MeasurementUnit.Ppm, measurementMedium = ConcentrationMeasurement.MeasurementMedium.Air) {
+    createDefaultFormaldehydeConcentrationMeasurementClusterServer(measuredValue = null, measurementUnit = ConcentrationMeasurement.MeasurementUnit.Ppm, measurementMedium = ConcentrationMeasurement.MeasurementMedium.Air) {
         this.behaviors.require(FormaldehydeConcentrationMeasurementServer.with(ConcentrationMeasurement.Feature.NumericMeasurement), {
             measuredValue,
             minMeasuredValue: null,
@@ -1080,7 +1088,7 @@ export class MatterbridgeEndpoint extends Endpoint {
         });
         return this;
     }
-    createDefaultPm1ConcentrationMeasurementClusterServer(measuredValue = 0, measurementUnit = ConcentrationMeasurement.MeasurementUnit.Ppm, measurementMedium = ConcentrationMeasurement.MeasurementMedium.Air) {
+    createDefaultPm1ConcentrationMeasurementClusterServer(measuredValue = null, measurementUnit = ConcentrationMeasurement.MeasurementUnit.Ppm, measurementMedium = ConcentrationMeasurement.MeasurementMedium.Air) {
         this.behaviors.require(Pm1ConcentrationMeasurementServer.with(ConcentrationMeasurement.Feature.NumericMeasurement), {
             measuredValue,
             minMeasuredValue: null,
@@ -1091,7 +1099,7 @@ export class MatterbridgeEndpoint extends Endpoint {
         });
         return this;
     }
-    createDefaultPm25ConcentrationMeasurementClusterServer(measuredValue = 0, measurementUnit = ConcentrationMeasurement.MeasurementUnit.Ppm, measurementMedium = ConcentrationMeasurement.MeasurementMedium.Air) {
+    createDefaultPm25ConcentrationMeasurementClusterServer(measuredValue = null, measurementUnit = ConcentrationMeasurement.MeasurementUnit.Ppm, measurementMedium = ConcentrationMeasurement.MeasurementMedium.Air) {
         this.behaviors.require(Pm25ConcentrationMeasurementServer.with(ConcentrationMeasurement.Feature.NumericMeasurement), {
             measuredValue,
             minMeasuredValue: null,
@@ -1102,7 +1110,7 @@ export class MatterbridgeEndpoint extends Endpoint {
         });
         return this;
     }
-    createDefaultPm10ConcentrationMeasurementClusterServer(measuredValue = 0, measurementUnit = ConcentrationMeasurement.MeasurementUnit.Ppm, measurementMedium = ConcentrationMeasurement.MeasurementMedium.Air) {
+    createDefaultPm10ConcentrationMeasurementClusterServer(measuredValue = null, measurementUnit = ConcentrationMeasurement.MeasurementUnit.Ppm, measurementMedium = ConcentrationMeasurement.MeasurementMedium.Air) {
         this.behaviors.require(Pm10ConcentrationMeasurementServer.with(ConcentrationMeasurement.Feature.NumericMeasurement), {
             measuredValue,
             minMeasuredValue: null,
@@ -1113,7 +1121,7 @@ export class MatterbridgeEndpoint extends Endpoint {
         });
         return this;
     }
-    createDefaultOzoneConcentrationMeasurementClusterServer(measuredValue = 0, measurementUnit = ConcentrationMeasurement.MeasurementUnit.Ugm3, measurementMedium = ConcentrationMeasurement.MeasurementMedium.Air) {
+    createDefaultOzoneConcentrationMeasurementClusterServer(measuredValue = null, measurementUnit = ConcentrationMeasurement.MeasurementUnit.Ugm3, measurementMedium = ConcentrationMeasurement.MeasurementMedium.Air) {
         this.behaviors.require(OzoneConcentrationMeasurementServer.with(ConcentrationMeasurement.Feature.NumericMeasurement), {
             measuredValue,
             minMeasuredValue: null,
@@ -1124,7 +1132,7 @@ export class MatterbridgeEndpoint extends Endpoint {
         });
         return this;
     }
-    createDefaultRadonConcentrationMeasurementClusterServer(measuredValue = 0, measurementUnit = ConcentrationMeasurement.MeasurementUnit.Ppm, measurementMedium = ConcentrationMeasurement.MeasurementMedium.Air) {
+    createDefaultRadonConcentrationMeasurementClusterServer(measuredValue = null, measurementUnit = ConcentrationMeasurement.MeasurementUnit.Ppm, measurementMedium = ConcentrationMeasurement.MeasurementMedium.Air) {
         this.behaviors.require(RadonConcentrationMeasurementServer.with(ConcentrationMeasurement.Feature.NumericMeasurement), {
             measuredValue,
             minMeasuredValue: null,
@@ -1135,7 +1143,7 @@ export class MatterbridgeEndpoint extends Endpoint {
         });
         return this;
     }
-    createDefaultNitrogenDioxideConcentrationMeasurementClusterServer(measuredValue = 0, measurementUnit = ConcentrationMeasurement.MeasurementUnit.Ugm3, measurementMedium = ConcentrationMeasurement.MeasurementMedium.Air) {
+    createDefaultNitrogenDioxideConcentrationMeasurementClusterServer(measuredValue = null, measurementUnit = ConcentrationMeasurement.MeasurementUnit.Ugm3, measurementMedium = ConcentrationMeasurement.MeasurementMedium.Air) {
         this.behaviors.require(NitrogenDioxideConcentrationMeasurementServer.with(ConcentrationMeasurement.Feature.NumericMeasurement), {
             measuredValue,
             minMeasuredValue: null,
@@ -1146,4 +1154,48 @@ export class MatterbridgeEndpoint extends Endpoint {
         });
         return this;
     }
+    createDefaultRvcRunModeClusterServer() {
+        this.behaviors.require(MatterbridgeRvcRunModeServer.with(RvcRunMode.Feature.OnOff), {
+            supportedModes: [
+                { label: 'Idle', mode: 1, modeTags: [{ value: RvcRunMode.ModeTag.Idle }] },
+                { label: 'Cleaning', mode: 2, modeTags: [{ value: RvcRunMode.ModeTag.Cleaning }] },
+                { label: 'SpotCleaning', mode: 3, modeTags: [{ value: RvcRunMode.ModeTag.Cleaning }] },
+            ],
+            currentMode: 1,
+            startUpMode: null,
+            onMode: null,
+        });
+        return this;
+    }
+    createDefaultRvcCleanModeClusterServer() {
+        this.behaviors.require(MatterbridgeRvcCleanModeServer.with(RvcCleanMode.Feature.OnOff), {
+            supportedModes: [
+                { label: 'Vacuum', mode: 1, modeTags: [{ value: RvcCleanMode.ModeTag.Vacuum }] },
+                { label: 'Mop', mode: 2, modeTags: [{ value: RvcCleanMode.ModeTag.Mop }] },
+                { label: 'Clean', mode: 3, modeTags: [{ value: RvcCleanMode.ModeTag.DeepClean }] },
+            ],
+            currentMode: 1,
+            startUpMode: null,
+            onMode: null,
+        });
+        return this;
+    }
+    createDefaultRvcOperationalStateClusterServer() {
+        this.behaviors.require(MatterbridgeRvcOperationalStateServer, {
+            phaseList: [],
+            currentPhase: null,
+            operationalStateList: [
+                { operationalStateId: RvcOperationalState.OperationalState.Stopped, operationalStateLabel: 'Stopped' },
+                { operationalStateId: RvcOperationalState.OperationalState.Running, operationalStateLabel: 'Running' },
+                { operationalStateId: RvcOperationalState.OperationalState.Paused, operationalStateLabel: 'Paused' },
+                { operationalStateId: RvcOperationalState.OperationalState.Error, operationalStateLabel: 'Error' },
+                { operationalStateId: RvcOperationalState.OperationalState.SeekingCharger, operationalStateLabel: 'SeekingCharger' },
+                { operationalStateId: RvcOperationalState.OperationalState.Charging, operationalStateLabel: 'Charging' },
+                { operationalStateId: RvcOperationalState.OperationalState.Docked, operationalStateLabel: 'Docked' },
+            ],
+            operationalState: RvcOperationalState.OperationalState.Docked,
+            operationalError: { errorStateId: RvcOperationalState.ErrorState.NoError, errorStateLabel: 'No Error', errorStateDetails: 'Fully operative' },
+        });
+        return this;
+    }
 }