@matterbridge/core 3.8.1-dev-20260608-9dc483f → 3.8.1-dev-20260609-37884d6

package/dist/devices/soilSensor.js

@@ -1,6 +1,4 @@
-import { SoilMeasurementServer } from '@matter/node/behaviors/soil-measurement';
 import { SoilMeasurement } from '@matter/types/clusters/soil-measurement';
-import { MeasurementType } from '@matter/types/globals';
 import { powerSource, soilSensor } from '../matterbridgeDeviceTypes.js';
 import { MatterbridgeEndpoint } from '../matterbridgeEndpoint.js';
 export class SoilSensor extends MatterbridgeEndpoint {
@@ -14,16 +12,7 @@ export class SoilSensor extends MatterbridgeEndpoint {
         else {
             this.createDefaultPowerSourceWiredClusterServer();
         }
-        this.behaviors.require(SoilMeasurementServer, {
-            soilMoistureMeasurementLimits: options.soilMoistureMeasurementLimits ?? {
-                measurementType: MeasurementType.SoilMoisture,
-                measured: true,
-                minMeasuredValue: 0,
-                maxMeasuredValue: 100,
-                accuracyRanges: [{ rangeMin: 0, rangeMax: 100, fixedMax: 1 }],
-            },
-            soilMoistureMeasuredValue: options.soilMoistureMeasuredValue ?? null,
-        });
+        this.createDefaultSoilMeasurementClusterServer(options.soilMoistureMeasuredValue, options.soilMoistureMeasurementLimits);
         if (options.temperatureMeasuredValue !== undefined)
             this.createDefaultTemperatureMeasurementClusterServer(options.temperatureMeasuredValue);
     }

package/dist/matterbridgeDeviceTypes.d.ts

@@ -26,8 +26,11 @@ export interface DeviceTypeDefinition {
     optionalServerClusters: ClusterId[];
     requiredClientClusters: ClusterId[];
     optionalClientClusters: ClusterId[];
+    requiredDeviceTypes?: DeviceTypeDefinition[];
+    requiredServerClustersOneOf?: ClusterId[];
+    composedOf?: DeviceTypeDefinition[];
 }
-export declare const DeviceTypeDefinition: ({ name, deviceName, code, deviceClass, deviceScope, revision, requiredServerClusters, optionalServerClusters, requiredClientClusters, optionalClientClusters, }: {
+export declare const DeviceTypeDefinition: ({ name, deviceName, code, deviceClass, deviceScope, revision, requiredServerClusters, optionalServerClusters, requiredClientClusters, optionalClientClusters, requiredDeviceTypes, requiredServerClustersOneOf, composedOf, }: {
     name: string;
     deviceName: string;
     code: number;
@@ -38,12 +41,15 @@ export declare const DeviceTypeDefinition: ({ name, deviceName, code, deviceClas
     optionalServerClusters?: ClusterId[];
     requiredClientClusters?: ClusterId[];
     optionalClientClusters?: ClusterId[];
+    requiredDeviceTypes?: DeviceTypeDefinition[];
+    requiredServerClustersOneOf?: ClusterId[];
+    composedOf?: DeviceTypeDefinition[];
 }) => DeviceTypeDefinition;
-export declare const baseDevice: DeviceTypeDefinition;
+export declare const baseDeviceType: DeviceTypeDefinition;
 export declare const rootNode: DeviceTypeDefinition;
 export declare const powerSource: DeviceTypeDefinition;
-export declare const OTARequestor: DeviceTypeDefinition;
-export declare const OTAProvider: DeviceTypeDefinition;
+export declare const otaRequestor: DeviceTypeDefinition;
+export declare const otaProvider: DeviceTypeDefinition;
 export declare const bridgedNode: DeviceTypeDefinition;
 export declare const electricalSensor: DeviceTypeDefinition;
 export declare const deviceEnergyManagement: DeviceTypeDefinition;
@@ -51,16 +57,26 @@ export declare const onOffLight: DeviceTypeDefinition;
 export declare const dimmableLight: DeviceTypeDefinition;
 export declare const colorTemperatureLight: DeviceTypeDefinition;
 export declare const extendedColorLight: DeviceTypeDefinition;
+export declare const onOffPluginUnit: DeviceTypeDefinition;
 export declare const onOffOutlet: DeviceTypeDefinition;
+export declare const dimmablePluginUnit: DeviceTypeDefinition;
 export declare const dimmableOutlet: DeviceTypeDefinition;
+export declare const mountedOnOffControl: DeviceTypeDefinition;
 export declare const onOffMountedSwitch: DeviceTypeDefinition;
+export declare const mountedDimmableLoadControl: DeviceTypeDefinition;
 export declare const dimmableMountedSwitch: DeviceTypeDefinition;
+export declare const pump: DeviceTypeDefinition;
 export declare const pumpDevice: DeviceTypeDefinition;
 export declare const waterValve: DeviceTypeDefinition;
 export declare const irrigationSystem: DeviceTypeDefinition;
+export declare const onOffLightSwitch: DeviceTypeDefinition;
 export declare const onOffSwitch: DeviceTypeDefinition;
+export declare const dimmerSwitch: DeviceTypeDefinition;
 export declare const dimmableSwitch: DeviceTypeDefinition;
+export declare const colorDimmerSwitch: DeviceTypeDefinition;
 export declare const colorTemperatureSwitch: DeviceTypeDefinition;
+export declare const controlBridge: DeviceTypeDefinition;
+export declare const pumpController: DeviceTypeDefinition;
 export declare const genericSwitch: DeviceTypeDefinition;
 export declare const contactSensor: DeviceTypeDefinition;
 export declare const lightSensor: DeviceTypeDefinition;
@@ -69,29 +85,42 @@ export declare const temperatureSensor: DeviceTypeDefinition;
 export declare const pressureSensor: DeviceTypeDefinition;
 export declare const flowSensor: DeviceTypeDefinition;
 export declare const humiditySensor: DeviceTypeDefinition;
+export declare const onOffSensor: DeviceTypeDefinition;
 export declare const smokeCoAlarm: DeviceTypeDefinition;
 export declare const airQualitySensor: DeviceTypeDefinition;
 export declare const waterFreezeDetector: DeviceTypeDefinition;
 export declare const waterLeakDetector: DeviceTypeDefinition;
 export declare const rainSensor: DeviceTypeDefinition;
 export declare const soilSensor: DeviceTypeDefinition;
+export declare const doorLock: DeviceTypeDefinition;
 export declare const doorLockDevice: DeviceTypeDefinition;
+export declare const doorLockController: DeviceTypeDefinition;
+export declare const windowCovering: DeviceTypeDefinition;
 export declare const coverDevice: DeviceTypeDefinition;
+export declare const windowCoveringController: DeviceTypeDefinition;
 export declare const closure: DeviceTypeDefinition;
 export declare const closurePanel: DeviceTypeDefinition;
 export declare const closureController: DeviceTypeDefinition;
+export declare const thermostat: DeviceTypeDefinition;
 export declare const thermostatDevice: DeviceTypeDefinition;
+export declare const fan: DeviceTypeDefinition;
 export declare const fanDevice: DeviceTypeDefinition;
 export declare const airPurifier: DeviceTypeDefinition;
+export declare const thermostatController: DeviceTypeDefinition;
 export declare const basicVideoPlayer: DeviceTypeDefinition;
 export declare const castingVideoPlayer: DeviceTypeDefinition;
+export declare const speaker: DeviceTypeDefinition;
 export declare const speakerDevice: DeviceTypeDefinition;
+export declare const contentApp: DeviceTypeDefinition;
+export declare const castingVideoClient: DeviceTypeDefinition;
+export declare const videoRemoteControl: DeviceTypeDefinition;
 export declare const modeSelect: DeviceTypeDefinition;
 export declare const aggregator: DeviceTypeDefinition;
 export declare const bridge: DeviceTypeDefinition;
 export declare const roboticVacuumCleaner: DeviceTypeDefinition;
 export declare const laundryWasher: DeviceTypeDefinition;
 export declare const refrigerator: DeviceTypeDefinition;
+export declare const roomAirConditioner: DeviceTypeDefinition;
 export declare const airConditioner: DeviceTypeDefinition;
 export declare const temperatureControlledCabinetCooler: DeviceTypeDefinition;
 export declare const temperatureControlledCabinetHeater: DeviceTypeDefinition;

package/dist/matterbridgeDeviceTypes.js

@@ -5,6 +5,7 @@ import { Actions } from '@matter/types/clusters/actions';
 import { ActivatedCarbonFilterMonitoring } from '@matter/types/clusters/activated-carbon-filter-monitoring';
 import { AdministratorCommissioning } from '@matter/types/clusters/administrator-commissioning';
 import { AirQuality } from '@matter/types/clusters/air-quality';
+import { ApplicationBasic } from '@matter/types/clusters/application-basic';
 import { ApplicationLauncher } from '@matter/types/clusters/application-launcher';
 import { AudioOutput } from '@matter/types/clusters/audio-output';
 import { Binding } from '@matter/types/clusters/binding';
@@ -24,6 +25,7 @@ import { CommissionerControl } from '@matter/types/clusters/commissioner-control
 import { CommodityMetering } from '@matter/types/clusters/commodity-metering';
 import { CommodityPrice } from '@matter/types/clusters/commodity-price';
 import { CommodityTariff } from '@matter/types/clusters/commodity-tariff';
+import { ContentAppObserver } from '@matter/types/clusters/content-app-observer';
 import { ContentControl } from '@matter/types/clusters/content-control';
 import { ContentLauncher } from '@matter/types/clusters/content-launcher';
 import { Descriptor } from '@matter/types/clusters/descriptor';
@@ -125,7 +127,7 @@ export var DeviceScopes;
     DeviceScopes["Endpoint"] = "endpoint";
     DeviceScopes["Node"] = "node";
 })(DeviceScopes || (DeviceScopes = {}));
-export const DeviceTypeDefinition = ({ name, deviceName, code, deviceClass, deviceScope, revision, requiredServerClusters = [], optionalServerClusters = [], requiredClientClusters = [], optionalClientClusters = [], }) => ({
+export const DeviceTypeDefinition = ({ name, deviceName, code, deviceClass, deviceScope, revision, requiredServerClusters = [], optionalServerClusters = [], requiredClientClusters = [], optionalClientClusters = [], requiredDeviceTypes = [], requiredServerClustersOneOf = [], composedOf = [], }) => ({
     name,
     deviceName,
     code: DeviceTypeId(code),
@@ -136,9 +138,12 @@ export const DeviceTypeDefinition = ({ name, deviceName, code, deviceClass, devi
     optionalServerClusters,
     requiredClientClusters,
     optionalClientClusters,
+    requiredDeviceTypes,
+    requiredServerClustersOneOf,
+    composedOf,
 });
-export const baseDevice = DeviceTypeDefinition({
-    name: 'MA-baseDevice',
+export const baseDeviceType = DeviceTypeDefinition({
+    name: 'MA-baseDeviceType',
     deviceName: 'Base Device Type',
     code: 0x0000,
     deviceClass: DeviceClasses.Simple,
@@ -156,6 +161,8 @@ export const rootNode = DeviceTypeDefinition({
     revision: 4,
     requiredServerClusters: [],
     optionalServerClusters: [],
+    requiredClientClusters: [],
+    optionalClientClusters: [],
 });
 export const powerSource = DeviceTypeDefinition({
     name: 'MA-powerSource',
@@ -167,8 +174,8 @@ export const powerSource = DeviceTypeDefinition({
     requiredServerClusters: [PowerSource.id],
     optionalServerClusters: [],
 });
-export const OTARequestor = DeviceTypeDefinition({
-    name: 'MA-OTARequestor',
+export const otaRequestor = DeviceTypeDefinition({
+    name: 'MA-otaRequestor',
     deviceName: 'OTA Requestor',
     code: 0x0012,
     deviceClass: DeviceClasses.Utility,
@@ -179,8 +186,8 @@ export const OTARequestor = DeviceTypeDefinition({
     requiredClientClusters: [OtaSoftwareUpdateProvider.id],
     optionalClientClusters: [],
 });
-export const OTAProvider = DeviceTypeDefinition({
-    name: 'MA-OTAProvider',
+export const otaProvider = DeviceTypeDefinition({
+    name: 'MA-otaProvider',
     deviceName: 'OTA Provider',
     code: 0x0014,
     deviceClass: DeviceClasses.Utility,
@@ -210,6 +217,7 @@ export const electricalSensor = DeviceTypeDefinition({
     revision: 1,
     requiredServerClusters: [PowerTopology.id],
     optionalServerClusters: [ElectricalPowerMeasurement.id, ElectricalEnergyMeasurement.id],
+    requiredServerClustersOneOf: [ElectricalPowerMeasurement.id, ElectricalEnergyMeasurement.id],
 });
 export const deviceEnergyManagement = DeviceTypeDefinition({
     name: 'MA-deviceEnergyManagement',
@@ -224,7 +232,7 @@ export const deviceEnergyManagement = DeviceTypeDefinition({
     optionalClientClusters: [ElectricalGridConditions.id],
 });
 export const onOffLight = DeviceTypeDefinition({
-    name: 'MA-onofflight',
+    name: 'MA-onOffLight',
     deviceName: 'OnOff Light',
     code: 0x0100,
     deviceClass: DeviceClasses.Simple,
@@ -236,7 +244,7 @@ export const onOffLight = DeviceTypeDefinition({
     optionalClientClusters: [OccupancySensing.id],
 });
 export const dimmableLight = DeviceTypeDefinition({
-    name: 'MA-dimmablelight',
+    name: 'MA-dimmableLight',
     deviceName: 'Dimmable Light',
     code: 0x0101,
     deviceClass: DeviceClasses.Simple,
@@ -248,7 +256,7 @@ export const dimmableLight = DeviceTypeDefinition({
     optionalClientClusters: [OccupancySensing.id],
 });
 export const colorTemperatureLight = DeviceTypeDefinition({
-    name: 'MA-colortemperaturelight',
+    name: 'MA-colorTemperatureLight',
     deviceName: 'Color Temperature Light',
     code: 0x010c,
     deviceClass: DeviceClasses.Simple,
@@ -260,7 +268,7 @@ export const colorTemperatureLight = DeviceTypeDefinition({
     optionalClientClusters: [OccupancySensing.id],
 });
 export const extendedColorLight = DeviceTypeDefinition({
-    name: 'MA-extendedcolorlight',
+    name: 'MA-extendedColorLight',
     deviceName: 'Extended Color Light',
     code: 0x010d,
     deviceClass: DeviceClasses.Simple,
@@ -271,8 +279,8 @@ export const extendedColorLight = DeviceTypeDefinition({
     requiredClientClusters: [],
     optionalClientClusters: [OccupancySensing.id],
 });
-export const onOffOutlet = DeviceTypeDefinition({
-    name: 'MA-onoffpluginunit',
+export const onOffPluginUnit = DeviceTypeDefinition({
+    name: 'MA-onOffPluginUnit',
     deviceName: 'OnOff Plugin Unit',
     code: 0x010a,
     deviceClass: DeviceClasses.Simple,
@@ -283,9 +291,10 @@ export const onOffOutlet = DeviceTypeDefinition({
     requiredClientClusters: [],
     optionalClientClusters: [OccupancySensing.id],
 });
-export const dimmableOutlet = DeviceTypeDefinition({
-    name: 'MA-dimmablepluginunit',
-    deviceName: 'Dimmable PlugIn Unit',
+export const onOffOutlet = onOffPluginUnit;
+export const dimmablePluginUnit = DeviceTypeDefinition({
+    name: 'MA-dimmablePluginUnit',
+    deviceName: 'Dimmable Plugin Unit',
     code: 0x010b,
     deviceClass: DeviceClasses.Simple,
     deviceScope: DeviceScopes.Endpoint,
@@ -295,8 +304,9 @@ export const dimmableOutlet = DeviceTypeDefinition({
     requiredClientClusters: [],
     optionalClientClusters: [OccupancySensing.id],
 });
-export const onOffMountedSwitch = DeviceTypeDefinition({
-    name: 'MA-onoffmountedswitch',
+export const dimmableOutlet = dimmablePluginUnit;
+export const mountedOnOffControl = DeviceTypeDefinition({
+    name: 'MA-mountedOnOffControl',
     deviceName: 'Mounted OnOff Control',
     code: 0x010f,
     deviceClass: DeviceClasses.Simple,
@@ -307,8 +317,9 @@ export const onOffMountedSwitch = DeviceTypeDefinition({
     requiredClientClusters: [],
     optionalClientClusters: [OccupancySensing.id],
 });
-export const dimmableMountedSwitch = DeviceTypeDefinition({
-    name: 'MA-dimmablemountedswitch',
+export const onOffMountedSwitch = mountedOnOffControl;
+export const mountedDimmableLoadControl = DeviceTypeDefinition({
+    name: 'MA-mountedDimmableLoadControl',
     deviceName: 'Mounted Dimmable Load Control',
     code: 0x0110,
     deviceClass: DeviceClasses.Simple,
@@ -319,7 +330,8 @@ export const dimmableMountedSwitch = DeviceTypeDefinition({
     requiredClientClusters: [],
     optionalClientClusters: [OccupancySensing.id],
 });
-export const pumpDevice = DeviceTypeDefinition({
+export const dimmableMountedSwitch = mountedDimmableLoadControl;
+export const pump = DeviceTypeDefinition({
     name: 'MA-pump',
     deviceName: 'Pump',
     code: 0x303,
@@ -331,6 +343,7 @@ export const pumpDevice = DeviceTypeDefinition({
     requiredClientClusters: [],
     optionalClientClusters: [TemperatureMeasurement.id, PressureMeasurement.id, FlowMeasurement.id, OccupancySensing.id],
 });
+export const pumpDevice = pump;
 export const waterValve = DeviceTypeDefinition({
     name: 'MA-waterValve',
     deviceName: 'Water Valve',
@@ -354,45 +367,73 @@ export const irrigationSystem = DeviceTypeDefinition({
     optionalServerClusters: [Identify.id, OperationalState.id, FlowMeasurement.id],
     requiredClientClusters: [],
     optionalClientClusters: [FlowMeasurement.id],
+    composedOf: [waterValve],
 });
-export const onOffSwitch = DeviceTypeDefinition({
-    name: 'MA-onoffswitch',
+export const onOffLightSwitch = DeviceTypeDefinition({
+    name: 'MA-onOffLightSwitch',
     deviceName: 'OnOff Light Switch',
     code: 0x0103,
     deviceClass: DeviceClasses.Simple,
     deviceScope: DeviceScopes.Endpoint,
     revision: 3,
-    requiredServerClusters: [Identify.id, OnOff.id],
+    requiredServerClusters: [Identify.id],
     optionalServerClusters: [],
     requiredClientClusters: [Identify.id, OnOff.id],
     optionalClientClusters: [Groups.id, ScenesManagement.id],
 });
-export const dimmableSwitch = DeviceTypeDefinition({
-    name: 'MA-dimmableswitch',
+export const onOffSwitch = onOffLightSwitch;
+export const dimmerSwitch = DeviceTypeDefinition({
+    name: 'MA-dimmerSwitch',
     deviceName: 'Dimmer Switch',
     code: 0x0104,
     deviceClass: DeviceClasses.Simple,
     deviceScope: DeviceScopes.Endpoint,
     revision: 3,
-    requiredServerClusters: [Identify.id, OnOff.id, LevelControl.id],
+    requiredServerClusters: [Identify.id],
     optionalServerClusters: [],
     requiredClientClusters: [Identify.id, OnOff.id, LevelControl.id],
     optionalClientClusters: [Groups.id, ScenesManagement.id],
 });
-export const colorTemperatureSwitch = DeviceTypeDefinition({
-    name: 'MA-colortemperatureswitch',
+export const dimmableSwitch = dimmerSwitch;
+export const colorDimmerSwitch = DeviceTypeDefinition({
+    name: 'MA-colorDimmerSwitch',
     deviceName: 'Color Dimmer Switch',
     code: 0x0105,
     deviceClass: DeviceClasses.Simple,
     deviceScope: DeviceScopes.Endpoint,
     revision: 3,
-    requiredServerClusters: [Identify.id, OnOff.id, LevelControl.id, ColorControl.id],
+    requiredServerClusters: [Identify.id],
     optionalServerClusters: [],
     requiredClientClusters: [Identify.id, OnOff.id, LevelControl.id, ColorControl.id],
     optionalClientClusters: [Groups.id, ScenesManagement.id],
 });
+export const colorTemperatureSwitch = colorDimmerSwitch;
+export const controlBridge = DeviceTypeDefinition({
+    name: 'MA-controlBridge',
+    deviceName: 'Control Bridge',
+    code: 0x0840,
+    deviceClass: DeviceClasses.Simple,
+    deviceScope: DeviceScopes.Endpoint,
+    revision: 3,
+    requiredServerClusters: [Identify.id],
+    optionalServerClusters: [],
+    requiredClientClusters: [Identify.id, Groups.id, ScenesManagement.id, OnOff.id, LevelControl.id, ColorControl.id],
+    optionalClientClusters: [IlluminanceMeasurement.id, OccupancySensing.id],
+});
+export const pumpController = DeviceTypeDefinition({
+    name: 'MA-pumpController',
+    deviceName: 'Pump Controller',
+    code: 0x0304,
+    deviceClass: DeviceClasses.Simple,
+    deviceScope: DeviceScopes.Endpoint,
+    revision: 4,
+    requiredServerClusters: [Identify.id],
+    optionalServerClusters: [],
+    requiredClientClusters: [OnOff.id, PumpConfigurationAndControl.id],
+    optionalClientClusters: [Identify.id, Groups.id, LevelControl.id, ScenesManagement.id, TemperatureMeasurement.id, PressureMeasurement.id, FlowMeasurement.id],
+});
 export const genericSwitch = DeviceTypeDefinition({
-    name: 'MA-genericswitch',
+    name: 'MA-genericSwitch',
     deviceName: 'Generic Switch',
     code: 0x000f,
     deviceClass: DeviceClasses.Simple,
@@ -402,7 +443,7 @@ export const genericSwitch = DeviceTypeDefinition({
     optionalServerClusters: [],
 });
 export const contactSensor = DeviceTypeDefinition({
-    name: 'MA-contactsensor',
+    name: 'MA-contactSensor',
     deviceName: 'Contact Sensor',
     code: 0x0015,
     deviceClass: DeviceClasses.Simple,
@@ -412,7 +453,7 @@ export const contactSensor = DeviceTypeDefinition({
     optionalServerClusters: [BooleanStateConfiguration.id],
 });
 export const lightSensor = DeviceTypeDefinition({
-    name: 'MA-lightsensor',
+    name: 'MA-lightSensor',
     deviceName: 'Light Sensor',
     code: 0x0106,
     deviceClass: DeviceClasses.Simple,
@@ -421,7 +462,7 @@ export const lightSensor = DeviceTypeDefinition({
     requiredServerClusters: [Identify.id, IlluminanceMeasurement.id],
 });
 export const occupancySensor = DeviceTypeDefinition({
-    name: 'MA-occupancysensor',
+    name: 'MA-occupancySensor',
     deviceName: 'Occupancy Sensor',
     code: 0x0107,
     deviceClass: DeviceClasses.Simple,
@@ -431,7 +472,7 @@ export const occupancySensor = DeviceTypeDefinition({
     optionalServerClusters: [BooleanStateConfiguration.id],
 });
 export const temperatureSensor = DeviceTypeDefinition({
-    name: 'MA-tempsensor',
+    name: 'MA-temperatureSensor',
     deviceName: 'Temperature Sensor',
     code: 0x0302,
     deviceClass: DeviceClasses.Simple,
@@ -441,7 +482,7 @@ export const temperatureSensor = DeviceTypeDefinition({
     optionalServerClusters: [ThermostatUserInterfaceConfiguration.id],
 });
 export const pressureSensor = DeviceTypeDefinition({
-    name: 'MA-pressuresensor',
+    name: 'MA-pressureSensor',
     deviceName: 'Pressure Sensor',
     code: 0x0305,
     deviceClass: DeviceClasses.Simple,
@@ -450,7 +491,7 @@ export const pressureSensor = DeviceTypeDefinition({
     requiredServerClusters: [Identify.id, PressureMeasurement.id],
 });
 export const flowSensor = DeviceTypeDefinition({
-    name: 'MA-flowsensor',
+    name: 'MA-flowSensor',
     deviceName: 'Flow Sensor',
     code: 0x0306,
     deviceClass: DeviceClasses.Simple,
@@ -459,7 +500,7 @@ export const flowSensor = DeviceTypeDefinition({
     requiredServerClusters: [Identify.id, FlowMeasurement.id],
 });
 export const humiditySensor = DeviceTypeDefinition({
-    name: 'MA-humiditysensor',
+    name: 'MA-humiditySensor',
     deviceName: 'Humidity Sensor',
     code: 0x0307,
     deviceClass: DeviceClasses.Simple,
@@ -467,6 +508,17 @@ export const humiditySensor = DeviceTypeDefinition({
     revision: 3,
     requiredServerClusters: [Identify.id, RelativeHumidityMeasurement.id],
 });
+export const onOffSensor = DeviceTypeDefinition({
+    name: 'MA-onOffSensor',
+    deviceName: 'OnOff Sensor',
+    code: 0x0850,
+    deviceClass: DeviceClasses.Simple,
+    deviceScope: DeviceScopes.Endpoint,
+    revision: 3,
+    requiredServerClusters: [Identify.id],
+    requiredClientClusters: [Identify.id, OnOff.id],
+    optionalClientClusters: [Groups.id, LevelControl.id, ColorControl.id, ScenesManagement.id],
+});
 export const smokeCoAlarm = DeviceTypeDefinition({
     name: 'MA-smokeCoAlarm',
     deviceName: 'Smoke CO Alarm',
@@ -476,6 +528,7 @@ export const smokeCoAlarm = DeviceTypeDefinition({
     revision: 1,
     requiredServerClusters: [Identify.id, SmokeCoAlarm.id],
     optionalServerClusters: [Groups.id, TemperatureMeasurement.id, RelativeHumidityMeasurement.id, CarbonMonoxideConcentrationMeasurement.id],
+    requiredDeviceTypes: [powerSource],
 });
 export const airQualitySensor = DeviceTypeDefinition({
     name: 'MA-airQualitySensor',
@@ -540,7 +593,7 @@ export const soilSensor = DeviceTypeDefinition({
     requiredServerClusters: [Identify.id, SoilMeasurement.id],
     optionalServerClusters: [TemperatureMeasurement.id],
 });
-export const doorLockDevice = DeviceTypeDefinition({
+export const doorLock = DeviceTypeDefinition({
     name: 'MA-doorLock',
     deviceName: 'Door Lock',
     code: 0xa,
@@ -550,7 +603,20 @@ export const doorLockDevice = DeviceTypeDefinition({
     requiredServerClusters: [Identify.id, DoorLock.id],
     optionalServerClusters: [],
 });
-export const coverDevice = DeviceTypeDefinition({
+export const doorLockDevice = doorLock;
+export const doorLockController = DeviceTypeDefinition({
+    name: 'MA-doorLockController',
+    deviceName: 'Door Lock Controller',
+    code: 0x00b,
+    deviceClass: DeviceClasses.Simple,
+    deviceScope: DeviceScopes.Endpoint,
+    revision: 3,
+    requiredServerClusters: [],
+    optionalServerClusters: [],
+    requiredClientClusters: [DoorLock.id],
+    optionalClientClusters: [Groups.id, ScenesManagement.id],
+});
+export const windowCovering = DeviceTypeDefinition({
     name: 'MA-windowCovering',
     deviceName: 'Window Covering',
     code: 0x202,
@@ -560,6 +626,19 @@ export const coverDevice = DeviceTypeDefinition({
     requiredServerClusters: [Identify.id, WindowCovering.id],
     optionalServerClusters: [Groups.id],
 });
+export const coverDevice = windowCovering;
+export const windowCoveringController = DeviceTypeDefinition({
+    name: 'MA-windowCoveringController',
+    deviceName: 'Window Covering Controller',
+    code: 0x203,
+    deviceClass: DeviceClasses.Simple,
+    deviceScope: DeviceScopes.Endpoint,
+    revision: 4,
+    requiredServerClusters: [],
+    optionalServerClusters: [Identify.id],
+    requiredClientClusters: [WindowCovering.id],
+    optionalClientClusters: [Identify.id, Groups.id],
+});
 export const closure = DeviceTypeDefinition({
     name: 'MA-closure',
     deviceName: 'Closure',
@@ -592,7 +671,7 @@ export const closureController = DeviceTypeDefinition({
     requiredClientClusters: [ClosureControl.id],
     optionalClientClusters: [Identify.id, Groups.id, ClosureDimension.id],
 });
-export const thermostatDevice = DeviceTypeDefinition({
+export const thermostat = DeviceTypeDefinition({
     name: 'MA-thermostat',
     deviceName: 'Thermostat',
     code: 0x301,
@@ -604,7 +683,8 @@ export const thermostatDevice = DeviceTypeDefinition({
     requiredClientClusters: [],
     optionalClientClusters: [FanControl.id, TemperatureMeasurement.id, RelativeHumidityMeasurement.id, OccupancySensing.id],
 });
-export const fanDevice = DeviceTypeDefinition({
+export const thermostatDevice = thermostat;
+export const fan = DeviceTypeDefinition({
     name: 'MA-fan',
     deviceName: 'Fan',
     code: 0x2b,
@@ -614,6 +694,7 @@ export const fanDevice = DeviceTypeDefinition({
     requiredServerClusters: [Identify.id, Groups.id, FanControl.id],
     optionalServerClusters: [OnOff.id],
 });
+export const fanDevice = fan;
 export const airPurifier = DeviceTypeDefinition({
     name: 'MA-airPurifier',
     deviceName: 'Air Purifier',
@@ -624,6 +705,18 @@ export const airPurifier = DeviceTypeDefinition({
     requiredServerClusters: [Identify.id, FanControl.id],
     optionalServerClusters: [Groups.id, OnOff.id, HepaFilterMonitoring.id, ActivatedCarbonFilterMonitoring.id],
 });
+export const thermostatController = DeviceTypeDefinition({
+    name: 'MA-thermostatController',
+    deviceName: 'Thermostat Controller',
+    code: 0x030a,
+    deviceClass: DeviceClasses.Simple,
+    deviceScope: DeviceScopes.Endpoint,
+    revision: 1,
+    requiredServerClusters: [],
+    optionalServerClusters: [],
+    requiredClientClusters: [Thermostat.id],
+    optionalClientClusters: [Identify.id, Groups.id, ScenesManagement.id],
+});
 export const basicVideoPlayer = DeviceTypeDefinition({
     name: 'MA-basicVideoPlayer',
     deviceName: 'Basic Video Player',
@@ -655,7 +748,7 @@ export const castingVideoPlayer = DeviceTypeDefinition({
         Messages.id,
     ],
 });
-export const speakerDevice = DeviceTypeDefinition({
+export const speaker = DeviceTypeDefinition({
     name: 'MA-speaker',
     deviceName: 'Speaker',
     code: 0x0022,
@@ -665,8 +758,70 @@ export const speakerDevice = DeviceTypeDefinition({
     requiredServerClusters: [OnOff.id, LevelControl.id],
     optionalServerClusters: [],
 });
+export const speakerDevice = speaker;
+export const contentApp = DeviceTypeDefinition({
+    name: 'MA-contentApp',
+    deviceName: 'Content App',
+    code: 0x0024,
+    deviceClass: DeviceClasses.Simple,
+    deviceScope: DeviceScopes.Endpoint,
+    revision: 2,
+    requiredServerClusters: [KeypadInput.id, ApplicationLauncher.id, ApplicationBasic.id],
+    optionalServerClusters: [Channel.id, TargetNavigator.id, MediaPlayback.id, ContentLauncher.id, AccountLogin.id],
+    requiredClientClusters: [],
+    optionalClientClusters: [ContentAppObserver.id],
+});
+export const castingVideoClient = DeviceTypeDefinition({
+    name: 'MA-castingVideoClient',
+    deviceName: 'Casting Video Client',
+    code: 0x0029,
+    deviceClass: DeviceClasses.Simple,
+    deviceScope: DeviceScopes.Endpoint,
+    revision: 2,
+    requiredServerClusters: [],
+    optionalServerClusters: [ContentAppObserver.id],
+    requiredClientClusters: [OnOff.id, KeypadInput.id, ContentLauncher.id, ApplicationBasic.id],
+    optionalClientClusters: [
+        LevelControl.id,
+        Messages.id,
+        WakeOnLan.id,
+        Channel.id,
+        TargetNavigator.id,
+        MediaPlayback.id,
+        MediaInput.id,
+        LowPower.id,
+        AudioOutput.id,
+        ApplicationLauncher.id,
+        AccountLogin.id,
+        ContentControl.id,
+    ],
+});
+export const videoRemoteControl = DeviceTypeDefinition({
+    name: 'MA-videoRemoteControl',
+    deviceName: 'Video Remote Control',
+    code: 0x002a,
+    deviceClass: DeviceClasses.Simple,
+    deviceScope: DeviceScopes.Endpoint,
+    revision: 2,
+    requiredServerClusters: [],
+    optionalServerClusters: [],
+    requiredClientClusters: [OnOff.id, MediaPlayback.id, KeypadInput.id],
+    optionalClientClusters: [
+        LevelControl.id,
+        WakeOnLan.id,
+        Channel.id,
+        TargetNavigator.id,
+        MediaInput.id,
+        LowPower.id,
+        ContentLauncher.id,
+        AudioOutput.id,
+        ApplicationLauncher.id,
+        AccountLogin.id,
+        ContentControl.id,
+    ],
+});
 export const modeSelect = DeviceTypeDefinition({
-    name: 'MA-modeselect',
+    name: 'MA-modeSelect',
     deviceName: 'Mode Select',
     code: 0x27,
     deviceClass: DeviceClasses.Simple,
@@ -686,7 +841,7 @@ export const aggregator = DeviceTypeDefinition({
 });
 export const bridge = aggregator;
 export const roboticVacuumCleaner = DeviceTypeDefinition({
-    name: 'MA-roboticvacuumcleaner',
+    name: 'MA-roboticVacuumCleaner',
     deviceName: 'Robotic Vacuum Cleaner',
     code: 0x74,
     deviceClass: DeviceClasses.Simple,
@@ -696,7 +851,7 @@ export const roboticVacuumCleaner = DeviceTypeDefinition({
     optionalServerClusters: [RvcCleanMode.id, ServiceArea.id],
 });
 export const laundryWasher = DeviceTypeDefinition({
-    name: 'MA-laundrywasher',
+    name: 'MA-laundryWasher',
     deviceName: 'Laundry Washer',
     code: 0x73,
     deviceClass: DeviceClasses.Simple,
@@ -715,8 +870,8 @@ export const refrigerator = DeviceTypeDefinition({
     requiredServerClusters: [],
     optionalServerClusters: [Identify.id, RefrigeratorAndTemperatureControlledCabinetMode.id, RefrigeratorAlarm.id],
 });
-export const airConditioner = DeviceTypeDefinition({
-    name: 'MA-airConditioner',
+export const roomAirConditioner = DeviceTypeDefinition({
+    name: 'MA-roomAirConditioner',
     deviceName: 'Room Air Conditioner',
     code: 0x72,
     deviceClass: DeviceClasses.Simple,
@@ -734,8 +889,9 @@ export const airConditioner = DeviceTypeDefinition({
         ActivatedCarbonFilterMonitoring.id,
     ],
 });
+export const airConditioner = roomAirConditioner;
 export const temperatureControlledCabinetCooler = DeviceTypeDefinition({
-    name: 'MA-temperaturecontrolledcabinetcooler',
+    name: 'MA-temperatureControlledCabinetCooler',
     deviceName: 'Temperature Controlled Cabinet',
     code: 0x71,
     deviceClass: DeviceClasses.Simple,
@@ -745,7 +901,7 @@ export const temperatureControlledCabinetCooler = DeviceTypeDefinition({
     optionalServerClusters: [TemperatureMeasurement.id],
 });
 export const temperatureControlledCabinetHeater = DeviceTypeDefinition({
-    name: 'MA-temperaturecontrolledcabinetheater',
+    name: 'MA-temperatureControlledCabinetHeater',
     deviceName: 'Temperature Controlled Cabinet',
     code: 0x71,
     deviceClass: DeviceClasses.Simple,
@@ -765,7 +921,7 @@ export const dishwasher = DeviceTypeDefinition({
     optionalServerClusters: [Identify.id, OnOff.id, TemperatureControl.id, DishwasherMode.id, DishwasherAlarm.id],
 });
 export const laundryDryer = DeviceTypeDefinition({
-    name: 'MA-laundrydryer',
+    name: 'MA-laundryDryer',
     deviceName: 'Laundry Dryer',
     code: 0x7c,
     deviceClass: DeviceClasses.Simple,
@@ -775,7 +931,7 @@ export const laundryDryer = DeviceTypeDefinition({
     optionalServerClusters: [Identify.id, LaundryWasherMode.id, OnOff.id, LaundryDryerControls.id, TemperatureControl.id],
 });
 export const cookSurface = DeviceTypeDefinition({
-    name: 'MA-cooksurface',
+    name: 'MA-cookSurface',
     deviceName: 'Cook Surface',
     code: 0x77,
     deviceClass: DeviceClasses.Simple,
@@ -805,7 +961,7 @@ export const oven = DeviceTypeDefinition({
     optionalServerClusters: [Identify.id],
 });
 export const extractorHood = DeviceTypeDefinition({
-    name: 'MA-extractorhood',
+    name: 'MA-extractorHood',
     deviceName: 'Extractor Hood',
     code: 0x7a,
     deviceClass: DeviceClasses.Simple,
@@ -815,7 +971,7 @@ export const extractorHood = DeviceTypeDefinition({
     optionalServerClusters: [Identify.id, HepaFilterMonitoring.id, ActivatedCarbonFilterMonitoring.id],
 });
 export const microwaveOven = DeviceTypeDefinition({
-    name: 'MA-microwaveoven',
+    name: 'MA-microwaveOven',
     deviceName: 'Microwave Oven',
     code: 0x79,
     deviceClass: DeviceClasses.Simple,
@@ -835,7 +991,7 @@ export const evse = DeviceTypeDefinition({
     optionalServerClusters: [Identify.id, TemperatureMeasurement.id],
 });
 export const waterHeater = DeviceTypeDefinition({
-    name: 'MA-waterheater',
+    name: 'MA-waterHeater',
     deviceName: 'Water Heater',
     code: 0x050f,
     deviceClass: DeviceClasses.Simple,
@@ -845,7 +1001,7 @@ export const waterHeater = DeviceTypeDefinition({
     optionalServerClusters: [Identify.id],
 });
 export const solarPower = DeviceTypeDefinition({
-    name: 'MA-solarpower',
+    name: 'MA-solarPower',
     deviceName: 'Solar Power',
     code: 0x0017,
     deviceClass: DeviceClasses.Simple,
@@ -855,7 +1011,7 @@ export const solarPower = DeviceTypeDefinition({
     optionalServerClusters: [Identify.id],
 });
 export const batteryStorage = DeviceTypeDefinition({
-    name: 'MA-batterystorage',
+    name: 'MA-batteryStorage',
     deviceName: 'Battery Storage',
     code: 0x0018,
     deviceClass: DeviceClasses.Simple,
@@ -865,7 +1021,7 @@ export const batteryStorage = DeviceTypeDefinition({
     optionalServerClusters: [Identify.id],
 });
 export const heatPump = DeviceTypeDefinition({
-    name: 'MA-heatpump',
+    name: 'MA-heatPump',
     deviceName: 'Heat Pump',
     code: 0x0309,
     deviceClass: DeviceClasses.Simple,

package/dist/matterbridgeEndpoint.d.ts

@@ -21,7 +21,7 @@ import { ThermostatUserInterfaceConfiguration } from '@matter/types/clusters/the
 import { ValveConfigurationAndControl } from '@matter/types/clusters/valve-configuration-and-control';
 import { WindowCovering } from '@matter/types/clusters/window-covering';
 import { ClusterId, EndpointNumber } from '@matter/types/datatype';
-import { Semtag } from '@matter/types/globals';
+import { MeasurementAccuracy, Semtag } from '@matter/types/globals';
 import { AnsiLogger, LogLevel } from 'node-ansi-logger';
 import { DeviceTypeDefinition } from './matterbridgeDeviceTypes.js';
 import { CommandHandler, CommandHandlerData, CommandHandlerExecutionResult, CommandHandlerFunction, CommandHandlers } from './matterbridgeEndpointCommandHandler.js';
@@ -137,8 +137,8 @@ export declare class MatterbridgeEndpoint extends Endpoint {
     static deserialize(serializedDevice: SerializedMatterbridgeEndpoint): MatterbridgeEndpoint | undefined;
     createDefaultPowerSourceWiredClusterServer(wiredCurrentType?: PowerSource.WiredCurrentType): this;
     createDefaultPowerSourceBatteryClusterServer(batPercentRemaining?: null | number, batChargeLevel?: PowerSource.BatChargeLevel, batVoltage?: null | number, batReplaceability?: PowerSource.BatReplaceability): this;
-    createDefaultPowerSourceReplaceableBatteryClusterServer(batPercentRemaining?: number, batChargeLevel?: PowerSource.BatChargeLevel, batVoltage?: number, batReplacementDescription?: string, batQuantity?: number, batReplaceability?: PowerSource.BatReplaceability): this;
-    createDefaultPowerSourceRechargeableBatteryClusterServer(batPercentRemaining?: number, batChargeLevel?: PowerSource.BatChargeLevel, batVoltage?: number, batReplaceability?: PowerSource.BatReplaceability): this;
+    createDefaultPowerSourceReplaceableBatteryClusterServer(batPercentRemaining?: number | null, batChargeLevel?: PowerSource.BatChargeLevel, batVoltage?: number | null, batReplacementDescription?: string, batQuantity?: number, batReplaceability?: PowerSource.BatReplaceability): this;
+    createDefaultPowerSourceRechargeableBatteryClusterServer(batPercentRemaining?: number | null, batChargeLevel?: PowerSource.BatChargeLevel, batVoltage?: number | null, batReplaceability?: PowerSource.BatReplaceability): this;
     createDefaultBasicInformationClusterServer(deviceName: string, serialNumber: string, vendorId?: number, vendorName?: string, productId?: number, productName?: string, softwareVersion?: number, softwareVersionString?: string, hardwareVersion?: number, hardwareVersionString?: string): this;
     createDefaultBridgedDeviceBasicInformationClusterServer(deviceName: string, serialNumber: string, vendorId?: number, vendorName?: string, productName?: string, softwareVersion?: number, softwareVersionString?: string, hardwareVersion?: number, hardwareVersionString?: string): this;
     createDefaultPowerTopologyClusterServer(): this;
@@ -218,6 +218,7 @@ export declare class MatterbridgeEndpoint extends Endpoint {
     createDefaultIlluminanceMeasurementClusterServer(measuredValue?: number | null, minMeasuredValue?: number | null, maxMeasuredValue?: number | null): this;
     createDefaultFlowMeasurementClusterServer(measuredValue?: number | null, minMeasuredValue?: number | null, maxMeasuredValue?: number | null): this;
     createDefaultOccupancySensingClusterServer(occupied?: boolean, holdTime?: number, holdTimeMin?: number, holdTimeMax?: number): this;
+    createDefaultSoilMeasurementClusterServer(soilMoistureMeasuredValue?: number | null, soilMoistureMeasurementLimits?: MeasurementAccuracy): this;
     createDefaultAirQualityClusterServer(airQuality?: AirQuality.AirQualityEnum): this;
     createDefaultTvocMeasurementClusterServer(measuredValue?: number | null, measurementUnit?: ConcentrationMeasurement.MeasurementUnit, measurementMedium?: ConcentrationMeasurement.MeasurementMedium, uncertainty?: number): this;
     createLevelTvocMeasurementClusterServer(levelValue?: ConcentrationMeasurement.LevelValue, measurementMedium?: ConcentrationMeasurement.MeasurementMedium): this;

package/dist/matterbridgeEndpoint.js

@@ -27,6 +27,7 @@ import { PumpConfigurationAndControlServer } from '@matter/node/behaviors/pump-c
 import { RadonConcentrationMeasurementServer } from '@matter/node/behaviors/radon-concentration-measurement';
 import { RelativeHumidityMeasurementServer } from '@matter/node/behaviors/relative-humidity-measurement';
 import { ScenesManagementServer } from '@matter/node/behaviors/scenes-management';
+import { SoilMeasurementServer } from '@matter/node/behaviors/soil-measurement';
 import { SwitchServer } from '@matter/node/behaviors/switch';
 import { TemperatureMeasurementServer } from '@matter/node/behaviors/temperature-measurement';
 import { ThermostatUserInterfaceConfigurationServer } from '@matter/node/behaviors/thermostat-user-interface-configuration';
@@ -83,7 +84,7 @@ import { MatterbridgeThermostatServer } from './behaviors/thermostatServer.js';
 import { MatterbridgeValveConfigurationAndControlServer } from './behaviors/valveConfigurationAndControlServer.js';
 import { MatterbridgeWindowCoveringServer } from './behaviors/windowCoveringServer.js';
 import { CommandHandler } from './matterbridgeEndpointCommandHandler.js';
-import { addClusterClients, addClusterServers, addFixedLabel, addOptionalClusterClients, addOptionalClusterServers, addRequiredClusterClients, addRequiredClusterServers, addUserLabel, checkNotLatinCharacters, createUniqueId, defaultFor, featuresFor, generateUniqueId, getApparentElectricalPowerMeasurementClusterServer, getAttribute, getAttributeId, getBehavior, getBehaviourTypesFromClusterClientIds, getBehaviourTypesFromClusterServerIds, getCluster, getClusterId, getDefaultDeviceEnergyManagementClusterServer, getDefaultDeviceEnergyManagementModeClusterServer, getDefaultElectricalEnergyMeasurementClusterServer, getDefaultElectricalPowerMeasurementClusterServer, getDefaultFlowMeasurementClusterServer, getDefaultIlluminanceMeasurementClusterServer, getDefaultOccupancySensingClusterServer, getDefaultOperationalStateClusterServer, getDefaultPowerSourceBatteryClusterServer, getDefaultPowerSourceRechargeableBatteryClusterServer, getDefaultPowerSourceReplaceableBatteryClusterServer, getDefaultPowerSourceWiredClusterServer, getDefaultPressureMeasurementClusterServer, getDefaultRelativeHumidityMeasurementClusterServer, getDefaultTemperatureMeasurementClusterServer, invokeBehaviorCommand, lowercaseFirstLetter, setAttribute, setCluster, subscribeAttribute, triggerEvent, updateAttribute, } from './matterbridgeEndpointHelpers.js';
+import { addClusterClients, addClusterServers, addFixedLabel, addOptionalClusterClients, addOptionalClusterServers, addRequiredClusterClients, addRequiredClusterServers, addUserLabel, checkNotLatinCharacters, createUniqueId, defaultFor, featuresFor, generateUniqueId, getApparentElectricalPowerMeasurementClusterServer, getAttribute, getAttributeId, getBehavior, getBehaviourTypesFromClusterClientIds, getBehaviourTypesFromClusterServerIds, getCluster, getClusterId, getDefaultDeviceEnergyManagementClusterServer, getDefaultDeviceEnergyManagementModeClusterServer, getDefaultElectricalEnergyMeasurementClusterServer, getDefaultElectricalPowerMeasurementClusterServer, getDefaultFlowMeasurementClusterServer, getDefaultIlluminanceMeasurementClusterServer, getDefaultOccupancySensingClusterServer, getDefaultOperationalStateClusterServer, getDefaultPowerSourceBatteryClusterServer, getDefaultPowerSourceRechargeableBatteryClusterServer, getDefaultPowerSourceReplaceableBatteryClusterServer, getDefaultPowerSourceWiredClusterServer, getDefaultPressureMeasurementClusterServer, getDefaultRelativeHumidityMeasurementClusterServer, getDefaultSoilMeasurementClusterServer, getDefaultTemperatureMeasurementClusterServer, invokeBehaviorCommand, lowercaseFirstLetter, setAttribute, setCluster, subscribeAttribute, triggerEvent, updateAttribute, } from './matterbridgeEndpointHelpers.js';
 const MATTERBRIDGE_ENDPOINT_BRAND = Symbol('MatterbridgeEndpoint.brand');
 export function isMatterbridgeEndpoint(value) {
     if (!value || typeof value !== 'object')
@@ -1379,6 +1380,10 @@ export class MatterbridgeEndpoint extends Endpoint {
         this.behaviors.require(OccupancySensingServer.with(OccupancySensing.Feature.PassiveInfrared), getDefaultOccupancySensingClusterServer(occupied, holdTime, holdTimeMin, holdTimeMax));
         return this;
     }
+    createDefaultSoilMeasurementClusterServer(soilMoistureMeasuredValue = null, soilMoistureMeasurementLimits) {
+        this.behaviors.require(SoilMeasurementServer, getDefaultSoilMeasurementClusterServer(soilMoistureMeasuredValue, soilMoistureMeasurementLimits));
+        return this;
+    }
     createDefaultAirQualityClusterServer(airQuality = AirQuality.AirQualityEnum.Unknown) {
         this.behaviors.require(AirQualityServer.with(AirQuality.Feature.Fair, AirQuality.Feature.Moderate, AirQuality.Feature.VeryPoor, AirQuality.Feature.ExtremelyPoor), {
             airQuality,

package/dist/matterbridgeEndpointHelpers.d.ts

@@ -14,9 +14,10 @@ import { OperationalState } from '@matter/types/clusters/operational-state';
 import { PowerSource } from '@matter/types/clusters/power-source';
 import { PressureMeasurement } from '@matter/types/clusters/pressure-measurement';
 import { RelativeHumidityMeasurement } from '@matter/types/clusters/relative-humidity-measurement';
+import { SoilMeasurement } from '@matter/types/clusters/soil-measurement';
 import { TemperatureMeasurement } from '@matter/types/clusters/temperature-measurement';
 import { ClusterId, VendorId } from '@matter/types/datatype';
-import { Semtag } from '@matter/types/globals';
+import { MeasurementAccuracy, Semtag } from '@matter/types/globals';
 import { AnsiLogger } from 'node-ansi-logger';
 import { MatterbridgeDeviceEnergyManagementModeServer } from './behaviors/deviceEnergyManagementModeServer.js';
 import { MatterbridgeDeviceEnergyManagementServer } from './behaviors/deviceEnergyManagementServer.js';
@@ -72,13 +73,13 @@ export declare function getDefaultPowerSourceBatteryClusterServer(batPercentRema
     rechargeable: false;
     replaceable: false;
 }>, typeof MatterbridgePowerSourceServer>>;
-export declare function getDefaultPowerSourceReplaceableBatteryClusterServer(batPercentRemaining?: number, batChargeLevel?: PowerSource.BatChargeLevel, batVoltage?: number, batReplacementDescription?: string, batQuantity?: number, batReplaceability?: PowerSource.BatReplaceability): Partial<import("@matter/node").ClusterState.Type<ClusterType.WithSupportedFeatures<PowerSource, {
+export declare function getDefaultPowerSourceReplaceableBatteryClusterServer(batPercentRemaining?: number | null, batChargeLevel?: PowerSource.BatChargeLevel, batVoltage?: number | null, batReplacementDescription?: string, batQuantity?: number, batReplaceability?: PowerSource.BatReplaceability): Partial<import("@matter/node").ClusterState.Type<ClusterType.WithSupportedFeatures<PowerSource, {
     wired: false;
     battery: true;
     rechargeable: false;
     replaceable: true;
 }>, typeof MatterbridgePowerSourceServer>>;
-export declare function getDefaultPowerSourceRechargeableBatteryClusterServer(batPercentRemaining?: number, batChargeLevel?: PowerSource.BatChargeLevel, batVoltage?: number, batReplaceability?: PowerSource.BatReplaceability): Partial<import("@matter/node").ClusterState.Type<ClusterType.WithSupportedFeatures<PowerSource, {
+export declare function getDefaultPowerSourceRechargeableBatteryClusterServer(batPercentRemaining?: number | null, batChargeLevel?: PowerSource.BatChargeLevel, batVoltage?: number | null, batReplaceability?: PowerSource.BatReplaceability): Partial<import("@matter/node").ClusterState.Type<ClusterType.WithSupportedFeatures<PowerSource, {
     wired: false;
     battery: true;
     rechargeable: true;
@@ -142,3 +143,4 @@ export declare function getDefaultOccupancySensingClusterServer(occupied?: boole
     rfSensing: false;
     vision: false;
 }>, typeof OccupancySensingServer>>;
+export declare function getDefaultSoilMeasurementClusterServer(soilMoistureMeasuredValue?: number | null, soilMoistureMeasurementLimits?: MeasurementAccuracy): Partial<import("@matter/node").ClusterState.Type<SoilMeasurement, typeof ClusterBehavior>>;

package/dist/matterbridgeEndpointHelpers.js

@@ -38,6 +38,7 @@ import { PumpConfigurationAndControlClient, PumpConfigurationAndControlServer }
 import { RadonConcentrationMeasurementServer } from '@matter/node/behaviors/radon-concentration-measurement';
 import { RelativeHumidityMeasurementClient, RelativeHumidityMeasurementServer } from '@matter/node/behaviors/relative-humidity-measurement';
 import { ScenesManagementClient, ScenesManagementServer } from '@matter/node/behaviors/scenes-management';
+import { SoilMeasurementServer } from '@matter/node/behaviors/soil-measurement';
 import { SwitchServer } from '@matter/node/behaviors/switch';
 import { TemperatureMeasurementClient, TemperatureMeasurementServer } from '@matter/node/behaviors/temperature-measurement';
 import { ThermostatClient } from '@matter/node/behaviors/thermostat';
@@ -86,6 +87,7 @@ import { RadonConcentrationMeasurement } from '@matter/types/clusters/radon-conc
 import { RelativeHumidityMeasurement } from '@matter/types/clusters/relative-humidity-measurement';
 import { ScenesManagement } from '@matter/types/clusters/scenes-management';
 import { SmokeCoAlarm } from '@matter/types/clusters/smoke-co-alarm';
+import { SoilMeasurement } from '@matter/types/clusters/soil-measurement';
 import { Switch } from '@matter/types/clusters/switch';
 import { TemperatureMeasurement } from '@matter/types/clusters/temperature-measurement';
 import { Thermostat } from '@matter/types/clusters/thermostat';
@@ -240,95 +242,97 @@ export function getBehaviourTypesFromClusterClientIds(clusterClientList) {
     return behaviorTypes;
 }
 export function getBehaviourTypeFromClusterServerId(clusterId) {
-    if (clusterId === PowerSource.Cluster.id)
+    if (clusterId === PowerSource.id)
         return PowerSourceServer.with(PowerSource.Feature.Wired);
-    if (clusterId === UserLabel.Cluster.id)
+    if (clusterId === UserLabel.id)
         return UserLabelServer;
-    if (clusterId === FixedLabel.Cluster.id)
+    if (clusterId === FixedLabel.id)
         return FixedLabelServer;
-    if (clusterId === BasicInformation.Cluster.id)
+    if (clusterId === BasicInformation.id)
         return BasicInformationServer;
-    if (clusterId === BridgedDeviceBasicInformation.Cluster.id)
+    if (clusterId === BridgedDeviceBasicInformation.id)
         return BridgedDeviceBasicInformationServer;
-    if (clusterId === Identify.Cluster.id)
+    if (clusterId === Identify.id)
         return MatterbridgeIdentifyServer;
-    if (clusterId === Groups.Cluster.id)
+    if (clusterId === Groups.id)
         return GroupsServer;
-    if (clusterId === ScenesManagement.Cluster.id)
+    if (clusterId === ScenesManagement.id)
         return ScenesManagementServer;
-    if (clusterId === OnOff.Cluster.id)
+    if (clusterId === OnOff.id)
         return MatterbridgeOnOffServer.with('Lighting');
-    if (clusterId === LevelControl.Cluster.id)
+    if (clusterId === LevelControl.id)
         return MatterbridgeLevelControlServer.with('OnOff', 'Lighting');
-    if (clusterId === ColorControl.Cluster.id)
+    if (clusterId === ColorControl.id)
         return MatterbridgeColorControlServer;
-    if (clusterId === WindowCovering.Cluster.id)
+    if (clusterId === WindowCovering.id)
         return MatterbridgeWindowCoveringServer.with('Lift', 'PositionAwareLift');
-    if (clusterId === Thermostat.Cluster.id)
+    if (clusterId === Thermostat.id)
         return MatterbridgeThermostatServer.with('AutoMode', 'Heating', 'Cooling');
-    if (clusterId === FanControl.Cluster.id)
+    if (clusterId === FanControl.id)
         return MatterbridgeFanControlServer;
-    if (clusterId === DoorLock.Cluster.id)
+    if (clusterId === DoorLock.id)
         return MatterbridgeDoorLockServer;
-    if (clusterId === ModeSelect.Cluster.id)
+    if (clusterId === ModeSelect.id)
         return MatterbridgeModeSelectServer;
-    if (clusterId === ValveConfigurationAndControl.Cluster.id)
+    if (clusterId === ValveConfigurationAndControl.id)
         return MatterbridgeValveConfigurationAndControlServer.with('Level');
-    if (clusterId === PumpConfigurationAndControl.Cluster.id)
+    if (clusterId === PumpConfigurationAndControl.id)
         return PumpConfigurationAndControlServer.with('ConstantSpeed');
-    if (clusterId === SmokeCoAlarm.Cluster.id)
+    if (clusterId === SmokeCoAlarm.id)
         return MatterbridgeSmokeCoAlarmServer.with('SmokeAlarm', 'CoAlarm');
-    if (clusterId === Switch.Cluster.id)
+    if (clusterId === Switch.id)
         return SwitchServer.with('MomentarySwitch', 'MomentarySwitchRelease', 'MomentarySwitchLongPress', 'MomentarySwitchMultiPress');
-    if (clusterId === OperationalState.Cluster.id)
+    if (clusterId === OperationalState.id)
         return MatterbridgeOperationalStateServer;
-    if (clusterId === BooleanState.Cluster.id)
+    if (clusterId === BooleanState.id)
         return BooleanStateServer.enable({ events: { stateChange: true } });
-    if (clusterId === BooleanStateConfiguration.Cluster.id)
+    if (clusterId === BooleanStateConfiguration.id)
         return MatterbridgeBooleanStateConfigurationServer;
-    if (clusterId === PowerTopology.Cluster.id)
+    if (clusterId === PowerTopology.id)
         return PowerTopologyServer.with('TreeTopology');
-    if (clusterId === ElectricalPowerMeasurement.Cluster.id)
+    if (clusterId === ElectricalPowerMeasurement.id)
         return ElectricalPowerMeasurementServer.with('AlternatingCurrent');
-    if (clusterId === ElectricalEnergyMeasurement.Cluster.id)
+    if (clusterId === ElectricalEnergyMeasurement.id)
         return ElectricalEnergyMeasurementServer.with('ImportedEnergy', 'ExportedEnergy', 'CumulativeEnergy');
-    if (clusterId === TemperatureMeasurement.Cluster.id)
+    if (clusterId === TemperatureMeasurement.id)
         return TemperatureMeasurementServer;
-    if (clusterId === RelativeHumidityMeasurement.Cluster.id)
+    if (clusterId === RelativeHumidityMeasurement.id)
         return RelativeHumidityMeasurementServer;
-    if (clusterId === PressureMeasurement.Cluster.id)
+    if (clusterId === PressureMeasurement.id)
         return PressureMeasurementServer;
-    if (clusterId === FlowMeasurement.Cluster.id)
+    if (clusterId === FlowMeasurement.id)
         return FlowMeasurementServer;
-    if (clusterId === IlluminanceMeasurement.Cluster.id)
+    if (clusterId === IlluminanceMeasurement.id)
         return IlluminanceMeasurementServer;
-    if (clusterId === OccupancySensing.Cluster.id)
+    if (clusterId === OccupancySensing.id)
         return OccupancySensingServer;
-    if (clusterId === AirQuality.Cluster.id)
+    if (clusterId === SoilMeasurement.id)
+        return SoilMeasurementServer;
+    if (clusterId === AirQuality.id)
         return AirQualityServer.with('Fair', 'Moderate', 'VeryPoor', 'ExtremelyPoor');
-    if (clusterId === CarbonMonoxideConcentrationMeasurement.Cluster.id)
+    if (clusterId === CarbonMonoxideConcentrationMeasurement.id)
         return CarbonMonoxideConcentrationMeasurementServer.with('NumericMeasurement');
-    if (clusterId === CarbonDioxideConcentrationMeasurement.Cluster.id)
+    if (clusterId === CarbonDioxideConcentrationMeasurement.id)
         return CarbonDioxideConcentrationMeasurementServer.with('NumericMeasurement');
-    if (clusterId === NitrogenDioxideConcentrationMeasurement.Cluster.id)
+    if (clusterId === NitrogenDioxideConcentrationMeasurement.id)
         return NitrogenDioxideConcentrationMeasurementServer.with('NumericMeasurement');
-    if (clusterId === OzoneConcentrationMeasurement.Cluster.id)
+    if (clusterId === OzoneConcentrationMeasurement.id)
         return OzoneConcentrationMeasurementServer.with('NumericMeasurement');
-    if (clusterId === FormaldehydeConcentrationMeasurement.Cluster.id)
+    if (clusterId === FormaldehydeConcentrationMeasurement.id)
         return FormaldehydeConcentrationMeasurementServer.with('NumericMeasurement');
-    if (clusterId === Pm1ConcentrationMeasurement.Cluster.id)
+    if (clusterId === Pm1ConcentrationMeasurement.id)
         return Pm1ConcentrationMeasurementServer.with('NumericMeasurement');
-    if (clusterId === Pm25ConcentrationMeasurement.Cluster.id)
+    if (clusterId === Pm25ConcentrationMeasurement.id)
         return Pm25ConcentrationMeasurementServer.with('NumericMeasurement');
-    if (clusterId === Pm10ConcentrationMeasurement.Cluster.id)
+    if (clusterId === Pm10ConcentrationMeasurement.id)
         return Pm10ConcentrationMeasurementServer.with('NumericMeasurement');
-    if (clusterId === RadonConcentrationMeasurement.Cluster.id)
+    if (clusterId === RadonConcentrationMeasurement.id)
         return RadonConcentrationMeasurementServer.with('NumericMeasurement');
-    if (clusterId === TotalVolatileOrganicCompoundsConcentrationMeasurement.Cluster.id)
+    if (clusterId === TotalVolatileOrganicCompoundsConcentrationMeasurement.id)
         return TotalVolatileOrganicCompoundsConcentrationMeasurementServer.with('NumericMeasurement');
-    if (clusterId === DeviceEnergyManagement.Cluster.id)
+    if (clusterId === DeviceEnergyManagement.id)
         return MatterbridgeDeviceEnergyManagementServer.with('PowerForecastReporting');
-    if (clusterId === DeviceEnergyManagementMode.Cluster.id)
+    if (clusterId === DeviceEnergyManagementMode.id)
         return MatterbridgeDeviceEnergyManagementModeServer;
     return MatterbridgeIdentifyServer;
 }
@@ -469,85 +473,87 @@ export function addOptionalClusterServers(endpoint) {
     addClusterServers(endpoint, optionalServerList);
 }
 export function addClusterServers(endpoint, serverList) {
-    if (serverList.includes(PowerSource.Cluster.id))
+    if (serverList.includes(PowerSource.id))
         endpoint.createDefaultPowerSourceWiredClusterServer();
-    if (serverList.includes(Identify.Cluster.id))
+    if (serverList.includes(Identify.id))
         endpoint.createDefaultIdentifyClusterServer();
-    if (serverList.includes(Groups.Cluster.id))
+    if (serverList.includes(Groups.id))
         endpoint.createDefaultGroupsClusterServer();
-    if (serverList.includes(ScenesManagement.Cluster.id))
+    if (serverList.includes(ScenesManagement.id))
         endpoint.createDefaultScenesManagementClusterServer();
-    if (serverList.includes(OnOff.Cluster.id))
+    if (serverList.includes(OnOff.id))
         endpoint.createDefaultOnOffClusterServer();
-    if (serverList.includes(LevelControl.Cluster.id))
+    if (serverList.includes(LevelControl.id))
         endpoint.createDefaultLevelControlClusterServer();
-    if (serverList.includes(ColorControl.Cluster.id))
+    if (serverList.includes(ColorControl.id))
         endpoint.createDefaultColorControlClusterServer();
-    if (serverList.includes(WindowCovering.Cluster.id))
+    if (serverList.includes(WindowCovering.id))
         endpoint.createDefaultWindowCoveringClusterServer();
-    if (serverList.includes(Thermostat.Cluster.id))
+    if (serverList.includes(Thermostat.id))
         endpoint.createDefaultThermostatClusterServer();
-    if (serverList.includes(FanControl.Cluster.id))
+    if (serverList.includes(FanControl.id))
         endpoint.createDefaultFanControlClusterServer();
-    if (serverList.includes(DoorLock.Cluster.id))
+    if (serverList.includes(DoorLock.id))
         endpoint.createDefaultDoorLockClusterServer();
-    if (serverList.includes(ValveConfigurationAndControl.Cluster.id))
+    if (serverList.includes(ValveConfigurationAndControl.id))
         endpoint.createDefaultValveConfigurationAndControlClusterServer();
-    if (serverList.includes(PumpConfigurationAndControl.Cluster.id))
+    if (serverList.includes(PumpConfigurationAndControl.id))
         endpoint.createDefaultPumpConfigurationAndControlClusterServer();
-    if (serverList.includes(SmokeCoAlarm.Cluster.id))
+    if (serverList.includes(SmokeCoAlarm.id))
         endpoint.createDefaultSmokeCOAlarmClusterServer();
-    if (serverList.includes(Switch.Cluster.id))
+    if (serverList.includes(Switch.id))
         endpoint.createDefaultSwitchClusterServer();
-    if (serverList.includes(OperationalState.Cluster.id))
+    if (serverList.includes(OperationalState.id))
         endpoint.createDefaultOperationalStateClusterServer();
-    if (serverList.includes(BooleanState.Cluster.id))
+    if (serverList.includes(BooleanState.id))
         endpoint.createDefaultBooleanStateClusterServer();
-    if (serverList.includes(BooleanStateConfiguration.Cluster.id))
+    if (serverList.includes(BooleanStateConfiguration.id))
         endpoint.createDefaultBooleanStateConfigurationClusterServer();
-    if (serverList.includes(PowerTopology.Cluster.id))
+    if (serverList.includes(PowerTopology.id))
         endpoint.createDefaultPowerTopologyClusterServer();
-    if (serverList.includes(ElectricalPowerMeasurement.Cluster.id))
+    if (serverList.includes(ElectricalPowerMeasurement.id))
         endpoint.createDefaultElectricalPowerMeasurementClusterServer();
-    if (serverList.includes(ElectricalEnergyMeasurement.Cluster.id))
+    if (serverList.includes(ElectricalEnergyMeasurement.id))
         endpoint.createDefaultElectricalEnergyMeasurementClusterServer();
-    if (serverList.includes(TemperatureMeasurement.Cluster.id))
+    if (serverList.includes(TemperatureMeasurement.id))
         endpoint.createDefaultTemperatureMeasurementClusterServer();
-    if (serverList.includes(RelativeHumidityMeasurement.Cluster.id))
+    if (serverList.includes(RelativeHumidityMeasurement.id))
         endpoint.createDefaultRelativeHumidityMeasurementClusterServer();
-    if (serverList.includes(PressureMeasurement.Cluster.id))
+    if (serverList.includes(PressureMeasurement.id))
         endpoint.createDefaultPressureMeasurementClusterServer();
-    if (serverList.includes(FlowMeasurement.Cluster.id))
+    if (serverList.includes(FlowMeasurement.id))
         endpoint.createDefaultFlowMeasurementClusterServer();
-    if (serverList.includes(IlluminanceMeasurement.Cluster.id))
+    if (serverList.includes(IlluminanceMeasurement.id))
         endpoint.createDefaultIlluminanceMeasurementClusterServer();
-    if (serverList.includes(OccupancySensing.Cluster.id))
+    if (serverList.includes(OccupancySensing.id))
         endpoint.createDefaultOccupancySensingClusterServer();
-    if (serverList.includes(AirQuality.Cluster.id))
+    if (serverList.includes(SoilMeasurement.id))
+        endpoint.createDefaultSoilMeasurementClusterServer();
+    if (serverList.includes(AirQuality.id))
         endpoint.createDefaultAirQualityClusterServer();
-    if (serverList.includes(CarbonMonoxideConcentrationMeasurement.Cluster.id))
+    if (serverList.includes(CarbonMonoxideConcentrationMeasurement.id))
         endpoint.createDefaultCarbonMonoxideConcentrationMeasurementClusterServer();
-    if (serverList.includes(CarbonDioxideConcentrationMeasurement.Cluster.id))
+    if (serverList.includes(CarbonDioxideConcentrationMeasurement.id))
         endpoint.createDefaultCarbonDioxideConcentrationMeasurementClusterServer();
-    if (serverList.includes(NitrogenDioxideConcentrationMeasurement.Cluster.id))
+    if (serverList.includes(NitrogenDioxideConcentrationMeasurement.id))
         endpoint.createDefaultNitrogenDioxideConcentrationMeasurementClusterServer();
-    if (serverList.includes(OzoneConcentrationMeasurement.Cluster.id))
+    if (serverList.includes(OzoneConcentrationMeasurement.id))
         endpoint.createDefaultOzoneConcentrationMeasurementClusterServer();
-    if (serverList.includes(FormaldehydeConcentrationMeasurement.Cluster.id))
+    if (serverList.includes(FormaldehydeConcentrationMeasurement.id))
         endpoint.createDefaultFormaldehydeConcentrationMeasurementClusterServer();
-    if (serverList.includes(Pm1ConcentrationMeasurement.Cluster.id))
+    if (serverList.includes(Pm1ConcentrationMeasurement.id))
         endpoint.createDefaultPm1ConcentrationMeasurementClusterServer();
-    if (serverList.includes(Pm25ConcentrationMeasurement.Cluster.id))
+    if (serverList.includes(Pm25ConcentrationMeasurement.id))
         endpoint.createDefaultPm25ConcentrationMeasurementClusterServer();
-    if (serverList.includes(Pm10ConcentrationMeasurement.Cluster.id))
+    if (serverList.includes(Pm10ConcentrationMeasurement.id))
         endpoint.createDefaultPm10ConcentrationMeasurementClusterServer();
-    if (serverList.includes(RadonConcentrationMeasurement.Cluster.id))
+    if (serverList.includes(RadonConcentrationMeasurement.id))
         endpoint.createDefaultRadonConcentrationMeasurementClusterServer();
-    if (serverList.includes(TotalVolatileOrganicCompoundsConcentrationMeasurement.Cluster.id))
+    if (serverList.includes(TotalVolatileOrganicCompoundsConcentrationMeasurement.id))
         endpoint.createDefaultTvocMeasurementClusterServer();
-    if (serverList.includes(DeviceEnergyManagement.Cluster.id))
+    if (serverList.includes(DeviceEnergyManagement.id))
         endpoint.createDefaultDeviceEnergyManagementClusterServer();
-    if (serverList.includes(DeviceEnergyManagementMode.Cluster.id))
+    if (serverList.includes(DeviceEnergyManagementMode.id))
         endpoint.createDefaultDeviceEnergyManagementModeClusterServer();
 }
 export function addClusterClients(endpoint, clientList) {
@@ -602,7 +608,7 @@ export function addOptionalClusterClients(endpoint) {
     addClusterClients(endpoint, optionalClientList);
 }
 export async function addFixedLabel(endpoint, label, value) {
-    if (!endpoint.hasClusterServer(FixedLabel.Cluster.id)) {
+    if (!endpoint.hasClusterServer(FixedLabel.id)) {
         endpoint.log.debug(`addFixedLabel: add cluster ${hk}FixedLabel${db}:${hk}fixedLabel${db} with label ${CYAN}${label}${db} value ${CYAN}${value}${db}`);
         endpoint.behaviors.require(FixedLabelServer, {
             labelList: [{ label: label.substring(0, 16), value: value.substring(0, 16) }],
@@ -610,15 +616,15 @@ export async function addFixedLabel(endpoint, label, value) {
         return;
     }
     endpoint.log.debug(`addFixedLabel: add label ${CYAN}${label}${db} value ${CYAN}${value}${db}`);
-    let labelList = endpoint.getAttribute(FixedLabel.Cluster.id, 'labelList', endpoint.log);
+    let labelList = endpoint.getAttribute(FixedLabel.id, 'labelList', endpoint.log);
     if (isValidArray(labelList)) {
         labelList = labelList.filter((entry) => entry.label !== label.substring(0, 16));
         labelList.push({ label: label.substring(0, 16), value: value.substring(0, 16) });
-        await endpoint.setAttribute(FixedLabel.Cluster.id, 'labelList', labelList, endpoint.log);
+        await endpoint.setAttribute(FixedLabel.id, 'labelList', labelList, endpoint.log);
     }
 }
 export async function addUserLabel(endpoint, label, value) {
-    if (!endpoint.hasClusterServer(UserLabel.Cluster.id)) {
+    if (!endpoint.hasClusterServer(UserLabel.id)) {
         endpoint.log.debug(`addUserLabel: add cluster ${hk}UserLabel${db}:${hk}userLabel${db} with label ${CYAN}${label}${db} value ${CYAN}${value}${db}`);
         endpoint.behaviors.require(UserLabelServer, {
             labelList: [{ label: label.substring(0, 16), value: value.substring(0, 16) }],
@@ -626,11 +632,11 @@ export async function addUserLabel(endpoint, label, value) {
         return;
     }
     endpoint.log.debug(`addUserLabel: add label ${CYAN}${label}${db} value ${CYAN}${value}${db}`);
-    let labelList = endpoint.getAttribute(UserLabel.Cluster.id, 'labelList', endpoint.log);
+    let labelList = endpoint.getAttribute(UserLabel.id, 'labelList', endpoint.log);
     if (isValidArray(labelList)) {
         labelList = labelList.filter((entry) => entry.label !== label.substring(0, 16));
         labelList.push({ label: label.substring(0, 16), value: value.substring(0, 16) });
-        await endpoint.setAttribute(UserLabel.Cluster.id, 'labelList', labelList, endpoint.log);
+        await endpoint.setAttribute(UserLabel.id, 'labelList', labelList, endpoint.log);
     }
 }
 export function getClusterId(endpoint, cluster) {
@@ -812,7 +818,7 @@ export function getDefaultPowerSourceReplaceableBatteryClusterServer(batPercentR
         description: 'Primary battery',
         endpointList: [],
         batVoltage,
-        batPercentRemaining: Math.min(Math.max(batPercentRemaining * 2, 0), 200),
+        batPercentRemaining: batPercentRemaining !== null ? Math.min(Math.max(batPercentRemaining * 2, 0), 200) : null,
         batChargeLevel,
         batReplacementNeeded: false,
         batReplaceability,
@@ -828,7 +834,7 @@ export function getDefaultPowerSourceRechargeableBatteryClusterServer(batPercent
         description: 'Primary battery',
         endpointList: [],
         batVoltage,
-        batPercentRemaining: Math.min(Math.max(batPercentRemaining * 2, 0), 200),
+        batPercentRemaining: batPercentRemaining !== null ? Math.min(Math.max(batPercentRemaining * 2, 0), 200) : null,
         batTimeRemaining: null,
         batChargeLevel,
         batReplacementNeeded: false,
@@ -1040,3 +1046,15 @@ export function getDefaultOccupancySensingClusterServer(occupied = false, holdTi
         holdTimeLimits: { holdTimeMin, holdTimeMax, holdTimeDefault: holdTime },
     });
 }
+export function getDefaultSoilMeasurementClusterServer(soilMoistureMeasuredValue = null, soilMoistureMeasurementLimits) {
+    return optionsFor(SoilMeasurementServer, {
+        soilMoistureMeasuredValue,
+        soilMoistureMeasurementLimits: soilMoistureMeasurementLimits ?? {
+            measurementType: MeasurementType.SoilMoisture,
+            measured: true,
+            minMeasuredValue: 0,
+            maxMeasuredValue: 100,
+            accuracyRanges: [{ rangeMin: 0, rangeMax: 100, fixedMax: 1 }],
+        },
+    });
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@matterbridge/core",
-  "version": "3.8.1-dev-20260608-9dc483f",
+  "version": "3.8.1-dev-20260609-37884d6",
   "description": "Matterbridge core library",
   "author": "https://github.com/Luligu",
   "homepage": "https://matterbridge.io/",
@@ -130,10 +130,10 @@
   ],
   "dependencies": {
     "@matter/main": "0.17.2-alpha.0-20260606-610f30128",
-    "@matterbridge/dgram": "3.8.1-dev-20260608-9dc483f",
-    "@matterbridge/thread": "3.8.1-dev-20260608-9dc483f",
-    "@matterbridge/types": "3.8.1-dev-20260608-9dc483f",
-    "@matterbridge/utils": "3.8.1-dev-20260608-9dc483f",
+    "@matterbridge/dgram": "3.8.1-dev-20260609-37884d6",
+    "@matterbridge/thread": "3.8.1-dev-20260609-37884d6",
+    "@matterbridge/types": "3.8.1-dev-20260609-37884d6",
+    "@matterbridge/utils": "3.8.1-dev-20260609-37884d6",
     "escape-html": "1.0.3",
     "express": "5.2.1",
     "express-rate-limit": "8.5.2",