matterbridge 1.5.9 → 1.6.0

package/dist/matterbridgeDevice.js

@@ -20,12 +20,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License. *
  */
-import { AirQuality, AirQualityCluster, BasicInformationCluster, BooleanState, BooleanStateCluster, BooleanStateConfiguration, BooleanStateConfigurationCluster, BridgedDeviceBasicInformation, BridgedDeviceBasicInformationCluster, CarbonDioxideConcentrationMeasurement, CarbonDioxideConcentrationMeasurementCluster, CarbonMonoxideConcentrationMeasurement, CarbonMonoxideConcentrationMeasurementCluster, ClusterServer, ColorControl, ColorControlCluster, ConcentrationMeasurement, DeviceEnergyManagement, DeviceEnergyManagementCluster, DeviceEnergyManagementMode, DeviceEnergyManagementModeCluster, DoorLock, DoorLockCluster, ElectricalEnergyMeasurement, ElectricalEnergyMeasurementCluster, ElectricalPowerMeasurement, ElectricalPowerMeasurementCluster, FanControl, FanControlCluster, FixedLabelCluster, FlowMeasurement, FlowMeasurementCluster, FormaldehydeConcentrationMeasurement, FormaldehydeConcentrationMeasurementCluster, Groups, GroupsCluster, GroupsClusterHandler, Identify, IdentifyCluster, IlluminanceMeasurement, IlluminanceMeasurementCluster, LevelControl, LevelControlCluster, MeasurementType, ModeSelectCluster, NitrogenDioxideConcentrationMeasurement, NitrogenDioxideConcentrationMeasurementCluster, OccupancySensing, OccupancySensingCluster, OnOff, OnOffCluster, OzoneConcentrationMeasurement, OzoneConcentrationMeasurementCluster, Pm10ConcentrationMeasurement, Pm10ConcentrationMeasurementCluster, Pm1ConcentrationMeasurement, Pm1ConcentrationMeasurementCluster, Pm25ConcentrationMeasurement, Pm25ConcentrationMeasurementCluster, PowerSource, PowerSourceCluster, PowerSourceConfigurationCluster, PowerTopology, PowerTopologyCluster, PressureMeasurement, PressureMeasurementCluster, RadonConcentrationMeasurement, RadonConcentrationMeasurementCluster, RelativeHumidityMeasurement, RelativeHumidityMeasurementCluster, SmokeCoAlarm, SmokeCoAlarmCluster, Switch, SwitchCluster, TemperatureMeasurement, TemperatureMeasurementCluster, Thermostat, ThermostatCluster, ThreadNetworkDiagnostics, ThreadNetworkDiagnosticsCluster, TimeSynchronization, TimeSynchronizationCluster, TotalVolatileOrganicCompoundsConcentrationMeasurement, TotalVolatileOrganicCompoundsConcentrationMeasurementCluster, WindowCovering, WindowCoveringCluster, getClusterNameById, } from '@project-chip/matter-node.js/cluster';
+import { ActionsCluster, AirQuality, AirQualityCluster, BasicInformationCluster, BooleanState, BooleanStateCluster, BooleanStateConfiguration, BooleanStateConfigurationCluster, BridgedDeviceBasicInformation, BridgedDeviceBasicInformationCluster, CarbonDioxideConcentrationMeasurement, CarbonDioxideConcentrationMeasurementCluster, CarbonMonoxideConcentrationMeasurement, CarbonMonoxideConcentrationMeasurementCluster, ClusterServer, ColorControl, ColorControlCluster, ConcentrationMeasurement, DeviceEnergyManagement, DeviceEnergyManagementCluster, DeviceEnergyManagementMode, DeviceEnergyManagementModeCluster, DoorLock, DoorLockCluster, ElectricalEnergyMeasurement, ElectricalEnergyMeasurementCluster, ElectricalPowerMeasurement, ElectricalPowerMeasurementCluster, FanControl, FanControlCluster, FixedLabelCluster, FlowMeasurement, FlowMeasurementCluster, FormaldehydeConcentrationMeasurement, FormaldehydeConcentrationMeasurementCluster, Groups, GroupsCluster, GroupsClusterHandler, Identify, IdentifyCluster, IlluminanceMeasurement, IlluminanceMeasurementCluster, LevelControl, LevelControlCluster, MeasurementType, ModeSelectCluster, NitrogenDioxideConcentrationMeasurement, NitrogenDioxideConcentrationMeasurementCluster, OccupancySensing, OccupancySensingCluster, OnOff, OnOffCluster, OzoneConcentrationMeasurement, OzoneConcentrationMeasurementCluster, Pm10ConcentrationMeasurement, Pm10ConcentrationMeasurementCluster, Pm1ConcentrationMeasurement, Pm1ConcentrationMeasurementCluster, Pm25ConcentrationMeasurement, Pm25ConcentrationMeasurementCluster, PowerSource, PowerSourceCluster, PowerSourceConfigurationCluster, PowerTopology, PowerTopologyCluster, PressureMeasurement, PressureMeasurementCluster, RadonConcentrationMeasurement, RadonConcentrationMeasurementCluster, RelativeHumidityMeasurement, RelativeHumidityMeasurementCluster, SmokeCoAlarm, SmokeCoAlarmCluster, Switch, SwitchCluster, TemperatureMeasurement, TemperatureMeasurementCluster, Thermostat, ThermostatCluster, ThreadNetworkDiagnostics, ThreadNetworkDiagnosticsCluster, TimeSynchronization, TimeSynchronizationCluster, TotalVolatileOrganicCompoundsConcentrationMeasurement, TotalVolatileOrganicCompoundsConcentrationMeasurementCluster, WindowCovering, WindowCoveringCluster, getClusterNameById, } from '@project-chip/matter-node.js/cluster';
 import { Specification } from '@project-chip/matter-node.js/model';
 import { EndpointNumber, VendorId } from '@project-chip/matter-node.js/datatype';
 import { Device, DeviceClasses, DeviceTypeDefinition, Endpoint } from '@project-chip/matter-node.js/device';
 import { extendPublicHandlerMethods } from '@project-chip/matter-node.js/util';
-import { EveHistory, MatterHistory } from 'matter-history';
 import { AnsiLogger, CYAN, YELLOW, db, debugStringify, hk, or, zb } from 'node-ansi-logger';
 import { createHash } from 'crypto';
 // Matter 1.2 and 1.3 device types
@@ -98,6 +97,13 @@ export const deviceEnergyManagement = DeviceTypeDefinition({
     requiredServerClusters: [DeviceEnergyManagement.Cluster.id, DeviceEnergyManagementMode.Cluster.id],
     optionalServerClusters: [],
 });
+export const bridge = DeviceTypeDefinition({
+    name: 'MA-aggregator',
+    code: 0x000e,
+    deviceClass: DeviceClasses.Dynamic,
+    revision: 1,
+    optionalServerClusters: [ActionsCluster.id],
+});
 export const powerSource = DeviceTypeDefinition({
     name: 'MA-powerSource',
     code: 0x0011,
@@ -230,73 +236,6 @@ export class MatterbridgeDevice extends extendPublicHandlerMethods(Device) {
     static async loadInstance(definition, options = {}, debug = false) {
         return new MatterbridgeDevice(definition, options, debug);
     }
-    /**
-     * Create asyncronously a device with one or more device types and with the required cluster servers and the specified cluster servers.
-     *
-     * @param {DeviceTypeDefinition | AtLeastOne<DeviceTypeDefinition>} definition - The device types to add.
-     * @param {EndpointOptions} [options={}] - The options for the device.
-     * @param {ClusterId[]} clusterServerList - The list of cluster IDs to include.
-     * @param {boolean} [debug=false] - The debug level for the device.
-     * @returns {Promise<MatterbridgeDevice>} The MatterbridgeDevice instance.
-     *
-    static async createWithClusterServer(definition: DeviceTypeDefinition | AtLeastOne<DeviceTypeDefinition>, options: EndpointOptions = {}, clusterServerList: ClusterId[] = [], debug = false): Promise<MatterbridgeDevice> {
-      const device = new MatterbridgeDevice(definition, options, debug);
-      if (Array.isArray(definition)) {
-        definition.forEach((deviceType) => {
-          deviceType.requiredServerClusters.forEach((clusterId) => {
-            if (!clusterServerList.includes(clusterId)) clusterServerList.push(clusterId);
-          });
-        });
-      } else {
-        definition.requiredServerClusters.forEach((clusterId) => {
-          if (!clusterServerList.includes(clusterId)) clusterServerList.push(clusterId);
-        });
-      }
-      device.log.debug(`createWithClusterServer:`);
-      const deviceTypes = device.getDeviceTypes();
-      deviceTypes.forEach((deviceType) => {
-        device.log.debug(`- with deviceType: ${zb}${deviceType.code}${db}-${zb}${deviceType.name}${db}`);
-      });
-      clusterServerList.forEach((clusterId) => {
-        device.log.debug(`- with cluster: ${hk}${clusterId}${db}-${hk}${getClusterNameById(clusterId)}${db}`);
-      });
-      device.addClusterServerFromList(device, clusterServerList);
-      // TODO must by typed and tested
-      Object.entries(options).forEach(([key, value]) => {
-        if (key === 'basicInformation') {
-          // eslint-disable-next-line @typescript-eslint/no-explicit-any
-          const basicInformation = value as any;
-          device.createDefaultBasicInformationClusterServer(
-            basicInformation.deviceName,
-            basicInformation.serialNumber,
-            basicInformation.vendorId,
-            basicInformation.vendorName,
-            basicInformation.productId,
-            basicInformation.productName,
-            basicInformation.softwareVersion,
-            basicInformation.softwareVersionString,
-            basicInformation.hardwareVersion,
-            basicInformation.hardwareVersionString,
-          );
-        } else if (key === 'bridgedDeviceBasicInformation') {
-          // eslint-disable-next-line @typescript-eslint/no-explicit-any
-          const bridgedDeviceBasicInformation = value as any;
-          device.createDefaultBridgedDeviceBasicInformationClusterServer(
-            bridgedDeviceBasicInformation.deviceName,
-            bridgedDeviceBasicInformation.serialNumber,
-            bridgedDeviceBasicInformation.vendorId,
-            bridgedDeviceBasicInformation.vendorName,
-            bridgedDeviceBasicInformation.productName,
-            bridgedDeviceBasicInformation.softwareVersion,
-            bridgedDeviceBasicInformation.softwareVersionString,
-            bridgedDeviceBasicInformation.hardwareVersion,
-            bridgedDeviceBasicInformation.hardwareVersionString,
-          );
-        }
-      });
-      return device;
-    }
-    */
     /**
      * Adds a device type to the list of device types of the MatterbridgeDevice endpoint.
      * If the device type is not already present in the list, it will be added.
@@ -351,7 +290,6 @@ export class MatterbridgeDevice extends extendPublicHandlerMethods(Device) {
         let child = this.getChildEndpoints().find((endpoint) => endpoint.uniqueStorageKey === endpointName);
         if (!child) {
             child = new Endpoint(deviceTypes, { uniqueStorageKey: endpointName });
-            child.addFixedLabel('endpointName', endpointName.slice(0, 16));
             this.addChildEndpoint(child);
         }
         deviceTypes.forEach((deviceType) => {
@@ -385,7 +323,7 @@ export class MatterbridgeDevice extends extendPublicHandlerMethods(Device) {
         endpoint.getDeviceTypes().forEach((deviceType) => {
             this.log.debug(`- for deviceType: ${zb}${deviceType.code}${db}-${zb}${deviceType.name}${db}`);
             deviceType.requiredServerClusters.forEach((clusterId) => {
-                if (!requiredServerList.includes(clusterId) && !endpoint.getClusterClientById(clusterId))
+                if (!requiredServerList.includes(clusterId) && !endpoint.getClusterServerById(clusterId))
                     requiredServerList.push(clusterId);
             });
         });
@@ -407,7 +345,7 @@ export class MatterbridgeDevice extends extendPublicHandlerMethods(Device) {
         endpoint.getDeviceTypes().forEach((deviceType) => {
             this.log.debug(`- for deviceType: ${zb}${deviceType.code}${db}-${zb}${deviceType.name}${db}`);
             deviceType.optionalServerClusters.forEach((clusterId) => {
-                if (!optionalServerList.includes(clusterId) && !endpoint.getClusterClientById(clusterId))
+                if (!optionalServerList.includes(clusterId) && !endpoint.getClusterServerById(clusterId))
                     optionalServerList.push(clusterId);
             });
         });
@@ -435,7 +373,7 @@ export class MatterbridgeDevice extends extendPublicHandlerMethods(Device) {
         if (includeServerList.includes(LevelControl.Cluster.id))
             endpoint.addClusterServer(this.getDefaultLevelControlClusterServer());
         if (includeServerList.includes(ColorControl.Cluster.id))
-            endpoint.addClusterServer(this.getDefaultCompleteColorControlClusterServer());
+            endpoint.addClusterServer(this.getDefaultColorControlClusterServer());
         if (includeServerList.includes(Switch.Cluster.id))
             endpoint.addClusterServer(this.getDefaultSwitchClusterServer());
         if (includeServerList.includes(DoorLock.Cluster.id))
@@ -446,6 +384,8 @@ export class MatterbridgeDevice extends extendPublicHandlerMethods(Device) {
             endpoint.addClusterServer(this.getDefaultTimeSyncClusterServer());
         if (includeServerList.includes(WindowCovering.Cluster.id))
             endpoint.addClusterServer(this.getDefaultWindowCoveringClusterServer());
+        if (includeServerList.includes(FanControl.Cluster.id))
+            endpoint.addClusterServer(this.getDefaultFanControlClusterServer());
         if (includeServerList.includes(TemperatureMeasurement.Cluster.id))
             endpoint.addClusterServer(this.getDefaultTemperatureMeasurementClusterServer());
         if (includeServerList.includes(RelativeHumidityMeasurement.Cluster.id))
@@ -464,8 +404,6 @@ export class MatterbridgeDevice extends extendPublicHandlerMethods(Device) {
             endpoint.addClusterServer(this.getDefaultIlluminanceMeasurementClusterServer());
         if (includeServerList.includes(PowerSource.Cluster.id))
             endpoint.addClusterServer(this.getDefaultPowerSourceWiredClusterServer());
-        if (includeServerList.includes(EveHistory.Cluster.id))
-            endpoint.addClusterServer(MatterHistory.getEveHistoryClusterServer());
         if (includeServerList.includes(PowerTopology.Cluster.id))
             endpoint.addClusterServer(this.getDefaultPowerTopologyClusterServer());
         if (includeServerList.includes(ElectricalPowerMeasurement.Cluster.id))
@@ -496,8 +434,6 @@ export class MatterbridgeDevice extends extendPublicHandlerMethods(Device) {
             endpoint.addClusterServer(this.getDefaultRadonConcentrationMeasurementClusterServer());
         if (includeServerList.includes(TotalVolatileOrganicCompoundsConcentrationMeasurement.Cluster.id))
             endpoint.addClusterServer(this.getDefaultTvocMeasurementClusterServer());
-        if (includeServerList.includes(FanControl.Cluster.id))
-            endpoint.addClusterServer(this.getDefaultFanControlClusterServer());
         if (includeServerList.includes(DeviceEnergyManagement.Cluster.id))
             endpoint.addClusterServer(this.getDefaultDeviceEnergyManagementClusterServer());
         if (includeServerList.includes(DeviceEnergyManagementMode.Cluster.id))
@@ -513,74 +449,6 @@ export class MatterbridgeDevice extends extendPublicHandlerMethods(Device) {
     getChildEndpointByName(endpointName) {
         return this.getChildEndpoints().find((endpoint) => endpoint.uniqueStorageKey === endpointName);
     }
-    /**
-     * Retrieves a child endpoint name.
-     *
-     * @param {Endpoint} child - The child endpoint to retrieve the name.
-     * @returns {string | undefined} The child endpoint name, or undefined if not found.
-     *
-     * @deprecated This method is deprecated and will be removed in a future version. Use endpoint.uniqueStorageKey instead.
-     */
-    getChildEndpointName(child) {
-        // Find the endpoint name (l1...)
-        const labelList = child.getClusterServer(FixedLabelCluster)?.getLabelListAttribute();
-        if (!labelList)
-            return undefined;
-        const endpointNameLabel = labelList.find((entry) => entry.label === 'endpointName');
-        if (endpointNameLabel)
-            return endpointNameLabel.value;
-    }
-    /**
-     * Sets the endpoint name for a child endpoint.
-     *
-     * @param {Endpoint} child - The child endpoint.
-     * @param {string} endpointName - The name of the endpoint.
-     *
-     * @deprecated This method is deprecated and will be removed in a future version.
-     */
-    setChildEndpointName(child, endpointName) {
-        child.addFixedLabel('endpointName', endpointName);
-    }
-    /**
-     * Retrieves the label associated with the specified endpoint number.
-     * @param {EndpointNumber | undefined} endpointNumber - The number of the endpoint.
-     * @returns {string | undefined} The label associated with the endpoint number, or undefined if not found.
-     *
-     * @deprecated This method is deprecated and will be removed in a future version.
-     */
-    getEndpointLabel(endpointNumber) {
-        if (!endpointNumber)
-            return undefined;
-        const labelList = this.getChildEndpoint(endpointNumber)?.getClusterServer(FixedLabelCluster)?.getLabelListAttribute();
-        if (!labelList)
-            return undefined;
-        for (const entry of labelList) {
-            if (entry.label === 'endpointName')
-                return entry.value;
-        }
-    }
-    /**
-     * Retrieves the child endpoint with the specified label.
-     *
-     * @param {string} label - The label of the child endpoint to retrieve.
-     * @returns {Endpoint | undefined} The child endpoint with the specified label, or undefined if not found.
-     *
-     * @deprecated This method is deprecated and will be removed in a future version. Use getChildEndpointByName instead.
-     */
-    getChildEndpointWithLabel(label) {
-        for (const endpoint of this.getChildEndpoints()) {
-            const labelList = endpoint.getClusterServer(FixedLabelCluster)?.getLabelListAttribute();
-            if (!labelList)
-                return undefined;
-            let endpointName = '';
-            for (const entry of labelList) {
-                if (entry.label === 'endpointName')
-                    endpointName = entry.value;
-            }
-            if (endpointName === label)
-                return endpoint;
-        }
-    }
     /**
      * Retrieves the value of the specified attribute from the given endpoint and cluster.
      *
@@ -708,14 +576,14 @@ export class MatterbridgeDevice extends extendPublicHandlerMethods(Device) {
      * @param pluginName - The name of the plugin.
      * @returns The serialized Matterbridge device object.
      */
-    serialize(pluginName) {
+    serialize() {
         if (!this.serialNumber || !this.deviceName || !this.uniqueId)
             return;
         const cluster = this.getClusterServer(BasicInformationCluster) ?? this.getClusterServer(BridgedDeviceBasicInformationCluster);
         if (!cluster)
             return;
         const serialized = {
-            pluginName,
+            pluginName: this.plugin ?? 'Unknown',
             serialNumber: this.serialNumber,
             deviceName: this.deviceName,
             uniqueId: this.uniqueId,
@@ -979,6 +847,7 @@ export class MatterbridgeDevice extends extendPublicHandlerMethods(Device) {
                 maxMeasuredValue: Number.MAX_SAFE_INTEGER,
                 accuracyRanges: [{ rangeMin: Number.MIN_SAFE_INTEGER, rangeMax: Number.MAX_SAFE_INTEGER, fixedMax: 1 }],
             },
+            cumulativeEnergyReset: null,
             cumulativeEnergyImported: energy ? { energy } : null,
             cumulativeEnergyExported: null,
         }, {}, {
@@ -1153,167 +1022,6 @@ export class MatterbridgeDevice extends extendPublicHandlerMethods(Device) {
     }
     /**
      * Get a default color control cluster server.
-     * @deprecated This method is deprecated and will be removed in a future version. Use getDefaultCompleteColorControlClusterServer.
-     *
-     * @param currentHue - The current hue value.
-     * @param currentSaturation - The current saturation value.
-     * @param colorTemperatureMireds - The color temperature in mireds.
-     * @param colorTempPhysicalMinMireds - The physical minimum color temperature in mireds.
-     * @param colorTempPhysicalMaxMireds - The physical maximum color temperature in mireds.
-     */
-    getDefaultColorControlClusterServer(currentHue = 0, currentSaturation = 0, colorTemperatureMireds = 500, colorTempPhysicalMinMireds = 147, colorTempPhysicalMaxMireds = 500) {
-        return ClusterServer(ColorControlCluster.with(ColorControl.Feature.HueSaturation, ColorControl.Feature.ColorTemperature), {
-            colorMode: ColorControl.ColorMode.CurrentHueAndCurrentSaturation,
-            options: {
-                executeIfOff: false,
-            },
-            numberOfPrimaries: null,
-            enhancedColorMode: ColorControl.EnhancedColorMode.CurrentHueAndCurrentSaturation,
-            colorCapabilities: { xy: false, hueSaturation: true, colorLoop: false, enhancedHue: false, colorTemperature: true },
-            currentHue,
-            currentSaturation,
-            colorTemperatureMireds,
-            colorTempPhysicalMinMireds,
-            colorTempPhysicalMaxMireds,
-        }, {
-            moveToHue: async ({ request, attributes, endpoint }) => {
-                this.log.debug('Matter command: moveToHue request:', request, 'attributes.currentHue:', attributes.currentHue.getLocal());
-                // attributes.currentHue.setLocal(request.hue);
-                this.commandHandler.executeHandler('moveToHue', { request, attributes, endpoint });
-            },
-            moveHue: async () => {
-                this.log.error('Matter command: moveHue not implemented');
-            },
-            stepHue: async () => {
-                this.log.error('Matter command: stepHue not implemented');
-            },
-            moveToSaturation: async ({ request, attributes, endpoint }) => {
-                this.log.debug('Matter command: moveToSaturation request:', request, 'attributes.currentSaturation:', attributes.currentSaturation.getLocal());
-                // attributes.currentSaturation.setLocal(request.saturation);
-                this.commandHandler.executeHandler('moveToSaturation', { request, attributes, endpoint });
-            },
-            moveSaturation: async () => {
-                this.log.error('Matter command: moveSaturation not implemented');
-            },
-            stepSaturation: async () => {
-                this.log.error('Matter command: stepSaturation not implemented');
-            },
-            moveToHueAndSaturation: async ({ request, attributes, endpoint }) => {
-                this.log.debug('Matter command: moveToHueAndSaturation request:', request, 'attributes.currentHue:', attributes.currentHue.getLocal(), 'attributes.currentSaturation:', attributes.currentSaturation.getLocal());
-                // attributes.currentHue.setLocal(request.hue);
-                // attributes.currentSaturation.setLocal(request.saturation);
-                this.commandHandler.executeHandler('moveToHueAndSaturation', { request, attributes, endpoint });
-            },
-            stopMoveStep: async () => {
-                this.log.error('Matter command: stopMoveStep not implemented');
-            },
-            moveToColorTemperature: async ({ request, attributes, endpoint }) => {
-                this.log.debug('Matter command: moveToColorTemperature request:', request, 'attributes.colorTemperatureMireds:', attributes.colorTemperatureMireds.getLocal());
-                // attributes.colorTemperatureMireds.setLocal(request.colorTemperatureMireds);
-                this.commandHandler.executeHandler('moveToColorTemperature', { request, attributes, endpoint });
-            },
-            moveColorTemperature: async () => {
-                this.log.error('Matter command: moveColorTemperature not implemented');
-            },
-            stepColorTemperature: async () => {
-                this.log.error('Matter command: stepColorTemperature not implemented');
-            },
-        }, {});
-    }
-    /**
-     * Creates a default color control cluster server.
-     * @deprecated This method is deprecated and will be removed in a future version. Use createDefaultCompleteColorControlClusterServer.
-     *
-     * @param currentHue - The current hue value.
-     * @param currentSaturation - The current saturation value.
-     * @param colorTemperatureMireds - The color temperature in mireds.
-     * @param colorTempPhysicalMinMireds - The physical minimum color temperature in mireds.
-     * @param colorTempPhysicalMaxMireds - The physical maximum color temperature in mireds.
-     */
-    createDefaultColorControlClusterServer(currentHue = 0, currentSaturation = 0, colorTemperatureMireds = 500, colorTempPhysicalMinMireds = 147, colorTempPhysicalMaxMireds = 500) {
-        this.addClusterServer(this.getDefaultColorControlClusterServer(currentHue, currentSaturation, colorTemperatureMireds, colorTempPhysicalMinMireds, colorTempPhysicalMaxMireds));
-    }
-    /**
-     * Get a default color control cluster server.
-     * @deprecated This method is deprecated and will be removed in a future version. Use getDefaultCompleteColorControlClusterServer.
-     *
-     * @param currentX - The current X value.
-     * @param currentY - The current Y value.
-     * @param currentHue - The current hue value.
-     * @param currentSaturation - The current saturation value.
-     * @param colorTemperatureMireds - The color temperature in mireds.
-     * @param colorTempPhysicalMinMireds - The physical minimum color temperature in mireds.
-     * @param colorTempPhysicalMaxMireds - The physical maximum color temperature in mireds.
-     */
-    getDefaultXYColorControlClusterServer(currentX = 0, currentY = 0, colorTemperatureMireds = 500, colorTempPhysicalMinMireds = 147, colorTempPhysicalMaxMireds = 500) {
-        return ClusterServer(ColorControlCluster.with(ColorControl.Feature.Xy, ColorControl.Feature.HueSaturation, ColorControl.Feature.ColorTemperature), {
-            colorMode: ColorControl.ColorMode.CurrentHueAndCurrentSaturation,
-            options: {
-                executeIfOff: false,
-            },
-            numberOfPrimaries: null,
-            enhancedColorMode: ColorControl.EnhancedColorMode.CurrentHueAndCurrentSaturation,
-            colorCapabilities: { xy: true, hueSaturation: true, colorLoop: false, enhancedHue: false, colorTemperature: true },
-            currentHue: 0,
-            currentSaturation: 0,
-            currentX,
-            currentY,
-            colorTemperatureMireds,
-            colorTempPhysicalMinMireds,
-            colorTempPhysicalMaxMireds,
-        }, {
-            moveToColor: async (data) => {
-                this.log.debug('Matter command: moveToColor request:', data.request, 'attributes.currentHue:', data.attributes.currentX.getLocal(), data.attributes.currentY.getLocal());
-                this.commandHandler.executeHandler('moveToColor', data);
-            },
-            moveColor: async () => {
-                this.log.error('Matter command: moveColor not implemented');
-            },
-            stepColor: async () => {
-                this.log.error('Matter command: stepColor not implemented');
-            },
-            moveToHue: async ({ request, attributes, endpoint }) => {
-                this.log.debug('Matter command: moveToHue request:', request, 'attributes.currentHue:', attributes.currentHue.getLocal());
-                this.commandHandler.executeHandler('moveToHue', { request, attributes, endpoint });
-            },
-            moveHue: async () => {
-                this.log.error('Matter command: moveHue not implemented');
-            },
-            stepHue: async () => {
-                this.log.error('Matter command: stepHue not implemented');
-            },
-            moveToSaturation: async ({ request, attributes, endpoint }) => {
-                this.log.debug('Matter command: moveToSaturation request:', request, 'attributes.currentSaturation:', attributes.currentSaturation.getLocal());
-                this.commandHandler.executeHandler('moveToSaturation', { request, attributes, endpoint });
-            },
-            moveSaturation: async () => {
-                this.log.error('Matter command: moveSaturation not implemented');
-            },
-            stepSaturation: async () => {
-                this.log.error('Matter command: stepSaturation not implemented');
-            },
-            moveToHueAndSaturation: async ({ request, attributes, endpoint }) => {
-                this.log.debug('Matter command: moveToHueAndSaturation request:', request, 'attributes.currentHue:', attributes.currentHue.getLocal(), 'attributes.currentSaturation:', attributes.currentSaturation.getLocal());
-                this.commandHandler.executeHandler('moveToHueAndSaturation', { request, attributes, endpoint });
-            },
-            stopMoveStep: async () => {
-                this.log.error('Matter command: stopMoveStep not implemented');
-            },
-            moveToColorTemperature: async ({ request, attributes, endpoint }) => {
-                this.log.debug('Matter command: moveToColorTemperature request:', request, 'attributes.colorTemperatureMireds:', attributes.colorTemperatureMireds.getLocal());
-                this.commandHandler.executeHandler('moveToColorTemperature', { request, attributes, endpoint });
-            },
-            moveColorTemperature: async () => {
-                this.log.error('Matter command: moveColorTemperature not implemented');
-            },
-            stepColorTemperature: async () => {
-                this.log.error('Matter command: stepColorTemperature not implemented');
-            },
-        }, {});
-    }
-    /**
-     * Creates a default color control cluster server.
-     * @deprecated This method is deprecated and will be removed in a future version. Use createDefaultCompleteColorControlClusterServer.
      *
      * @param currentX - The current X value.
      * @param currentY - The current Y value.
@@ -1323,21 +1031,7 @@ export class MatterbridgeDevice extends extendPublicHandlerMethods(Device) {
      * @param colorTempPhysicalMinMireds - The physical minimum color temperature in mireds.
      * @param colorTempPhysicalMaxMireds - The physical maximum color temperature in mireds.
      */
-    createDefaultXYColorControlClusterServer(currentX = 0, currentY = 0, colorTemperatureMireds = 500, colorTempPhysicalMinMireds = 147, colorTempPhysicalMaxMireds = 500) {
-        this.addClusterServer(this.getDefaultXYColorControlClusterServer(currentX, currentY, colorTemperatureMireds, colorTempPhysicalMinMireds, colorTempPhysicalMaxMireds));
-    }
-    /**
-     * Get a default color control cluster server.
-     *
-     * @param currentX - The current X value.
-     * @param currentY - The current Y value.
-     * @param currentHue - The current hue value.
-     * @param currentSaturation - The current saturation value.
-     * @param colorTemperatureMireds - The color temperature in mireds.
-     * @param colorTempPhysicalMinMireds - The physical minimum color temperature in mireds.
-     * @param colorTempPhysicalMaxMireds - The physical maximum color temperature in mireds.
-     */
-    getDefaultCompleteColorControlClusterServer(currentX = 0, currentY = 0, currentHue = 0, currentSaturation = 0, colorTemperatureMireds = 500, colorTempPhysicalMinMireds = 147, colorTempPhysicalMaxMireds = 500) {
+    getDefaultColorControlClusterServer(currentX = 0, currentY = 0, currentHue = 0, currentSaturation = 0, colorTemperatureMireds = 500, colorTempPhysicalMinMireds = 147, colorTempPhysicalMaxMireds = 500) {
         return ClusterServer(ColorControlCluster.with(ColorControl.Feature.Xy, ColorControl.Feature.HueSaturation, ColorControl.Feature.ColorTemperature), {
             colorMode: ColorControl.ColorMode.CurrentHueAndCurrentSaturation,
             enhancedColorMode: ColorControl.EnhancedColorMode.CurrentHueAndCurrentSaturation,
@@ -1414,8 +1108,8 @@ export class MatterbridgeDevice extends extendPublicHandlerMethods(Device) {
      * @param colorTempPhysicalMinMireds - The physical minimum color temperature in mireds.
      * @param colorTempPhysicalMaxMireds - The physical maximum color temperature in mireds.
      */
-    createDefaultCompleteColorControlClusterServer(currentX = 0, currentY = 0, currentHue = 0, currentSaturation = 0, colorTemperatureMireds = 500, colorTempPhysicalMinMireds = 147, colorTempPhysicalMaxMireds = 500) {
-        this.addClusterServer(this.getDefaultCompleteColorControlClusterServer(currentX, currentY, currentHue, currentSaturation, colorTemperatureMireds, colorTempPhysicalMinMireds, colorTempPhysicalMaxMireds));
+    createDefaultColorControlClusterServer(currentX = 0, currentY = 0, currentHue = 0, currentSaturation = 0, colorTemperatureMireds = 500, colorTempPhysicalMinMireds = 147, colorTempPhysicalMaxMireds = 500) {
+        this.addClusterServer(this.getDefaultColorControlClusterServer(currentX, currentY, currentHue, currentSaturation, colorTemperatureMireds, colorTempPhysicalMinMireds, colorTempPhysicalMaxMireds));
     }
     /**
      * Configures the color control cluster for a device.
@@ -1434,7 +1128,7 @@ export class MatterbridgeDevice extends extendPublicHandlerMethods(Device) {
             endpoint = this;
         endpoint.getClusterServer(ColorControlCluster)?.setFeatureMapAttribute({ hueSaturation, enhancedHue: false, colorLoop: false, xy, colorTemperature });
         endpoint.getClusterServer(ColorControlCluster)?.setColorCapabilitiesAttribute({ hueSaturation, enhancedHue: false, colorLoop: false, xy, colorTemperature });
-        if (colorMode !== undefined && colorMode >= 0 && colorMode <= 2) {
+        if (colorMode !== undefined && colorMode >= ColorControl.ColorMode.CurrentHueAndCurrentSaturation && colorMode <= ColorControl.ColorMode.ColorTemperatureMireds) {
             endpoint.getClusterServer(ColorControlCluster)?.setColorModeAttribute(colorMode);
             endpoint.getClusterServer(ColorControlCluster)?.setEnhancedColorModeAttribute(colorMode);
         }
@@ -1766,8 +1460,6 @@ export class MatterbridgeDevice extends extendPublicHandlerMethods(Device) {
     /**
      * Retrieves the default mode select cluster server.
      *
-     * @deprecated This method is currently under development and should not be used.
-     *
      * @param description - The description of the cluster server.
      * @param supportedModes - The supported modes for the cluster server.
      * @param currentMode - The current mode of the cluster server. Defaults to 0.
@@ -1794,17 +1486,12 @@ export class MatterbridgeDevice extends extendPublicHandlerMethods(Device) {
      * @remarks
      * This method adds a cluster server for a mode select cluster with default settings.
      *
-     * @deprecated This method is currently under development and should not be used.
-     *
      * @param endpoint - The endpoint to add the cluster server to. Defaults to `this` if not provided.
      */
-    createDefaultModeSelectClusterServer(endpoint) {
+    createDefaultModeSelectClusterServer(description, supportedModes, currentMode = 0, startUpMode = 0, endpoint) {
         if (!endpoint)
             endpoint = this;
-        endpoint.addClusterServer(this.getDefaultModeSelectClusterServer('Mode select', [
-            { label: 'Mode 0', mode: 0, semanticTags: [{ mfgCode: VendorId(0xfff1), value: 0 }] },
-            { label: 'Mode 1', mode: 1, semanticTags: [{ mfgCode: VendorId(0xfff1), value: 1 }] },
-        ]));
+        endpoint.addClusterServer(this.getDefaultModeSelectClusterServer(description, supportedModes, currentMode, startUpMode));
     }
     /**
      * Get a default occupancy sensing cluster server.
@@ -2130,25 +1817,30 @@ export class MatterbridgeDevice extends extendPublicHandlerMethods(Device) {
     /**
      * Get a default thermostat cluster server with the specified parameters.
      *
-     * @param localTemperature - The local temperature value in degrees Celsius. Defaults to 23.
-     * @param occupiedHeatingSetpoint - The occupied heating setpoint value in degrees Celsius. Defaults to 21.
-     * @param occupiedCoolingSetpoint - The occupied cooling setpoint value in degrees Celsius. Defaults to 25.
-     * @param minSetpointDeadBand - The minimum setpoint dead band value.
-     */
-    getDefaultThermostatClusterServer(localTemperature = 23, occupiedHeatingSetpoint = 21, occupiedCoolingSetpoint = 25, minSetpointDeadBand = 1) {
+     * @param {number} [localTemperature=23] - The local temperature value in degrees Celsius. Defaults to 23°.
+     * @param {number} [occupiedHeatingSetpoint=21] - The occupied heating setpoint value in degrees Celsius. Defaults to 21°.
+     * @param {number} [occupiedCoolingSetpoint=25] - The occupied cooling setpoint value in degrees Celsius. Defaults to 25°.
+     * @param {number} [minSetpointDeadBand=1] - The minimum setpoint dead band value. Defaults to 1°.
+     * @param {number} [minHeatSetpointLimit=0] - The minimum heat setpoint limit value. Defaults to 0°.
+     * @param {number} [maxHeatSetpointLimit=50] - The maximum heat setpoint limit value. Defaults to 50°.
+     * @param {number} [minCoolSetpointLimit=0] - The minimum cool setpoint limit value. Defaults to 0°.
+     * @param {number} [maxCoolSetpointLimit=50] - The maximum cool setpoint limit value. Defaults to 50°.
+     * @returns {ThermostatClusterServer} A default thermostat cluster server configured with the specified parameters.
+     */
+    getDefaultThermostatClusterServer(localTemperature = 23, occupiedHeatingSetpoint = 21, occupiedCoolingSetpoint = 25, minSetpointDeadBand = 1, minHeatSetpointLimit = 0, maxHeatSetpointLimit = 50, minCoolSetpointLimit = 0, maxCoolSetpointLimit = 50) {
         return ClusterServer(ThermostatCluster.with(Thermostat.Feature.Heating, Thermostat.Feature.Cooling, Thermostat.Feature.AutoMode), {
             localTemperature: localTemperature * 100,
             occupiedHeatingSetpoint: occupiedHeatingSetpoint * 100,
             occupiedCoolingSetpoint: occupiedCoolingSetpoint * 100,
-            minHeatSetpointLimit: 0,
-            maxHeatSetpointLimit: 5000,
-            absMinHeatSetpointLimit: 0,
-            absMaxHeatSetpointLimit: 5000,
-            minCoolSetpointLimit: 0,
-            maxCoolSetpointLimit: 5000,
-            absMinCoolSetpointLimit: 0,
-            absMaxCoolSetpointLimit: 5000,
-            minSetpointDeadBand,
+            minHeatSetpointLimit: minHeatSetpointLimit * 100,
+            maxHeatSetpointLimit: maxHeatSetpointLimit * 100,
+            absMinHeatSetpointLimit: minHeatSetpointLimit * 100,
+            absMaxHeatSetpointLimit: maxHeatSetpointLimit * 100,
+            minCoolSetpointLimit: minCoolSetpointLimit * 100,
+            maxCoolSetpointLimit: maxCoolSetpointLimit * 100,
+            absMinCoolSetpointLimit: minCoolSetpointLimit * 100,
+            absMaxCoolSetpointLimit: maxCoolSetpointLimit * 100,
+            minSetpointDeadBand: minSetpointDeadBand * 100,
             systemMode: Thermostat.SystemMode.Off,
             controlSequenceOfOperation: Thermostat.ControlSequenceOfOperation.CoolingAndHeating,
             thermostatRunningMode: Thermostat.ThermostatRunningMode.Off,
@@ -2162,13 +1854,17 @@ export class MatterbridgeDevice extends extendPublicHandlerMethods(Device) {
     /**
      * Creates and adds a default thermostat cluster server to the device.
      *
-     * @param localTemperature - The local temperature value.
-     * @param occupiedHeatingSetpoint - The occupied heating setpoint value.
-     * @param occupiedCoolingSetpoint - The occupied cooling setpoint value.
-     * @param minSetpointDeadBand - The minimum setpoint dead band value.
+     * @param {number} [localTemperature=23] - The local temperature value in degrees Celsius. Defaults to 23°.
+     * @param {number} [occupiedHeatingSetpoint=21] - The occupied heating setpoint value in degrees Celsius. Defaults to 21°.
+     * @param {number} [occupiedCoolingSetpoint=25] - The occupied cooling setpoint value in degrees Celsius. Defaults to 25°.
+     * @param {number} [minSetpointDeadBand=1] - The minimum setpoint dead band value. Defaults to 1°.
+     * @param {number} [minHeatSetpointLimit=0] - The minimum heat setpoint limit value. Defaults to 0°.
+     * @param {number} [maxHeatSetpointLimit=50] - The maximum heat setpoint limit value. Defaults to 50°.
+     * @param {number} [minCoolSetpointLimit=0] - The minimum cool setpoint limit value. Defaults to 0°.
+     * @param {number} [maxCoolSetpointLimit=50] - The maximum cool setpoint limit value. Defaults to 50°.
      */
-    createDefaultThermostatClusterServer(localTemperature = 23, occupiedHeatingSetpoint = 21, occupiedCoolingSetpoint = 25, minSetpointDeadBand = 1) {
-        this.addClusterServer(this.getDefaultThermostatClusterServer(localTemperature, occupiedHeatingSetpoint, occupiedCoolingSetpoint, minSetpointDeadBand));
+    createDefaultThermostatClusterServer(localTemperature = 23, occupiedHeatingSetpoint = 21, occupiedCoolingSetpoint = 25, minSetpointDeadBand = 1, minHeatSetpointLimit = 0, maxHeatSetpointLimit = 50, minCoolSetpointLimit = 0, maxCoolSetpointLimit = 50) {
+        this.addClusterServer(this.getDefaultThermostatClusterServer(localTemperature, occupiedHeatingSetpoint, occupiedCoolingSetpoint, minSetpointDeadBand, minHeatSetpointLimit, maxHeatSetpointLimit, minCoolSetpointLimit, maxCoolSetpointLimit));
     }
     /**
      * Get a default dummy time sync cluster server. Only needed to create a thermostat.
@@ -2517,7 +2213,7 @@ export class MatterbridgeDevice extends extendPublicHandlerMethods(Device) {
      * @returns The default fan control cluster server.
      */
     getDefaultFanControlClusterServer(fanMode = FanControl.FanMode.Off) {
-        return ClusterServer(FanControlCluster.with(FanControl.Feature.MultiSpeed, FanControl.Feature.Auto /* , FanControl.Feature.Step*/), {
+        return ClusterServer(FanControlCluster.with(FanControl.Feature.MultiSpeed, FanControl.Feature.Auto, FanControl.Feature.Step), {
             fanMode,
             fanModeSequence: FanControl.FanModeSequence.OffLowMedHighAuto,
             percentSetting: 0,
@@ -2526,12 +2222,10 @@ export class MatterbridgeDevice extends extendPublicHandlerMethods(Device) {
             speedSetting: 0,
             speedCurrent: 0,
         }, {
-        /*
-        step: async ({ request, attributes }) => {
-          this.log.debug('Matter command: step', request);
-          await this.commandHandler.executeHandler('step', { request, attributes });
-        },
-        */
+            step: async (data) => {
+                this.log.debug('Matter command: step', data.request);
+                await this.commandHandler.executeHandler('step', data);
+            },
         }, {});
     }
     /**