@matterbridge/core 3.6.1-dev-20260313-a699c0e → 3.6.1

package/dist/devices/basicVideoPlayer.js

@@ -2,7 +2,7 @@ import { KeypadInputServer } from '@matter/node/behaviors/keypad-input';
 import { MediaPlaybackServer } from '@matter/node/behaviors/media-playback';
 import { KeypadInput } from '@matter/types/clusters/keypad-input';
 import { MediaPlayback } from '@matter/types/clusters/media-playback';
-import { MatterbridgeOnOffServer, MatterbridgeServer } from '../matterbridgeBehaviors.js';
+import { MatterbridgeOnOffServer, MatterbridgeServer } from '../matterbridgeBehaviorsServer.js';
 import { basicVideoPlayer, powerSource } from '../matterbridgeDeviceTypes.js';
 import { MatterbridgeEndpoint } from '../matterbridgeEndpoint.js';
 export class BasicVideoPlayer extends MatterbridgeEndpoint {

package/dist/devices/castingVideoPlayer.js

@@ -1,6 +1,6 @@
 import { ContentLauncherServer } from '@matter/node/behaviors/content-launcher';
 import { MediaPlayback } from '@matter/types/clusters/media-playback';
-import { MatterbridgeServer } from '../matterbridgeBehaviors.js';
+import { MatterbridgeServer } from '../matterbridgeBehaviorsServer.js';
 import { castingVideoPlayer, powerSource } from '../matterbridgeDeviceTypes.js';
 import { MatterbridgeEndpoint } from '../matterbridgeEndpoint.js';
 import { MatterbridgeKeypadInputServer, MatterbridgeMediaPlaybackServer } from './basicVideoPlayer.js';

package/dist/devices/closure.js

@@ -2,7 +2,7 @@ import { AttributeElement, ClusterElement, ClusterModel, CommandElement, Datatyp
 import { ClusterBehavior } from '@matter/node';
 import { ClusterType } from '@matter/types';
 import { ClosureControl } from '../clusters/closure-control.js';
-import { MatterbridgeServer } from '../matterbridgeBehaviors.js';
+import { MatterbridgeServer } from '../matterbridgeBehaviorsServer.js';
 import { closure } from '../matterbridgeDeviceTypes.js';
 import { MatterbridgeEndpoint } from '../matterbridgeEndpoint.js';
 const ClosureControlSchema = ClusterElement({

package/dist/devices/closurePanel.js

@@ -2,7 +2,7 @@ import { AttributeElement, ClusterElement, ClusterModel, CommandElement, Datatyp
 import { ClusterBehavior } from '@matter/node';
 import { ClusterType } from '@matter/types';
 import { ClosureDimension } from '../clusters/closure-dimension.js';
-import { MatterbridgeServer } from '../matterbridgeBehaviors.js';
+import { MatterbridgeServer } from '../matterbridgeBehaviorsServer.js';
 import { closurePanel } from '../matterbridgeDeviceTypes.js';
 import { MatterbridgeEndpoint } from '../matterbridgeEndpoint.js';
 const ClosureDimensionSchema = ClusterElement({

package/dist/devices/dishwasher.js

@@ -2,7 +2,7 @@ import { DishwasherAlarmServer } from '@matter/node/behaviors/dishwasher-alarm';
 import { DishwasherModeServer } from '@matter/node/behaviors/dishwasher-mode';
 import { DishwasherMode } from '@matter/types/clusters/dishwasher-mode';
 import { ModeBase } from '@matter/types/clusters/mode-base';
-import { MatterbridgeOnOffServer, MatterbridgeServer } from '../matterbridgeBehaviors.js';
+import { MatterbridgeOnOffServer, MatterbridgeServer } from '../matterbridgeBehaviorsServer.js';
 import { dishwasher, powerSource } from '../matterbridgeDeviceTypes.js';
 import { MatterbridgeEndpoint } from '../matterbridgeEndpoint.js';
 import { createLevelTemperatureControlClusterServer, createNumberTemperatureControlClusterServer } from './temperatureControl.js';

package/dist/devices/evse.js

@@ -4,7 +4,7 @@ import { DeviceEnergyManagement } from '@matter/types/clusters/device-energy-man
 import { EnergyEvse } from '@matter/types/clusters/energy-evse';
 import { EnergyEvseMode } from '@matter/types/clusters/energy-evse-mode';
 import { ModeBase } from '@matter/types/clusters/mode-base';
-import { MatterbridgeServer } from '../matterbridgeBehaviors.js';
+import { MatterbridgeServer } from '../matterbridgeBehaviorsServer.js';
 import { deviceEnergyManagement, electricalSensor, evse, powerSource } from '../matterbridgeDeviceTypes.js';
 import { MatterbridgeEndpoint } from '../matterbridgeEndpoint.js';
 export class Evse extends MatterbridgeEndpoint {

package/dist/devices/laundryWasher.js

@@ -3,7 +3,7 @@ import { LaundryWasherModeServer } from '@matter/node/behaviors/laundry-washer-m
 import { LaundryWasherControls } from '@matter/types/clusters/laundry-washer-controls';
 import { LaundryWasherMode } from '@matter/types/clusters/laundry-washer-mode';
 import { ModeBase } from '@matter/types/clusters/mode-base';
-import { MatterbridgeOnOffServer, MatterbridgeServer } from '../matterbridgeBehaviors.js';
+import { MatterbridgeOnOffServer, MatterbridgeServer } from '../matterbridgeBehaviorsServer.js';
 import { laundryWasher, powerSource } from '../matterbridgeDeviceTypes.js';
 import { MatterbridgeEndpoint } from '../matterbridgeEndpoint.js';
 import { createLevelTemperatureControlClusterServer, createNumberTemperatureControlClusterServer } from './temperatureControl.js';

package/dist/devices/microwaveOven.js

@@ -3,7 +3,7 @@ import { MicrowaveOvenModeServer } from '@matter/node/behaviors/microwave-oven-m
 import { MicrowaveOvenControl } from '@matter/types/clusters/microwave-oven-control';
 import { MicrowaveOvenMode } from '@matter/types/clusters/microwave-oven-mode';
 import { OperationalState } from '@matter/types/clusters/operational-state';
-import { MatterbridgeOperationalStateServer, MatterbridgeServer } from '../matterbridgeBehaviors.js';
+import { MatterbridgeOperationalStateServer, MatterbridgeServer } from '../matterbridgeBehaviorsServer.js';
 import { microwaveOven, powerSource } from '../matterbridgeDeviceTypes.js';
 import { MatterbridgeEndpoint } from '../matterbridgeEndpoint.js';
 export class MicrowaveOven extends MatterbridgeEndpoint {

package/dist/devices/oven.js

@@ -3,7 +3,7 @@ import { OvenModeServer } from '@matter/node/behaviors/oven-mode';
 import { ModeBase } from '@matter/types/clusters/mode-base';
 import { OperationalState } from '@matter/types/clusters/operational-state';
 import { OvenMode } from '@matter/types/clusters/oven-mode';
-import { MatterbridgeServer } from '../matterbridgeBehaviors.js';
+import { MatterbridgeServer } from '../matterbridgeBehaviorsServer.js';
 import { oven, powerSource, temperatureControlledCabinetHeater } from '../matterbridgeDeviceTypes.js';
 import { MatterbridgeEndpoint } from '../matterbridgeEndpoint.js';
 import { createNumberTemperatureControlClusterServer } from './temperatureControl.js';

package/dist/devices/refrigerator.js

@@ -2,7 +2,7 @@ import { RefrigeratorAlarmServer } from '@matter/node/behaviors/refrigerator-ala
 import { RefrigeratorAndTemperatureControlledCabinetModeServer } from '@matter/node/behaviors/refrigerator-and-temperature-controlled-cabinet-mode';
 import { ModeBase } from '@matter/types/clusters/mode-base';
 import { RefrigeratorAndTemperatureControlledCabinetMode } from '@matter/types/clusters/refrigerator-and-temperature-controlled-cabinet-mode';
-import { MatterbridgeServer } from '../matterbridgeBehaviors.js';
+import { MatterbridgeServer } from '../matterbridgeBehaviorsServer.js';
 import { powerSource, refrigerator, temperatureControlledCabinetCooler } from '../matterbridgeDeviceTypes.js';
 import { MatterbridgeEndpoint } from '../matterbridgeEndpoint.js';
 import { createNumberTemperatureControlClusterServer } from './temperatureControl.js';

package/dist/devices/roboticVacuumCleaner.js

@@ -9,7 +9,7 @@ import { RvcCleanMode } from '@matter/types/clusters/rvc-clean-mode';
 import { RvcOperationalState } from '@matter/types/clusters/rvc-operational-state';
 import { RvcRunMode } from '@matter/types/clusters/rvc-run-mode';
 import { ServiceArea } from '@matter/types/clusters/service-area';
-import { MatterbridgeServer, MatterbridgeServiceAreaServer } from '../matterbridgeBehaviors.js';
+import { MatterbridgeServer, MatterbridgeServiceAreaServer } from '../matterbridgeBehaviorsServer.js';
 import { powerSource, roboticVacuumCleaner } from '../matterbridgeDeviceTypes.js';
 import { MatterbridgeEndpoint } from '../matterbridgeEndpoint.js';
 export class RoboticVacuumCleaner extends MatterbridgeEndpoint {

package/dist/devices/temperatureControl.js

@@ -1,6 +1,6 @@
 import { TemperatureControlServer } from '@matter/node/behaviors/temperature-control';
 import { TemperatureControl } from '@matter/types/clusters/temperature-control';
-import { MatterbridgeServer } from '../matterbridgeBehaviors.js';
+import { MatterbridgeServer } from '../matterbridgeBehaviorsServer.js';
 export function createLevelTemperatureControlClusterServer(endpoint, selectedTemperatureLevel = 1, supportedTemperatureLevels = ['Cold', 'Warm', 'Hot', '30°', '40°', '60°', '80°']) {
     endpoint.behaviors.require(MatterbridgeLevelTemperatureControlServer.with(TemperatureControl.Feature.TemperatureLevel), {
         selectedTemperatureLevel,

package/dist/devices/waterHeater.js

@@ -4,7 +4,7 @@ import { DeviceEnergyManagement } from '@matter/types/clusters/device-energy-man
 import { ModeBase } from '@matter/types/clusters/mode-base';
 import { WaterHeaterManagement } from '@matter/types/clusters/water-heater-management';
 import { WaterHeaterMode } from '@matter/types/clusters/water-heater-mode';
-import { MatterbridgeServer } from '../matterbridgeBehaviors.js';
+import { MatterbridgeServer } from '../matterbridgeBehaviorsServer.js';
 import { deviceEnergyManagement, electricalSensor, powerSource, waterHeater } from '../matterbridgeDeviceTypes.js';
 import { MatterbridgeEndpoint } from '../matterbridgeEndpoint.js';
 export class WaterHeater extends MatterbridgeEndpoint {

package/dist/export.d.ts

@@ -1,6 +1,6 @@
 export { addVirtualDevice } from './helpers.js';
 export * from './matterbridgeAccessoryPlatform.js';
-export * from './matterbridgeBehaviors.js';
+export * from './matterbridgeBehaviorsServer.js';
 export * from './matterbridgeDeviceTypes.js';
 export * from './matterbridgeDynamicPlatform.js';
 export * from './matterbridgeEndpoint.js';

package/dist/export.js

@@ -2,7 +2,7 @@ if (process.argv.includes('--loader') || process.argv.includes('-loader'))
     console.log('\u001B[32mIndex loaded.\u001B[40;0m');
 export { addVirtualDevice } from './helpers.js';
 export * from './matterbridgeAccessoryPlatform.js';
-export * from './matterbridgeBehaviors.js';
+export * from './matterbridgeBehaviorsServer.js';
 export * from './matterbridgeDeviceTypes.js';
 export * from './matterbridgeDynamicPlatform.js';
 export * from './matterbridgeEndpoint.js';

package/dist/jestutils/jestHelpers.d.ts

@@ -93,6 +93,8 @@ export declare function deleteDevice(owner: ServerNode<ServerNode.RootEndpoint>
 export declare function getMoveToLevelRequest(level: number, transitionTime: number, executeIfOff: boolean): LevelControl.MoveToLevelRequest;
 export declare function getMoveToColorTemperatureRequest(colorTemperatureMireds: number, transitionTime: number, executeIfOff: boolean): ColorControl.MoveToColorTemperatureRequest;
 export declare function getMoveToHueRequest(hue: number, transitionTime: number, executeIfOff: boolean): ColorControl.MoveToHueRequest;
+export declare function getEnhancedMoveToHueRequest(enhancedHue: number, transitionTime: number, executeIfOff: boolean): ColorControl.EnhancedMoveToHueRequest;
 export declare function getMoveToSaturationRequest(saturation: number, transitionTime: number, executeIfOff: boolean): ColorControl.MoveToSaturationRequest;
 export declare function getMoveToHueAndSaturationRequest(hue: number, saturation: number, transitionTime: number, executeIfOff: boolean): ColorControl.MoveToHueAndSaturationRequest;
+export declare function getEnhancedMoveToHueAndSaturationRequest(enhancedHue: number, saturation: number, transitionTime: number, executeIfOff: boolean): ColorControl.EnhancedMoveToHueAndSaturationRequest;
 export declare function getMoveToColorRequest(colorX: number, colorY: number, transitionTime: number, executeIfOff: boolean): ColorControl.MoveToColorRequest;

package/dist/jestutils/jestHelpers.js

@@ -579,6 +579,7 @@ export async function addDevice(owner, device, pause = 10) {
         process.stderr.write(`${er}Error adding device ${device.maybeId}.${device.maybeNumber}: ${errorMessage}${rs}\nStack: ${errorInspect}\n`);
         return false;
     }
+    await device.construction.ready;
     expect(owner.parts.has(device)).toBeTruthy();
     expect(owner.lifecycle.isPartsReady).toBeTruthy();
     expect(device.lifecycle.isReady).toBeTruthy();
@@ -642,6 +643,16 @@ export function getMoveToHueRequest(hue, transitionTime, executeIfOff) {
     };
     return request;
 }
+export function getEnhancedMoveToHueRequest(enhancedHue, transitionTime, executeIfOff) {
+    const request = {
+        enhancedHue,
+        transitionTime,
+        direction: ColorControl.Direction.Shortest,
+        optionsMask: { executeIfOff },
+        optionsOverride: { executeIfOff },
+    };
+    return request;
+}
 export function getMoveToSaturationRequest(saturation, transitionTime, executeIfOff) {
     const request = {
         saturation,
@@ -661,6 +672,16 @@ export function getMoveToHueAndSaturationRequest(hue, saturation, transitionTime
     };
     return request;
 }
+export function getEnhancedMoveToHueAndSaturationRequest(enhancedHue, saturation, transitionTime, executeIfOff) {
+    const request = {
+        enhancedHue,
+        saturation,
+        transitionTime,
+        optionsMask: { executeIfOff },
+        optionsOverride: { executeIfOff },
+    };
+    return request;
+}
 export function getMoveToColorRequest(colorX, colorY, transitionTime, executeIfOff) {
     const request = {
         colorX,

package/dist/matterbridge.js

@@ -1183,7 +1183,7 @@ export class Matterbridge extends EventEmitter {
                 catch {
                 }
             }
-            if (hasParameter('reset-sessions')) {
+            if (hasParameter('reset-sessions') || !hasParameter('no-reset-sessions')) {
                 this.log.debug(`Cleaning matter storage context for ${GREEN}Matterbridge${db}...`);
                 unlinkSafe(path.join(this.matterbridgeDirectory, MATTER_STORAGE_NAME, 'Matterbridge', 'sessions.resumptionRecords'), this.log);
                 unlinkSafe(path.join(this.matterbridgeDirectory, MATTER_STORAGE_NAME, 'Matterbridge', 'root.subscriptions.subscriptions'), this.log);

package/dist/matterbridgeBehaviorsClient.js

@@ -1,6 +1,6 @@
 import { BindingBehavior } from '@matter/main/behaviors/binding';
 import { DescriptorServer } from '@matter/main/behaviors/descriptor';
-import { MatterbridgeServer } from './matterbridgeBehaviors.js';
+import { MatterbridgeServer } from './matterbridgeBehaviorsServer.js';
 export class MatterbridgeBindingServer extends BindingBehavior {
     async initialize() {
         const device = this.endpoint.stateOf(MatterbridgeServer);

package/dist/{matterbridgeBehaviors.d.ts → matterbridgeBehaviorsServer.d.ts}

@@ -1327,12 +1327,12 @@ declare const MatterbridgeThermostatServer_base: import("@matter/node").ClusterB
         }>, void, any>;
         readonly atomicRequest: import("@matter/types").Command<import("@matter/types").TypeFromFields<{
             requestType: import("@matter/types").FieldType<Thermostat.RequestType>;
-            attributeRequests: import("@matter/types").FieldType<import("@matter/types/datatype").AttributeId[]>;
+            attributeRequests: import("@matter/types").FieldType<import("@matter/types").AttributeId[]>;
             timeout: import("@matter/types").OptionalFieldType<number>;
         }>, import("@matter/types").TypeFromFields<{
             statusCode: import("@matter/types").FieldType<import("@matter/types").Status>;
             attributeStatus: import("@matter/types").FieldType<import("@matter/types").TypeFromFields<{
-                attributeId: import("@matter/types").FieldType<import("@matter/types/datatype").AttributeId>;
+                attributeId: import("@matter/types").FieldType<import("@matter/types").AttributeId>;
                 statusCode: import("@matter/types").FieldType<import("@matter/types").Status>;
             }>[]>;
             timeout: import("@matter/types").OptionalFieldType<number>;
@@ -1615,6 +1615,7 @@ declare const MatterbridgeThermostatServer_base: import("@matter/node").ClusterB
     }];
 }>, readonly [Thermostat.Feature.Cooling, Thermostat.Feature.Heating, Thermostat.Feature.AutoMode]>, typeof ThermostatServer, import("@matter/node/behaviors/thermostat").ThermostatInterface>;
 export declare class MatterbridgeThermostatServer extends MatterbridgeThermostatServer_base {
+    initialize(): Promise<void>;
     setpointRaiseLower(request: Thermostat.SetpointRaiseLowerRequest): MaybePromise;
 }
 declare const MatterbridgePresetThermostatServer_base: import("@matter/node").ClusterBehavior.Type<import("@matter/types").ClusterComposer.WithFeatures<import("@matter/types").ClusterType.Of<{
@@ -1691,12 +1692,12 @@ declare const MatterbridgePresetThermostatServer_base: import("@matter/node").Cl
         }>, void, any>;
         readonly atomicRequest: import("@matter/types").Command<import("@matter/types").TypeFromFields<{
             requestType: import("@matter/types").FieldType<Thermostat.RequestType>;
-            attributeRequests: import("@matter/types").FieldType<import("@matter/types/datatype").AttributeId[]>;
+            attributeRequests: import("@matter/types").FieldType<import("@matter/types").AttributeId[]>;
             timeout: import("@matter/types").OptionalFieldType<number>;
         }>, import("@matter/types").TypeFromFields<{
             statusCode: import("@matter/types").FieldType<import("@matter/types").Status>;
             attributeStatus: import("@matter/types").FieldType<import("@matter/types").TypeFromFields<{
-                attributeId: import("@matter/types").FieldType<import("@matter/types/datatype").AttributeId>;
+                attributeId: import("@matter/types").FieldType<import("@matter/types").AttributeId>;
                 statusCode: import("@matter/types").FieldType<import("@matter/types").Status>;
             }>[]>;
             timeout: import("@matter/types").OptionalFieldType<number>;

package/dist/{matterbridgeBehaviors.js → matterbridgeBehaviorsServer.js}

@@ -1,3 +1,4 @@
+import { Bytes } from '@matter/general';
 import { Behavior } from '@matter/node';
 import { ActivatedCarbonFilterMonitoringServer } from '@matter/node/behaviors/activated-carbon-filter-monitoring';
 import { BooleanStateConfigurationServer } from '@matter/node/behaviors/boolean-state-configuration';
@@ -19,6 +20,7 @@ import { SwitchServer } from '@matter/node/behaviors/switch';
 import { ThermostatServer } from '@matter/node/behaviors/thermostat';
 import { ValveConfigurationAndControlServer } from '@matter/node/behaviors/valve-configuration-and-control';
 import { WindowCoveringServer } from '@matter/node/behaviors/window-covering';
+import { StatusResponse } from '@matter/types';
 import { BooleanStateConfiguration } from '@matter/types/clusters/boolean-state-configuration';
 import { ColorControl } from '@matter/types/clusters/color-control';
 import { DeviceEnergyManagement } from '@matter/types/clusters/device-energy-management';
@@ -321,6 +323,17 @@ export class MatterbridgeFanControlServer extends FanControlServer.with(FanContr
     }
 }
 export class MatterbridgeThermostatServer extends ThermostatServer.with(Thermostat.Feature.Cooling, Thermostat.Feature.Heating, Thermostat.Feature.AutoMode) {
+    async initialize() {
+        await super.initialize();
+        this.endpoint.construction.onSuccess(async () => {
+            const device = this.endpoint.stateOf(MatterbridgeServer);
+            device.log.debug(`Removing atomic commands (endpoint ${this.endpoint.maybeId}.${this.endpoint.maybeNumber})`);
+            await this.endpoint.setStateOf(ThermostatServer, {
+                acceptedCommandList: [0],
+                generatedCommandList: [],
+            });
+        });
+    }
     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})`);
@@ -369,6 +382,12 @@ export class MatterbridgePresetThermostatServer extends ThermostatServer.with(Th
         const device = this.endpoint.stateOf(MatterbridgeServer);
         device.log.info(`Setting preset to ${request.presetHandle} (endpoint ${this.endpoint.maybeId}.${this.endpoint.maybeNumber})`);
         device.commandHandler.executeHandler('setActivePresetRequest', { request, cluster: ThermostatServer.id, attributes: this.state, endpoint: this.endpoint });
+        if (request.presetHandle !== null) {
+            const preset = this.state.persistedPresets?.find((storedPreset) => storedPreset.presetHandle !== null && Bytes.areEqual(storedPreset.presetHandle, request.presetHandle));
+            if (preset === undefined)
+                throw new StatusResponse.InvalidCommandError('Requested PresetHandle not found');
+        }
+        this.state.activePresetHandle = request.presetHandle;
         device.log.debug(`MatterbridgePresetThermostatServer: setActivePresetRequest called with presetHandle: ${request.presetHandle}`);
     }
 }

package/dist/matterbridgeEndpoint.d.ts

@@ -62,15 +62,27 @@ export declare class MatterbridgeEndpoint extends Endpoint {
     setAttribute(clusterId: Behavior.Type | ClusterType | ClusterId | string, attribute: string, value: boolean | number | bigint | string | object | null, log?: AnsiLogger): Promise<boolean>;
     updateAttribute(cluster: Behavior.Type | ClusterType | ClusterId | string, attribute: string, value: boolean | number | bigint | string | object | null, log?: AnsiLogger): Promise<boolean>;
     subscribeAttribute(cluster: Behavior.Type | ClusterType | ClusterId | string, attribute: string, listener: (newValue: any, oldValue: any, context: ActionContext) => void, log?: AnsiLogger): Promise<boolean>;
-    setCluster(cluster: Behavior.Type | ClusterType | ClusterId | string, value: Record<string, boolean | number | bigint | string | object | undefined | null>, log?: AnsiLogger): Promise<boolean>;
-    getCluster(cluster: Behavior.Type | ClusterType | ClusterId | string, log?: AnsiLogger): Record<string, boolean | number | bigint | string | object | undefined | null> | undefined;
+    setCluster<T extends Behavior.Type>(cluster: T, value: Behavior.StateOf<T>, log?: AnsiLogger): Promise<boolean>;
+    setCluster<T extends ClusterType>(cluster: T, value: ClusterType.AttributeValues<T>, log?: AnsiLogger): Promise<boolean>;
+    setCluster(cluster: ClusterId | string, value: Record<string, boolean | number | bigint | string | object | undefined | null>, log?: AnsiLogger): Promise<boolean>;
+    getCluster<T extends Behavior.Type>(cluster: T, log?: AnsiLogger): Behavior.StateOf<T> | undefined;
+    getCluster<T extends ClusterType>(cluster: T, log?: AnsiLogger): ClusterType.AttributeValues<T> | undefined;
+    getCluster(cluster: ClusterId | string, log?: AnsiLogger): Record<string, boolean | number | bigint | string | object | undefined | null> | undefined;
     triggerEvent(cluster: Behavior.Type | ClusterType | ClusterId | string, event: string, payload: Record<string, boolean | number | bigint | string | object | undefined | null>, log?: AnsiLogger): Promise<boolean>;
     addClusterServers(serverList: ClusterId[]): this;
     addFixedLabel(label: string, value: string): Promise<this>;
     addUserLabel(label: string, value: string): Promise<this>;
     addCommandHandler(command: keyof MatterbridgeEndpointCommands, handler: CommandHandlerFunction): this;
     executeCommandHandler(command: keyof MatterbridgeEndpointCommands, request?: Record<string, boolean | number | bigint | string | object | null>, cluster?: string, attributes?: Record<string, boolean | number | bigint | string | object | null>, endpoint?: MatterbridgeEndpoint): Promise<void>;
-    invokeBehaviorCommand(cluster: Behavior.Type | ClusterType | ClusterId | string, command: keyof MatterbridgeEndpointCommands, params?: Record<string, boolean | number | bigint | string | object | null>): Promise<void>;
+    invokeBehaviorCommand<T extends Behavior.Type, C extends keyof {
+        [K in keyof InstanceType<T> as InstanceType<T>[K] extends (...args: unknown[]) => unknown ? K : never]: InstanceType<T>[K];
+    }>(cluster: T, command: C, params?: {
+        [K in keyof InstanceType<T> as InstanceType<T>[K] extends (...args: unknown[]) => unknown ? K : never]: InstanceType<T>[K];
+    }[C] extends (...args: infer P) => unknown ? P[0] : never): Promise<void>;
+    invokeBehaviorCommand<T extends ClusterType, C extends keyof ClusterType.CommandsOf<T>>(cluster: T, command: C, params?: ClusterType.CommandsOf<T>[C] extends {
+        requestSchema: infer S extends import('@matter/types/tlv').TlvSchema<unknown>;
+    } ? import('@matter/types/tlv').TypeFromSchema<S> : never): Promise<void>;
+    invokeBehaviorCommand(cluster: ClusterId | string, command: keyof MatterbridgeEndpointCommands, params?: Record<string, boolean | number | bigint | string | object | null>): Promise<void>;
     addRequiredClusterServers(): MatterbridgeEndpoint;
     addOptionalClusterServers(): MatterbridgeEndpoint;
     getAllClusterServers(): Behavior.Type[];

package/dist/matterbridgeEndpoint.js

@@ -62,7 +62,7 @@ import { VendorId } from '@matter/types/datatype';
 import { inspectError } from '@matterbridge/utils/error';
 import { isValidNumber, isValidObject, isValidString } from '@matterbridge/utils/validate';
 import { AnsiLogger, CYAN, db, debugStringify, hk, or, YELLOW, zb } from 'node-ansi-logger';
-import { MatterbridgeActivatedCarbonFilterMonitoringServer, MatterbridgeBooleanStateConfigurationServer, MatterbridgeColorControlServer, MatterbridgeDeviceEnergyManagementModeServer, MatterbridgeDeviceEnergyManagementServer, MatterbridgeDoorLockServer, MatterbridgeEnhancedColorControlServer, MatterbridgeFanControlServer, MatterbridgeHepaFilterMonitoringServer, MatterbridgeIdentifyServer, MatterbridgeLevelControlServer, MatterbridgeLiftTiltWindowCoveringServer, MatterbridgeLiftWindowCoveringServer, MatterbridgeModeSelectServer, MatterbridgeOnOffServer, MatterbridgeOperationalStateServer, MatterbridgePowerSourceServer, MatterbridgePresetThermostatServer, MatterbridgeServer, MatterbridgeSmokeCoAlarmServer, MatterbridgeSwitchServer, MatterbridgeThermostatServer, MatterbridgeValveConfigurationAndControlServer, } from './matterbridgeBehaviors.js';
+import { MatterbridgeActivatedCarbonFilterMonitoringServer, MatterbridgeBooleanStateConfigurationServer, MatterbridgeColorControlServer, MatterbridgeDeviceEnergyManagementModeServer, MatterbridgeDeviceEnergyManagementServer, MatterbridgeDoorLockServer, MatterbridgeEnhancedColorControlServer, MatterbridgeFanControlServer, MatterbridgeHepaFilterMonitoringServer, MatterbridgeIdentifyServer, MatterbridgeLevelControlServer, MatterbridgeLiftTiltWindowCoveringServer, MatterbridgeLiftWindowCoveringServer, MatterbridgeModeSelectServer, MatterbridgeOnOffServer, MatterbridgeOperationalStateServer, MatterbridgePowerSourceServer, MatterbridgePresetThermostatServer, MatterbridgeServer, MatterbridgeSmokeCoAlarmServer, MatterbridgeSwitchServer, MatterbridgeThermostatServer, MatterbridgeValveConfigurationAndControlServer, } from './matterbridgeBehaviorsServer.js';
 import { addClusterServers, addFixedLabel, addOptionalClusterServers, addRequiredClusterServers, addUserLabel, checkNotLatinCharacters, createUniqueId, featuresFor, generateUniqueId, getApparentElectricalPowerMeasurementClusterServer, getAttribute, getAttributeId, getBehavior, getBehaviourTypesFromClusterClientIds, getBehaviourTypesFromClusterServerIds, getCluster, getClusterId, getDefaultDeviceEnergyManagementClusterServer, getDefaultDeviceEnergyManagementModeClusterServer, getDefaultElectricalEnergyMeasurementClusterServer, getDefaultElectricalPowerMeasurementClusterServer, getDefaultFlowMeasurementClusterServer, getDefaultIlluminanceMeasurementClusterServer, getDefaultOccupancySensingClusterServer, getDefaultOperationalStateClusterServer, getDefaultPowerSourceBatteryClusterServer, getDefaultPowerSourceRechargeableBatteryClusterServer, getDefaultPowerSourceReplaceableBatteryClusterServer, getDefaultPowerSourceWiredClusterServer, getDefaultPressureMeasurementClusterServer, getDefaultRelativeHumidityMeasurementClusterServer, getDefaultTemperatureMeasurementClusterServer, invokeBehaviorCommand, lowercaseFirstLetter, setAttribute, setCluster, subscribeAttribute, triggerEvent, updateAttribute, } from './matterbridgeEndpointHelpers.js';
 const MATTERBRIDGE_ENDPOINT_BRAND = Symbol('MatterbridgeEndpoint.brand');
 export function isMatterbridgeEndpoint(value) {
@@ -910,7 +910,7 @@ export class MatterbridgeEndpoint extends Endpoint {
             ...(occupied !== undefined ? { unoccupiedCoolingSetpoint: unoccupiedCoolingSetpoint !== undefined ? unoccupiedCoolingSetpoint * 100 : 2700 } : {}),
             ...(occupied !== undefined ? { occupancy: { occupied } } : {}),
             ...(occupied !== undefined ? { externallyMeasuredOccupancy: true } : {}),
-            numberOfPresets: Array.isArray(presetsList) ? presetsList.length : 0,
+            numberOfPresets: Math.max(Array.isArray(presetsList) ? presetsList.length : 0, 10),
             activePresetHandle: activePresetHandle !== undefined ? Uint8Array.from([activePresetHandle]) : null,
             presets: (presetsList ?? []).map((p) => ({
                 presetHandle: Uint8Array.from(p.presetHandle || [0]),

package/dist/matterbridgeEndpointHelpers.d.ts

@@ -18,7 +18,7 @@ import { TemperatureMeasurement } from '@matter/types/clusters/temperature-measu
 import { ClusterId, VendorId } from '@matter/types/datatype';
 import { MeasurementType, Semtag } from '@matter/types/globals';
 import { AnsiLogger } from 'node-ansi-logger';
-import { MatterbridgeDeviceEnergyManagementModeServer, MatterbridgeDeviceEnergyManagementServer, MatterbridgeOperationalStateServer, MatterbridgePowerSourceServer } from './matterbridgeBehaviors.js';
+import { MatterbridgeDeviceEnergyManagementModeServer, MatterbridgeDeviceEnergyManagementServer, MatterbridgeOperationalStateServer, MatterbridgePowerSourceServer } from './matterbridgeBehaviorsServer.js';
 import { MatterbridgeEndpoint } from './matterbridgeEndpoint.js';
 import { MatterbridgeEndpointCommands } from './matterbridgeEndpointTypes.js';
 export declare function capitalizeFirstLetter(name: string): string;

package/dist/matterbridgeEndpointHelpers.js

@@ -83,7 +83,7 @@ import { deepCopy } from '@matterbridge/utils/deep-copy';
 import { deepEqual } from '@matterbridge/utils/deep-equal';
 import { isValidArray } from '@matterbridge/utils/validate';
 import { BLUE, CYAN, db, debugStringify, er, hk, or, YELLOW, zb } from 'node-ansi-logger';
-import { MatterbridgeBooleanStateConfigurationServer, MatterbridgeColorControlServer, MatterbridgeDeviceEnergyManagementModeServer, MatterbridgeDeviceEnergyManagementServer, MatterbridgeDoorLockServer, MatterbridgeFanControlServer, MatterbridgeIdentifyServer, MatterbridgeLevelControlServer, MatterbridgeLiftWindowCoveringServer, MatterbridgeModeSelectServer, MatterbridgeOnOffServer, MatterbridgeOperationalStateServer, MatterbridgePowerSourceServer, MatterbridgeSmokeCoAlarmServer, MatterbridgeThermostatServer, MatterbridgeValveConfigurationAndControlServer, } from './matterbridgeBehaviors.js';
+import { MatterbridgeBooleanStateConfigurationServer, MatterbridgeColorControlServer, MatterbridgeDeviceEnergyManagementModeServer, MatterbridgeDeviceEnergyManagementServer, MatterbridgeDoorLockServer, MatterbridgeFanControlServer, MatterbridgeIdentifyServer, MatterbridgeLevelControlServer, MatterbridgeLiftWindowCoveringServer, MatterbridgeModeSelectServer, MatterbridgeOnOffServer, MatterbridgeOperationalStateServer, MatterbridgePowerSourceServer, MatterbridgeSmokeCoAlarmServer, MatterbridgeThermostatServer, MatterbridgeValveConfigurationAndControlServer, } from './matterbridgeBehaviorsServer.js';
 export function capitalizeFirstLetter(name) {
     if (!name)
         return name;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@matterbridge/core",
-  "version": "3.6.1-dev-20260313-a699c0e",
+  "version": "3.6.1",
   "description": "Matterbridge core library",
   "author": "https://github.com/Luligu",
   "homepage": "https://matterbridge.io/",
@@ -121,11 +121,11 @@
     "CHANGELOG.md"
   ],
   "dependencies": {
-    "@matter/main": "0.17.0-alpha.0-20260311-3dbb8a732",
-    "@matterbridge/dgram": "3.6.1-dev-20260313-a699c0e",
-    "@matterbridge/thread": "3.6.1-dev-20260313-a699c0e",
-    "@matterbridge/types": "3.6.1-dev-20260313-a699c0e",
-    "@matterbridge/utils": "3.6.1-dev-20260313-a699c0e",
+    "@matter/main": "0.16.10",
+    "@matterbridge/dgram": "3.6.1",
+    "@matterbridge/thread": "3.6.1",
+    "@matterbridge/types": "3.6.1",
+    "@matterbridge/utils": "3.6.1",
     "archiver": "7.0.1",
     "express": "5.2.1",
     "glob": "13.0.6",