matterbridge 3.0.6-dev-20250611-48af719 → 3.0.6-dev-20250612-6b6e953

package/CHANGELOG.md

@@ -13,10 +13,20 @@ If you like this project and find it useful, please consider giving it a star on
 ### Added
 
 - [tests] Update Jest test coverage on addBridgedEndpoint and removeBridgedEndpoint.
+- [fan]: Added createMultiSpeedFanControlClusterServer claster helper with MultiSpeed feature.
+- [fan]: Added all parameters to the fan cluster helpers.
+- [valve]: Added logic in MatterbridgeValveConfigurationAndControlServer.
+- [command]: Added cluster property to commandHandler data object.
 
 ### Changed
 
 - [package]: Updated dependencies.
+- [fan]: The default fan has no more the MultiSpeed feature.
+- [behaviors]: Bump Matterbridge Behaviors to 1.3.0
+- [evse]: Updated class and behavior to 1.1.0.
+- [waterHeater]: Updated class and behavior to 1.1.0.
+- [rvc]: Updated class and behavior to 1.1.0.
+- [laundryWasher]: Updated class and behavior to 1.1.0.
 
 ### Fixed
 

package/README.md

@@ -324,6 +324,8 @@ It exposes 38 devices:
 - a microwave Oven device (supported by SmartThings, Alexa and Home Assistant)
 - an extractor Hood device (supported by SmartThings, Alexa and Home Assistant)
 - a cooktop device (supported by SmartThings, Alexa and Home Assistant)
+- a water heater device (supported by SmartThings and Home Assistant)
+- a car charger device (supported by Home Assistant)
 
 All these virtual devices continuously change state and position. The plugin also shows how to use all the command handlers (you can control all the devices).
 

package/dist/evse.js

@@ -51,7 +51,7 @@ export class MatterbridgeEnergyEvseServer extends EnergyEvseServer {
     disable() {
         const device = this.endpoint.stateOf(MatterbridgeServer);
         device.log.info(`Disable charging (endpoint ${this.endpoint.maybeId}.${this.endpoint.maybeNumber})`);
-        device.commandHandler.executeHandler('disable', { request: {}, attributes: this.state, endpoint: this.endpoint });
+        device.commandHandler.executeHandler('disable', { request: {}, cluster: EnergyEvseServer.id, attributes: this.state, endpoint: this.endpoint });
         device.log.debug(`MatterbridgeEnergyEvseServer disable called`);
         this.state.supplyState = EnergyEvse.SupplyState.Disabled;
         if (this.state.state === EnergyEvse.State.PluggedInCharging) {
@@ -62,7 +62,7 @@ export class MatterbridgeEnergyEvseServer extends EnergyEvseServer {
     enableCharging(request) {
         const device = this.endpoint.stateOf(MatterbridgeServer);
         device.log.info(`EnableCharging (endpoint ${this.endpoint.maybeId}.${this.endpoint.maybeNumber})`);
-        device.commandHandler.executeHandler('enableCharging', { request, attributes: this.state, endpoint: this.endpoint });
+        device.commandHandler.executeHandler('enableCharging', { request, cluster: EnergyEvseServer.id, attributes: this.state, endpoint: this.endpoint });
         device.log.debug(`MatterbridgeEnergyEvseServer enableCharging called`);
         this.state.supplyState = EnergyEvse.SupplyState.ChargingEnabled;
         if (this.state.state === EnergyEvse.State.PluggedInDemand) {
@@ -77,13 +77,12 @@ export class MatterbridgeEnergyEvseModeServer extends EnergyEvseModeServer {
     changeToMode(request) {
         const device = this.endpoint.stateOf(MatterbridgeServer);
         device.log.info(`Changing mode to ${request.newMode} (endpoint ${this.endpoint.maybeId}.${this.endpoint.maybeNumber})`);
-        device.commandHandler.executeHandler('changeToMode', { request, attributes: this.state, endpoint: this.endpoint });
+        device.commandHandler.executeHandler('changeToMode', { request, cluster: EnergyEvseModeServer.id, attributes: this.state, endpoint: this.endpoint });
         const supported = this.state.supportedModes.find((mode) => mode.mode === request.newMode);
         if (!supported) {
             device.log.error(`MatterbridgeEnergyEvseModeServer changeToMode called with unsupported newMode: ${request.newMode}`);
             return { status: ModeBase.ModeChangeStatus.UnsupportedMode, statusText: 'Unsupported mode' };
         }
-        device.commandHandler.executeHandler('changeToMode', { request, attributes: this.state, endpoint: this.endpoint });
         this.state.currentMode = request.newMode;
         device.log.debug(`MatterbridgeEnergyEvseModeServer changeToMode called with newMode ${request.newMode} => ${supported.label}`);
         return { status: ModeBase.ModeChangeStatus.Success, statusText: 'Success' };

package/dist/laundryWasher.js

@@ -71,7 +71,7 @@ export class MatterbridgeLevelTemperatureControlServer extends TemperatureContro
     setTemperature(request) {
         const device = this.endpoint.stateOf(MatterbridgeServer);
         device.log.info(`SetTemperature (endpoint ${this.endpoint.maybeId}.${this.endpoint.maybeNumber})`);
-        device.commandHandler.executeHandler('setTemperature', { request, attributes: this.state, endpoint: this.endpoint });
+        device.commandHandler.executeHandler('setTemperature', { request, cluster: TemperatureControlServer.id, attributes: this.state, endpoint: this.endpoint });
         if (request.targetTemperatureLevel !== undefined && request.targetTemperatureLevel >= 0 && request.targetTemperatureLevel < this.state.supportedTemperatureLevels.length) {
             device.log.debug(`MatterbridgeLevelTemperatureControlServer: setTemperature called setting selectedTemperatureLevel to ${request.targetTemperatureLevel}: ${this.state.supportedTemperatureLevels[request.targetTemperatureLevel]}`);
             this.state.selectedTemperatureLevel = request.targetTemperatureLevel;
@@ -89,7 +89,7 @@ export class MatterbridgeNumberTemperatureControlServer extends TemperatureContr
     setTemperature(request) {
         const device = this.endpoint.stateOf(MatterbridgeServer);
         device.log.info(`SetTemperature (endpoint ${this.endpoint.maybeId}.${this.endpoint.maybeNumber})`);
-        device.commandHandler.executeHandler('setTemperature', { request, attributes: this.state, endpoint: this.endpoint });
+        device.commandHandler.executeHandler('setTemperature', { request, cluster: TemperatureControlServer.id, attributes: this.state, endpoint: this.endpoint });
         if (request.targetTemperature !== undefined && request.targetTemperature >= this.state.minTemperature && request.targetTemperature <= this.state.maxTemperature) {
             device.log.debug(`MatterbridgeNumberTemperatureControlServer: setTemperature called setting temperatureSetpoint to ${request.targetTemperature}`);
             this.state.temperatureSetpoint = request.targetTemperature;
@@ -116,10 +116,9 @@ export class MatterbridgeLaundryWasherModeServer extends LaundryWasherModeServer
     changeToMode(request) {
         const device = this.endpoint.stateOf(MatterbridgeServer);
         device.log.info(`ChangeToMode (endpoint ${this.endpoint.maybeId}.${this.endpoint.maybeNumber})`);
-        device.commandHandler.executeHandler('changeToMode', { request, attributes: this.state, endpoint: this.endpoint });
+        device.commandHandler.executeHandler('changeToMode', { request, cluster: LaundryWasherModeServer.id, attributes: this.state, endpoint: this.endpoint });
         const supportedMode = this.state.supportedModes.find((supportedMode) => supportedMode.mode === request.newMode);
         if (supportedMode) {
-            device.commandHandler.executeHandler('changeToMode', { request, attributes: this.state, endpoint: this.endpoint });
             device.log.debug(`MatterbridgeLaundryWasherModeServer: changeToMode called with mode ${supportedMode.mode} => ${supportedMode.label}`);
             this.state.currentMode = request.newMode;
             return { status: ModeBase.ModeChangeStatus.Success, statusText: 'Success' };

package/dist/matterbridgeBehaviors.js

@@ -43,14 +43,14 @@ export class MatterbridgeIdentifyServer extends IdentifyServer {
     identify(request) {
         const device = this.endpoint.stateOf(MatterbridgeServer);
         device.log.info(`Identifying device for ${request.identifyTime} seconds (endpoint ${this.endpoint.maybeId}.${this.endpoint.maybeNumber})`);
-        device.commandHandler.executeHandler('identify', { request, attributes: this.state, endpoint: this.endpoint });
+        device.commandHandler.executeHandler('identify', { request, cluster: IdentifyServer.id, attributes: this.state, endpoint: this.endpoint });
         device.log.debug(`MatterbridgeIdentifyServer: identify called`);
         super.identify(request);
     }
     triggerEffect(request) {
         const device = this.endpoint.stateOf(MatterbridgeServer);
         device.log.info(`Triggering effect ${request.effectIdentifier} variant ${request.effectVariant} (endpoint ${this.endpoint.maybeId}.${this.endpoint.maybeNumber})`);
-        device.commandHandler.executeHandler('triggerEffect', { request, attributes: this.state, endpoint: this.endpoint });
+        device.commandHandler.executeHandler('triggerEffect', { request, cluster: IdentifyServer.id, attributes: this.state, endpoint: this.endpoint });
         device.log.debug(`MatterbridgeIdentifyServer: triggerEffect called`);
         super.triggerEffect(request);
     }
@@ -59,21 +59,21 @@ export class MatterbridgeOnOffServer extends OnOffServer {
     on() {
         const device = this.endpoint.stateOf(MatterbridgeServer);
         device.log.info(`Switching device on (endpoint ${this.endpoint.maybeId}.${this.endpoint.maybeNumber})`);
-        device.commandHandler.executeHandler('on', { request: {}, attributes: this.state, endpoint: this.endpoint });
+        device.commandHandler.executeHandler('on', { request: {}, cluster: OnOffServer.id, attributes: this.state, endpoint: this.endpoint });
         device.log.debug(`MatterbridgeOnOffServer: on called`);
         super.on();
     }
     off() {
         const device = this.endpoint.stateOf(MatterbridgeServer);
         device.log.info(`Switching device off (endpoint ${this.endpoint.maybeId}.${this.endpoint.maybeNumber})`);
-        device.commandHandler.executeHandler('off', { request: {}, attributes: this.state, endpoint: this.endpoint });
+        device.commandHandler.executeHandler('off', { request: {}, cluster: OnOffServer.id, attributes: this.state, endpoint: this.endpoint });
         device.log.debug(`MatterbridgeOnOffServer: off called`);
         super.off();
     }
     toggle() {
         const device = this.endpoint.stateOf(MatterbridgeServer);
         device.log.info(`Toggle device on/off (endpoint ${this.endpoint.maybeId}.${this.endpoint.maybeNumber})`);
-        device.commandHandler.executeHandler('toggle', { request: {}, attributes: this.state, endpoint: this.endpoint });
+        device.commandHandler.executeHandler('toggle', { request: {}, cluster: OnOffServer.id, attributes: this.state, endpoint: this.endpoint });
         device.log.debug(`MatterbridgeOnOffServer: toggle called`);
         super.toggle();
     }
@@ -82,14 +82,14 @@ export class MatterbridgeLevelControlServer extends LevelControlServer {
     moveToLevel(request) {
         const device = this.endpoint.stateOf(MatterbridgeServer);
         device.log.info(`Setting level to ${request.level} with transitionTime ${request.transitionTime} (endpoint ${this.endpoint.maybeId}.${this.endpoint.maybeNumber})`);
-        device.commandHandler.executeHandler('moveToLevel', { request, attributes: this.state, endpoint: this.endpoint });
+        device.commandHandler.executeHandler('moveToLevel', { request, cluster: LevelControlServer.id, attributes: this.state, endpoint: this.endpoint });
         device.log.debug(`MatterbridgeLevelControlServer: moveToLevel called`);
         super.moveToLevel(request);
     }
     moveToLevelWithOnOff(request) {
         const device = this.endpoint.stateOf(MatterbridgeServer);
         device.log.info(`Setting level to ${request.level} with transitionTime ${request.transitionTime} (endpoint ${this.endpoint.maybeId}.${this.endpoint.maybeNumber})`);
-        device.commandHandler.executeHandler('moveToLevelWithOnOff', { request, attributes: this.state, endpoint: this.endpoint });
+        device.commandHandler.executeHandler('moveToLevelWithOnOff', { request, cluster: LevelControlServer.id, attributes: this.state, endpoint: this.endpoint });
         device.log.debug(`MatterbridgeLevelControlServer: moveToLevelWithOnOff called`);
         super.moveToLevelWithOnOff(request);
     }
@@ -98,35 +98,35 @@ export class MatterbridgeColorControlServer extends ColorControlServer.with(Colo
     moveToHue(request) {
         const device = this.endpoint.stateOf(MatterbridgeServer);
         device.log.info(`Setting hue to ${request.hue} with transitionTime ${request.transitionTime} (endpoint ${this.endpoint.maybeId}.${this.endpoint.maybeNumber})`);
-        device.commandHandler.executeHandler('moveToHue', { request, attributes: this.state, endpoint: this.endpoint });
+        device.commandHandler.executeHandler('moveToHue', { request, cluster: ColorControlServer.id, attributes: this.state, endpoint: this.endpoint });
         device.log.debug(`MatterbridgeColorControlServer: moveToHue called`);
         super.moveToHue(request);
     }
     moveToSaturation(request) {
         const device = this.endpoint.stateOf(MatterbridgeServer);
         device.log.info(`Setting saturation to ${request.saturation} with transitionTime ${request.transitionTime} (endpoint ${this.endpoint.maybeId}.${this.endpoint.maybeNumber})`);
-        device.commandHandler.executeHandler('moveToSaturation', { request, attributes: this.state, endpoint: this.endpoint });
+        device.commandHandler.executeHandler('moveToSaturation', { request, cluster: ColorControlServer.id, attributes: this.state, endpoint: this.endpoint });
         device.log.debug(`MatterbridgeColorControlServer: moveToSaturation called`);
         super.moveToSaturation(request);
     }
     moveToHueAndSaturation(request) {
         const device = this.endpoint.stateOf(MatterbridgeServer);
         device.log.info(`Setting hue to ${request.hue} and saturation to ${request.saturation} with transitionTime ${request.transitionTime} (endpoint ${this.endpoint.maybeId}.${this.endpoint.maybeNumber})`);
-        device.commandHandler.executeHandler('moveToHueAndSaturation', { request, attributes: this.state, endpoint: this.endpoint });
+        device.commandHandler.executeHandler('moveToHueAndSaturation', { request, cluster: ColorControlServer.id, attributes: this.state, endpoint: this.endpoint });
         device.log.debug(`MatterbridgeColorControlServer: moveToHueAndSaturation called`);
         super.moveToHueAndSaturation(request);
     }
     moveToColor(request) {
         const device = this.endpoint.stateOf(MatterbridgeServer);
         device.log.info(`Setting color to ${request.colorX}, ${request.colorY} with transitionTime ${request.transitionTime} (endpoint ${this.endpoint.maybeId}.${this.endpoint.maybeNumber})`);
-        device.commandHandler.executeHandler('moveToColor', { request, attributes: this.state, endpoint: this.endpoint });
+        device.commandHandler.executeHandler('moveToColor', { request, cluster: ColorControlServer.id, attributes: this.state, endpoint: this.endpoint });
         device.log.debug(`MatterbridgeColorControlServer: moveToColor called`);
         super.moveToColor(request);
     }
     moveToColorTemperature(request) {
         const device = this.endpoint.stateOf(MatterbridgeServer);
         device.log.info(`Setting color temperature to ${request.colorTemperatureMireds} with transitionTime ${request.transitionTime} (endpoint ${this.endpoint.maybeId}.${this.endpoint.maybeNumber})`);
-        device.commandHandler.executeHandler('moveToColorTemperature', { request, attributes: this.state, endpoint: this.endpoint });
+        device.commandHandler.executeHandler('moveToColorTemperature', { request, cluster: ColorControlServer.id, attributes: this.state, endpoint: this.endpoint });
         device.log.debug(`MatterbridgeColorControlServer: moveToColorTemperature called`);
         super.moveToColorTemperature(request);
     }
@@ -135,28 +135,28 @@ export class MatterbridgeLiftWindowCoveringServer extends WindowCoveringServer.w
     upOrOpen() {
         const device = this.endpoint.stateOf(MatterbridgeServer);
         device.log.info(`Opening cover (endpoint ${this.endpoint.maybeId}.${this.endpoint.maybeNumber})`);
-        device.commandHandler.executeHandler(`upOrOpen`, { request: {}, attributes: this.state, endpoint: this.endpoint });
+        device.commandHandler.executeHandler(`upOrOpen`, { request: {}, cluster: WindowCoveringServer.id, attributes: this.state, endpoint: this.endpoint });
         device.log.debug(`MatterbridgeWindowCoveringServer: upOrOpen called`);
         super.upOrOpen();
     }
     downOrClose() {
         const device = this.endpoint.stateOf(MatterbridgeServer);
         device.log.info(`Closing cover (endpoint ${this.endpoint.maybeId}.${this.endpoint.maybeNumber})`);
-        device.commandHandler.executeHandler(`downOrClose`, { request: {}, attributes: this.state, endpoint: this.endpoint });
+        device.commandHandler.executeHandler(`downOrClose`, { request: {}, cluster: WindowCoveringServer.id, attributes: this.state, endpoint: this.endpoint });
         device.log.debug(`MatterbridgeWindowCoveringServer: downOrClose called`);
         super.downOrClose();
     }
     stopMotion() {
         const device = this.endpoint.stateOf(MatterbridgeServer);
         device.log.info(`Stopping cover (endpoint ${this.endpoint.maybeId}.${this.endpoint.maybeNumber})`);
-        device.commandHandler.executeHandler('stopMotion', { request: {}, attributes: this.state, endpoint: this.endpoint });
+        device.commandHandler.executeHandler('stopMotion', { request: {}, cluster: WindowCoveringServer.id, attributes: this.state, endpoint: this.endpoint });
         device.log.debug(`MatterbridgeWindowCoveringServer: stopMotion called`);
         super.stopMotion();
     }
     goToLiftPercentage(request) {
         const device = this.endpoint.stateOf(MatterbridgeServer);
         device.log.info(`Setting cover lift percentage to ${request.liftPercent100thsValue} (endpoint ${this.endpoint.maybeId}.${this.endpoint.maybeNumber})`);
-        device.commandHandler.executeHandler('goToLiftPercentage', { request, attributes: this.state, endpoint: this.endpoint });
+        device.commandHandler.executeHandler('goToLiftPercentage', { request, cluster: WindowCoveringServer.id, attributes: this.state, endpoint: this.endpoint });
         device.log.debug(`MatterbridgeWindowCoveringServer: goToLiftPercentage with ${request.liftPercent100thsValue}`);
         super.goToLiftPercentage(request);
     }
@@ -167,35 +167,35 @@ export class MatterbridgeLiftTiltWindowCoveringServer extends WindowCoveringServ
     upOrOpen() {
         const device = this.endpoint.stateOf(MatterbridgeServer);
         device.log.info(`Opening cover (endpoint ${this.endpoint.maybeId}.${this.endpoint.maybeNumber})`);
-        device.commandHandler.executeHandler(`upOrOpen`, { request: {}, attributes: this.state, endpoint: this.endpoint });
+        device.commandHandler.executeHandler(`upOrOpen`, { request: {}, cluster: WindowCoveringServer.id, attributes: this.state, endpoint: this.endpoint });
         device.log.debug(`MatterbridgeLiftTiltWindowCoveringServer: upOrOpen called`);
         super.upOrOpen();
     }
     downOrClose() {
         const device = this.endpoint.stateOf(MatterbridgeServer);
         device.log.info(`Closing cover (endpoint ${this.endpoint.maybeId}.${this.endpoint.maybeNumber})`);
-        device.commandHandler.executeHandler(`downOrClose`, { request: {}, attributes: this.state, endpoint: this.endpoint });
+        device.commandHandler.executeHandler(`downOrClose`, { request: {}, cluster: WindowCoveringServer.id, attributes: this.state, endpoint: this.endpoint });
         device.log.debug(`MatterbridgeLiftTiltWindowCoveringServer: downOrClose called`);
         super.downOrClose();
     }
     stopMotion() {
         const device = this.endpoint.stateOf(MatterbridgeServer);
         device.log.info(`Stopping cover (endpoint ${this.endpoint.maybeId}.${this.endpoint.maybeNumber})`);
-        device.commandHandler.executeHandler('stopMotion', { request: {}, attributes: this.state, endpoint: this.endpoint });
+        device.commandHandler.executeHandler('stopMotion', { request: {}, cluster: WindowCoveringServer.id, attributes: this.state, endpoint: this.endpoint });
         device.log.debug(`MatterbridgeLiftTiltWindowCoveringServer: stopMotion called`);
         super.stopMotion();
     }
     goToLiftPercentage(request) {
         const device = this.endpoint.stateOf(MatterbridgeServer);
         device.log.info(`Setting cover lift percentage to ${request.liftPercent100thsValue} (endpoint ${this.endpoint.maybeId}.${this.endpoint.maybeNumber})`);
-        device.commandHandler.executeHandler('goToLiftPercentage', { request, attributes: this.state, endpoint: this.endpoint });
+        device.commandHandler.executeHandler('goToLiftPercentage', { request, cluster: WindowCoveringServer.id, attributes: this.state, endpoint: this.endpoint });
         device.log.debug(`MatterbridgeLiftTiltWindowCoveringServer: goToLiftPercentage with ${request.liftPercent100thsValue}`);
         super.goToLiftPercentage(request);
     }
     goToTiltPercentage(request) {
         const device = this.endpoint.stateOf(MatterbridgeServer);
         device.log.info(`Setting cover tilt percentage to ${request.tiltPercent100thsValue} (endpoint ${this.endpoint.maybeId}.${this.endpoint.maybeNumber})`);
-        device.commandHandler.executeHandler('goToTiltPercentage', { request, attributes: this.state, endpoint: this.endpoint });
+        device.commandHandler.executeHandler('goToTiltPercentage', { request, cluster: WindowCoveringServer.id, attributes: this.state, endpoint: this.endpoint });
         device.log.debug(`MatterbridgeLiftTiltWindowCoveringServer: goToTiltPercentage with ${request.tiltPercent100thsValue}`);
         super.goToTiltPercentage(request);
     }
@@ -206,23 +206,23 @@ export class MatterbridgeDoorLockServer extends DoorLockServer {
     lockDoor() {
         const device = this.endpoint.stateOf(MatterbridgeServer);
         device.log.info(`Locking door (endpoint ${this.endpoint.maybeId}.${this.endpoint.maybeNumber})`);
-        device.commandHandler.executeHandler('lockDoor', { request: {}, attributes: this.state, endpoint: this.endpoint });
+        device.commandHandler.executeHandler('lockDoor', { request: {}, cluster: DoorLockServer.id, attributes: this.state, endpoint: this.endpoint });
         device.log.debug(`MatterbridgeDoorLockServer: lockDoor called`);
         super.lockDoor();
     }
     unlockDoor() {
         const device = this.endpoint.stateOf(MatterbridgeServer);
         device.log.info(`Unlocking door (endpoint ${this.endpoint.maybeId}.${this.endpoint.maybeNumber})`);
-        device.commandHandler.executeHandler('unlockDoor', { request: {}, attributes: this.state, endpoint: this.endpoint });
+        device.commandHandler.executeHandler('unlockDoor', { request: {}, cluster: DoorLockServer.id, attributes: this.state, endpoint: this.endpoint });
         device.log.debug(`MatterbridgeDoorLockServer: unlockDoor called`);
         super.unlockDoor();
     }
 }
-export class MatterbridgeFanControlServer extends FanControlServer.with(FanControl.Feature.MultiSpeed, FanControl.Feature.Auto, FanControl.Feature.Step) {
+export class MatterbridgeFanControlServer extends FanControlServer.with(FanControl.Feature.Auto, FanControl.Feature.Step) {
     step(request) {
         const device = this.endpoint.stateOf(MatterbridgeServer);
         device.log.info(`Stepping fan with direction ${request.direction} (endpoint ${this.endpoint.maybeId}.${this.endpoint.maybeNumber})`);
-        device.commandHandler.executeHandler('step', { request, attributes: this.state, endpoint: this.endpoint });
+        device.commandHandler.executeHandler('step', { request, cluster: FanControlServer.id, attributes: this.state, endpoint: this.endpoint });
         const lookupStepDirection = ['Increase', 'Decrease'];
         device.log.debug(`MatterbridgeFanControlServer: step called with direction: ${lookupStepDirection[request.direction]} wrap: ${request.wrap} lowestOff: ${request.lowestOff}`);
         device.log.debug(`- current percentCurrent: ${this.state.percentCurrent}`);
@@ -247,7 +247,7 @@ export class MatterbridgeThermostatServer extends ThermostatServer.with(Thermost
     setpointRaiseLower(request) {
         const device = this.endpoint.stateOf(MatterbridgeServer);
         device.log.info(`Setting setpoint by ${request.amount} in mode ${request.mode} (endpoint ${this.endpoint.maybeId}.${this.endpoint.maybeNumber})`);
-        device.commandHandler.executeHandler('setpointRaiseLower', { request, attributes: this.state, endpoint: this.endpoint });
+        device.commandHandler.executeHandler('setpointRaiseLower', { request, cluster: ThermostatServer.id, attributes: this.state, endpoint: this.endpoint });
         const lookupSetpointAdjustMode = ['Heat', 'Cool', 'Both'];
         device.log.debug(`MatterbridgeThermostatServer: setpointRaiseLower called with mode: ${lookupSetpointAdjustMode[request.mode]} amount: ${request.amount / 10}`);
         if (this.state.occupiedHeatingSetpoint !== undefined)
@@ -269,26 +269,35 @@ export class MatterbridgeThermostatServer extends ThermostatServer.with(Thermost
 export class MatterbridgeValveConfigurationAndControlServer extends ValveConfigurationAndControlServer.with(ValveConfigurationAndControl.Feature.Level) {
     open(request) {
         const device = this.endpoint.stateOf(MatterbridgeServer);
-        device.log.info(`Opening valve to ${request.targetLevel}% (endpoint ${this.endpoint.maybeId}.${this.endpoint.maybeNumber})`);
-        device.commandHandler.executeHandler('open', { request, attributes: this.state, endpoint: this.endpoint });
+        device.log.info(`Opening valve to ${request.targetLevel ? request.targetLevel + '%' : 'fully opened'} ${request.openDuration ? 'for ' + request.openDuration + 's' : 'until closed'} (endpoint ${this.endpoint.maybeId}.${this.endpoint.maybeNumber})`);
+        device.commandHandler.executeHandler('open', { request, cluster: ValveConfigurationAndControlServer.id, attributes: this.state, endpoint: this.endpoint });
         device.log.debug(`MatterbridgeValveConfigurationAndControlServer: open called with openDuration: ${request.openDuration} targetLevel: ${request.targetLevel}`);
+        this.state.targetState = ValveConfigurationAndControl.ValveState.Open;
+        this.state.currentState = ValveConfigurationAndControl.ValveState.Open;
         this.state.targetLevel = request.targetLevel ?? 100;
         this.state.currentLevel = request.targetLevel ?? 100;
+        this.state.openDuration = request.openDuration ?? this.state.defaultOpenDuration;
+        if (this.state.openDuration === null)
+            this.state.remainingDuration = null;
     }
     close() {
         const device = this.endpoint.stateOf(MatterbridgeServer);
         device.log.info(`Closing valve (endpoint ${this.endpoint.maybeId}.${this.endpoint.maybeNumber})`);
-        device.commandHandler.executeHandler('close', { request: {}, attributes: this.state, endpoint: this.endpoint });
+        device.commandHandler.executeHandler('close', { request: {}, cluster: ValveConfigurationAndControlServer.id, attributes: this.state, endpoint: this.endpoint });
         device.log.debug(`MatterbridgeValveConfigurationAndControlServer: close called`);
+        this.state.targetState = ValveConfigurationAndControl.ValveState.Closed;
+        this.state.currentState = ValveConfigurationAndControl.ValveState.Closed;
         this.state.targetLevel = 0;
         this.state.currentLevel = 0;
+        this.state.openDuration = null;
+        this.state.remainingDuration = null;
     }
 }
 export class MatterbridgeSmokeCoAlarmServer extends SmokeCoAlarmServer.with(SmokeCoAlarm.Feature.SmokeAlarm, SmokeCoAlarm.Feature.CoAlarm) {
     selfTestRequest() {
         const device = this.endpoint.stateOf(MatterbridgeServer);
         device.log.info(`Testing SmokeCOAlarm (endpoint ${this.endpoint.maybeId}.${this.endpoint.maybeNumber})`);
-        device.commandHandler.executeHandler('selfTestRequest', { request: {}, attributes: this.state, endpoint: this.endpoint });
+        device.commandHandler.executeHandler('selfTestRequest', { request: {}, cluster: SmokeCoAlarmServer.id, attributes: this.state, endpoint: this.endpoint });
         device.log.debug(`MatterbridgeSmokeCoAlarmServer: selfTestRequest called`);
     }
 }
@@ -296,7 +305,7 @@ export class MatterbridgeBooleanStateConfigurationServer extends BooleanStateCon
     enableDisableAlarm(request) {
         const device = this.endpoint.stateOf(MatterbridgeServer);
         device.log.info(`Enabling/disabling alarm ${request.alarmsToEnableDisable} (endpoint ${this.endpoint.maybeId}.${this.endpoint.maybeNumber})`);
-        device.commandHandler.executeHandler('enableDisableAlarm', { request, attributes: this.state, endpoint: this.endpoint });
+        device.commandHandler.executeHandler('enableDisableAlarm', { request, cluster: BooleanStateConfigurationServer.id, attributes: this.state, endpoint: this.endpoint });
         device.log.debug(`MatterbridgeBooleanStateConfigurationServer: enableDisableAlarm called`);
     }
 }
@@ -315,7 +324,7 @@ export class MatterbridgeOperationalStateServer extends OperationalStateServer {
     pause() {
         const device = this.endpoint.stateOf(MatterbridgeServer);
         device.log.info(`Pause (endpoint ${this.endpoint.maybeId}.${this.endpoint.maybeNumber})`);
-        device.commandHandler.executeHandler('pause', { request: {}, attributes: this.state, endpoint: this.endpoint });
+        device.commandHandler.executeHandler('pause', { request: {}, cluster: OperationalStateServer.id, attributes: this.state, endpoint: this.endpoint });
         device.log.debug('MatterbridgeOperationalStateServer: pause called setting operational state to Paused');
         this.state.operationalState = OperationalState.OperationalStateEnum.Paused;
         this.state.operationalError = { errorStateId: OperationalState.ErrorState.NoError, errorStateLabel: 'No error', errorStateDetails: 'Fully operational' };
@@ -326,7 +335,7 @@ export class MatterbridgeOperationalStateServer extends OperationalStateServer {
     stop() {
         const device = this.endpoint.stateOf(MatterbridgeServer);
         device.log.info(`Stop (endpoint ${this.endpoint.maybeId}.${this.endpoint.maybeNumber})`);
-        device.commandHandler.executeHandler('stop', { request: {}, attributes: this.state, endpoint: this.endpoint });
+        device.commandHandler.executeHandler('stop', { request: {}, cluster: OperationalStateServer.id, attributes: this.state, endpoint: this.endpoint });
         device.log.debug('MatterbridgeOperationalStateServer: stop called setting operational state to Stopped');
         this.state.operationalState = OperationalState.OperationalStateEnum.Stopped;
         this.state.operationalError = { errorStateId: OperationalState.ErrorState.NoError, errorStateLabel: 'No error', errorStateDetails: 'Fully operational' };
@@ -337,7 +346,7 @@ export class MatterbridgeOperationalStateServer extends OperationalStateServer {
     start() {
         const device = this.endpoint.stateOf(MatterbridgeServer);
         device.log.info(`Start (endpoint ${this.endpoint.maybeId}.${this.endpoint.maybeNumber})`);
-        device.commandHandler.executeHandler('start', { request: {}, attributes: this.state, endpoint: this.endpoint });
+        device.commandHandler.executeHandler('start', { request: {}, cluster: OperationalStateServer.id, attributes: this.state, endpoint: this.endpoint });
         device.log.debug('MatterbridgeOperationalStateServer: start called setting operational state to Running');
         this.state.operationalState = OperationalState.OperationalStateEnum.Running;
         this.state.operationalError = { errorStateId: OperationalState.ErrorState.NoError, errorStateLabel: 'No error', errorStateDetails: 'Fully operational' };
@@ -348,7 +357,7 @@ export class MatterbridgeOperationalStateServer extends OperationalStateServer {
     resume() {
         const device = this.endpoint.stateOf(MatterbridgeServer);
         device.log.info(`Resume (endpoint ${this.endpoint.maybeId}.${this.endpoint.maybeNumber})`);
-        device.commandHandler.executeHandler('resume', { request: {}, attributes: this.state, endpoint: this.endpoint });
+        device.commandHandler.executeHandler('resume', { request: {}, cluster: OperationalStateServer.id, attributes: this.state, endpoint: this.endpoint });
         device.log.debug('MatterbridgeOperationalStateServer: resume called setting operational state to Running');
         this.state.operationalState = OperationalState.OperationalStateEnum.Running;
         this.state.operationalError = { errorStateId: OperationalState.ErrorState.NoError, errorStateLabel: 'No error', errorStateDetails: 'Fully operational' };
@@ -360,6 +369,8 @@ export class MatterbridgeOperationalStateServer extends OperationalStateServer {
 export class MatterbridgeServiceAreaServer extends ServiceAreaServer {
     selectAreas(request) {
         const device = this.endpoint.stateOf(MatterbridgeServer);
+        device.log.info(`Selecting areas ${request.newAreas} (endpoint ${this.endpoint.maybeId}.${this.endpoint.maybeNumber})`);
+        device.commandHandler.executeHandler('selectAreas', { request, cluster: ServiceAreaServer.id, attributes: this.state, endpoint: this.endpoint });
         for (const area of request.newAreas) {
             const supportedArea = this.state.supportedAreas.find((supportedArea) => supportedArea.areaId === area);
             if (!supportedArea) {
@@ -367,8 +378,6 @@ export class MatterbridgeServiceAreaServer extends ServiceAreaServer {
                 return { status: ServiceArea.SelectAreasStatus.UnsupportedArea, statusText: 'Unsupported areas' };
             }
         }
-        device.log.info(`Selecting areas ${request.newAreas} (endpoint ${this.endpoint.maybeId}.${this.endpoint.maybeNumber})`);
-        device.commandHandler.executeHandler('selectAreas', { request, attributes: this.state, endpoint: this.endpoint });
         this.state.selectedAreas = request.newAreas;
         device.log.debug(`MatterbridgeServiceAreaServer selectAreas called with: ${request.newAreas.map((area) => area.toString()).join(', ')}`);
         return super.selectAreas(request);
@@ -378,7 +387,7 @@ export class MatterbridgeModeSelectServer extends ModeSelectServer {
     changeToMode(request) {
         const device = this.endpoint.stateOf(MatterbridgeServer);
         device.log.info(`Changing mode to ${request.newMode} (endpoint ${this.endpoint.maybeId}.${this.endpoint.maybeNumber})`);
-        device.commandHandler.executeHandler('changeToMode', { request, attributes: this.state, endpoint: this.endpoint });
+        device.commandHandler.executeHandler('changeToMode', { request, cluster: ModeSelectServer.id, attributes: this.state, endpoint: this.endpoint });
         device.log.debug(`MatterbridgeModeSelectServer: changeToMode called with mode: ${request.newMode}`);
         super.changeToMode(request);
     }
@@ -386,13 +395,13 @@ export class MatterbridgeModeSelectServer extends ModeSelectServer {
 export class MatterbridgeDeviceEnergyManagementModeServer extends DeviceEnergyManagementModeServer {
     changeToMode(request) {
         const device = this.endpoint.stateOf(MatterbridgeServer);
+        device.log.info(`Changing mode to ${request.newMode} (endpoint ${this.endpoint.maybeId}.${this.endpoint.maybeNumber})`);
+        device.commandHandler.executeHandler('changeToMode', { request, cluster: DeviceEnergyManagementModeServer.id, attributes: this.state, endpoint: this.endpoint });
         const supported = this.state.supportedModes.find((mode) => mode.mode === request.newMode);
         if (!supported) {
             device.log.error(`MatterbridgeDeviceEnergyManagementModeServer changeToMode called with unsupported newMode: ${request.newMode}`);
             return { status: ModeBase.ModeChangeStatus.UnsupportedMode, statusText: 'Unsupported mode' };
         }
-        device.log.info(`Changing mode to ${request.newMode} (endpoint ${this.endpoint.maybeId}.${this.endpoint.maybeNumber})`);
-        device.commandHandler.executeHandler('changeToMode', { request, attributes: this.state, endpoint: this.endpoint });
         this.state.currentMode = request.newMode;
         device.log.debug(`MatterbridgeDeviceEnergyManagementModeServer changeToMode called with newMode ${request.newMode} => ${supported.label}`);
         return super.changeToMode(request);

package/dist/matterbridgeEndpoint.js

@@ -803,24 +803,33 @@ export class MatterbridgeEndpoint extends Endpoint {
         });
         return this;
     }
-    createDefaultFanControlClusterServer(fanMode = FanControl.FanMode.Off) {
+    createDefaultFanControlClusterServer(fanMode = FanControl.FanMode.Off, fanModeSequence = FanControl.FanModeSequence.OffLowMedHighAuto, percentSetting = 0, percentCurrent = 0) {
+        this.behaviors.require(MatterbridgeFanControlServer.with(FanControl.Feature.Auto, FanControl.Feature.Step), {
+            fanMode,
+            fanModeSequence,
+            percentSetting,
+            percentCurrent,
+        });
+        return this;
+    }
+    createMultiSpeedFanControlClusterServer(fanMode = FanControl.FanMode.Off, fanModeSequence = FanControl.FanModeSequence.OffLowMedHighAuto, percentSetting = 0, percentCurrent = 0, speedMax = 10, speedSetting = 0, speedCurrent = 0) {
         this.behaviors.require(MatterbridgeFanControlServer.with(FanControl.Feature.MultiSpeed, FanControl.Feature.Auto, FanControl.Feature.Step), {
             fanMode,
-            fanModeSequence: FanControl.FanModeSequence.OffLowMedHighAuto,
-            percentSetting: 0,
-            percentCurrent: 0,
-            speedMax: 100,
-            speedSetting: 0,
-            speedCurrent: 0,
+            fanModeSequence,
+            percentSetting,
+            percentCurrent,
+            speedMax,
+            speedSetting,
+            speedCurrent,
         });
         return this;
     }
-    createBaseFanControlClusterServer(fanMode = FanControl.FanMode.Off) {
+    createBaseFanControlClusterServer(fanMode = FanControl.FanMode.Off, fanModeSequence = FanControl.FanModeSequence.OffLowMedHigh, percentSetting = 0, percentCurrent = 0) {
         this.behaviors.require(FanControlServer, {
             fanMode,
-            fanModeSequence: FanControl.FanModeSequence.OffLowMedHigh,
-            percentSetting: 0,
-            percentCurrent: 0,
+            fanModeSequence,
+            percentSetting,
+            percentCurrent,
         });
         return this;
     }
@@ -871,13 +880,13 @@ export class MatterbridgeEndpoint extends Endpoint {
         this.behaviors.require(MatterbridgeValveConfigurationAndControlServer.with(ValveConfigurationAndControl.Feature.Level), {
             currentState: valveState,
             targetState: valveState,
-            currentLevel: valveLevel,
-            targetLevel: valveLevel,
             openDuration: null,
             defaultOpenDuration: null,
             remainingDuration: null,
-            defaultOpenLevel: 100,
             valveFault: { generalFault: false, blocked: false, leaking: false, notConnected: false, shortCircuit: false, currentExceeded: false },
+            currentLevel: valveLevel,
+            targetLevel: valveLevel,
+            defaultOpenLevel: 100,
             levelStep: 1,
         });
         return this;

package/dist/roboticVacuumCleaner.js

@@ -97,7 +97,7 @@ export class MatterbridgeRvcRunModeServer extends RvcRunModeServer {
     changeToMode(request) {
         const device = this.endpoint.stateOf(MatterbridgeServer);
         device.log.info(`Changing mode to ${request.newMode} (endpoint ${this.endpoint.maybeId}.${this.endpoint.maybeNumber})`);
-        device.commandHandler.executeHandler('changeToMode', { request, attributes: this.state, endpoint: this.endpoint });
+        device.commandHandler.executeHandler('changeToMode', { request, cluster: RvcRunModeServer.id, attributes: this.state, endpoint: this.endpoint });
         const supported = this.state.supportedModes.find((mode) => mode.mode === request.newMode);
         if (!supported) {
             device.log.error(`MatterbridgeRvcRunModeServer changeToMode called with unsupported newMode: ${request.newMode}`);
@@ -123,7 +123,7 @@ export class MatterbridgeRvcCleanModeServer extends RvcCleanModeServer {
     changeToMode(request) {
         const device = this.endpoint.stateOf(MatterbridgeServer);
         device.log.info(`Changing mode to ${request.newMode} (endpoint ${this.endpoint.maybeId}.${this.endpoint.maybeNumber})`);
-        device.commandHandler.executeHandler('changeToMode', { request, attributes: this.state, endpoint: this.endpoint });
+        device.commandHandler.executeHandler('changeToMode', { request, cluster: RvcCleanModeServer.id, attributes: this.state, endpoint: this.endpoint });
         const supported = this.state.supportedModes.find((mode) => mode.mode === request.newMode);
         if (!supported) {
             device.log.error(`MatterbridgeRvcCleanModeServer changeToMode called with unsupported newMode: ${request.newMode}`);
@@ -138,7 +138,7 @@ export class MatterbridgeRvcOperationalStateServer extends RvcOperationalStateSe
     pause() {
         const device = this.endpoint.stateOf(MatterbridgeServer);
         device.log.info(`Pause (endpoint ${this.endpoint.maybeId}.${this.endpoint.maybeNumber})`);
-        device.commandHandler.executeHandler('pause', { request: {}, attributes: this.state, endpoint: this.endpoint });
+        device.commandHandler.executeHandler('pause', { request: {}, cluster: RvcOperationalStateServer.id, attributes: this.state, endpoint: this.endpoint });
         device.log.debug('MatterbridgeRvcOperationalStateServer: pause called setting operational state to Paused and currentMode to Idle');
         this.agent.get(MatterbridgeRvcRunModeServer).state.currentMode = 1;
         this.state.operationalState = RvcOperationalState.OperationalState.Paused;
@@ -150,7 +150,7 @@ export class MatterbridgeRvcOperationalStateServer extends RvcOperationalStateSe
     resume() {
         const device = this.endpoint.stateOf(MatterbridgeServer);
         device.log.info(`Resume (endpoint ${this.endpoint.maybeId}.${this.endpoint.maybeNumber})`);
-        device.commandHandler.executeHandler('resume', { request: {}, attributes: this.state, endpoint: this.endpoint });
+        device.commandHandler.executeHandler('resume', { request: {}, cluster: RvcOperationalStateServer.id, attributes: this.state, endpoint: this.endpoint });
         device.log.debug('MatterbridgeRvcOperationalStateServer: resume called setting operational state to Running and currentMode to Cleaning');
         this.agent.get(MatterbridgeRvcRunModeServer).state.currentMode = 2;
         this.state.operationalState = RvcOperationalState.OperationalState.Running;
@@ -162,7 +162,7 @@ export class MatterbridgeRvcOperationalStateServer extends RvcOperationalStateSe
     goHome() {
         const device = this.endpoint.stateOf(MatterbridgeServer);
         device.log.info(`GoHome (endpoint ${this.endpoint.maybeId}.${this.endpoint.maybeNumber})`);
-        device.commandHandler.executeHandler('goHome', { request: {}, attributes: this.state, endpoint: this.endpoint });
+        device.commandHandler.executeHandler('goHome', { request: {}, cluster: RvcOperationalStateServer.id, attributes: this.state, endpoint: this.endpoint });
         device.log.debug('MatterbridgeRvcOperationalStateServer: goHome called setting operational state to Docked and currentMode to Idle');
         this.agent.get(MatterbridgeRvcRunModeServer).state.currentMode = 1;
         this.state.operationalState = RvcOperationalState.OperationalState.Docked;

package/dist/waterHeater.js

@@ -51,14 +51,14 @@ export class MatterbridgeWaterHeaterManagementServer extends WaterHeaterManageme
     boost(request) {
         const device = this.endpoint.stateOf(MatterbridgeServer);
         device.log.info(`Boost (endpoint ${this.endpoint.maybeId}.${this.endpoint.maybeNumber})`);
-        device.commandHandler.executeHandler('boost', { request, attributes: this.state, endpoint: this.endpoint });
+        device.commandHandler.executeHandler('boost', { request, cluster: WaterHeaterManagementServer.id, attributes: this.state, endpoint: this.endpoint });
         device.log.debug(`MatterbridgeWaterHeaterManagementServer boost called with: ${JSON.stringify(request)}`);
         this.state.boostState = WaterHeaterManagement.BoostState.Active;
     }
     cancelBoost() {
         const device = this.endpoint.stateOf(MatterbridgeServer);
         device.log.info(`Cancel boost (endpoint ${this.endpoint.maybeId}.${this.endpoint.maybeNumber})`);
-        device.commandHandler.executeHandler('cancelBoost', { request: {}, attributes: this.state, endpoint: this.endpoint });
+        device.commandHandler.executeHandler('cancelBoost', { request: {}, cluster: WaterHeaterManagementServer.id, attributes: this.state, endpoint: this.endpoint });
         device.log.debug(`MatterbridgeWaterHeaterManagementServer cancelBoost called`);
         this.state.boostState = WaterHeaterManagement.BoostState.Inactive;
     }
@@ -67,13 +67,12 @@ export class MatterbridgeWaterHeaterModeServer extends WaterHeaterModeServer {
     changeToMode(request) {
         const device = this.endpoint.stateOf(MatterbridgeServer);
         device.log.info(`Changing mode to ${request.newMode} (endpoint ${this.endpoint.maybeId}.${this.endpoint.maybeNumber})`);
-        device.commandHandler.executeHandler('changeToMode', { request, attributes: this.state, endpoint: this.endpoint });
+        device.commandHandler.executeHandler('changeToMode', { request, cluster: WaterHeaterModeServer.id, attributes: this.state, endpoint: this.endpoint });
         const supported = this.state.supportedModes.find((mode) => mode.mode === request.newMode);
         if (!supported) {
             device.log.error(`MatterbridgeWaterHeaterModeServer changeToMode called with unsupported newMode: ${request.newMode}`);
             return { status: ModeBase.ModeChangeStatus.UnsupportedMode, statusText: 'Unsupported mode' };
         }
-        device.commandHandler.executeHandler('changeToMode', { request, attributes: this.state, endpoint: this.endpoint });
         this.state.currentMode = request.newMode;
         device.log.debug(`MatterbridgeWaterHeaterModeServer changeToMode called with newMode ${request.newMode} => ${supported.label}`);
         return { status: ModeBase.ModeChangeStatus.Success, statusText: 'Success' };

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "matterbridge",
-  "version": "3.0.6-dev-20250611-48af719",
+  "version": "3.0.6-dev-20250612-6b6e953",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "matterbridge",
-      "version": "3.0.6-dev-20250611-48af719",
+      "version": "3.0.6-dev-20250612-6b6e953",
       "license": "Apache-2.0",
       "dependencies": {
         "@matter/main": "0.14.0",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "matterbridge",
-  "version": "3.0.6-dev-20250611-48af719",
+  "version": "3.0.6-dev-20250612-6b6e953",
   "description": "Matterbridge plugin manager for Matter",
   "author": "https://github.com/Luligu",
   "license": "Apache-2.0",