@matterbridge/core 3.7.1-dev-20260323-0a65511 → 3.7.1-dev-20260324-7b86640

package/dist/devices/roboticVacuumCleaner.d.ts

@@ -9,10 +9,10 @@ import { RvcRunMode } from '@matter/types/clusters/rvc-run-mode';
 import { ServiceArea } from '@matter/types/clusters/service-area';
 import { MatterbridgeEndpoint } from '../matterbridgeEndpoint.js';
 export declare class RoboticVacuumCleaner extends MatterbridgeEndpoint {
-    constructor(name: string, serial: string, mode?: 'server' | 'matter' | undefined, currentRunMode?: number, supportedRunModes?: RvcRunMode.ModeOption[], currentCleanMode?: number, supportedCleanModes?: RvcCleanMode.ModeOption[], currentPhase?: number | null, phaseList?: string[] | null, operationalState?: RvcOperationalState.OperationalState, operationalStateList?: RvcOperationalState.OperationalStateStruct[], supportedAreas?: ServiceArea.Area[], selectedAreas?: number[], currentArea?: number, supportedMaps?: ServiceArea.Map[]);
+    constructor(name: string, serial: string, mode?: 'server' | 'matter' | undefined, currentRunMode?: number, supportedRunModes?: RvcRunMode.ModeOption[], currentCleanMode?: number, supportedCleanModes?: RvcCleanMode.ModeOption[], currentPhase?: number | null, phaseList?: string[] | null, operationalState?: RvcOperationalState.OperationalState, operationalStateList?: RvcOperationalState.OperationalStateStruct[], supportedAreas?: ServiceArea.Area[], selectedAreas?: number[], currentArea?: number | null, supportedMaps?: ServiceArea.Map[]);
     createDefaultRvcRunModeClusterServer(currentMode?: number, supportedModes?: RvcRunMode.ModeOption[]): this;
     createDefaultRvcCleanModeClusterServer(currentMode?: number, supportedModes?: RvcCleanMode.ModeOption[]): this;
-    createDefaultServiceAreaClusterServer(supportedAreas?: ServiceArea.Area[], selectedAreas?: number[], currentArea?: number, supportedMaps?: ServiceArea.Map[]): this;
+    createDefaultServiceAreaClusterServer(supportedAreas?: ServiceArea.Area[], selectedAreas?: number[], currentArea?: number | null, supportedMaps?: ServiceArea.Map[]): this;
     createDefaultRvcOperationalStateClusterServer(phaseList?: string[] | null, currentPhase?: number | null, operationalStateList?: RvcOperationalState.OperationalStateStruct[], operationalState?: RvcOperationalState.OperationalState, operationalError?: RvcOperationalState.ErrorStateStruct): this;
 }
 export declare class MatterbridgeRvcRunModeServer extends RvcRunModeServer {

package/dist/devices/roboticVacuumCleaner.js

@@ -71,7 +71,7 @@ export class RoboticVacuumCleaner extends MatterbridgeEndpoint {
                 },
             ],
             selectedAreas: selectedAreas ?? [],
-            currentArea: currentArea ?? 1,
+            currentArea: currentArea !== undefined ? currentArea : 1,
             supportedMaps: supportedMaps ?? [],
             estimatedEndTime: null,
         });

package/dist/matterbridge.js

@@ -1197,11 +1197,33 @@ export class Matterbridge extends EventEmitter {
             }
             if (message === 'shutting down with reset...') {
                 this.log.info('Resetting Matterbridge commissioning information...');
-                await this.matterStorageManager?.createContext('events')?.clearAll();
-                await this.matterStorageManager?.createContext('fabrics')?.clearAll();
-                await this.matterStorageManager?.createContext('root')?.clearAll();
-                await this.matterStorageManager?.createContext('sessions')?.clearAll();
                 await this.matterbridgeContext?.clearAll();
+                if (this.bridgeMode === 'bridge') {
+                    await this.matterStorageManager?.createContext('events')?.clearAll();
+                    await this.matterStorageManager?.createContext('fabrics')?.clearAll();
+                    await this.matterStorageManager?.createContext('root')?.clearAll();
+                    await this.matterStorageManager?.createContext('sessions')?.clearAll();
+                }
+                else if (this.bridgeMode === 'childbridge') {
+                    for (const plugin of this.plugins.array()) {
+                        plugin.storageContext?.clearAll();
+                        const storageManager = await this.matterStorageService?.open(plugin.name);
+                        await storageManager?.createContext('events')?.clearAll();
+                        await storageManager?.createContext('fabrics')?.clearAll();
+                        await storageManager?.createContext('root')?.clearAll();
+                        await storageManager?.createContext('sessions')?.clearAll();
+                    }
+                }
+                for (const device of this.devices.array()) {
+                    if (device.mode === 'server' && device.deviceName) {
+                        const storageManager = await this.matterStorageService?.open(device.deviceName.replaceAll(' ', ''));
+                        await storageManager?.createContext('persist')?.clearAll();
+                        await storageManager?.createContext('events')?.clearAll();
+                        await storageManager?.createContext('fabrics')?.clearAll();
+                        await storageManager?.createContext('root')?.clearAll();
+                        await storageManager?.createContext('sessions')?.clearAll();
+                    }
+                }
                 this.log.info('Matter storage reset done! Remove the bridge from the controller.');
             }
             if (message === 'unregistered all devices and shutting down...') {

package/dist/matterbridgeBehaviorsServer.d.ts

@@ -452,15 +452,17 @@ declare const MatterbridgeColorControlServer_base: import("@matter/node").Cluste
         };
         readonly component: false;
     }];
-}>, readonly [ColorControl.Feature.HueSaturation, ColorControl.Feature.Xy, ColorControl.Feature.ColorTemperature]>, typeof ColorControlServer, import("@matter/node/behaviors/color-control").ColorControlInterface>;
+}>, readonly [ColorControl.Feature.HueSaturation, ColorControl.Feature.Xy, ColorControl.Feature.ColorTemperature, ColorControl.Feature.EnhancedHue]>, typeof ColorControlServer, import("@matter/node/behaviors/color-control").ColorControlInterface>;
 export declare class MatterbridgeColorControlServer extends MatterbridgeColorControlServer_base {
     moveToHue(request: ColorControl.MoveToHueRequest): Promise<void>;
+    enhancedMoveToHue(request: ColorControl.EnhancedMoveToHueRequest): Promise<void>;
     moveToSaturation(request: ColorControl.MoveToSaturationRequest): Promise<void>;
     moveToHueAndSaturation(request: ColorControl.MoveToHueAndSaturationRequest): Promise<void>;
+    enhancedMoveToHueAndSaturation(request: ColorControl.EnhancedMoveToHueAndSaturationRequest): Promise<void>;
     moveToColor(request: ColorControl.MoveToColorRequest): Promise<void>;
     moveToColorTemperature(request: ColorControl.MoveToColorTemperatureRequest): Promise<void>;
 }
-declare const MatterbridgeEnhancedColorControlServer_base: import("@matter/node").ClusterBehavior.Type<import("@matter/types").ClusterComposer.WithFeatures<import("@matter/types").ClusterType.Of<{
+declare const MatterbridgeEnhancedColorControlServer_base: import("@matter/node").ClusterBehavior.Type<import("@matter/types").ClusterComposer.WithFeatures<import("@matter/types").ClusterComposer.WithFeatures<import("@matter/types").ClusterType.Of<{
     readonly id: 768;
     readonly name: "ColorControl";
     readonly revision: 7;
@@ -846,15 +848,8 @@ declare const MatterbridgeEnhancedColorControlServer_base: import("@matter/node"
         };
         readonly component: false;
     }];
-}>, readonly [ColorControl.Feature.HueSaturation, ColorControl.Feature.EnhancedHue, ColorControl.Feature.Xy, ColorControl.Feature.ColorTemperature]>, typeof ColorControlServer, import("@matter/node/behaviors/color-control").ColorControlInterface>;
+}>, readonly [ColorControl.Feature.HueSaturation, ColorControl.Feature.Xy, ColorControl.Feature.ColorTemperature, ColorControl.Feature.EnhancedHue]>, readonly [ColorControl.Feature.HueSaturation, ColorControl.Feature.EnhancedHue, ColorControl.Feature.Xy, ColorControl.Feature.ColorTemperature]>, typeof MatterbridgeColorControlServer, import("@matter/node/behaviors/color-control").ColorControlInterface>;
 export declare class MatterbridgeEnhancedColorControlServer extends MatterbridgeEnhancedColorControlServer_base {
-    moveToHue(request: ColorControl.MoveToHueRequest): Promise<void>;
-    enhancedMoveToHue(request: ColorControl.EnhancedMoveToHueRequest): Promise<void>;
-    moveToSaturation(request: ColorControl.MoveToSaturationRequest): Promise<void>;
-    moveToHueAndSaturation(request: ColorControl.MoveToHueAndSaturationRequest): Promise<void>;
-    enhancedMoveToHueAndSaturation(request: ColorControl.EnhancedMoveToHueAndSaturationRequest): Promise<void>;
-    moveToColor(request: ColorControl.MoveToColorRequest): Promise<void>;
-    moveToColorTemperature(request: ColorControl.MoveToColorTemperatureRequest): Promise<void>;
 }
 declare const MatterbridgeWindowCoveringServer_base: import("@matter/node").ClusterBehavior.Type<import("@matter/types").ClusterComposer.WithFeatures<import("@matter/types").ClusterType.Of<{
     readonly id: 258;
@@ -1803,10 +1798,11 @@ declare const MatterbridgeThermostatServer_base: import("@matter/node").ClusterB
         };
         readonly component: false;
     }];
-}>, readonly [Thermostat.Feature.Cooling, Thermostat.Feature.Heating, Thermostat.Feature.AutoMode]>, typeof ThermostatServer, import("@matter/node/behaviors/thermostat").ThermostatInterface>;
+}>, readonly [Thermostat.Feature.Cooling, Thermostat.Feature.Heating, Thermostat.Feature.AutoMode, Thermostat.Feature.Presets]>, typeof ThermostatServer, import("@matter/node/behaviors/thermostat").ThermostatInterface>;
 export declare class MatterbridgeThermostatServer extends MatterbridgeThermostatServer_base {
     initialize(): Promise<void>;
     setpointRaiseLower(request: Thermostat.SetpointRaiseLowerRequest): Promise<void>;
+    setActivePresetRequest(request: Thermostat.SetActivePresetRequest): Promise<void>;
 }
 declare const MatterbridgePresetThermostatServer_base: import("@matter/node").ClusterBehavior.Type<import("@matter/types").ClusterComposer.WithFeatures<import("@matter/types").ClusterType.Of<{
     readonly id: 513;
@@ -2170,8 +2166,6 @@ declare const MatterbridgePresetThermostatServer_base: import("@matter/node").Cl
     }];
 }>, readonly [Thermostat.Feature.Presets, Thermostat.Feature.Cooling, Thermostat.Feature.Heating, Thermostat.Feature.AutoMode]>, typeof ThermostatServer, import("@matter/node/behaviors/thermostat").ThermostatInterface>;
 export declare class MatterbridgePresetThermostatServer extends MatterbridgePresetThermostatServer_base {
-    setpointRaiseLower(request: Thermostat.SetpointRaiseLowerRequest): Promise<void>;
-    setActivePresetRequest(request: Thermostat.SetActivePresetRequest): Promise<void>;
 }
 declare const MatterbridgeValveConfigurationAndControlServer_base: import("@matter/node").ClusterBehavior.Type<import("@matter/types").ClusterComposer.WithFeatures<ValveConfigurationAndControl.Cluster, readonly [ValveConfigurationAndControl.Feature.Level]>, typeof ValveConfigurationAndControlServer, import("@matter/node/behaviors/valve-configuration-and-control").ValveConfigurationAndControlInterface>;
 export declare class MatterbridgeValveConfigurationAndControlServer extends MatterbridgeValveConfigurationAndControlServer_base {

package/dist/matterbridgeBehaviorsServer.js

@@ -27,7 +27,6 @@ import { FanControl } from '@matter/types/clusters/fan-control';
 import { ModeBase } from '@matter/types/clusters/mode-base';
 import { OperationalState } from '@matter/types/clusters/operational-state';
 import { ResourceMonitoring } from '@matter/types/clusters/resource-monitoring';
-import { ServiceArea } from '@matter/types/clusters/service-area';
 import { SmokeCoAlarm } from '@matter/types/clusters/smoke-co-alarm';
 import { Thermostat } from '@matter/types/clusters/thermostat';
 import { ValveConfigurationAndControl } from '@matter/types/clusters/valve-configuration-and-control';
@@ -162,74 +161,7 @@ export class MatterbridgeLevelControlServer extends LevelControlServer {
         await super.moveToLevelWithOnOff(request);
     }
 }
-export class MatterbridgeColorControlServer extends ColorControlServer.with(ColorControl.Feature.HueSaturation, ColorControl.Feature.Xy, ColorControl.Feature.ColorTemperature) {
-    async 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})`);
-        await device.commandHandler.executeHandler('ColorControl.moveToHue', {
-            command: 'moveToHue',
-            request,
-            cluster: ColorControlServer.id,
-            attributes: this.state,
-            endpoint: this.endpoint,
-        });
-        device.log.debug(`MatterbridgeColorControlServer: moveToHue called`);
-        await super.moveToHue(request);
-    }
-    async 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})`);
-        await device.commandHandler.executeHandler('ColorControl.moveToSaturation', {
-            command: 'moveToSaturation',
-            request,
-            cluster: ColorControlServer.id,
-            attributes: this.state,
-            endpoint: this.endpoint,
-        });
-        device.log.debug(`MatterbridgeColorControlServer: moveToSaturation called`);
-        await super.moveToSaturation(request);
-    }
-    async 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})`);
-        await device.commandHandler.executeHandler('ColorControl.moveToHueAndSaturation', {
-            command: 'moveToHueAndSaturation',
-            request,
-            cluster: ColorControlServer.id,
-            attributes: this.state,
-            endpoint: this.endpoint,
-        });
-        device.log.debug(`MatterbridgeColorControlServer: moveToHueAndSaturation called`);
-        await super.moveToHueAndSaturation(request);
-    }
-    async 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})`);
-        await device.commandHandler.executeHandler('ColorControl.moveToColor', {
-            command: 'moveToColor',
-            request,
-            cluster: ColorControlServer.id,
-            attributes: this.state,
-            endpoint: this.endpoint,
-        });
-        device.log.debug(`MatterbridgeColorControlServer: moveToColor called`);
-        await super.moveToColor(request);
-    }
-    async 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})`);
-        await device.commandHandler.executeHandler('ColorControl.moveToColorTemperature', {
-            command: 'moveToColorTemperature',
-            request,
-            cluster: ColorControlServer.id,
-            attributes: this.state,
-            endpoint: this.endpoint,
-        });
-        device.log.debug(`MatterbridgeColorControlServer: moveToColorTemperature called`);
-        await super.moveToColorTemperature(request);
-    }
-}
-export class MatterbridgeEnhancedColorControlServer extends ColorControlServer.with(ColorControl.Feature.HueSaturation, ColorControl.Feature.EnhancedHue, ColorControl.Feature.Xy, ColorControl.Feature.ColorTemperature) {
+export class MatterbridgeColorControlServer extends ColorControlServer.with(ColorControl.Feature.HueSaturation, ColorControl.Feature.Xy, ColorControl.Feature.ColorTemperature, ColorControl.Feature.EnhancedHue) {
     async 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})`);
@@ -322,6 +254,8 @@ export class MatterbridgeEnhancedColorControlServer extends ColorControlServer.w
         await super.moveToColorTemperature(request);
     }
 }
+export class MatterbridgeEnhancedColorControlServer extends MatterbridgeColorControlServer.with(ColorControl.Feature.HueSaturation, ColorControl.Feature.EnhancedHue, ColorControl.Feature.Xy, ColorControl.Feature.ColorTemperature) {
+}
 export class MatterbridgeWindowCoveringServer extends WindowCoveringServer.with(WindowCovering.Feature.Lift, WindowCovering.Feature.PositionAwareLift, WindowCovering.Feature.Tilt, WindowCovering.Feature.PositionAwareTilt) {
     lookupMovementStatus = ['Stopped', 'Opening', 'Closing', 'Unknown'];
     async initialize() {
@@ -466,7 +400,7 @@ export class MatterbridgeFanControlServer extends FanControlServer.with(FanContr
         device.log.debug('Set percentCurrent to:', this.state.percentCurrent);
     }
 }
-export class MatterbridgeThermostatServer extends ThermostatServer.with(Thermostat.Feature.Cooling, Thermostat.Feature.Heating, Thermostat.Feature.AutoMode) {
+export class MatterbridgeThermostatServer extends ThermostatServer.with(Thermostat.Feature.Cooling, Thermostat.Feature.Heating, Thermostat.Feature.AutoMode, Thermostat.Feature.Presets) {
     async initialize() {
         await super.initialize();
         this.endpoint.construction.onSuccess(async () => {
@@ -492,22 +426,6 @@ export class MatterbridgeThermostatServer extends ThermostatServer.with(Thermost
         device.log.debug(`MatterbridgeThermostatServer: setpointRaiseLower called with mode: ${lookupSetpointAdjustMode[request.mode]} amount: ${request.amount / 10}`);
         await super.setpointRaiseLower(request);
     }
-}
-export class MatterbridgePresetThermostatServer extends ThermostatServer.with(Thermostat.Feature.Presets, Thermostat.Feature.Cooling, Thermostat.Feature.Heating, Thermostat.Feature.AutoMode) {
-    async 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})`);
-        await device.commandHandler.executeHandler('Thermostat.setpointRaiseLower', {
-            command: 'setpointRaiseLower',
-            request,
-            cluster: ThermostatServer.id,
-            attributes: this.state,
-            endpoint: this.endpoint,
-        });
-        const lookupSetpointAdjustMode = ['Heat', 'Cool', 'Both'];
-        device.log.debug(`MatterbridgePresetThermostatServer: setpointRaiseLower called with mode: ${lookupSetpointAdjustMode[request.mode]} amount: ${request.amount / 10}`);
-        await super.setpointRaiseLower(request);
-    }
     async setActivePresetRequest(request) {
         const device = this.endpoint.stateOf(MatterbridgeServer);
         const presetHandle = request.presetHandle ? `0x${Buffer.from(request.presetHandle).toString('hex')}` : 'null';
@@ -519,12 +437,14 @@ export class MatterbridgePresetThermostatServer extends ThermostatServer.with(Th
             attributes: this.state,
             endpoint: this.endpoint,
         });
-        device.log.debug(`MatterbridgePresetThermostatServer: setActivePresetRequest called with presetHandle: ${presetHandle}`);
+        device.log.debug(`MatterbridgeThermostatServer: setActivePresetRequest called with presetHandle: ${presetHandle}`);
         await super.setActivePresetRequest(request);
         const activePresetHandle = this.state.activePresetHandle ? `0x${Buffer.from(this.state.activePresetHandle).toString('hex')}` : 'null';
-        device.log.debug(`MatterbridgePresetThermostatServer: setActivePresetRequest completed with activePresetHandle: ${activePresetHandle} occupiedHeatingSetpoint: ${this.state.occupiedHeatingSetpoint} occupiedCoolingSetpoint: ${this.state.occupiedCoolingSetpoint}`);
+        device.log.debug(`MatterbridgeThermostatServer: setActivePresetRequest completed with activePresetHandle: ${activePresetHandle} occupiedHeatingSetpoint: ${this.state.occupiedHeatingSetpoint} occupiedCoolingSetpoint: ${this.state.occupiedCoolingSetpoint}`);
     }
 }
+export class MatterbridgePresetThermostatServer extends ThermostatServer.with(Thermostat.Feature.Presets, Thermostat.Feature.Cooling, Thermostat.Feature.Heating, Thermostat.Feature.AutoMode) {
+}
 export class MatterbridgeValveConfigurationAndControlServer extends ValveConfigurationAndControlServer.with(ValveConfigurationAndControl.Feature.Level) {
     async open(request) {
         const device = this.endpoint.stateOf(MatterbridgeServer);
@@ -676,7 +596,7 @@ export class MatterbridgeOperationalStateServer extends OperationalStateServer {
 export class MatterbridgeServiceAreaServer extends ServiceAreaServer {
     async selectAreas(request) {
         const device = this.endpoint.stateOf(MatterbridgeServer);
-        device.log.info(`Selecting areas ${request.newAreas} (endpoint ${this.endpoint.maybeId}.${this.endpoint.maybeNumber})`);
+        device.log.info(`Selecting areas [${request.newAreas.join(', ')}] (endpoint ${this.endpoint.maybeId}.${this.endpoint.maybeNumber})`);
         await device.commandHandler.executeHandler('ServiceArea.selectAreas', {
             command: 'selectAreas',
             request,
@@ -684,15 +604,7 @@ export class MatterbridgeServiceAreaServer extends ServiceAreaServer {
             attributes: this.state,
             endpoint: this.endpoint,
         });
-        for (const area of request.newAreas) {
-            const supportedArea = this.state.supportedAreas.find((supportedArea) => supportedArea.areaId === area);
-            if (!supportedArea) {
-                device.log.error(`MatterbridgeServiceAreaServer selectAreas called with unsupported area: ${area}`);
-                return { status: ServiceArea.SelectAreasStatus.UnsupportedArea, statusText: 'Unsupported areas' };
-            }
-        }
-        this.state.selectedAreas = request.newAreas;
-        device.log.debug(`MatterbridgeServiceAreaServer selectAreas called with: ${request.newAreas.map((area) => area.toString()).join(', ')}`);
+        device.log.debug(`MatterbridgeServiceAreaServer selectAreas called with: [${request.newAreas.join(', ')}]`);
         return await super.selectAreas(request);
     }
 }

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, MatterbridgeModeSelectServer, MatterbridgeOnOffServer, MatterbridgeOperationalStateServer, MatterbridgePowerSourceServer, MatterbridgePresetThermostatServer, MatterbridgeServer, MatterbridgeSmokeCoAlarmServer, MatterbridgeSwitchServer, MatterbridgeThermostatServer, MatterbridgeValveConfigurationAndControlServer, MatterbridgeWindowCoveringServer, } from './matterbridgeBehaviorsServer.js';
+import { MatterbridgeActivatedCarbonFilterMonitoringServer, MatterbridgeBooleanStateConfigurationServer, MatterbridgeColorControlServer, MatterbridgeDeviceEnergyManagementModeServer, MatterbridgeDeviceEnergyManagementServer, MatterbridgeDoorLockServer, MatterbridgeFanControlServer, MatterbridgeHepaFilterMonitoringServer, MatterbridgeIdentifyServer, MatterbridgeLevelControlServer, MatterbridgeModeSelectServer, MatterbridgeOnOffServer, MatterbridgeOperationalStateServer, MatterbridgePowerSourceServer, MatterbridgeServer, MatterbridgeSmokeCoAlarmServer, MatterbridgeSwitchServer, MatterbridgeThermostatServer, MatterbridgeValveConfigurationAndControlServer, MatterbridgeWindowCoveringServer, } from './matterbridgeBehaviorsServer.js';
 import { CommandHandler } from './matterbridgeEndpointCommandHandler.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');
@@ -639,7 +639,7 @@ export class MatterbridgeEndpoint extends Endpoint {
         return this;
     }
     createEnhancedColorControlClusterServer(currentX = 0, currentY = 0, enhancedCurrentHue = 0, currentSaturation = 0, colorTemperatureMireds = 500, colorTempPhysicalMinMireds = 147, colorTempPhysicalMaxMireds = 500) {
-        this.behaviors.require(MatterbridgeEnhancedColorControlServer.with(ColorControl.Feature.Xy, ColorControl.Feature.HueSaturation, ColorControl.Feature.EnhancedHue, ColorControl.Feature.ColorTemperature), {
+        this.behaviors.require(MatterbridgeColorControlServer.with(ColorControl.Feature.Xy, ColorControl.Feature.HueSaturation, ColorControl.Feature.EnhancedHue, ColorControl.Feature.ColorTemperature), {
             colorMode: ColorControl.ColorMode.CurrentHueAndCurrentSaturation,
             enhancedColorMode: ColorControl.EnhancedColorMode.EnhancedCurrentHueAndCurrentSaturation,
             colorCapabilities: { xy: true, hueSaturation: true, colorLoop: false, enhancedHue: true, colorTemperature: true },
@@ -893,7 +893,7 @@ export class MatterbridgeEndpoint extends Endpoint {
         return this;
     }
     createDefaultPresetsThermostatClusterServer(localTemperature = 23, occupiedHeatingSetpoint = 21, occupiedCoolingSetpoint = 25, minSetpointDeadBand = 0, minHeatSetpointLimit = 0, maxHeatSetpointLimit = 50, minCoolSetpointLimit = 0, maxCoolSetpointLimit = 50, unoccupiedHeatingSetpoint = undefined, unoccupiedCoolingSetpoint = undefined, occupied = undefined, outdoorTemperature = undefined, activePresetHandle = null, presetsList = undefined, presetTypes = undefined) {
-        this.behaviors.require(MatterbridgePresetThermostatServer.with(Thermostat.Feature.Heating, Thermostat.Feature.Cooling, Thermostat.Feature.AutoMode, ...(occupied !== undefined ? [Thermostat.Feature.Occupancy] : []), Thermostat.Feature.Presets), {
+        this.behaviors.require(MatterbridgeThermostatServer.with(Thermostat.Feature.Heating, Thermostat.Feature.Cooling, Thermostat.Feature.AutoMode, ...(occupied !== undefined ? [Thermostat.Feature.Occupancy] : []), Thermostat.Feature.Presets), {
             localTemperature: localTemperature * 100,
             externalMeasuredIndoorTemperature: localTemperature * 100,
             ...(outdoorTemperature !== undefined ? { outdoorTemperature: outdoorTemperature !== null ? outdoorTemperature * 100 : outdoorTemperature } : {}),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@matterbridge/core",
-  "version": "3.7.1-dev-20260323-0a65511",
+  "version": "3.7.1-dev-20260324-7b86640",
   "description": "Matterbridge core library",
   "author": "https://github.com/Luligu",
   "homepage": "https://matterbridge.io/",
@@ -122,14 +122,14 @@
   ],
   "dependencies": {
     "@matter/main": "0.16.10",
-    "@matterbridge/dgram": "3.7.1-dev-20260323-0a65511",
-    "@matterbridge/thread": "3.7.1-dev-20260323-0a65511",
-    "@matterbridge/types": "3.7.1-dev-20260323-0a65511",
-    "@matterbridge/utils": "3.7.1-dev-20260323-0a65511",
+    "@matterbridge/dgram": "3.7.1-dev-20260324-7b86640",
+    "@matterbridge/thread": "3.7.1-dev-20260324-7b86640",
+    "@matterbridge/types": "3.7.1-dev-20260324-7b86640",
+    "@matterbridge/utils": "3.7.1-dev-20260324-7b86640",
     "express": "5.2.1",
     "multer": "2.1.1",
     "node-ansi-logger": "3.2.0",
     "node-persist-manager": "2.0.1",
-    "ws": "8.19.0"
+    "ws": "8.20.0"
   }
 }