matterbridge 2.1.0-dev.3 → 2.1.0-dev.4

package/CHANGELOG.md

@@ -21,7 +21,7 @@ The legacy old api have been removed.
 The frontend has a new dark and light mode. The dark mode is now the default mode.
 It is possible to change the mode (Classic, Dark or Light) in Settings, Matterbridge settings.
 
-## [2.1.0.dev.3] - 2025-01-27
+## [2.1.0.dev.4] - 2025-01-28
 
 ### Added
 

package/dist/frontend.js

@@ -830,77 +830,75 @@ export class Frontend {
                 return '';
         };
         let attributes = '';
-        Object.entries(device.state).forEach(([clusterName, clusterAttributes]) => {
-            Object.entries(clusterAttributes).forEach(([attributeName, attributeValue]) => {
-                if (typeof attributeValue === 'undefined')
-                    return;
-                if (clusterName === 'onOff' && attributeName === 'onOff')
-                    attributes += `OnOff: ${attributeValue} `;
-                if (clusterName === 'switch' && attributeName === 'currentPosition')
-                    attributes += `Position: ${attributeValue} `;
-                if (clusterName === 'windowCovering' && attributeName === 'currentPositionLiftPercent100ths')
-                    attributes += `Cover position: ${attributeValue / 100}% `;
-                if (clusterName === 'doorLock' && attributeName === 'lockState')
-                    attributes += `State: ${attributeValue === 1 ? 'Locked' : 'Not locked'} `;
-                if (clusterName === 'thermostat' && attributeName === 'localTemperature')
-                    attributes += `Temperature: ${attributeValue / 100}°C `;
-                if (clusterName === 'thermostat' && attributeName === 'occupiedHeatingSetpoint')
-                    attributes += `Heat to: ${attributeValue / 100}°C `;
-                if (clusterName === 'thermostat' && attributeName === 'occupiedCoolingSetpoint')
-                    attributes += `Cool to: ${attributeValue / 100}°C `;
-                if (clusterName === 'pumpConfigurationAndControl' && attributeName === 'operationMode')
-                    attributes += `Mode: ${attributeValue} `;
-                if (clusterName === 'valveConfigurationAndControl' && attributeName === 'currentState')
-                    attributes += `State: ${attributeValue} `;
-                if (clusterName === 'levelControl' && attributeName === 'currentLevel')
-                    attributes += `Level: ${attributeValue}% `;
-                if (clusterName === 'colorControl' && attributeName === 'colorMode')
-                    attributes += `Mode: ${['HS', 'XY', 'CT'][attributeValue]} `;
-                if (clusterName === 'colorControl' && getAttribute(device, 'colorControl', 'colorMode') === 0 && attributeName === 'currentHue')
-                    attributes += `Hue: ${Math.round(attributeValue)} `;
-                if (clusterName === 'colorControl' && getAttribute(device, 'colorControl', 'colorMode') === 0 && attributeName === 'currentSaturation')
-                    attributes += `Saturation: ${Math.round(attributeValue)} `;
-                if (clusterName === 'colorControl' && getAttribute(device, 'colorControl', 'colorMode') === 1 && attributeName === 'currentX')
-                    attributes += `X: ${Math.round(attributeValue)} `;
-                if (clusterName === 'colorControl' && getAttribute(device, 'colorControl', 'colorMode') === 1 && attributeName === 'currentY')
-                    attributes += `Y: ${Math.round(attributeValue)} `;
-                if (clusterName === 'colorControl' && getAttribute(device, 'colorControl', 'colorMode') === 2 && attributeName === 'colorTemperatureMireds')
-                    attributes += `ColorTemp: ${Math.round(attributeValue)} `;
-                if (clusterName === 'booleanState' && attributeName === 'stateValue')
-                    attributes += `Contact: ${attributeValue} `;
-                if (clusterName === 'booleanStateConfiguration' && attributeName === 'alarmsActive')
-                    attributes += `Active alarms: ${stringify(attributeValue)} `;
-                if (clusterName === 'smokeCoAlarm' && attributeName === 'smokeState')
-                    attributes += `Smoke: ${attributeValue} `;
-                if (clusterName === 'smokeCoAlarm' && attributeName === 'coState')
-                    attributes += `Co: ${attributeValue} `;
-                if (clusterName === 'fanControl' && attributeName === 'fanMode')
-                    attributes += `Mode: ${attributeValue} `;
-                if (clusterName === 'fanControl' && attributeName === 'percentCurrent')
-                    attributes += `Percent: ${attributeValue} `;
-                if (clusterName === 'fanControl' && attributeName === 'speedCurrent')
-                    attributes += `Speed: ${attributeValue} `;
-                if (clusterName === 'occupancySensing' && attributeName === 'occupancy')
-                    attributes += `Occupancy: ${attributeValue.occupied} `;
-                if (clusterName === 'illuminanceMeasurement' && attributeName === 'measuredValue')
-                    attributes += `Illuminance: ${attributeValue} `;
-                if (clusterName === 'airQuality' && attributeName === 'airQuality')
-                    attributes += `Air quality: ${attributeValue} `;
-                if (clusterName === 'tvocMeasurement' && attributeName === 'measuredValue')
-                    attributes += `Voc: ${attributeValue} `;
-                if (clusterName === 'temperatureMeasurement' && attributeName === 'measuredValue')
-                    attributes += `Temperature: ${attributeValue / 100}°C `;
-                if (clusterName === 'relativeHumidityMeasurement' && attributeName === 'measuredValue')
-                    attributes += `Humidity: ${attributeValue / 100}% `;
-                if (clusterName === 'pressureMeasurement' && attributeName === 'measuredValue')
-                    attributes += `Pressure: ${attributeValue} `;
-                if (clusterName === 'flowMeasurement' && attributeName === 'measuredValue')
-                    attributes += `Flow: ${attributeValue} `;
-                if (clusterName === 'fixedLabel' && attributeName === 'labelList')
-                    attributes += `${getFixedLabel(device)} `;
-                if (clusterName === 'userLabel' && attributeName === 'labelList')
-                    attributes += `${getUserLabel(device)} `;
-            });
+        device.forEachAttribute((clusterName, attributeName, attributeValue) => {
+            if (typeof attributeValue === 'undefined')
+                return;
+            if (clusterName === 'onOff' && attributeName === 'onOff')
+                attributes += `OnOff: ${attributeValue} `;
+            if (clusterName === 'switch' && attributeName === 'currentPosition')
+                attributes += `Position: ${attributeValue} `;
+            if (clusterName === 'windowCovering' && attributeName === 'currentPositionLiftPercent100ths' && isValidNumber(attributeValue, 0, 10000))
+                attributes += `Cover position: ${attributeValue / 100}% `;
+            if (clusterName === 'doorLock' && attributeName === 'lockState')
+                attributes += `State: ${attributeValue === 1 ? 'Locked' : 'Not locked'} `;
+            if (clusterName === 'thermostat' && attributeName === 'localTemperature' && isValidNumber(attributeValue))
+                attributes += `Temperature: ${attributeValue / 100}°C `;
+            if (clusterName === 'thermostat' && attributeName === 'occupiedHeatingSetpoint' && isValidNumber(attributeValue))
+                attributes += `Heat to: ${attributeValue / 100}°C `;
+            if (clusterName === 'thermostat' && attributeName === 'occupiedCoolingSetpoint' && isValidNumber(attributeValue))
+                attributes += `Cool to: ${attributeValue / 100}°C `;
+            if (clusterName === 'pumpConfigurationAndControl' && attributeName === 'operationMode')
+                attributes += `Mode: ${attributeValue} `;
+            if (clusterName === 'valveConfigurationAndControl' && attributeName === 'currentState')
+                attributes += `State: ${attributeValue} `;
+            if (clusterName === 'levelControl' && attributeName === 'currentLevel')
+                attributes += `Level: ${attributeValue} `;
+            if (clusterName === 'colorControl' && attributeName === 'colorMode' && isValidNumber(attributeValue, 0, 2))
+                attributes += `Mode: ${['HS', 'XY', 'CT'][attributeValue]} `;
+            if (clusterName === 'colorControl' && getAttribute(device, 'colorControl', 'colorMode') === 0 && attributeName === 'currentHue' && isValidNumber(attributeValue))
+                attributes += `Hue: ${Math.round(attributeValue)} `;
+            if (clusterName === 'colorControl' && getAttribute(device, 'colorControl', 'colorMode') === 0 && attributeName === 'currentSaturation' && isValidNumber(attributeValue))
+                attributes += `Saturation: ${Math.round(attributeValue)} `;
+            if (clusterName === 'colorControl' && getAttribute(device, 'colorControl', 'colorMode') === 1 && attributeName === 'currentX' && isValidNumber(attributeValue))
+                attributes += `X: ${Math.round(attributeValue / 655.36) / 100} `;
+            if (clusterName === 'colorControl' && getAttribute(device, 'colorControl', 'colorMode') === 1 && attributeName === 'currentY' && isValidNumber(attributeValue))
+                attributes += `Y: ${Math.round(attributeValue / 655.36) / 100} `;
+            if (clusterName === 'colorControl' && getAttribute(device, 'colorControl', 'colorMode') === 2 && attributeName === 'colorTemperatureMireds' && isValidNumber(attributeValue))
+                attributes += `ColorTemp: ${Math.round(attributeValue)} `;
+            if (clusterName === 'booleanState' && attributeName === 'stateValue')
+                attributes += `Contact: ${attributeValue} `;
+            if (clusterName === 'booleanStateConfiguration' && attributeName === 'alarmsActive' && isValidObject(attributeValue))
+                attributes += `Active alarms: ${stringify(attributeValue)} `;
+            if (clusterName === 'smokeCoAlarm' && attributeName === 'smokeState')
+                attributes += `Smoke: ${attributeValue} `;
+            if (clusterName === 'smokeCoAlarm' && attributeName === 'coState')
+                attributes += `Co: ${attributeValue} `;
+            if (clusterName === 'fanControl' && attributeName === 'fanMode')
+                attributes += `Mode: ${attributeValue} `;
+            if (clusterName === 'fanControl' && attributeName === 'percentCurrent')
+                attributes += `Percent: ${attributeValue} `;
+            if (clusterName === 'fanControl' && attributeName === 'speedCurrent')
+                attributes += `Speed: ${attributeValue} `;
+            if (clusterName === 'occupancySensing' && attributeName === 'occupancy' && isValidObject(attributeValue, 1))
+                attributes += `Occupancy: ${attributeValue.occupied} `;
+            if (clusterName === 'illuminanceMeasurement' && attributeName === 'measuredValue')
+                attributes += `Illuminance: ${attributeValue} `;
+            if (clusterName === 'airQuality' && attributeName === 'airQuality')
+                attributes += `Air quality: ${attributeValue} `;
+            if (clusterName === 'tvocMeasurement' && attributeName === 'measuredValue')
+                attributes += `Voc: ${attributeValue} `;
+            if (clusterName === 'temperatureMeasurement' && attributeName === 'measuredValue' && isValidNumber(attributeValue))
+                attributes += `Temperature: ${attributeValue / 100}°C `;
+            if (clusterName === 'relativeHumidityMeasurement' && attributeName === 'measuredValue' && isValidNumber(attributeValue))
+                attributes += `Humidity: ${attributeValue / 100}% `;
+            if (clusterName === 'pressureMeasurement' && attributeName === 'measuredValue')
+                attributes += `Pressure: ${attributeValue} `;
+            if (clusterName === 'flowMeasurement' && attributeName === 'measuredValue')
+                attributes += `Flow: ${attributeValue} `;
+            if (clusterName === 'fixedLabel' && attributeName === 'labelList')
+                attributes += `${getFixedLabel(device)} `;
+            if (clusterName === 'userLabel' && attributeName === 'labelList')
+                attributes += `${getUserLabel(device)} `;
         });
         return attributes.trimStart().trimEnd();
     }
@@ -1066,8 +1064,11 @@ export class Frontend {
                     const clusterServers = endpointServer.getAllClusterServers();
                     clusterServers.forEach((clusterServer) => {
                         Object.entries(clusterServer.attributes).forEach(([key, value]) => {
-                            if (clusterServer.name === 'EveHistory')
-                                return;
+                            if (clusterServer.name === 'EveHistory') {
+                                if (['configDataGet', 'configDataSet', 'historyStatus', 'historyEntries', 'historyRequest', 'historySetTime', 'rLoc'].includes(key)) {
+                                    return;
+                                }
+                            }
                             if (clusterServer.name === 'Descriptor' && key === 'deviceTypeList') {
                                 value.getLocal().forEach((deviceType) => {
                                     deviceTypes.push(deviceType.deviceType);

package/dist/matter/export.js

@@ -2,5 +2,5 @@ export * from '@matter/main';
 export { AggregatorEndpoint } from '@matter/main/endpoints';
 export * from '@matter/main/devices';
 export * from '@matter/main/behaviors';
-export { FabricAction, MdnsService, PaseClient } from '@matter/main/protocol';
+export { FabricAction, MdnsService, PaseClient, logEndpoint } from '@matter/main/protocol';
 export { AttributeElement, ClusterElement, ClusterModel, CommandElement, EventElement, FieldElement } from '@matter/main/model';

package/dist/matterbridgeEndpoint.js

@@ -1,18 +1,16 @@
-import { createHash } from 'crypto';
 import { AnsiLogger, BLUE, CYAN, YELLOW, db, debugStringify, er, hk, or, zb } from './logger/export.js';
 import { bridgedNode } from './matterbridgeDeviceTypes.js';
 import { deepCopy, isValidNumber } from './utils/utils.js';
 import { MatterbridgeBehavior, MatterbridgeBehaviorDevice, MatterbridgeIdentifyServer, MatterbridgeOnOffServer, MatterbridgeLevelControlServer, MatterbridgeColorControlServer, MatterbridgeWindowCoveringServer, MatterbridgeThermostatServer, MatterbridgeFanControlServer, MatterbridgeDoorLockServer, MatterbridgeModeSelectServer, MatterbridgeValveConfigurationAndControlServer, MatterbridgeSmokeCoAlarmServer, MatterbridgeBooleanStateConfigurationServer, } from './matterbridgeBehaviors.js';
+import { addClusterServers, addOptionalClusterServers, addRequiredClusterServers, capitalizeFirstLetter, createUniqueId, getBehavior, getBehaviourTypesFromClusterClientIds, getBehaviourTypesFromClusterServerIds, lowercaseFirstLetter, optionsFor, } from './matterbridgeEndpointHelpers.js';
 import { Endpoint, Lifecycle, MutableEndpoint, NamedHandler, SupportedBehaviors, VendorId } from '@matter/main';
 import { getClusterNameById, MeasurementType } from '@matter/main/types';
 import { Descriptor } from '@matter/main/clusters/descriptor';
 import { PowerSource } from '@matter/main/clusters/power-source';
 import { UserLabel } from '@matter/main/clusters/user-label';
 import { FixedLabel } from '@matter/main/clusters/fixed-label';
-import { BasicInformation } from '@matter/main/clusters/basic-information';
 import { BridgedDeviceBasicInformation } from '@matter/main/clusters/bridged-device-basic-information';
 import { Identify } from '@matter/main/clusters/identify';
-import { Groups } from '@matter/main/clusters/groups';
 import { OnOff } from '@matter/main/clusters/on-off';
 import { LevelControl } from '@matter/main/clusters/level-control';
 import { ColorControl } from '@matter/main/clusters/color-control';
@@ -20,39 +18,21 @@ import { WindowCovering } from '@matter/main/clusters/window-covering';
 import { Thermostat } from '@matter/main/clusters/thermostat';
 import { FanControl } from '@matter/main/clusters/fan-control';
 import { DoorLock } from '@matter/main/clusters/door-lock';
-import { ModeSelect } from '@matter/main/clusters/mode-select';
 import { ValveConfigurationAndControl } from '@matter/main/clusters/valve-configuration-and-control';
 import { PumpConfigurationAndControl } from '@matter/main/clusters/pump-configuration-and-control';
 import { SmokeCoAlarm } from '@matter/main/clusters/smoke-co-alarm';
 import { Switch } from '@matter/main/clusters/switch';
-import { BooleanState } from '@matter/main/clusters/boolean-state';
 import { BooleanStateConfiguration } from '@matter/main/clusters/boolean-state-configuration';
 import { PowerTopology } from '@matter/main/clusters/power-topology';
 import { ElectricalPowerMeasurement } from '@matter/main/clusters/electrical-power-measurement';
 import { ElectricalEnergyMeasurement } from '@matter/main/clusters/electrical-energy-measurement';
-import { TemperatureMeasurement } from '@matter/main/clusters/temperature-measurement';
-import { RelativeHumidityMeasurement } from '@matter/main/clusters/relative-humidity-measurement';
-import { PressureMeasurement } from '@matter/main/clusters/pressure-measurement';
-import { FlowMeasurement } from '@matter/main/clusters/flow-measurement';
-import { IlluminanceMeasurement } from '@matter/main/clusters/illuminance-measurement';
 import { OccupancySensing } from '@matter/main/clusters/occupancy-sensing';
 import { AirQuality } from '@matter/main/clusters/air-quality';
-import { CarbonMonoxideConcentrationMeasurement } from '@matter/main/clusters/carbon-monoxide-concentration-measurement';
-import { CarbonDioxideConcentrationMeasurement } from '@matter/main/clusters/carbon-dioxide-concentration-measurement';
-import { NitrogenDioxideConcentrationMeasurement } from '@matter/main/clusters/nitrogen-dioxide-concentration-measurement';
-import { OzoneConcentrationMeasurement } from '@matter/main/clusters/ozone-concentration-measurement';
-import { FormaldehydeConcentrationMeasurement } from '@matter/main/clusters/formaldehyde-concentration-measurement';
-import { Pm1ConcentrationMeasurement } from '@matter/main/clusters/pm1-concentration-measurement';
-import { Pm25ConcentrationMeasurement } from '@matter/main/clusters/pm25-concentration-measurement';
-import { Pm10ConcentrationMeasurement } from '@matter/main/clusters/pm10-concentration-measurement';
-import { RadonConcentrationMeasurement } from '@matter/main/clusters/radon-concentration-measurement';
-import { TotalVolatileOrganicCompoundsConcentrationMeasurement } from '@matter/main/clusters/total-volatile-organic-compounds-concentration-measurement';
 import { ConcentrationMeasurement } from '@matter/main/clusters/concentration-measurement';
 import { DescriptorServer } from '@matter/main/behaviors/descriptor';
 import { PowerSourceServer } from '@matter/main/behaviors/power-source';
 import { UserLabelServer } from '@matter/main/behaviors/user-label';
 import { FixedLabelServer } from '@matter/main/behaviors/fixed-label';
-import { BasicInformationServer } from '@matter/main/behaviors/basic-information';
 import { BridgedDeviceBasicInformationServer } from '@matter/main/behaviors/bridged-device-basic-information';
 import { GroupsServer } from '@matter/main/behaviors/groups';
 import { ScenesManagementServer } from '@matter/main/behaviors/scenes-management';
@@ -79,242 +59,6 @@ import { Pm25ConcentrationMeasurementServer } from '@matter/main/behaviors/pm25-
 import { Pm10ConcentrationMeasurementServer } from '@matter/main/behaviors/pm10-concentration-measurement';
 import { RadonConcentrationMeasurementServer } from '@matter/main/behaviors/radon-concentration-measurement';
 import { TotalVolatileOrganicCompoundsConcentrationMeasurementServer } from '@matter/main/behaviors/total-volatile-organic-compounds-concentration-measurement';
-function capitalizeFirstLetter(name) {
-    if (!name)
-        return name;
-    return name.charAt(0).toUpperCase() + name.slice(1);
-}
-function lowercaseFirstLetter(name) {
-    if (!name)
-        return name;
-    return name.charAt(0).toLowerCase() + name.slice(1);
-}
-function createUniqueId(param1, param2, param3, param4) {
-    const hash = createHash('md5');
-    hash.update(param1 + param2 + param3 + param4);
-    return hash.digest('hex');
-}
-function getBehaviourTypesFromClusterServerIds(clusterServerList) {
-    const behaviorTypes = [];
-    clusterServerList.forEach((clusterId) => {
-        behaviorTypes.push(getBehaviourTypeFromClusterServerId(clusterId));
-    });
-    return behaviorTypes;
-}
-function getBehaviourTypesFromClusterClientIds(clusterClientList) {
-    const behaviorTypes = [];
-    clusterClientList.forEach((clusterId) => {
-    });
-    return behaviorTypes;
-}
-function getBehaviourTypeFromClusterServerId(clusterId) {
-    if (clusterId === PowerSource.Cluster.id)
-        return PowerSourceServer.with(PowerSource.Feature.Wired);
-    if (clusterId === UserLabel.Cluster.id)
-        return UserLabelServer;
-    if (clusterId === FixedLabel.Cluster.id)
-        return FixedLabelServer;
-    if (clusterId === BasicInformation.Cluster.id)
-        return BasicInformationServer;
-    if (clusterId === BridgedDeviceBasicInformation.Cluster.id)
-        return BridgedDeviceBasicInformationServer;
-    if (clusterId === Identify.Cluster.id)
-        return MatterbridgeIdentifyServer;
-    if (clusterId === Groups.Cluster.id)
-        return GroupsServer;
-    if (clusterId === OnOff.Cluster.id)
-        return MatterbridgeOnOffServer.with('Lighting');
-    if (clusterId === LevelControl.Cluster.id)
-        return MatterbridgeLevelControlServer.with('OnOff', 'Lighting');
-    if (clusterId === ColorControl.Cluster.id)
-        return MatterbridgeColorControlServer;
-    if (clusterId === WindowCovering.Cluster.id)
-        return MatterbridgeWindowCoveringServer.with('Lift', 'PositionAwareLift');
-    if (clusterId === Thermostat.Cluster.id)
-        return MatterbridgeThermostatServer.with('AutoMode', 'Heating', 'Cooling');
-    if (clusterId === FanControl.Cluster.id)
-        return MatterbridgeFanControlServer;
-    if (clusterId === DoorLock.Cluster.id)
-        return MatterbridgeDoorLockServer;
-    if (clusterId === ModeSelect.Cluster.id)
-        return MatterbridgeModeSelectServer;
-    if (clusterId === ValveConfigurationAndControl.Cluster.id)
-        return MatterbridgeValveConfigurationAndControlServer.with('Level');
-    if (clusterId === PumpConfigurationAndControl.Cluster.id)
-        return PumpConfigurationAndControlServer.with('ConstantSpeed');
-    if (clusterId === SmokeCoAlarm.Cluster.id)
-        return MatterbridgeSmokeCoAlarmServer.with('SmokeAlarm', 'CoAlarm');
-    if (clusterId === Switch.Cluster.id)
-        return SwitchServer.with('MomentarySwitch', 'MomentarySwitchRelease', 'MomentarySwitchLongPress', 'MomentarySwitchMultiPress');
-    if (clusterId === BooleanState.Cluster.id)
-        return BooleanStateServer.enable({ events: { stateChange: true } });
-    if (clusterId === BooleanStateConfiguration.Cluster.id)
-        return MatterbridgeBooleanStateConfigurationServer;
-    if (clusterId === PowerTopology.Cluster.id)
-        return PowerTopologyServer.with('TreeTopology');
-    if (clusterId === ElectricalPowerMeasurement.Cluster.id)
-        return ElectricalPowerMeasurementServer.with('AlternatingCurrent');
-    if (clusterId === ElectricalEnergyMeasurement.Cluster.id)
-        return ElectricalEnergyMeasurementServer.with('ImportedEnergy', 'ExportedEnergy', 'CumulativeEnergy');
-    if (clusterId === TemperatureMeasurement.Cluster.id)
-        return TemperatureMeasurementServer;
-    if (clusterId === RelativeHumidityMeasurement.Cluster.id)
-        return RelativeHumidityMeasurementServer;
-    if (clusterId === PressureMeasurement.Cluster.id)
-        return PressureMeasurementServer;
-    if (clusterId === FlowMeasurement.Cluster.id)
-        return FlowMeasurementServer;
-    if (clusterId === IlluminanceMeasurement.Cluster.id)
-        return IlluminanceMeasurementServer;
-    if (clusterId === OccupancySensing.Cluster.id)
-        return OccupancySensingServer;
-    if (clusterId === AirQuality.Cluster.id)
-        return AirQualityServer.with('Fair', 'Moderate', 'VeryPoor', 'ExtremelyPoor');
-    if (clusterId === CarbonMonoxideConcentrationMeasurement.Cluster.id)
-        return CarbonMonoxideConcentrationMeasurementServer.with('NumericMeasurement');
-    if (clusterId === CarbonDioxideConcentrationMeasurement.Cluster.id)
-        return CarbonDioxideConcentrationMeasurementServer.with('NumericMeasurement');
-    if (clusterId === NitrogenDioxideConcentrationMeasurement.Cluster.id)
-        return NitrogenDioxideConcentrationMeasurementServer.with('NumericMeasurement');
-    if (clusterId === OzoneConcentrationMeasurement.Cluster.id)
-        return OzoneConcentrationMeasurementServer.with('NumericMeasurement');
-    if (clusterId === FormaldehydeConcentrationMeasurement.Cluster.id)
-        return FormaldehydeConcentrationMeasurementServer.with('NumericMeasurement');
-    if (clusterId === Pm1ConcentrationMeasurement.Cluster.id)
-        return Pm1ConcentrationMeasurementServer.with('NumericMeasurement');
-    if (clusterId === Pm25ConcentrationMeasurement.Cluster.id)
-        return Pm25ConcentrationMeasurementServer.with('NumericMeasurement');
-    if (clusterId === Pm10ConcentrationMeasurement.Cluster.id)
-        return Pm10ConcentrationMeasurementServer.with('NumericMeasurement');
-    if (clusterId === RadonConcentrationMeasurement.Cluster.id)
-        return RadonConcentrationMeasurementServer.with('NumericMeasurement');
-    if (clusterId === TotalVolatileOrganicCompoundsConcentrationMeasurement.Cluster.id)
-        return TotalVolatileOrganicCompoundsConcentrationMeasurementServer.with('NumericMeasurement');
-    return MatterbridgeIdentifyServer;
-}
-function getBehaviourTypeFromClusterClientId(clusterId) {
-}
-function getBehavior(endpoint, cluster) {
-    let behavior;
-    if (typeof cluster === 'string') {
-        behavior = endpoint.behaviors.supported[lowercaseFirstLetter(cluster)];
-    }
-    else if (typeof cluster === 'number') {
-        behavior = endpoint.behaviors.supported[lowercaseFirstLetter(getClusterNameById(cluster))];
-    }
-    else if (typeof cluster === 'object') {
-        behavior = endpoint.behaviors.supported[lowercaseFirstLetter(cluster.name)];
-    }
-    else if (typeof cluster === 'function') {
-        behavior = cluster;
-    }
-    return behavior;
-}
-function addRequiredClusterServers(endpoint) {
-    const requiredServerList = [];
-    endpoint.log.debug(`addRequiredClusterServers for ${CYAN}${endpoint.maybeId}${db}`);
-    Array.from(endpoint.deviceTypes.values()).forEach((deviceType) => {
-        endpoint.log.debug(`- for deviceType: ${zb}${'0x' + deviceType.code.toString(16).padStart(4, '0')}${db}-${zb}${deviceType.name}${db}`);
-        deviceType.requiredServerClusters.forEach((clusterId) => {
-            if (!requiredServerList.includes(clusterId) && !endpoint.hasClusterServer(clusterId)) {
-                requiredServerList.push(clusterId);
-                endpoint.log.debug(`- cluster: ${hk}${'0x' + clusterId.toString(16).padStart(4, '0')}${db}-${hk}${getClusterNameById(clusterId)}${db}`);
-            }
-        });
-    });
-    addClusterServers(endpoint, requiredServerList);
-}
-function addOptionalClusterServers(endpoint) {
-    const optionalServerList = [];
-    endpoint.log.debug(`addOptionalClusterServers for ${CYAN}${endpoint.maybeId}${db}`);
-    Array.from(endpoint.deviceTypes.values()).forEach((deviceType) => {
-        endpoint.log.debug(`- for deviceType: ${zb}${'0x' + deviceType.code.toString(16).padStart(4, '0')}${db}-${zb}${deviceType.name}${db}`);
-        deviceType.optionalServerClusters.forEach((clusterId) => {
-            if (!optionalServerList.includes(clusterId) && !endpoint.hasClusterServer(clusterId)) {
-                optionalServerList.push(clusterId);
-                endpoint.log.debug(`- cluster: ${hk}${'0x' + clusterId.toString(16).padStart(4, '0')}${db}-${hk}${getClusterNameById(clusterId)}${db}`);
-            }
-        });
-    });
-    addClusterServers(endpoint, optionalServerList);
-}
-function addClusterServers(endpoint, serverList) {
-    if (serverList.includes(PowerSource.Cluster.id))
-        endpoint.createDefaultPowerSourceWiredClusterServer();
-    if (serverList.includes(Identify.Cluster.id))
-        endpoint.createDefaultIdentifyClusterServer();
-    if (serverList.includes(Groups.Cluster.id))
-        endpoint.createDefaultGroupsClusterServer();
-    if (serverList.includes(OnOff.Cluster.id))
-        endpoint.createDefaultOnOffClusterServer();
-    if (serverList.includes(LevelControl.Cluster.id))
-        endpoint.createDefaultLevelControlClusterServer();
-    if (serverList.includes(ColorControl.Cluster.id))
-        endpoint.createDefaultColorControlClusterServer();
-    if (serverList.includes(WindowCovering.Cluster.id))
-        endpoint.createDefaultWindowCoveringClusterServer();
-    if (serverList.includes(Thermostat.Cluster.id))
-        endpoint.createDefaultThermostatClusterServer();
-    if (serverList.includes(FanControl.Cluster.id))
-        endpoint.createDefaultFanControlClusterServer();
-    if (serverList.includes(DoorLock.Cluster.id))
-        endpoint.createDefaultDoorLockClusterServer();
-    if (serverList.includes(ValveConfigurationAndControl.Cluster.id))
-        endpoint.createDefaultValveConfigurationAndControlClusterServer();
-    if (serverList.includes(PumpConfigurationAndControl.Cluster.id))
-        endpoint.createDefaultPumpConfigurationAndControlClusterServer();
-    if (serverList.includes(SmokeCoAlarm.Cluster.id))
-        endpoint.createDefaultSmokeCOAlarmClusterServer();
-    if (serverList.includes(Switch.Cluster.id))
-        endpoint.createDefaultSwitchClusterServer();
-    if (serverList.includes(BooleanState.Cluster.id))
-        endpoint.createDefaultBooleanStateClusterServer();
-    if (serverList.includes(BooleanStateConfiguration.Cluster.id))
-        endpoint.createDefaultBooleanStateConfigurationClusterServer();
-    if (serverList.includes(PowerTopology.Cluster.id))
-        endpoint.createDefaultPowerTopologyClusterServer();
-    if (serverList.includes(ElectricalPowerMeasurement.Cluster.id))
-        endpoint.createDefaultElectricalPowerMeasurementClusterServer();
-    if (serverList.includes(ElectricalEnergyMeasurement.Cluster.id))
-        endpoint.createDefaultElectricalEnergyMeasurementClusterServer();
-    if (serverList.includes(TemperatureMeasurement.Cluster.id))
-        endpoint.createDefaultTemperatureMeasurementClusterServer();
-    if (serverList.includes(RelativeHumidityMeasurement.Cluster.id))
-        endpoint.createDefaultRelativeHumidityMeasurementClusterServer();
-    if (serverList.includes(PressureMeasurement.Cluster.id))
-        endpoint.createDefaultPressureMeasurementClusterServer();
-    if (serverList.includes(FlowMeasurement.Cluster.id))
-        endpoint.createDefaultFlowMeasurementClusterServer();
-    if (serverList.includes(IlluminanceMeasurement.Cluster.id))
-        endpoint.createDefaultIlluminanceMeasurementClusterServer();
-    if (serverList.includes(OccupancySensing.Cluster.id))
-        endpoint.createDefaultOccupancySensingClusterServer();
-    if (serverList.includes(AirQuality.Cluster.id))
-        endpoint.createDefaultAirQualityClusterServer();
-    if (serverList.includes(CarbonMonoxideConcentrationMeasurement.Cluster.id))
-        endpoint.createDefaultCarbonMonoxideConcentrationMeasurementClusterServer();
-    if (serverList.includes(CarbonDioxideConcentrationMeasurement.Cluster.id))
-        endpoint.createDefaultCarbonDioxideConcentrationMeasurementClusterServer();
-    if (serverList.includes(NitrogenDioxideConcentrationMeasurement.Cluster.id))
-        endpoint.createDefaultNitrogenDioxideConcentrationMeasurementClusterServer();
-    if (serverList.includes(OzoneConcentrationMeasurement.Cluster.id))
-        endpoint.createDefaultOzoneConcentrationMeasurementClusterServer();
-    if (serverList.includes(FormaldehydeConcentrationMeasurement.Cluster.id))
-        endpoint.createDefaultFormaldehydeConcentrationMeasurementClusterServer();
-    if (serverList.includes(Pm1ConcentrationMeasurement.Cluster.id))
-        endpoint.createDefaultPm1ConcentrationMeasurementClusterServer();
-    if (serverList.includes(Pm25ConcentrationMeasurement.Cluster.id))
-        endpoint.createDefaultPm25ConcentrationMeasurementClusterServer();
-    if (serverList.includes(Pm10ConcentrationMeasurement.Cluster.id))
-        endpoint.createDefaultPm10ConcentrationMeasurementClusterServer();
-    if (serverList.includes(RadonConcentrationMeasurement.Cluster.id))
-        endpoint.createDefaultRadonConcentrationMeasurementClusterServer();
-    if (serverList.includes(TotalVolatileOrganicCompoundsConcentrationMeasurement.Cluster.id))
-        endpoint.createDefaultTvocMeasurementClusterServer();
-}
-export function optionsFor(type, options) {
-    return options;
-}
 export class MatterbridgeEndpoint extends Endpoint {
     static bridgeMode = '';
     static logLevel = "info";
@@ -337,7 +81,6 @@ export class MatterbridgeEndpoint extends Endpoint {
     deviceType;
     uniqueStorageKey = undefined;
     tagList = undefined;
-    subType = '';
     deviceTypes = new Map();
     commandHandler = new NamedHandler();
     constructor(definition, options = {}, debug = false) {
@@ -412,7 +155,8 @@ export class MatterbridgeEndpoint extends Endpoint {
         if (!behavior || !this.behaviors.supported[behavior.id])
             return false;
         const options = this.behaviors.optionsFor(behavior);
-        return lowercaseFirstLetter(attribute) in options;
+        const defaults = this.behaviors.defaultsFor(behavior);
+        return lowercaseFirstLetter(attribute) in options || lowercaseFirstLetter(attribute) in defaults;
     }
     getClusterServerOptions(cluster) {
         const behavior = getBehavior(this, cluster);
@@ -484,21 +228,19 @@ export class MatterbridgeEndpoint extends Endpoint {
         log?.info(`${db}Subscribed endpoint ${or}${this.id}${db}:${or}${this.number}${db} attribute ${hk}${capitalizeFirstLetter(clusterName)}${db}.${hk}${attribute}${db}`);
         return true;
     }
-    async triggerEvent(clusterId, event, payload, log, endpoint) {
-        if (!endpoint)
-            endpoint = this;
+    async triggerEvent(clusterId, event, payload, log) {
         const clusterName = lowercaseFirstLetter(getClusterNameById(clusterId));
-        if (endpoint.construction.status !== Lifecycle.Status.Active) {
-            this.log.error(`triggerEvent ${hk}${clusterName}.${event}${er} error: Endpoint ${or}${endpoint.maybeId}${er}:${or}${endpoint.maybeNumber}${er} is in the ${BLUE}${endpoint.construction.status}${er} state`);
+        if (this.construction.status !== Lifecycle.Status.Active) {
+            this.log.error(`triggerEvent ${hk}${clusterName}.${event}${er} error: Endpoint ${or}${this.maybeId}${er}:${or}${this.maybeNumber}${er} is in the ${BLUE}${this.construction.status}${er} state`);
             return false;
         }
-        const events = endpoint.events;
+        const events = this.events;
         if (!(clusterName in events) || !(event in events[clusterName])) {
-            this.log.error(`triggerEvent ${hk}${event}${er} error: Cluster ${'0x' + clusterId.toString(16).padStart(4, '0')}:${clusterName} not found on endpoint ${or}${endpoint.id}${er}:${or}${endpoint.number}${er}`);
+            this.log.error(`triggerEvent ${hk}${event}${er} error: Cluster ${'0x' + clusterId.toString(16).padStart(4, '0')}:${clusterName} not found on endpoint ${or}${this.id}${er}:${or}${this.number}${er}`);
             return false;
         }
-        await endpoint.act((agent) => agent[clusterName].events[event].emit(payload, agent.context));
-        log?.info(`${db}Trigger event ${hk}${capitalizeFirstLetter(clusterName)}${db}.${hk}${event}${db} with ${debugStringify(payload)}${db} on endpoint ${or}${endpoint.id}${db}:${or}${endpoint.number}${db} `);
+        await this.act((agent) => agent[clusterName].events[event].emit(payload, agent.context));
+        log?.info(`${db}Trigger event ${hk}${capitalizeFirstLetter(clusterName)}${db}.${hk}${event}${db} with ${debugStringify(payload)}${db} on endpoint ${or}${this.id}${db}:${or}${this.number}${db} `);
         return true;
     }
     addClusterServers(serverList) {
@@ -553,6 +295,15 @@ export class MatterbridgeEndpoint extends Endpoint {
     getAllClusterServerNames() {
         return Object.keys(this.behaviors.supported);
     }
+    forEachAttribute(callback) {
+        for (const [clusterName, clusterAttributes] of Object.entries(this.state)) {
+            for (const [attributeName, attributeValue] of Object.entries(clusterAttributes)) {
+                if (typeof attributeValue === 'undefined')
+                    continue;
+                callback(clusterName, attributeName, attributeValue);
+            }
+        }
+    }
     addChildDeviceType(endpointName, definition, options = {}, debug = false) {
         this.log.debug(`addChildDeviceType: ${CYAN}${endpointName}${db}`);
         let alreadyAdded = false;

package/dist/matterbridgeEndpointHelpers.js

@@ -0,0 +1,316 @@
+import { createHash } from 'crypto';
+import { CYAN, db, hk, zb } from './logger/export.js';
+import { MatterbridgeIdentifyServer, MatterbridgeOnOffServer, MatterbridgeLevelControlServer, MatterbridgeColorControlServer, MatterbridgeWindowCoveringServer, MatterbridgeThermostatServer, MatterbridgeFanControlServer, MatterbridgeDoorLockServer, MatterbridgeModeSelectServer, MatterbridgeValveConfigurationAndControlServer, MatterbridgeSmokeCoAlarmServer, MatterbridgeBooleanStateConfigurationServer, } from './matterbridgeBehaviors.js';
+import { getClusterNameById } from '@matter/main/types';
+import { PowerSource } from '@matter/main/clusters/power-source';
+import { UserLabel } from '@matter/main/clusters/user-label';
+import { FixedLabel } from '@matter/main/clusters/fixed-label';
+import { BasicInformation } from '@matter/main/clusters/basic-information';
+import { BridgedDeviceBasicInformation } from '@matter/main/clusters/bridged-device-basic-information';
+import { Identify } from '@matter/main/clusters/identify';
+import { Groups } from '@matter/main/clusters/groups';
+import { OnOff } from '@matter/main/clusters/on-off';
+import { LevelControl } from '@matter/main/clusters/level-control';
+import { ColorControl } from '@matter/main/clusters/color-control';
+import { WindowCovering } from '@matter/main/clusters/window-covering';
+import { Thermostat } from '@matter/main/clusters/thermostat';
+import { FanControl } from '@matter/main/clusters/fan-control';
+import { DoorLock } from '@matter/main/clusters/door-lock';
+import { ModeSelect } from '@matter/main/clusters/mode-select';
+import { ValveConfigurationAndControl } from '@matter/main/clusters/valve-configuration-and-control';
+import { PumpConfigurationAndControl } from '@matter/main/clusters/pump-configuration-and-control';
+import { SmokeCoAlarm } from '@matter/main/clusters/smoke-co-alarm';
+import { Switch } from '@matter/main/clusters/switch';
+import { BooleanState } from '@matter/main/clusters/boolean-state';
+import { BooleanStateConfiguration } from '@matter/main/clusters/boolean-state-configuration';
+import { PowerTopology } from '@matter/main/clusters/power-topology';
+import { ElectricalPowerMeasurement } from '@matter/main/clusters/electrical-power-measurement';
+import { ElectricalEnergyMeasurement } from '@matter/main/clusters/electrical-energy-measurement';
+import { TemperatureMeasurement } from '@matter/main/clusters/temperature-measurement';
+import { RelativeHumidityMeasurement } from '@matter/main/clusters/relative-humidity-measurement';
+import { PressureMeasurement } from '@matter/main/clusters/pressure-measurement';
+import { FlowMeasurement } from '@matter/main/clusters/flow-measurement';
+import { IlluminanceMeasurement } from '@matter/main/clusters/illuminance-measurement';
+import { OccupancySensing } from '@matter/main/clusters/occupancy-sensing';
+import { AirQuality } from '@matter/main/clusters/air-quality';
+import { CarbonMonoxideConcentrationMeasurement } from '@matter/main/clusters/carbon-monoxide-concentration-measurement';
+import { CarbonDioxideConcentrationMeasurement } from '@matter/main/clusters/carbon-dioxide-concentration-measurement';
+import { NitrogenDioxideConcentrationMeasurement } from '@matter/main/clusters/nitrogen-dioxide-concentration-measurement';
+import { OzoneConcentrationMeasurement } from '@matter/main/clusters/ozone-concentration-measurement';
+import { FormaldehydeConcentrationMeasurement } from '@matter/main/clusters/formaldehyde-concentration-measurement';
+import { Pm1ConcentrationMeasurement } from '@matter/main/clusters/pm1-concentration-measurement';
+import { Pm25ConcentrationMeasurement } from '@matter/main/clusters/pm25-concentration-measurement';
+import { Pm10ConcentrationMeasurement } from '@matter/main/clusters/pm10-concentration-measurement';
+import { RadonConcentrationMeasurement } from '@matter/main/clusters/radon-concentration-measurement';
+import { TotalVolatileOrganicCompoundsConcentrationMeasurement } from '@matter/main/clusters/total-volatile-organic-compounds-concentration-measurement';
+import { PowerSourceServer } from '@matter/main/behaviors/power-source';
+import { UserLabelServer } from '@matter/main/behaviors/user-label';
+import { FixedLabelServer } from '@matter/main/behaviors/fixed-label';
+import { BasicInformationServer } from '@matter/main/behaviors/basic-information';
+import { BridgedDeviceBasicInformationServer } from '@matter/main/behaviors/bridged-device-basic-information';
+import { GroupsServer } from '@matter/main/behaviors/groups';
+import { PumpConfigurationAndControlServer } from '@matter/main/behaviors/pump-configuration-and-control';
+import { SwitchServer } from '@matter/main/behaviors/switch';
+import { BooleanStateServer } from '@matter/main/behaviors/boolean-state';
+import { PowerTopologyServer } from '@matter/main/behaviors/power-topology';
+import { ElectricalPowerMeasurementServer } from '@matter/main/behaviors/electrical-power-measurement';
+import { ElectricalEnergyMeasurementServer } from '@matter/main/behaviors/electrical-energy-measurement';
+import { TemperatureMeasurementServer } from '@matter/main/behaviors/temperature-measurement';
+import { RelativeHumidityMeasurementServer } from '@matter/main/behaviors/relative-humidity-measurement';
+import { PressureMeasurementServer } from '@matter/main/behaviors/pressure-measurement';
+import { FlowMeasurementServer } from '@matter/main/behaviors/flow-measurement';
+import { IlluminanceMeasurementServer } from '@matter/main/behaviors/illuminance-measurement';
+import { OccupancySensingServer } from '@matter/main/behaviors/occupancy-sensing';
+import { AirQualityServer } from '@matter/main/behaviors/air-quality';
+import { CarbonMonoxideConcentrationMeasurementServer } from '@matter/main/behaviors/carbon-monoxide-concentration-measurement';
+import { CarbonDioxideConcentrationMeasurementServer } from '@matter/main/behaviors/carbon-dioxide-concentration-measurement';
+import { NitrogenDioxideConcentrationMeasurementServer } from '@matter/main/behaviors/nitrogen-dioxide-concentration-measurement';
+import { OzoneConcentrationMeasurementServer } from '@matter/main/behaviors/ozone-concentration-measurement';
+import { FormaldehydeConcentrationMeasurementServer } from '@matter/main/behaviors/formaldehyde-concentration-measurement';
+import { Pm1ConcentrationMeasurementServer } from '@matter/main/behaviors/pm1-concentration-measurement';
+import { Pm25ConcentrationMeasurementServer } from '@matter/main/behaviors/pm25-concentration-measurement';
+import { Pm10ConcentrationMeasurementServer } from '@matter/main/behaviors/pm10-concentration-measurement';
+import { RadonConcentrationMeasurementServer } from '@matter/main/behaviors/radon-concentration-measurement';
+import { TotalVolatileOrganicCompoundsConcentrationMeasurementServer } from '@matter/main/behaviors/total-volatile-organic-compounds-concentration-measurement';
+export function capitalizeFirstLetter(name) {
+    if (!name)
+        return name;
+    return name.charAt(0).toUpperCase() + name.slice(1);
+}
+export function lowercaseFirstLetter(name) {
+    if (!name)
+        return name;
+    return name.charAt(0).toLowerCase() + name.slice(1);
+}
+export function createUniqueId(param1, param2, param3, param4) {
+    const hash = createHash('md5');
+    hash.update(param1 + param2 + param3 + param4);
+    return hash.digest('hex');
+}
+export function getBehaviourTypesFromClusterServerIds(clusterServerList) {
+    const behaviorTypes = [];
+    clusterServerList.forEach((clusterId) => {
+        behaviorTypes.push(getBehaviourTypeFromClusterServerId(clusterId));
+    });
+    return behaviorTypes;
+}
+export function getBehaviourTypesFromClusterClientIds(clusterClientList) {
+    const behaviorTypes = [];
+    clusterClientList.forEach((clusterId) => {
+    });
+    return behaviorTypes;
+}
+export function getBehaviourTypeFromClusterServerId(clusterId) {
+    if (clusterId === PowerSource.Cluster.id)
+        return PowerSourceServer.with(PowerSource.Feature.Wired);
+    if (clusterId === UserLabel.Cluster.id)
+        return UserLabelServer;
+    if (clusterId === FixedLabel.Cluster.id)
+        return FixedLabelServer;
+    if (clusterId === BasicInformation.Cluster.id)
+        return BasicInformationServer;
+    if (clusterId === BridgedDeviceBasicInformation.Cluster.id)
+        return BridgedDeviceBasicInformationServer;
+    if (clusterId === Identify.Cluster.id)
+        return MatterbridgeIdentifyServer;
+    if (clusterId === Groups.Cluster.id)
+        return GroupsServer;
+    if (clusterId === OnOff.Cluster.id)
+        return MatterbridgeOnOffServer.with('Lighting');
+    if (clusterId === LevelControl.Cluster.id)
+        return MatterbridgeLevelControlServer.with('OnOff', 'Lighting');
+    if (clusterId === ColorControl.Cluster.id)
+        return MatterbridgeColorControlServer;
+    if (clusterId === WindowCovering.Cluster.id)
+        return MatterbridgeWindowCoveringServer.with('Lift', 'PositionAwareLift');
+    if (clusterId === Thermostat.Cluster.id)
+        return MatterbridgeThermostatServer.with('AutoMode', 'Heating', 'Cooling');
+    if (clusterId === FanControl.Cluster.id)
+        return MatterbridgeFanControlServer;
+    if (clusterId === DoorLock.Cluster.id)
+        return MatterbridgeDoorLockServer;
+    if (clusterId === ModeSelect.Cluster.id)
+        return MatterbridgeModeSelectServer;
+    if (clusterId === ValveConfigurationAndControl.Cluster.id)
+        return MatterbridgeValveConfigurationAndControlServer.with('Level');
+    if (clusterId === PumpConfigurationAndControl.Cluster.id)
+        return PumpConfigurationAndControlServer.with('ConstantSpeed');
+    if (clusterId === SmokeCoAlarm.Cluster.id)
+        return MatterbridgeSmokeCoAlarmServer.with('SmokeAlarm', 'CoAlarm');
+    if (clusterId === Switch.Cluster.id)
+        return SwitchServer.with('MomentarySwitch', 'MomentarySwitchRelease', 'MomentarySwitchLongPress', 'MomentarySwitchMultiPress');
+    if (clusterId === BooleanState.Cluster.id)
+        return BooleanStateServer.enable({ events: { stateChange: true } });
+    if (clusterId === BooleanStateConfiguration.Cluster.id)
+        return MatterbridgeBooleanStateConfigurationServer;
+    if (clusterId === PowerTopology.Cluster.id)
+        return PowerTopologyServer.with('TreeTopology');
+    if (clusterId === ElectricalPowerMeasurement.Cluster.id)
+        return ElectricalPowerMeasurementServer.with('AlternatingCurrent');
+    if (clusterId === ElectricalEnergyMeasurement.Cluster.id)
+        return ElectricalEnergyMeasurementServer.with('ImportedEnergy', 'ExportedEnergy', 'CumulativeEnergy');
+    if (clusterId === TemperatureMeasurement.Cluster.id)
+        return TemperatureMeasurementServer;
+    if (clusterId === RelativeHumidityMeasurement.Cluster.id)
+        return RelativeHumidityMeasurementServer;
+    if (clusterId === PressureMeasurement.Cluster.id)
+        return PressureMeasurementServer;
+    if (clusterId === FlowMeasurement.Cluster.id)
+        return FlowMeasurementServer;
+    if (clusterId === IlluminanceMeasurement.Cluster.id)
+        return IlluminanceMeasurementServer;
+    if (clusterId === OccupancySensing.Cluster.id)
+        return OccupancySensingServer;
+    if (clusterId === AirQuality.Cluster.id)
+        return AirQualityServer.with('Fair', 'Moderate', 'VeryPoor', 'ExtremelyPoor');
+    if (clusterId === CarbonMonoxideConcentrationMeasurement.Cluster.id)
+        return CarbonMonoxideConcentrationMeasurementServer.with('NumericMeasurement');
+    if (clusterId === CarbonDioxideConcentrationMeasurement.Cluster.id)
+        return CarbonDioxideConcentrationMeasurementServer.with('NumericMeasurement');
+    if (clusterId === NitrogenDioxideConcentrationMeasurement.Cluster.id)
+        return NitrogenDioxideConcentrationMeasurementServer.with('NumericMeasurement');
+    if (clusterId === OzoneConcentrationMeasurement.Cluster.id)
+        return OzoneConcentrationMeasurementServer.with('NumericMeasurement');
+    if (clusterId === FormaldehydeConcentrationMeasurement.Cluster.id)
+        return FormaldehydeConcentrationMeasurementServer.with('NumericMeasurement');
+    if (clusterId === Pm1ConcentrationMeasurement.Cluster.id)
+        return Pm1ConcentrationMeasurementServer.with('NumericMeasurement');
+    if (clusterId === Pm25ConcentrationMeasurement.Cluster.id)
+        return Pm25ConcentrationMeasurementServer.with('NumericMeasurement');
+    if (clusterId === Pm10ConcentrationMeasurement.Cluster.id)
+        return Pm10ConcentrationMeasurementServer.with('NumericMeasurement');
+    if (clusterId === RadonConcentrationMeasurement.Cluster.id)
+        return RadonConcentrationMeasurementServer.with('NumericMeasurement');
+    if (clusterId === TotalVolatileOrganicCompoundsConcentrationMeasurement.Cluster.id)
+        return TotalVolatileOrganicCompoundsConcentrationMeasurementServer.with('NumericMeasurement');
+    return MatterbridgeIdentifyServer;
+}
+export function getBehaviourTypeFromClusterClientId(clusterId) {
+}
+export function getBehavior(endpoint, cluster) {
+    let behavior;
+    if (typeof cluster === 'string') {
+        behavior = endpoint.behaviors.supported[lowercaseFirstLetter(cluster)];
+    }
+    else if (typeof cluster === 'number') {
+        behavior = endpoint.behaviors.supported[lowercaseFirstLetter(getClusterNameById(cluster))];
+    }
+    else if (typeof cluster === 'object') {
+        behavior = endpoint.behaviors.supported[lowercaseFirstLetter(cluster.name)];
+    }
+    else if (typeof cluster === 'function') {
+        behavior = cluster;
+    }
+    return behavior;
+}
+export function addRequiredClusterServers(endpoint) {
+    const requiredServerList = [];
+    endpoint.log.debug(`addRequiredClusterServers for ${CYAN}${endpoint.maybeId}${db}`);
+    Array.from(endpoint.deviceTypes.values()).forEach((deviceType) => {
+        endpoint.log.debug(`- for deviceType: ${zb}${'0x' + deviceType.code.toString(16).padStart(4, '0')}${db}-${zb}${deviceType.name}${db}`);
+        deviceType.requiredServerClusters.forEach((clusterId) => {
+            if (!requiredServerList.includes(clusterId) && !endpoint.hasClusterServer(clusterId)) {
+                requiredServerList.push(clusterId);
+                endpoint.log.debug(`- cluster: ${hk}${'0x' + clusterId.toString(16).padStart(4, '0')}${db}-${hk}${getClusterNameById(clusterId)}${db}`);
+            }
+        });
+    });
+    addClusterServers(endpoint, requiredServerList);
+}
+export function addOptionalClusterServers(endpoint) {
+    const optionalServerList = [];
+    endpoint.log.debug(`addOptionalClusterServers for ${CYAN}${endpoint.maybeId}${db}`);
+    Array.from(endpoint.deviceTypes.values()).forEach((deviceType) => {
+        endpoint.log.debug(`- for deviceType: ${zb}${'0x' + deviceType.code.toString(16).padStart(4, '0')}${db}-${zb}${deviceType.name}${db}`);
+        deviceType.optionalServerClusters.forEach((clusterId) => {
+            if (!optionalServerList.includes(clusterId) && !endpoint.hasClusterServer(clusterId)) {
+                optionalServerList.push(clusterId);
+                endpoint.log.debug(`- cluster: ${hk}${'0x' + clusterId.toString(16).padStart(4, '0')}${db}-${hk}${getClusterNameById(clusterId)}${db}`);
+            }
+        });
+    });
+    addClusterServers(endpoint, optionalServerList);
+}
+export function addClusterServers(endpoint, serverList) {
+    if (serverList.includes(PowerSource.Cluster.id))
+        endpoint.createDefaultPowerSourceWiredClusterServer();
+    if (serverList.includes(Identify.Cluster.id))
+        endpoint.createDefaultIdentifyClusterServer();
+    if (serverList.includes(Groups.Cluster.id))
+        endpoint.createDefaultGroupsClusterServer();
+    if (serverList.includes(OnOff.Cluster.id))
+        endpoint.createDefaultOnOffClusterServer();
+    if (serverList.includes(LevelControl.Cluster.id))
+        endpoint.createDefaultLevelControlClusterServer();
+    if (serverList.includes(ColorControl.Cluster.id))
+        endpoint.createDefaultColorControlClusterServer();
+    if (serverList.includes(WindowCovering.Cluster.id))
+        endpoint.createDefaultWindowCoveringClusterServer();
+    if (serverList.includes(Thermostat.Cluster.id))
+        endpoint.createDefaultThermostatClusterServer();
+    if (serverList.includes(FanControl.Cluster.id))
+        endpoint.createDefaultFanControlClusterServer();
+    if (serverList.includes(DoorLock.Cluster.id))
+        endpoint.createDefaultDoorLockClusterServer();
+    if (serverList.includes(ValveConfigurationAndControl.Cluster.id))
+        endpoint.createDefaultValveConfigurationAndControlClusterServer();
+    if (serverList.includes(PumpConfigurationAndControl.Cluster.id))
+        endpoint.createDefaultPumpConfigurationAndControlClusterServer();
+    if (serverList.includes(SmokeCoAlarm.Cluster.id))
+        endpoint.createDefaultSmokeCOAlarmClusterServer();
+    if (serverList.includes(Switch.Cluster.id))
+        endpoint.createDefaultSwitchClusterServer();
+    if (serverList.includes(BooleanState.Cluster.id))
+        endpoint.createDefaultBooleanStateClusterServer();
+    if (serverList.includes(BooleanStateConfiguration.Cluster.id))
+        endpoint.createDefaultBooleanStateConfigurationClusterServer();
+    if (serverList.includes(PowerTopology.Cluster.id))
+        endpoint.createDefaultPowerTopologyClusterServer();
+    if (serverList.includes(ElectricalPowerMeasurement.Cluster.id))
+        endpoint.createDefaultElectricalPowerMeasurementClusterServer();
+    if (serverList.includes(ElectricalEnergyMeasurement.Cluster.id))
+        endpoint.createDefaultElectricalEnergyMeasurementClusterServer();
+    if (serverList.includes(TemperatureMeasurement.Cluster.id))
+        endpoint.createDefaultTemperatureMeasurementClusterServer();
+    if (serverList.includes(RelativeHumidityMeasurement.Cluster.id))
+        endpoint.createDefaultRelativeHumidityMeasurementClusterServer();
+    if (serverList.includes(PressureMeasurement.Cluster.id))
+        endpoint.createDefaultPressureMeasurementClusterServer();
+    if (serverList.includes(FlowMeasurement.Cluster.id))
+        endpoint.createDefaultFlowMeasurementClusterServer();
+    if (serverList.includes(IlluminanceMeasurement.Cluster.id))
+        endpoint.createDefaultIlluminanceMeasurementClusterServer();
+    if (serverList.includes(OccupancySensing.Cluster.id))
+        endpoint.createDefaultOccupancySensingClusterServer();
+    if (serverList.includes(AirQuality.Cluster.id))
+        endpoint.createDefaultAirQualityClusterServer();
+    if (serverList.includes(CarbonMonoxideConcentrationMeasurement.Cluster.id))
+        endpoint.createDefaultCarbonMonoxideConcentrationMeasurementClusterServer();
+    if (serverList.includes(CarbonDioxideConcentrationMeasurement.Cluster.id))
+        endpoint.createDefaultCarbonDioxideConcentrationMeasurementClusterServer();
+    if (serverList.includes(NitrogenDioxideConcentrationMeasurement.Cluster.id))
+        endpoint.createDefaultNitrogenDioxideConcentrationMeasurementClusterServer();
+    if (serverList.includes(OzoneConcentrationMeasurement.Cluster.id))
+        endpoint.createDefaultOzoneConcentrationMeasurementClusterServer();
+    if (serverList.includes(FormaldehydeConcentrationMeasurement.Cluster.id))
+        endpoint.createDefaultFormaldehydeConcentrationMeasurementClusterServer();
+    if (serverList.includes(Pm1ConcentrationMeasurement.Cluster.id))
+        endpoint.createDefaultPm1ConcentrationMeasurementClusterServer();
+    if (serverList.includes(Pm25ConcentrationMeasurement.Cluster.id))
+        endpoint.createDefaultPm25ConcentrationMeasurementClusterServer();
+    if (serverList.includes(Pm10ConcentrationMeasurement.Cluster.id))
+        endpoint.createDefaultPm10ConcentrationMeasurementClusterServer();
+    if (serverList.includes(RadonConcentrationMeasurement.Cluster.id))
+        endpoint.createDefaultRadonConcentrationMeasurementClusterServer();
+    if (serverList.includes(TotalVolatileOrganicCompoundsConcentrationMeasurement.Cluster.id))
+        endpoint.createDefaultTvocMeasurementClusterServer();
+}
+export function optionsFor(type, options) {
+    return options;
+}
+export function getClusterId(endpoint, cluster) {
+    return endpoint.behaviors.supported[lowercaseFirstLetter(cluster)]?.schema?.id;
+}
+export function getAttributeId(endpoint, cluster, attribute) {
+    return endpoint.behaviors.supported[lowercaseFirstLetter(cluster)]?.schema?.children?.find((child) => child.name === capitalizeFirstLetter(attribute))?.id;
+}

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "matterbridge",
-  "version": "2.1.0-dev.3",
+  "version": "2.1.0-dev.4",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "matterbridge",
-      "version": "2.1.0-dev.3",
+      "version": "2.1.0-dev.4",
       "license": "Apache-2.0",
       "dependencies": {
         "@matter/main": "0.12.1",
@@ -1491,12 +1491,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/queue-tick": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/queue-tick/-/queue-tick-1.0.1.tgz",
-      "integrity": "sha512-kJt5qhMxoszgU/62PLP1CJytzd2NKetjSRnyuj31fDd3Rlcz3fzlFdFLD1SItunPwyqEOkca6GbV612BWfaBag==",
-      "license": "MIT"
-    },
     "node_modules/range-parser": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
@@ -1777,13 +1771,12 @@
       }
     },
     "node_modules/streamx": {
-      "version": "2.21.1",
-      "resolved": "https://registry.npmjs.org/streamx/-/streamx-2.21.1.tgz",
-      "integrity": "sha512-PhP9wUnFLa+91CPy3N6tiQsK+gnYyUNuk15S3YG/zjYE7RuPeCjJngqnzpC31ow0lzBHQ+QGO4cNJnd0djYUsw==",
+      "version": "2.22.0",
+      "resolved": "https://registry.npmjs.org/streamx/-/streamx-2.22.0.tgz",
+      "integrity": "sha512-sLh1evHOzBy/iWRiR6d1zRcLao4gGZr3C1kzNz4fopCOKJb6xD9ub8Mpi9Mr1R6id5o43S+d93fI48UC5uM9aw==",
       "license": "MIT",
       "dependencies": {
         "fast-fifo": "^1.3.2",
-        "queue-tick": "^1.0.1",
         "text-decoder": "^1.1.0"
       },
       "optionalDependencies": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "matterbridge",
-  "version": "2.1.0-dev.3",
+  "version": "2.1.0-dev.4",
   "description": "Matterbridge plugin manager for Matter",
   "author": "https://github.com/Luligu",
   "license": "Apache-2.0",