@matterbridge/core 3.10.8-dev-20260901-971f7bf → 3.10.8-dev-20260903-4ab4a0f

package/dist/behaviors/export.d.ts

@@ -21,4 +21,5 @@ export * from './smokeCoAlarmServer.js';
 export * from './switchServer.js';
 export * from './thermostatServer.js';
 export * from './valveConfigurationAndControlServer.js';
+export * from './waterTankLevelMonitoringServer.js';
 export * from './windowCoveringServer.js';

package/dist/behaviors/export.js

@@ -21,4 +21,5 @@ export * from './smokeCoAlarmServer.js';
 export * from './switchServer.js';
 export * from './thermostatServer.js';
 export * from './valveConfigurationAndControlServer.js';
+export * from './waterTankLevelMonitoringServer.js';
 export * from './windowCoveringServer.js';

package/dist/behaviors/waterTankLevelMonitoringServer.d.ts

@@ -0,0 +1,11 @@
+import { WaterTankLevelMonitoringServer } from '@matter/node/behaviors/water-tank-level-monitoring';
+import type { WaterTankLevelMonitoring } from '@matter/types/clusters/water-tank-level-monitoring';
+declare const MatterbridgeWaterTankLevelMonitoringServer_base: import("@matter/node").ClusterBehavior.Type<typeof WaterTankLevelMonitoringServer, import("@matter/types").ClusterType.WithSupportedFeatures<WaterTankLevelMonitoring, {
+    condition: true;
+    replacementProductList: true;
+    warning: true;
+}>, import("@matter/types").ClusterType.Concrete, new () => {}, "waterTankLevelMonitoring">;
+export declare class MatterbridgeWaterTankLevelMonitoringServer extends MatterbridgeWaterTankLevelMonitoringServer_base {
+    resetCondition(): Promise<void>;
+}
+export {};

package/dist/behaviors/waterTankLevelMonitoringServer.js

@@ -0,0 +1,21 @@
+import { WaterTankLevelMonitoringServer } from '@matter/node/behaviors/water-tank-level-monitoring';
+import { ResourceMonitoring } from '@matter/types/clusters/resource-monitoring';
+import { MatterbridgeServer } from './matterbridgeServer.js';
+export class MatterbridgeWaterTankLevelMonitoringServer extends WaterTankLevelMonitoringServer.with(ResourceMonitoring.Feature.Condition, ResourceMonitoring.Feature.Warning, ResourceMonitoring.Feature.ReplacementProductList) {
+    async resetCondition() {
+        const device = this.endpoint.stateOf(MatterbridgeServer);
+        device.log.info(`MatterbridgeWaterTankLevelMonitoringServer: resetting condition (endpoint ${this.endpoint.maybeId}.${this.endpoint.maybeNumber})`);
+        await device.commandHandler.executeHandler('WaterTankLevelMonitoring.resetCondition', {
+            command: 'resetCondition',
+            request: {},
+            cluster: MatterbridgeWaterTankLevelMonitoringServer.id,
+            attributes: this.state,
+            endpoint: this.endpoint,
+            context: this.context,
+        });
+        this.state.condition = 100;
+        this.state.changeIndication = ResourceMonitoring.ChangeIndication.Ok;
+        this.state.lastChangedTime = Math.floor(new Date().getTime() / 1000);
+        device.log.debug(`MatterbridgeWaterTankLevelMonitoringServer: resetCondition called (endpoint ${this.endpoint.maybeId}.${this.endpoint.maybeNumber})`);
+    }
+}

package/dist/behaviors/windowCoveringServer.js

@@ -133,7 +133,11 @@ export class MatterbridgeWindowCoveringServer extends WindowCoveringServer.with(
                 this.state.targetPositionLiftPercent100ths = this.state.currentPositionLiftPercent100ths;
             if (this.features.positionAwareTilt)
                 this.state.targetPositionTiltPercent100ths = this.state.currentPositionTiltPercent100ths;
-            this.state.operationalStatus = { global: WindowCovering.MovementStatus.Stopped, lift: WindowCovering.MovementStatus.Stopped, tilt: WindowCovering.MovementStatus.Stopped };
+            this.state.operationalStatus = {
+                global: WindowCovering.MovementStatus.Stopped,
+                ...(this.features.lift ? { lift: WindowCovering.MovementStatus.Stopped } : {}),
+                ...(this.features.tilt ? { tilt: WindowCovering.MovementStatus.Stopped } : {}),
+            };
         }
         device.log.debug(`MatterbridgeWindowCoveringServer: stopMotion result target ${this.state.targetPositionLiftPercent100ths} current ${this.state.currentPositionLiftPercent100ths} status global ${this.getMovementStatusLabel(this.state.operationalStatus.global)} lift ${this.getMovementStatusLabel(this.state.operationalStatus.lift)} tilt ${this.getMovementStatusLabel(this.state.operationalStatus.tilt)} (endpoint ${this.endpoint.maybeId}.${this.endpoint.maybeNumber})`);
     }

package/dist/demoDevices.js

@@ -375,13 +375,13 @@ export async function createDemoDevices(matterbridge) {
     ep = new MatterbridgeEndpoint([getSupportedDeviceType('DoorLockController'), bridgedNode, powerSource], { id: 'DoorLockController', number: EndpointNumber(8_02) });
     await registerDevice(ep, 'Door Lock Controller', 'ENTRY-08-02');
     ep = new MatterbridgeEndpoint([getSupportedDeviceType('WindowCovering'), bridgedNode, powerSource], { id: 'WindowCoveringLift', number: EndpointNumber(8_03) });
-    ep.createDefaultWindowCoveringClusterServer();
+    ep.createDefaultWindowCoveringClusterServer(100_00, undefined, undefined, 10_000);
     await registerDevice(ep, 'Window Covering Lift', 'ENTRY-08-03');
     ep = new MatterbridgeEndpoint([getSupportedDeviceType('WindowCovering'), bridgedNode, powerSource], { id: 'WindowCoveringTilt', number: EndpointNumber(8_03_1) });
-    ep.createDefaultTiltWindowCoveringClusterServer();
+    ep.createDefaultTiltWindowCoveringClusterServer(100_00, undefined, undefined, 10_000);
     await registerDevice(ep, 'Window Covering Tilt', 'ENTRY-08-03-1');
     ep = new MatterbridgeEndpoint([getSupportedDeviceType('WindowCovering'), bridgedNode, powerSource], { id: 'WindowCoveringLiftTilt', number: EndpointNumber(8_03_2) });
-    ep.createDefaultLiftTiltWindowCoveringClusterServer();
+    ep.createDefaultLiftTiltWindowCoveringClusterServer(100_00, 100_00, undefined, undefined, 10_000);
     await registerDevice(ep, 'Window Covering LiftTilt', 'ENTRY-08-03-2');
     ep = new MatterbridgeEndpoint([getSupportedDeviceType('WindowCoveringController'), bridgedNode, powerSource], { id: 'WindowCoveringController', number: EndpointNumber(8_04) });
     await registerDevice(ep, 'Window Covering Controller', 'ENTRY-08-04');

package/dist/devices/closure.d.ts

@@ -1,4 +1,4 @@
-import type { MaybePromise } from '@matter/general';
+import { type MaybePromise, type Timer } from '@matter/general';
 import { ClosureControlServer } from '@matter/node/behaviors/closure-control';
 import { type EndpointNumber } from '@matter/types';
 import { ClosureControl } from '@matter/types/clusters/closure-control';
@@ -18,19 +18,21 @@ declare const MatterbridgeClosureControlServerBase: import("@matter/node").Clust
     ventilation: false;
 }>, import("@matter/types").ClusterType.Concrete, new () => {}, "closureControl">;
 export declare class MatterbridgeClosureControlServer extends MatterbridgeClosureControlServerBase {
+    #private;
     readonly state: MatterbridgeClosureControlServer.State;
     protected internal: MatterbridgeClosureControlServer.Internal;
     initialize(): MaybePromise;
     moveTo: (request: ClosureControl.MoveToRequest) => Promise<void>;
-    private completeMoveTo;
     stop: () => Promise<void>;
     calibrate: () => Promise<void>;
-    private completeCalibrate;
+    [Symbol.asyncDispose](): Promise<void>;
 }
 export declare namespace MatterbridgeClosureControlServer {
     class Internal extends MatterbridgeClosureControlServerBase.Internal {
-        movementTimer?: NodeJS.Timeout;
-        calibrateTimer?: NodeJS.Timeout;
+        movementTimer?: Timer;
+        movementTargetState: ClosureControl.OverallTargetState;
+        movementPreviousState: ClosureControl.OverallCurrentState;
+        calibrateTimer?: Timer;
     }
     class State extends MatterbridgeClosureControlServerBase.State {
         movementDuration: number;

package/dist/devices/closure.js

@@ -1,3 +1,4 @@
+import { Millis, Time } from '@matter/general';
 import { ClosureTag } from '@matter/node';
 import { ClosureControlServer } from '@matter/node/behaviors/closure-control';
 import { StatusResponse } from '@matter/types';
@@ -73,25 +74,24 @@ export class MatterbridgeClosureControlServer extends MatterbridgeClosureControl
             (!this.features.motionLatching || nextTarget.latch === undefined || nextTarget.latch === currentState.latch) &&
             (!this.features.speed || nextTarget.speed === currentState.speed);
         this.state.mainState = isAtTarget ? ClosureControl.MainState.Stopped : ClosureControl.MainState.Moving;
-        clearTimeout(this.internal.movementTimer);
+        this.internal.movementTimer?.stop();
+        this.internal.movementTimer = undefined;
         if (isAtTarget) {
-            this.internal.movementTimer = undefined;
             this.state.countdownTime = 0;
         }
         else if (currentState === null || this.state.movementDuration <= 0) {
-            this.internal.movementTimer = undefined;
         }
         else {
             this.state.countdownTime = this.state.movementDuration / 1000;
-            const previousState = currentState;
-            this.internal.movementTimer = setTimeout(() => {
-                this.internal.movementTimer = undefined;
-                void this.completeMoveTo(nextTarget, previousState);
-            }, this.state.movementDuration);
+            this.internal.movementTargetState = nextTarget;
+            this.internal.movementPreviousState = currentState;
+            this.internal.movementTimer = Time.getTimer('ClosureControl movement complete', Millis(this.state.movementDuration), this.callback(this.#completeMoveTo, { lock: true })).start();
         }
     };
-    completeMoveTo = async (targetState, previousState) => {
-        const closure = this.endpoint;
+    #completeMoveTo() {
+        this.internal.movementTimer = undefined;
+        const targetState = this.internal.movementTargetState;
+        const previousState = this.internal.movementPreviousState;
         let position = previousState.position;
         if (targetState.position !== undefined && targetState.position !== null) {
             const mappedPosition = targetToCurrentPosition[targetState.position];
@@ -100,17 +100,25 @@ export class MatterbridgeClosureControlServer extends MatterbridgeClosureControl
         }
         const latch = targetState.latch ?? previousState.latch;
         const secureState = this.features.motionLatching ? latch === true : position === ClosureControl.CurrentPosition.FullyClosed;
-        await closure.setState({
+        this.state.countdownTime = 0;
+        this.state.mainState = ClosureControl.MainState.Stopped;
+        this.state.currentErrorList = [];
+        this.state.overallCurrentState = {
             position,
             ...(this.features.motionLatching ? { latch } : null),
             ...(this.features.speed ? { speed: targetState.speed } : null),
             secureState,
-        }, targetState, ClosureControl.MainState.Stopped, 0);
+        };
+        this.state.overallTargetState = {
+            position: targetState.position,
+            ...(this.features.motionLatching ? { latch: targetState.latch } : null),
+            ...(this.features.speed ? { speed: targetState.speed } : null),
+        };
         if (secureState !== previousState.secureState) {
-            await closure.triggerSecureStateChanged(secureState);
+            this.events.secureStateChanged.emit({ secureValue: secureState }, this.context);
         }
-        await closure.triggerMovementCompleted();
-    };
+        this.events.movementCompleted.emit(undefined, this.context);
+    }
     stop = async () => {
         const device = this.endpoint.stateOf(MatterbridgeServer);
         device.log.info(`Stop (endpoint ${this.endpoint.maybeId}.${this.endpoint.maybeNumber})`);
@@ -121,9 +129,9 @@ export class MatterbridgeClosureControlServer extends MatterbridgeClosureControl
             attributes: this.state,
             endpoint: this.endpoint,
         });
-        clearTimeout(this.internal.movementTimer);
+        this.internal.movementTimer?.stop();
         this.internal.movementTimer = undefined;
-        clearTimeout(this.internal.calibrateTimer);
+        this.internal.calibrateTimer?.stop();
         this.internal.calibrateTimer = undefined;
         if ([ClosureControl.MainState.Moving, ClosureControl.MainState.WaitingForMotion, ClosureControl.MainState.Calibrating].includes(this.state.mainState)) {
             this.state.mainState = ClosureControl.MainState.Stopped;
@@ -147,27 +155,33 @@ export class MatterbridgeClosureControlServer extends MatterbridgeClosureControl
             throw new StatusResponse.InvalidInStateError('ClosureControl.calibrate is only allowed while Stopped or SetupRequired');
         }
         this.state.mainState = ClosureControl.MainState.Calibrating;
-        clearTimeout(this.internal.calibrateTimer);
+        this.internal.calibrateTimer?.stop();
         if (this.state.calibrationDuration <= 0) {
             this.internal.calibrateTimer = undefined;
         }
         else {
             this.state.countdownTime = this.state.calibrationDuration / 1000;
-            this.internal.calibrateTimer = setTimeout(() => {
-                this.internal.calibrateTimer = undefined;
-                void this.completeCalibrate();
-            }, this.state.calibrationDuration);
+            this.internal.calibrateTimer = Time.getTimer('ClosureControl calibrate complete', Millis(this.state.calibrationDuration), this.callback(this.#completeCalibrate, { lock: true })).start();
         }
     };
-    completeCalibrate = async () => {
-        const closure = this.endpoint;
-        await closure.setAttribute(ClosureControl, 'countdownTime', 0);
-        await closure.setAttribute(ClosureControl, 'mainState', ClosureControl.MainState.Stopped);
-    };
+    #completeCalibrate() {
+        this.internal.calibrateTimer = undefined;
+        this.state.countdownTime = 0;
+        this.state.mainState = ClosureControl.MainState.Stopped;
+    }
+    async [Symbol.asyncDispose]() {
+        this.internal.movementTimer?.stop();
+        this.internal.movementTimer = undefined;
+        this.internal.calibrateTimer?.stop();
+        this.internal.calibrateTimer = undefined;
+        await super[Symbol.asyncDispose]?.();
+    }
 }
 (function (MatterbridgeClosureControlServer) {
     class Internal extends MatterbridgeClosureControlServerBase.Internal {
         movementTimer;
+        movementTargetState = {};
+        movementPreviousState = { position: ClosureControl.CurrentPosition.FullyClosed, secureState: true };
         calibrateTimer;
     }
     MatterbridgeClosureControlServer.Internal = Internal;

package/dist/devices/closurePanel.d.ts

@@ -1,4 +1,4 @@
-import type { MaybePromise } from '@matter/general';
+import { type MaybePromise, type Timer } from '@matter/general';
 import { ClosureDimensionServer } from '@matter/node/behaviors/closure-dimension';
 import { ClosureDimension } from '@matter/types/clusters/closure-dimension';
 import type { EndpointNumber } from '@matter/types/datatype';
@@ -15,17 +15,19 @@ declare const MatterbridgeClosureDimensionServerBase: import("@matter/node").Clu
     unit: false;
 }>, import("@matter/types").ClusterType.Concrete, new () => {}, "closureDimension">;
 export declare class MatterbridgeClosureDimensionServer extends MatterbridgeClosureDimensionServerBase {
+    #private;
     readonly state: MatterbridgeClosureDimensionServer.State;
     protected internal: MatterbridgeClosureDimensionServer.Internal;
     initialize(): MaybePromise;
     setTarget: (request: ClosureDimension.SetTargetRequest) => Promise<void>;
     step: (request: ClosureDimension.StepRequest) => Promise<void>;
-    private scheduleMovement;
-    private completeMovement;
+    [Symbol.asyncDispose](): Promise<void>;
 }
 export declare namespace MatterbridgeClosureDimensionServer {
     class Internal extends MatterbridgeClosureDimensionServerBase.Internal {
-        movementTimer?: NodeJS.Timeout;
+        movementTimer?: Timer;
+        movementTargetState: ClosureDimension.DimensionState;
+        movementPreviousState: ClosureDimension.DimensionState;
     }
     class State extends MatterbridgeClosureDimensionServerBase.State {
         movementDuration: number;

package/dist/devices/closurePanel.js

@@ -1,3 +1,4 @@
+import { Millis, Time } from '@matter/general';
 import { ClosureControlServer } from '@matter/node/behaviors/closure-control';
 import { ClosureDimensionServer } from '@matter/node/behaviors/closure-dimension';
 import { StatusResponse } from '@matter/types';
@@ -71,7 +72,7 @@ export class MatterbridgeClosureDimensionServer extends MatterbridgeClosureDimen
         if (matchesCurrentState)
             return;
         this.state.targetState = nextTarget;
-        this.scheduleMovement(nextTarget, currentState);
+        this.#scheduleMovement(nextTarget, currentState);
     };
     step = async (request) => {
         const device = this.endpoint.stateOf(MatterbridgeServer);
@@ -121,35 +122,41 @@ export class MatterbridgeClosureDimensionServer extends MatterbridgeClosureDimen
             ...(this.features.speed && request.speed !== undefined ? { speed: request.speed } : null),
         };
         this.state.targetState = nextTarget;
-        this.scheduleMovement(nextTarget, currentState);
+        this.#scheduleMovement(nextTarget, currentState);
     };
-    scheduleMovement(targetState, currentState) {
-        clearTimeout(this.internal.movementTimer);
-        if (currentState === null || this.state.movementDuration <= 0) {
-            this.internal.movementTimer = undefined;
+    #scheduleMovement(targetState, currentState) {
+        this.internal.movementTimer?.stop();
+        this.internal.movementTimer = undefined;
+        if (currentState === null || this.state.movementDuration <= 0)
             return;
-        }
-        const previousState = currentState;
-        this.internal.movementTimer = setTimeout(() => {
-            this.internal.movementTimer = undefined;
-            void this.completeMovement(targetState, previousState);
-        }, this.state.movementDuration);
+        this.internal.movementTargetState = targetState;
+        this.internal.movementPreviousState = currentState;
+        this.internal.movementTimer = Time.getTimer('ClosureDimension movement complete', Millis(this.state.movementDuration), this.callback(this.#completeMovement, { lock: true })).start();
     }
-    completeMovement = async (targetState, previousState) => {
-        const endpoint = this.endpoint;
+    #completeMovement() {
+        this.internal.movementTimer = undefined;
+        const targetState = this.internal.movementTargetState;
+        const previousState = this.internal.movementPreviousState;
         const position = targetState.position ?? previousState.position;
         const latch = targetState.latch ?? previousState.latch;
         const speed = targetState.speed ?? previousState.speed;
-        await endpoint.setAttribute(ClosureDimensionServer, 'currentState', {
+        this.state.currentState = {
             position,
             ...(this.features.motionLatching ? { latch } : null),
             ...(this.features.speed ? { speed } : null),
-        });
-    };
+        };
+    }
+    async [Symbol.asyncDispose]() {
+        this.internal.movementTimer?.stop();
+        this.internal.movementTimer = undefined;
+        await super[Symbol.asyncDispose]?.();
+    }
 }
 (function (MatterbridgeClosureDimensionServer) {
     class Internal extends MatterbridgeClosureDimensionServerBase.Internal {
         movementTimer;
+        movementTargetState = {};
+        movementPreviousState = {};
     }
     MatterbridgeClosureDimensionServer.Internal = Internal;
     class State extends MatterbridgeClosureDimensionServerBase.State {

package/dist/export.d.ts

@@ -19,6 +19,7 @@ export * from './behaviors/smokeCoAlarmServer.js';
 export * from './behaviors/switchServer.js';
 export * from './behaviors/thermostatServer.js';
 export * from './behaviors/valveConfigurationAndControlServer.js';
+export * from './behaviors/waterTankLevelMonitoringServer.js';
 export * from './behaviors/windowCoveringServer.js';
 export { addVirtualDevice } from './helpers.js';
 export * from './matterbridgeAccessoryPlatform.js';

package/dist/export.js

@@ -21,6 +21,7 @@ export * from './behaviors/smokeCoAlarmServer.js';
 export * from './behaviors/switchServer.js';
 export * from './behaviors/thermostatServer.js';
 export * from './behaviors/valveConfigurationAndControlServer.js';
+export * from './behaviors/waterTankLevelMonitoringServer.js';
 export * from './behaviors/windowCoveringServer.js';
 export { addVirtualDevice } from './helpers.js';
 export * from './matterbridgeAccessoryPlatform.js';

package/dist/frontend.js

@@ -1200,6 +1200,8 @@ export class Frontend extends EventEmitter {
                 attributes += `Hepa filter: ${attributeValue}% `;
             if (clusterName === 'activatedCarbonFilterMonitoring' && attributeName === 'condition')
                 attributes += `Carbon filter: ${attributeValue}% `;
+            if (clusterName === 'waterTankLevelMonitoring' && attributeName === 'condition')
+                attributes += `Water tank: ${attributeValue}% `;
             if (clusterName === 'occupancySensing' && attributeName === 'occupancy' && isValidObject(attributeValue, 1))
                 attributes += `Occupancy: ${attributeValue.occupied} `;
             if (clusterName === 'illuminanceMeasurement' && attributeName === 'measuredValue') {

package/dist/matterbridgeDeviceTypes.js

@@ -104,6 +104,7 @@ import { ValveConfigurationAndControl } from '@matter/types/clusters/valve-confi
 import { WakeOnLan } from '@matter/types/clusters/wake-on-lan';
 import { WaterHeaterManagement } from '@matter/types/clusters/water-heater-management';
 import { WaterHeaterMode } from '@matter/types/clusters/water-heater-mode';
+import { WaterTankLevelMonitoring } from '@matter/types/clusters/water-tank-level-monitoring';
 import { WebRtcTransportProvider } from '@matter/types/clusters/web-rtc-transport-provider';
 import { WebRtcTransportRequestor } from '@matter/types/clusters/web-rtc-transport-requestor';
 import { WindowCovering } from '@matter/types/clusters/window-covering';
@@ -1276,6 +1277,7 @@ export const supportedClusters = [
     WakeOnLan,
     WaterHeaterManagement,
     WaterHeaterMode,
+    WaterTankLevelMonitoring,
     WebRtcTransportProvider,
     WebRtcTransportRequestor,
     WindowCovering,

package/dist/matterbridgeEndpoint.d.ts

@@ -207,6 +207,7 @@ export declare class MatterbridgeEndpoint extends Endpoint {
     }, airflowDirection?: FanControl.AirflowDirection): this;
     createDefaultHepaFilterMonitoringClusterServer(condition?: number, changeIndication?: ResourceMonitoring.ChangeIndication, inPlaceIndicator?: boolean | undefined, lastChangedTime?: number | null | undefined, replacementProductList?: ResourceMonitoring.ReplacementProduct[]): this;
     createDefaultActivatedCarbonFilterMonitoringClusterServer(condition?: number, changeIndication?: ResourceMonitoring.ChangeIndication, inPlaceIndicator?: boolean | undefined, lastChangedTime?: number | null | undefined, replacementProductList?: ResourceMonitoring.ReplacementProduct[]): this;
+    createDefaultWaterTankLevelMonitoringClusterServer(condition?: number, changeIndication?: ResourceMonitoring.ChangeIndication, inPlaceIndicator?: boolean | undefined, lastChangedTime?: number | null | undefined, replacementProductList?: ResourceMonitoring.ReplacementProduct[]): this;
     createDefaultDoorLockClusterServer(lockState?: DoorLock.LockState, lockType?: DoorLock.LockType, autoRelockTime?: number, numberOfWeekDaySchedulesSupportedPerUser?: number, numberOfYearDaySchedulesSupportedPerUser?: number, numberOfHolidaySchedulesSupported?: number): this;
     createUserPinDoorLockClusterServer(lockState?: DoorLock.LockState, lockType?: DoorLock.LockType, autoRelockTime?: number, minPinCodeLength?: number, maxPinCodeLength?: number, numberOfWeekDaySchedulesSupportedPerUser?: number, numberOfYearDaySchedulesSupportedPerUser?: number, numberOfHolidaySchedulesSupported?: number): this;
     createDefaultModeSelectClusterServer(description: string, supportedModes: ModeSelect.ModeOption[], currentMode?: number, startUpMode?: number): this;

package/dist/matterbridgeEndpoint.js

@@ -81,6 +81,7 @@ import { MatterbridgeSmokeCoAlarmServer } from './behaviors/smokeCoAlarmServer.j
 import { MatterbridgeSwitchServer } from './behaviors/switchServer.js';
 import { MatterbridgeThermostatServer } from './behaviors/thermostatServer.js';
 import { MatterbridgeValveConfigurationAndControlServer } from './behaviors/valveConfigurationAndControlServer.js';
+import { MatterbridgeWaterTankLevelMonitoringServer } from './behaviors/waterTankLevelMonitoringServer.js';
 import { MatterbridgeWindowCoveringServer } from './behaviors/windowCoveringServer.js';
 import { CommandHandler, } from './matterbridgeEndpointCommandHandler.js';
 import { addClusterClients, addClusterServers, addFixedLabel, addOptionalClusterClients, addOptionalClusterServers, addRequiredClusterClients, addRequiredClusterServers, addUserLabel, checkNotLatinCharacters, createUniqueId, defaultFor, featuresFor, generateUniqueId, getApparentElectricalPowerMeasurementClusterServer, getAttribute, getAttributeId, getBehavior, getBehaviourTypesFromClusterClientIds, getBehaviourTypesFromClusterServerIds, getCluster, getClusterId, getDefaultDeviceEnergyManagementClusterServer, getDefaultDeviceEnergyManagementModeClusterServer, getDefaultElectricalEnergyMeasurementClusterServer, getDefaultElectricalPowerMeasurementClusterServer, getDefaultFlowMeasurementClusterServer, getDefaultIlluminanceMeasurementClusterServer, getDefaultOccupancySensingClusterServer, getDefaultOperationalStateClusterServer, getDefaultPowerSourceBatteryClusterServer, getDefaultPowerSourceRechargeableBatteryClusterServer, getDefaultPowerSourceReplaceableBatteryClusterServer, getDefaultPowerSourceWiredClusterServer, getDefaultPressureMeasurementClusterServer, getDefaultRelativeHumidityMeasurementClusterServer, getDefaultSoilMeasurementClusterServer, getDefaultTemperatureMeasurementClusterServer, getExportedElectricalEnergyMeasurementClusterServer, getImportedElectricalEnergyMeasurementClusterServer, invokeBehaviorCommand, lowercaseFirstLetter, setAttribute, setCluster, subscribeAttribute, triggerEvent, updateAttribute, } from './matterbridgeEndpointHelpers.js';
@@ -831,14 +832,13 @@ export class MatterbridgeEndpoint extends Endpoint {
             numberOfActuationsLift: 0,
             configStatus: {
                 operational: true,
-                onlineReserved: false,
                 liftMovementReversed: false,
                 liftPositionAware: true,
                 tiltPositionAware: false,
                 liftEncoderControlled: false,
                 tiltEncoderControlled: false,
             },
-            operationalStatus: { global: WindowCovering.MovementStatus.Stopped, lift: WindowCovering.MovementStatus.Stopped, tilt: WindowCovering.MovementStatus.Stopped },
+            operationalStatus: { global: WindowCovering.MovementStatus.Stopped, lift: WindowCovering.MovementStatus.Stopped },
             endProductType,
             mode: { motorDirectionReversed: false, calibrationMode: false, maintenanceMode: false, ledFeedback: false },
             targetPositionLiftPercent100ths: positionPercent100ths,
@@ -855,7 +855,6 @@ export class MatterbridgeEndpoint extends Endpoint {
             numberOfActuationsTilt: 0,
             configStatus: {
                 operational: true,
-                onlineReserved: false,
                 liftMovementReversed: false,
                 liftPositionAware: true,
                 tiltPositionAware: true,
@@ -881,14 +880,13 @@ export class MatterbridgeEndpoint extends Endpoint {
             numberOfActuationsTilt: 0,
             configStatus: {
                 operational: true,
-                onlineReserved: false,
                 liftMovementReversed: false,
                 liftPositionAware: false,
                 tiltPositionAware: true,
                 liftEncoderControlled: false,
                 tiltEncoderControlled: false,
             },
-            operationalStatus: { global: WindowCovering.MovementStatus.Stopped, lift: WindowCovering.MovementStatus.Stopped, tilt: WindowCovering.MovementStatus.Stopped },
+            operationalStatus: { global: WindowCovering.MovementStatus.Stopped, tilt: WindowCovering.MovementStatus.Stopped },
             endProductType,
             mode: { motorDirectionReversed: false, calibrationMode: false, maintenanceMode: false, ledFeedback: false },
             targetPositionTiltPercent100ths: positionTiltPercent100ths,
@@ -899,39 +897,44 @@ export class MatterbridgeEndpoint extends Endpoint {
         return this;
     }
     async setWindowCoveringTargetAsCurrentAndStopped() {
-        const position = this.getAttribute(WindowCovering, 'currentPositionLiftPercent100ths', this.log);
-        if (isValidNumber(position, 0, 10000)) {
-            await this.setAttribute(WindowCovering, 'targetPositionLiftPercent100ths', position, this.log);
-            await this.setAttribute(WindowCovering, 'operationalStatus', {
-                global: WindowCovering.MovementStatus.Stopped,
-                lift: WindowCovering.MovementStatus.Stopped,
-                tilt: WindowCovering.MovementStatus.Stopped,
-            }, this.log);
+        const { lift, tilt } = featuresFor(this, WindowCovering);
+        if (lift) {
+            const position = this.getAttribute(WindowCovering, 'currentPositionLiftPercent100ths', this.log);
+            if (isValidNumber(position, 0, 10000)) {
+                await this.setAttribute(WindowCovering, 'targetPositionLiftPercent100ths', position, this.log);
+            }
+            this.log.debug(`Set WindowCovering currentPositionLiftPercent100ths and targetPositionLiftPercent100ths to ${position} and operationalStatus to Stopped.`);
         }
-        this.log.debug(`Set WindowCovering currentPositionLiftPercent100ths and targetPositionLiftPercent100ths to ${position} and operationalStatus to Stopped.`);
-        if (this.hasAttributeServer(WindowCovering, 'currentPositionTiltPercent100ths')) {
+        if (tilt) {
             const position = this.getAttribute(WindowCovering, 'currentPositionTiltPercent100ths', this.log);
             if (isValidNumber(position, 0, 10000)) {
                 await this.setAttribute(WindowCovering, 'targetPositionTiltPercent100ths', position, this.log);
             }
             this.log.debug(`Set WindowCovering currentPositionTiltPercent100ths and targetPositionTiltPercent100ths to ${position} and operationalStatus to Stopped.`);
         }
+        await this.setAttribute(WindowCovering, 'operationalStatus', {
+            global: WindowCovering.MovementStatus.Stopped,
+            ...(lift ? { lift: WindowCovering.MovementStatus.Stopped } : {}),
+            ...(tilt ? { tilt: WindowCovering.MovementStatus.Stopped } : {}),
+        }, this.log);
     }
     async setWindowCoveringCurrentTargetStatus(current, target, status) {
         await this.setAttribute(WindowCovering, 'currentPositionLiftPercent100ths', current, this.log);
         await this.setAttribute(WindowCovering, 'targetPositionLiftPercent100ths', target, this.log);
+        const { lift, tilt } = featuresFor(this, WindowCovering);
         await this.setAttribute(WindowCovering, 'operationalStatus', {
             global: status,
-            lift: status,
-            tilt: status,
+            ...(lift ? { lift: status } : {}),
+            ...(tilt ? { tilt: status } : {}),
         }, this.log);
         this.log.debug(`Set WindowCovering currentPositionLiftPercent100ths: ${current}, targetPositionLiftPercent100ths: ${target} and operationalStatus: ${status}.`);
     }
     async setWindowCoveringStatus(status) {
+        const { lift, tilt } = featuresFor(this, WindowCovering);
         await this.setAttribute(WindowCovering, 'operationalStatus', {
             global: status,
-            lift: status,
-            tilt: status,
+            ...(lift ? { lift: status } : {}),
+            ...(tilt ? { tilt: status } : {}),
         }, this.log);
         this.log.debug(`Set WindowCovering operationalStatus: ${status}`);
     }
@@ -947,7 +950,7 @@ export class MatterbridgeEndpoint extends Endpoint {
         await this.setAttribute(WindowCovering, 'currentPositionLiftPercent100ths', liftPosition, this.log);
         await this.setAttribute(WindowCovering, 'targetPositionLiftPercent100ths', liftPosition, this.log);
         this.log.debug(`Set WindowCovering currentPositionLiftPercent100ths: ${liftPosition} and targetPositionLiftPercent100ths: ${liftPosition}.`);
-        if (tiltPosition && this.hasAttributeServer(WindowCovering, 'currentPositionTiltPercent100ths')) {
+        if (tiltPosition && featuresFor(this, WindowCovering).tilt) {
             await this.setAttribute(WindowCovering, 'currentPositionTiltPercent100ths', tiltPosition, this.log);
             await this.setAttribute(WindowCovering, 'targetPositionTiltPercent100ths', tiltPosition, this.log);
             this.log.debug(`Set WindowCovering currentPositionTiltPercent100ths: ${tiltPosition} and targetPositionTiltPercent100ths: ${tiltPosition}.`);
@@ -1282,6 +1285,17 @@ export class MatterbridgeEndpoint extends Endpoint {
         });
         return this;
     }
+    createDefaultWaterTankLevelMonitoringClusterServer(condition = 100, changeIndication = ResourceMonitoring.ChangeIndication.Ok, inPlaceIndicator = true, lastChangedTime = null, replacementProductList = []) {
+        this.behaviors.require(MatterbridgeWaterTankLevelMonitoringServer.with(ResourceMonitoring.Feature.Condition, ResourceMonitoring.Feature.Warning, ResourceMonitoring.Feature.ReplacementProductList), {
+            condition,
+            degradationDirection: ResourceMonitoring.DegradationDirection.Down,
+            replacementProductList,
+            changeIndication,
+            inPlaceIndicator,
+            lastChangedTime,
+        });
+        return this;
+    }
     createDefaultDoorLockClusterServer(lockState = DoorLock.LockState.Locked, lockType = DoorLock.LockType.DeadBolt, autoRelockTime = 0, numberOfWeekDaySchedulesSupportedPerUser, numberOfYearDaySchedulesSupportedPerUser, numberOfHolidaySchedulesSupported) {
         this.behaviors.require(MatterbridgeDoorLockServer.with(...(numberOfWeekDaySchedulesSupportedPerUser !== undefined ? [DoorLock.Feature.WeekDayAccessSchedules] : []), ...(numberOfYearDaySchedulesSupportedPerUser !== undefined ? [DoorLock.Feature.YearDayAccessSchedules] : []), ...(numberOfHolidaySchedulesSupported !== undefined ? [DoorLock.Feature.HolidaySchedules] : [])).enable({
             events: { doorLockAlarm: true, lockOperation: true, lockOperationError: true },

package/dist/matterbridgeEndpointCommandHandler.d.ts

@@ -37,6 +37,7 @@ import type { TimeSynchronization } from '@matter/types/clusters/time-synchroniz
 import type { ValveConfigurationAndControl } from '@matter/types/clusters/valve-configuration-and-control';
 import type { WaterHeaterManagement } from '@matter/types/clusters/water-heater-management';
 import type { WaterHeaterMode } from '@matter/types/clusters/water-heater-mode';
+import type { WaterTankLevelMonitoring } from '@matter/types/clusters/water-tank-level-monitoring';
 import type { WindowCovering } from '@matter/types/clusters/window-covering';
 import type { ClosureControl } from './clusters/closure-control.js';
 import type { ClosureDimension } from './clusters/closure-dimension.js';
@@ -991,6 +992,13 @@ export type CommandHandlerDataMap = {
         attributes: ClusterAttributeValues<(typeof ActivatedCarbonFilterMonitoring)['attributes']>;
         endpoint: MatterbridgeEndpoint;
     };
+    'WaterTankLevelMonitoring.resetCondition': {
+        command: 'resetCondition';
+        request: {};
+        cluster: 'waterTankLevelMonitoring';
+        attributes: ClusterAttributeValues<(typeof WaterTankLevelMonitoring)['attributes']>;
+        endpoint: MatterbridgeEndpoint;
+    };
     'CommodityPrice.getDetailedPriceRequest': {
         command: 'getDetailedPriceRequest';
         request: CommodityPrice.GetDetailedPriceRequest;

package/dist/matterbridgeEndpointHelpers.js

@@ -48,6 +48,7 @@ import { ThermostatClient } from '@matter/node/behaviors/thermostat';
 import { ThermostatUserInterfaceConfigurationServer } from '@matter/node/behaviors/thermostat-user-interface-configuration';
 import { TotalVolatileOrganicCompoundsConcentrationMeasurementServer } from '@matter/node/behaviors/total-volatile-organic-compounds-concentration-measurement';
 import { UserLabelServer } from '@matter/node/behaviors/user-label';
+import { WaterTankLevelMonitoringServer } from '@matter/node/behaviors/water-tank-level-monitoring';
 import { WindowCoveringClient } from '@matter/node/behaviors/window-covering';
 import { getClusterNameById } from '@matter/types/cluster';
 import { ActivatedCarbonFilterMonitoring } from '@matter/types/clusters/activated-carbon-filter-monitoring';
@@ -104,6 +105,7 @@ import { ThermostatUserInterfaceConfiguration } from '@matter/types/clusters/the
 import { TotalVolatileOrganicCompoundsConcentrationMeasurement } from '@matter/types/clusters/total-volatile-organic-compounds-concentration-measurement';
 import { UserLabel } from '@matter/types/clusters/user-label';
 import { ValveConfigurationAndControl } from '@matter/types/clusters/valve-configuration-and-control';
+import { WaterTankLevelMonitoring } from '@matter/types/clusters/water-tank-level-monitoring';
 import { WindowCovering } from '@matter/types/clusters/window-covering';
 import { NodeId } from '@matter/types/datatype';
 import { MeasurementType } from '@matter/types/globals';
@@ -331,6 +333,8 @@ export function getBehaviourTypeFromClusterServerId(clusterId) {
         return HepaFilterMonitoringServer.with('Condition', 'Warning', 'ReplacementProductList');
     if (clusterId === ActivatedCarbonFilterMonitoring.id)
         return ActivatedCarbonFilterMonitoringServer.with('Condition', 'Warning', 'ReplacementProductList');
+    if (clusterId === WaterTankLevelMonitoring.id)
+        return WaterTankLevelMonitoringServer.with('Condition', 'Warning', 'ReplacementProductList');
     if (clusterId === CarbonMonoxideConcentrationMeasurement.id)
         return CarbonMonoxideConcentrationMeasurementServer.with('NumericMeasurement');
     if (clusterId === CarbonDioxideConcentrationMeasurement.id)
@@ -439,6 +443,11 @@ export async function invokeBehaviorCommand(endpoint, cluster, command, params)
             return;
         }
         void behavior?.['state'];
+        if (endpoint.behaviors.supported[behaviorId]?.lockOnInvoke) {
+            const transaction = agent.context.transaction;
+            await transaction.addResources(behavior);
+            await transaction.begin();
+        }
         const injectedSubject = { kind: 'node', id: NodeId(100) };
         const patchedContext = new Proxy(agent.context, { get: (t, k) => (k === 'fabric' ? 1 : k === 'subject' ? injectedSubject : Reflect.get(t, k, t)) });
         Object.defineProperty(behavior, 'context', { configurable: true, value: patchedContext });
@@ -564,6 +573,8 @@ export function addClusterServers(endpoint, serverList) {
         endpoint.createDefaultHepaFilterMonitoringClusterServer();
     if (serverList.includes(ActivatedCarbonFilterMonitoring.id))
         endpoint.createDefaultActivatedCarbonFilterMonitoringClusterServer();
+    if (serverList.includes(WaterTankLevelMonitoring.id))
+        endpoint.createDefaultWaterTankLevelMonitoringClusterServer();
     if (serverList.includes(CarbonMonoxideConcentrationMeasurement.id))
         endpoint.createDefaultCarbonMonoxideConcentrationMeasurementClusterServer();
     if (serverList.includes(CarbonDioxideConcentrationMeasurement.id))

package/dist/matterbridgeFactory.js

@@ -46,12 +46,15 @@ export async function getServerBehaviorFromClusterId(clusterId, features) {
     const base = mod[`${name}Server`];
     if (!base || !ClusterBehavior.isType(base) || isClientBehavior(base))
         return undefined;
+    const knownFeatureNames = new Set(Object.keys(base.cluster.features ?? {}).map((key) => pascalCase(key)));
     const featureNames = (Array.isArray(features)
         ? features
         : Object.entries(features ?? {})
             .filter(([, enabled]) => enabled)
-            .map(([key]) => key)).map((key) => pascalCase(key));
-    return featureNames.length > 0 ? base.with(...featureNames) : base;
+            .map(([key]) => key))
+        .map((key) => pascalCase(key))
+        .filter((key) => knownFeatureNames.has(key));
+    return features === undefined ? base : base.with(...featureNames);
 }
 export async function getClientBehaviorFromClusterId(clusterId) {
     const name = getClusterNameById(clusterId);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@matterbridge/core",
-  "version": "3.10.8-dev-20260901-971f7bf",
+  "version": "3.10.8-dev-20260903-4ab4a0f",
   "description": "Matterbridge core library",
   "author": "https://github.com/Luligu",
   "homepage": "https://matterbridge.io/",
@@ -132,10 +132,10 @@
   },
   "dependencies": {
     "@matter/main": "0.17.9",
-    "@matterbridge/dgram": "3.10.8-dev-20260901-971f7bf",
-    "@matterbridge/thread": "3.10.8-dev-20260901-971f7bf",
-    "@matterbridge/types": "3.10.8-dev-20260901-971f7bf",
-    "@matterbridge/utils": "3.10.8-dev-20260901-971f7bf",
+    "@matterbridge/dgram": "3.10.8-dev-20260903-4ab4a0f",
+    "@matterbridge/thread": "3.10.8-dev-20260903-4ab4a0f",
+    "@matterbridge/types": "3.10.8-dev-20260903-4ab4a0f",
+    "@matterbridge/utils": "3.10.8-dev-20260903-4ab4a0f",
     "escape-html": "1.0.3",
     "express": "5.2.1",
     "express-rate-limit": "8.7.0",