matterbridge 2.1.0-dev.4 → 2.1.0-dev.6

package/CHANGELOG.md

@@ -16,12 +16,12 @@ Tamer (https://github.com/tammeryousef1006) has created the Matterbridge Discord
 ### Breaking Changes
 
 Starting from v. 2.0.0 Matterbridge is running only in mode edge (no parameter needed and no badge in the frontend).
-The legacy old api have been removed.
+With this release v. 2.1.0, the legacy old api of matter.js have been completely removed from Matterbridge and from all plugins.
+For this reason there is no compatibility for old versions of the plugins.
+You need to update all plugins you use and Matterbridge in the same moment. 
+I suggest to first update all plugins without restarting and then to update Matterbridge so when it restarts, all versions will be the latest.
 
-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.4] - 2025-01-28
+## [2.1.0.dev.6] - 2025-01-29
 
 ### Added
 
@@ -31,10 +31,10 @@ It is possible to change the mode (Classic, Dark or Light) in Settings, Matterbr
 
 ### Changed
 
+- [package]: Removed legacy imports.
 - [package]: Update dependencies.
-- [package]: Update matter.js to 0.12.1.
 - [package]: Update matter.js to 0.12.0.
-- [package]: Removed legacy imports.
+- [package]: Update matter.js to 0.12.1.
 
 ### Fixed
 

package/dist/frontend.js

@@ -830,7 +830,7 @@ export class Frontend {
                 return '';
         };
         let attributes = '';
-        device.forEachAttribute((clusterName, attributeName, attributeValue) => {
+        device.forEachAttribute((clusterName, clusterId, attributeName, attributeId, attributeValue) => {
             if (typeof attributeValue === 'undefined')
                 return;
             if (clusterName === 'onOff' && attributeName === 'onOff')
@@ -881,12 +881,20 @@ export class Frontend {
                 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 === 'illuminanceMeasurement' && attributeName === 'measuredValue' && isValidNumber(attributeValue))
+                attributes += `Illuminance: ${Math.round(Math.max(Math.pow(10, attributeValue / 10000), 0))} `;
             if (clusterName === 'airQuality' && attributeName === 'airQuality')
                 attributes += `Air quality: ${attributeValue} `;
-            if (clusterName === 'tvocMeasurement' && attributeName === 'measuredValue')
+            if (clusterName === 'totalVolatileOrganicCompoundsConcentrationMeasurement' && attributeName === 'measuredValue')
                 attributes += `Voc: ${attributeValue} `;
+            if (clusterName === 'pm1ConcentrationMeasurement' && attributeName === 'measuredValue')
+                attributes += `Pm1: ${attributeValue} `;
+            if (clusterName === 'pm25ConcentrationMeasurement' && attributeName === 'measuredValue')
+                attributes += `Pm2.5: ${attributeValue} `;
+            if (clusterName === 'pm10ConcentrationMeasurement' && attributeName === 'measuredValue')
+                attributes += `Pm10: ${attributeValue} `;
+            if (clusterName === 'formaldehydeConcentrationMeasurement' && attributeName === 'measuredValue')
+                attributes += `CH₂O: ${attributeValue} `;
             if (clusterName === 'temperatureMeasurement' && attributeName === 'measuredValue' && isValidNumber(attributeValue))
                 attributes += `Temperature: ${attributeValue / 100}°C `;
             if (clusterName === 'relativeHumidityMeasurement' && attributeName === 'measuredValue' && isValidNumber(attributeValue))

package/dist/matter/behaviors.js

@@ -0,0 +1 @@
+export * from '@matter/node/behaviors';

package/dist/matter/clusters.js

@@ -0,0 +1 @@
+export * from '@matter/types/clusters';

package/dist/matter/devices.js

@@ -0,0 +1 @@
+export * from '@matter/node/devices';

package/dist/matter/endpoints.js

@@ -0,0 +1 @@
+export { AggregatorEndpoint, ElectricalSensorEndpoint, PowerSourceEndpoint, BridgedNodeEndpoint, RootEndpoint, DeviceEnergyManagementEndpoint, OtaProviderEndpoint, OtaRequestorEndpoint } from '@matter/node/endpoints';

package/dist/matter/export.js

@@ -1,6 +1,3 @@
 export * from '@matter/main';
-export { AggregatorEndpoint } from '@matter/main/endpoints';
-export * from '@matter/main/devices';
-export * from '@matter/main/behaviors';
-export { FabricAction, MdnsService, PaseClient, logEndpoint } from '@matter/main/protocol';
+export { SemanticNamespace, ClosureTag, CompassDirectionTag, CompassLocationTag, DirectionTag, ElectricalMeasurementTag, LaundryTag, LevelTag, LocationTag, NumberTag, PositionTag, PowerSourceTag, RefrigeratorTag, RoomAirConditionerTag, SwitchesTag, } from '@matter/main';
 export { AttributeElement, ClusterElement, ClusterModel, CommandElement, EventElement, FieldElement } from '@matter/main/model';

package/dist/matter/types.js

@@ -0,0 +1 @@
+export * from '@matter/types';

package/dist/matterbridgeEndpoint.js

@@ -1,14 +1,12 @@
 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 { isValidNumber, isValidObject } 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 { addClusterServers, addFixedLabel, addOptionalClusterServers, addRequiredClusterServers, addUserLabel, capitalizeFirstLetter, createUniqueId, getBehavior, getBehaviourTypesFromClusterClientIds, getBehaviourTypesFromClusterServerIds, getDefaultFlowMeasurementClusterServer, getDefaultIlluminanceMeasurementClusterServer, getDefaultPressureMeasurementClusterServer, getDefaultRelativeHumidityMeasurementClusterServer, getDefaultTemperatureMeasurementClusterServer, getDefaultOccupancySensingClusterServer, lowercaseFirstLetter, updateAttribute, getClusterId, getAttributeId, setAttribute, getAttribute, } 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 { BridgedDeviceBasicInformation } from '@matter/main/clusters/bridged-device-basic-information';
 import { Identify } from '@matter/main/clusters/identify';
 import { OnOff } from '@matter/main/clusters/on-off';
@@ -26,13 +24,10 @@ import { BooleanStateConfiguration } from '@matter/main/clusters/boolean-state-c
 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 { OccupancySensing } from '@matter/main/clusters/occupancy-sensing';
 import { AirQuality } from '@matter/main/clusters/air-quality';
 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 { BridgedDeviceBasicInformationServer } from '@matter/main/behaviors/bridged-device-basic-information';
 import { GroupsServer } from '@matter/main/behaviors/groups';
 import { ScenesManagementServer } from '@matter/main/behaviors/scenes-management';
@@ -164,50 +159,14 @@ export class MatterbridgeEndpoint extends Endpoint {
             return undefined;
         return this.behaviors.optionsFor(behavior);
     }
-    getAttribute(clusterId, attribute, log) {
-        const clusterName = lowercaseFirstLetter(getClusterNameById(clusterId));
-        if (this.construction.status !== Lifecycle.Status.Active) {
-            this.log.error(`getAttribute ${hk}${clusterName}.${attribute}${er} error: Endpoint ${or}${this.maybeId}${er}:${or}${this.maybeNumber}${er} is in the ${BLUE}${this.construction.status}${er} state`);
-            return undefined;
-        }
-        const state = this.state;
-        if (!(clusterName in state)) {
-            this.log.error(`getAttribute error: Cluster ${'0x' + clusterId.toString(16).padStart(4, '0')}:${clusterName} not found on endpoint ${or}${this.id}${er}:${or}${this.number}${er}`);
-            return undefined;
-        }
-        attribute = lowercaseFirstLetter(attribute);
-        if (!(attribute in state[clusterName])) {
-            this.log.error(`getAttribute error: Attribute ${hk}${attribute}${er} not found on Cluster ${'0x' + clusterId.toString(16).padStart(4, '0')}:${clusterName} on endpoint ${or}${this.id}${er}:${or}${this.number}${er}`);
-            return undefined;
-        }
-        const value = state[clusterName][attribute];
-        log?.info(`${db}Get endpoint ${or}${this.id}${db}:${or}${this.number}${db} attribute ${hk}${capitalizeFirstLetter(clusterName)}${db}.${hk}${attribute}${db} value ${YELLOW}${value !== null && typeof value === 'object' ? debugStringify(value) : value}${db}`);
-        return value;
+    getAttribute(cluster, attribute, log) {
+        return getAttribute(this, cluster, attribute, log);
     }
     async setAttribute(clusterId, attribute, value, log) {
-        const clusterName = lowercaseFirstLetter(getClusterNameById(clusterId));
-        if (this.construction.status !== Lifecycle.Status.Active) {
-            this.log.error(`setAttribute ${hk}${clusterName}.${attribute}${er} error: Endpoint ${or}${this.maybeId}${er}:${or}${this.maybeNumber}${er} is in the ${BLUE}${this.construction.status}${er} state`);
-            return false;
-        }
-        const state = this.state;
-        if (!(clusterName in state)) {
-            this.log.error(`setAttribute ${hk}${attribute}${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;
-        }
-        attribute = lowercaseFirstLetter(attribute);
-        if (!(attribute in state[clusterName])) {
-            this.log.error(`setAttribute error: Attribute ${hk}${attribute}${er} not found on Cluster ${'0x' + clusterId.toString(16).padStart(4, '0')}:${clusterName} on endpoint ${or}${this.id}${er}:${or}${this.number}${er}`);
-            return false;
-        }
-        let oldValue = state[clusterName][attribute];
-        if (typeof oldValue === 'object')
-            oldValue = deepCopy(oldValue);
-        await this.setStateOf(this.behaviors.supported[clusterName], { [attribute]: value });
-        log?.info(`${db}Set endpoint ${or}${this.id}${db}:${or}${this.number}${db} attribute ${hk}${capitalizeFirstLetter(clusterName)}${db}.${hk}${attribute}${db} ` +
-            `from ${YELLOW}${oldValue !== null && typeof oldValue === 'object' ? debugStringify(oldValue) : oldValue}${db} ` +
-            `to ${YELLOW}${value !== null && typeof value === 'object' ? debugStringify(value) : value}${db}`);
-        return true;
+        return await setAttribute(this, clusterId, attribute, value, log);
+    }
+    async updateAttribute(cluster, attribute, value, log) {
+        return await updateAttribute(this, cluster, attribute, value, log);
     }
     async subscribeAttribute(clusterId, attribute, listener, log) {
         const clusterName = lowercaseFirstLetter(getClusterNameById(clusterId));
@@ -247,31 +206,11 @@ export class MatterbridgeEndpoint extends Endpoint {
         addClusterServers(this, serverList);
     }
     async addFixedLabel(label, value) {
-        if (!this.hasClusterServer(FixedLabel.Cluster.id)) {
-            this.log.debug(`addFixedLabel: add cluster ${hk}FixedLabel${db}:${hk}fixedLabel${db} with label ${CYAN}${label}${db} value ${CYAN}${value}${db}`);
-            this.behaviors.require(FixedLabelServer, {
-                labelList: [{ label, value }],
-            });
-            return this;
-        }
-        this.log.debug(`addFixedLabel: add label ${CYAN}${label}${db} value ${CYAN}${value}${db}`);
-        const labelList = (this.getAttribute(FixedLabel.Cluster.id, 'labelList', this.log) ?? []).filter((entryLabel) => entryLabel.label !== label);
-        labelList.push({ label, value });
-        await this.setAttribute(FixedLabel.Cluster.id, 'labelList', labelList, this.log);
+        await addFixedLabel(this, label, value);
         return this;
     }
     async addUserLabel(label, value) {
-        if (!this.hasClusterServer(UserLabel.Cluster.id)) {
-            this.log.debug(`addUserLabel: add cluster ${hk}UserLabel${db}:${hk}userLabel${db} with label ${CYAN}${label}${db} value ${CYAN}${value}${db}`);
-            this.behaviors.require(UserLabelServer, {
-                labelList: [{ label, value }],
-            });
-            return this;
-        }
-        this.log.debug(`addUserLabel: add label ${CYAN}${label}${db} value ${CYAN}${value}${db}`);
-        const labelList = (this.getAttribute(UserLabel.Cluster.id, 'labelList', this.log) ?? []).filter((entryLabel) => entryLabel.label !== label);
-        labelList.push({ label, value });
-        await this.setAttribute(UserLabel.Cluster.id, 'labelList', labelList, this.log);
+        await addUserLabel(this, label, value);
         return this;
     }
     addCommandHandler(command, handler) {
@@ -298,9 +237,15 @@ export class MatterbridgeEndpoint extends Endpoint {
     forEachAttribute(callback) {
         for (const [clusterName, clusterAttributes] of Object.entries(this.state)) {
             for (const [attributeName, attributeValue] of Object.entries(clusterAttributes)) {
-                if (typeof attributeValue === 'undefined')
+                const clusterId = getClusterId(this, clusterName);
+                if (clusterId === undefined) {
+                    continue;
+                }
+                const attributeId = getAttributeId(this, clusterName, attributeName);
+                if (attributeId === undefined) {
                     continue;
-                callback(clusterName, attributeName, attributeValue);
+                }
+                callback(clusterName, clusterId, attributeName, attributeId, attributeValue);
             }
         }
     }
@@ -694,7 +639,6 @@ export class MatterbridgeEndpoint extends Endpoint {
             await this.setAttribute(ColorControl.Cluster.id, 'colorMode', colorMode, this.log);
             await this.setAttribute(ColorControl.Cluster.id, 'enhancedColorMode', colorMode, this.log);
         }
-        return this;
     }
     createDefaultWindowCoveringClusterServer(positionPercent100ths) {
         this.behaviors.require(MatterbridgeWindowCoveringServer.with(WindowCovering.Feature.Lift, WindowCovering.Feature.PositionAwareLift), {
@@ -718,7 +662,7 @@ export class MatterbridgeEndpoint extends Endpoint {
     }
     async setWindowCoveringTargetAsCurrentAndStopped() {
         const position = this.getAttribute(WindowCovering.Cluster.id, 'currentPositionLiftPercent100ths', this.log);
-        if (position !== null) {
+        if (isValidNumber(position, 0, 10000)) {
             await this.setAttribute(WindowCovering.Cluster.id, 'targetPositionLiftPercent100ths', position, this.log);
             await this.setAttribute(WindowCovering.Cluster.id, 'operationalStatus', {
                 global: WindowCovering.MovementStatus.Stopped,
@@ -748,8 +692,10 @@ export class MatterbridgeEndpoint extends Endpoint {
     }
     getWindowCoveringStatus() {
         const status = this.getAttribute(WindowCovering.Cluster.id, 'operationalStatus', this.log);
-        this.log.debug(`Get WindowCovering operationalStatus: ${status.global}`);
-        return status.global;
+        if (isValidObject(status, 3) && 'global' in status && typeof status.global === 'number') {
+            this.log.debug(`Get WindowCovering operationalStatus: ${status.global}`);
+            return status.global;
+        }
     }
     async setWindowCoveringTargetAndCurrentPosition(position) {
         await this.setAttribute(WindowCovering.Cluster.id, 'currentPositionLiftPercent100ths', position, this.log);
@@ -1037,76 +983,28 @@ export class MatterbridgeEndpoint extends Endpoint {
         });
         return this;
     }
-    getDefaultTemperatureMeasurementClusterServer(measuredValue = 0) {
-        return optionsFor(TemperatureMeasurementServer, {
-            measuredValue,
-            minMeasuredValue: null,
-            maxMeasuredValue: null,
-            tolerance: 0,
-        });
-    }
     createDefaultTemperatureMeasurementClusterServer(measuredValue = 0) {
-        this.behaviors.require(TemperatureMeasurementServer, this.getDefaultTemperatureMeasurementClusterServer(measuredValue));
+        this.behaviors.require(TemperatureMeasurementServer, getDefaultTemperatureMeasurementClusterServer(measuredValue));
         return this;
     }
-    getDefaultRelativeHumidityMeasurementClusterServer(measuredValue = 0) {
-        return optionsFor(RelativeHumidityMeasurementServer, {
-            measuredValue,
-            minMeasuredValue: null,
-            maxMeasuredValue: null,
-            tolerance: 0,
-        });
-    }
     createDefaultRelativeHumidityMeasurementClusterServer(measuredValue = 0) {
-        this.behaviors.require(RelativeHumidityMeasurementServer, this.getDefaultRelativeHumidityMeasurementClusterServer(measuredValue));
+        this.behaviors.require(RelativeHumidityMeasurementServer, getDefaultRelativeHumidityMeasurementClusterServer(measuredValue));
         return this;
     }
-    getDefaultPressureMeasurementClusterServer(measuredValue = 1000) {
-        return optionsFor(PressureMeasurementServer, {
-            measuredValue,
-            minMeasuredValue: null,
-            maxMeasuredValue: null,
-            tolerance: 0,
-        });
-    }
     createDefaultPressureMeasurementClusterServer(measuredValue = 1000) {
-        this.behaviors.require(PressureMeasurementServer, this.getDefaultPressureMeasurementClusterServer(measuredValue));
+        this.behaviors.require(PressureMeasurementServer, getDefaultPressureMeasurementClusterServer(measuredValue));
         return this;
     }
-    getDefaultIlluminanceMeasurementClusterServer(measuredValue = 0) {
-        return optionsFor(IlluminanceMeasurementServer, {
-            measuredValue,
-            minMeasuredValue: null,
-            maxMeasuredValue: null,
-            tolerance: 0,
-        });
-    }
     createDefaultIlluminanceMeasurementClusterServer(measuredValue = 0) {
-        this.behaviors.require(IlluminanceMeasurementServer, this.getDefaultIlluminanceMeasurementClusterServer(measuredValue));
+        this.behaviors.require(IlluminanceMeasurementServer, getDefaultIlluminanceMeasurementClusterServer(measuredValue));
         return this;
     }
-    getDefaultFlowMeasurementClusterServer(measuredValue = 0) {
-        return optionsFor(FlowMeasurementServer, {
-            measuredValue,
-            minMeasuredValue: null,
-            maxMeasuredValue: null,
-            tolerance: 0,
-        });
-    }
     createDefaultFlowMeasurementClusterServer(measuredValue = 0) {
-        this.behaviors.require(FlowMeasurementServer, this.getDefaultFlowMeasurementClusterServer(measuredValue));
+        this.behaviors.require(FlowMeasurementServer, getDefaultFlowMeasurementClusterServer(measuredValue));
         return this;
     }
-    getDefaultOccupancySensingClusterServer(occupied = false) {
-        return optionsFor(OccupancySensingServer, {
-            occupancy: { occupied },
-            occupancySensorType: OccupancySensing.OccupancySensorType.Pir,
-            occupancySensorTypeBitmap: { pir: true, ultrasonic: false, physicalContact: false },
-            pirOccupiedToUnoccupiedDelay: 30,
-        });
-    }
     createDefaultOccupancySensingClusterServer(occupied = false) {
-        this.behaviors.require(OccupancySensingServer, this.getDefaultOccupancySensingClusterServer(occupied));
+        this.behaviors.require(OccupancySensingServer, getDefaultOccupancySensingClusterServer(occupied));
         return this;
     }
     createDefaultAirQualityClusterServer(airQuality = AirQuality.AirQualityEnum.Unknown) {

package/dist/matterbridgeEndpointHelpers.js

@@ -1,6 +1,7 @@
 import { createHash } from 'crypto';
-import { CYAN, db, hk, zb } from './logger/export.js';
+import { BLUE, CYAN, db, debugStringify, er, hk, or, YELLOW, zb } from './logger/export.js';
 import { MatterbridgeIdentifyServer, MatterbridgeOnOffServer, MatterbridgeLevelControlServer, MatterbridgeColorControlServer, MatterbridgeWindowCoveringServer, MatterbridgeThermostatServer, MatterbridgeFanControlServer, MatterbridgeDoorLockServer, MatterbridgeModeSelectServer, MatterbridgeValveConfigurationAndControlServer, MatterbridgeSmokeCoAlarmServer, MatterbridgeBooleanStateConfigurationServer, } from './matterbridgeBehaviors.js';
+import { Lifecycle } from '@matter/main';
 import { getClusterNameById } from '@matter/main/types';
 import { PowerSource } from '@matter/main/clusters/power-source';
 import { UserLabel } from '@matter/main/clusters/user-label';
@@ -72,6 +73,7 @@ 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';
+import { deepCopy, deepEqual, isValidArray } from './utils/utils.js';
 export function capitalizeFirstLetter(name) {
     if (!name)
         return name;
@@ -305,6 +307,38 @@ export function addClusterServers(endpoint, serverList) {
     if (serverList.includes(TotalVolatileOrganicCompoundsConcentrationMeasurement.Cluster.id))
         endpoint.createDefaultTvocMeasurementClusterServer();
 }
+export async function addFixedLabel(endpoint, label, value) {
+    if (!endpoint.hasClusterServer(FixedLabel.Cluster.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, 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);
+    if (isValidArray(labelList)) {
+        labelList = labelList.filter((entry) => entry.label !== label);
+        labelList.push({ label, value });
+        await endpoint.setAttribute(FixedLabel.Cluster.id, 'labelList', labelList, endpoint.log);
+    }
+}
+export async function addUserLabel(endpoint, label, value) {
+    if (!endpoint.hasClusterServer(UserLabel.Cluster.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, 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);
+    if (isValidArray(labelList)) {
+        labelList = labelList.filter((entry) => entry.label !== label);
+        labelList.push({ label, value });
+        await endpoint.setAttribute(UserLabel.Cluster.id, 'labelList', labelList, endpoint.log);
+    }
+}
 export function optionsFor(type, options) {
     return options;
 }
@@ -312,5 +346,168 @@ 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;
+    if (attribute === 'attributeList')
+        return 0xfffb;
+    else if (attribute === 'featureMap')
+        return 0xfffc;
+    else if (attribute === 'eventList')
+        return 0xfffa;
+    else if (attribute === 'generatedCommandList')
+        return 0xfff8;
+    else if (attribute === 'acceptedCommandList')
+        return 0xfff9;
+    else if (attribute === 'clusterRevision')
+        return 0xfffd;
+    else {
+        if (endpoint.behaviors.supported[lowercaseFirstLetter(cluster)]?.schema?.type === 'ConcentrationMeasurement') {
+            if (attribute === 'measuredValue')
+                return 0x0;
+            else if (attribute === 'minMeasuredValue')
+                return 0x1;
+            else if (attribute === 'maxMeasuredValue')
+                return 0x2;
+            else if (attribute === 'peakMeasuredValue')
+                return 0x3;
+            else if (attribute === 'peakMeasuredValueWindow')
+                return 0x4;
+            else if (attribute === 'averageMeasuredValue')
+                return 0x5;
+            else if (attribute === 'averageMeasuredValueWindow')
+                return 0x6;
+            else if (attribute === 'uncertainty')
+                return 0x7;
+            else if (attribute === 'measurementUnit')
+                return 0x8;
+            else if (attribute === 'measurementMedium')
+                return 0x9;
+            else if (attribute === 'levelValue')
+                return 0xa;
+        }
+        return endpoint.behaviors.supported[lowercaseFirstLetter(cluster)]?.schema?.children?.find((child) => child.name === capitalizeFirstLetter(attribute))?.id;
+    }
+}
+export function getAttribute(endpoint, cluster, attribute, log) {
+    const clusterName = getBehavior(endpoint, cluster)?.id;
+    if (!clusterName) {
+        endpoint.log.error(`getAttribute ${hk}${attribute}${er} error: cluster not found on endpoint ${or}${endpoint.maybeId}${er}:${or}${endpoint.maybeNumber}${er}`);
+        return undefined;
+    }
+    if (endpoint.construction.status !== Lifecycle.Status.Active) {
+        endpoint.log.error(`getAttribute ${hk}${clusterName}.${attribute}${er} error: Endpoint ${or}${endpoint.maybeId}${er}:${or}${endpoint.maybeNumber}${er} is in the ${BLUE}${endpoint.construction.status}${er} state`);
+        return undefined;
+    }
+    const state = endpoint.state;
+    attribute = lowercaseFirstLetter(attribute);
+    if (!(attribute in state[clusterName])) {
+        endpoint.log.error(`getAttribute error: Attribute ${hk}${attribute}${er} not found on Cluster ${'0x' + getClusterId(endpoint, clusterName)?.toString(16).padStart(4, '0')}:${clusterName} on endpoint ${or}${endpoint.id}${er}:${or}${endpoint.number}${er}`);
+        return undefined;
+    }
+    let value = state[clusterName][attribute];
+    if (typeof value === 'object')
+        value = deepCopy(value);
+    log?.info(`${db}Get endpoint ${or}${endpoint.id}${db}:${or}${endpoint.number}${db} attribute ${hk}${capitalizeFirstLetter(clusterName)}${db}.${hk}${attribute}${db} value ${YELLOW}${value !== null && typeof value === 'object' ? debugStringify(value) : value}${db}`);
+    return value;
+}
+export async function setAttribute(endpoint, cluster, attribute, value, log) {
+    const clusterName = getBehavior(endpoint, cluster)?.id;
+    if (!clusterName) {
+        endpoint.log.error(`setAttribute ${hk}${attribute}${er} error: cluster not found on endpoint ${or}${endpoint.maybeId}${er}:${or}${endpoint.maybeNumber}${er}`);
+        return false;
+    }
+    if (endpoint.construction.status !== Lifecycle.Status.Active) {
+        endpoint.log.error(`setAttribute ${hk}${clusterName}.${attribute}${er} error: Endpoint ${or}${endpoint.maybeId}${er}:${or}${endpoint.maybeNumber}${er} is in the ${BLUE}${endpoint.construction.status}${er} state`);
+        return false;
+    }
+    const state = endpoint.state;
+    attribute = lowercaseFirstLetter(attribute);
+    if (!(attribute in state[clusterName])) {
+        endpoint.log.error(`setAttribute error: Attribute ${hk}${attribute}${er} not found on cluster ${'0x' + getClusterId(endpoint, clusterName)?.toString(16).padStart(4, '0')}:${clusterName} on endpoint ${or}${endpoint.id}${er}:${or}${endpoint.number}${er}`);
+        return false;
+    }
+    let oldValue = state[clusterName][attribute];
+    if (typeof oldValue === 'object')
+        oldValue = deepCopy(oldValue);
+    await endpoint.setStateOf(endpoint.behaviors.supported[clusterName], { [attribute]: value });
+    log?.info(`${db}Set endpoint ${or}${endpoint.id}${db}:${or}${endpoint.number}${db} attribute ${hk}${capitalizeFirstLetter(clusterName)}${db}.${hk}${attribute}${db} ` +
+        `from ${YELLOW}${oldValue !== null && typeof oldValue === 'object' ? debugStringify(oldValue) : oldValue}${db} ` +
+        `to ${YELLOW}${value !== null && typeof value === 'object' ? debugStringify(value) : value}${db}`);
+    return true;
+}
+export async function updateAttribute(endpoint, cluster, attribute, value, log) {
+    const clusterName = getBehavior(endpoint, cluster)?.id;
+    if (!clusterName) {
+        endpoint.log.error(`updateAttribute ${hk}${attribute}${er} error: cluster not found on endpoint ${or}${endpoint.maybeId}${er}:${or}${endpoint.maybeNumber}${er}`);
+        return false;
+    }
+    if (endpoint.construction.status !== Lifecycle.Status.Active) {
+        endpoint.log.error(`updateAttribute ${hk}${clusterName}.${attribute}${er} error: Endpoint ${or}${endpoint.maybeId}${er}:${or}${endpoint.maybeNumber}${er} is in the ${BLUE}${endpoint.construction.status}${er} state`);
+        return false;
+    }
+    const state = endpoint.state;
+    attribute = lowercaseFirstLetter(attribute);
+    if (!(attribute in state[clusterName])) {
+        endpoint.log.error(`updateAttribute error: Attribute ${hk}${attribute}${er} not found on cluster ${'0x' + getClusterId(endpoint, clusterName)?.toString(16).padStart(4, '0')}:${clusterName} on endpoint ${or}${endpoint.id}${er}:${or}${endpoint.number}${er}`);
+        return false;
+    }
+    let oldValue = state[clusterName][attribute];
+    if (typeof oldValue === 'object') {
+        if (deepEqual(oldValue, value))
+            return false;
+        oldValue = deepCopy(oldValue);
+    }
+    else if (oldValue === value)
+        return false;
+    await endpoint.setStateOf(endpoint.behaviors.supported[clusterName], { [attribute]: value });
+    log?.info(`${db}Update endpoint ${or}${endpoint.id}${db}:${or}${endpoint.number}${db} attribute ${hk}${capitalizeFirstLetter(clusterName)}${db}.${hk}${attribute}${db} ` +
+        `from ${YELLOW}${oldValue !== null && typeof oldValue === 'object' ? debugStringify(oldValue) : oldValue}${db} ` +
+        `to ${YELLOW}${value !== null && typeof value === 'object' ? debugStringify(value) : value}${db}`);
+    return true;
+}
+export function getDefaultTemperatureMeasurementClusterServer(measuredValue = 0) {
+    return optionsFor(TemperatureMeasurementServer, {
+        measuredValue,
+        minMeasuredValue: null,
+        maxMeasuredValue: null,
+        tolerance: 0,
+    });
+}
+export function getDefaultRelativeHumidityMeasurementClusterServer(measuredValue = 0) {
+    return optionsFor(RelativeHumidityMeasurementServer, {
+        measuredValue,
+        minMeasuredValue: null,
+        maxMeasuredValue: null,
+        tolerance: 0,
+    });
+}
+export function getDefaultPressureMeasurementClusterServer(measuredValue = 1000) {
+    return optionsFor(PressureMeasurementServer, {
+        measuredValue,
+        minMeasuredValue: null,
+        maxMeasuredValue: null,
+        tolerance: 0,
+    });
+}
+export function getDefaultIlluminanceMeasurementClusterServer(measuredValue = 0) {
+    return optionsFor(IlluminanceMeasurementServer, {
+        measuredValue,
+        minMeasuredValue: null,
+        maxMeasuredValue: null,
+        tolerance: 0,
+    });
+}
+export function getDefaultFlowMeasurementClusterServer(measuredValue = 0) {
+    return optionsFor(FlowMeasurementServer, {
+        measuredValue,
+        minMeasuredValue: null,
+        maxMeasuredValue: null,
+        tolerance: 0,
+    });
+}
+export function getDefaultOccupancySensingClusterServer(occupied = false) {
+    return optionsFor(OccupancySensingServer, {
+        occupancy: { occupied },
+        occupancySensorType: OccupancySensing.OccupancySensorType.Pir,
+        occupancySensorTypeBitmap: { pir: true, ultrasonic: false, physicalContact: false },
+        pirOccupiedToUnoccupiedDelay: 30,
+    });
 }

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "matterbridge",
-  "version": "2.1.0-dev.4",
+  "version": "2.1.0-dev.6",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "matterbridge",
-      "version": "2.1.0-dev.4",
+      "version": "2.1.0-dev.6",
       "license": "Apache-2.0",
       "dependencies": {
         "@matter/main": "0.12.1",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "matterbridge",
-  "version": "2.1.0-dev.4",
+  "version": "2.1.0-dev.6",
   "description": "Matterbridge plugin manager for Matter",
   "author": "https://github.com/Luligu",
   "license": "Apache-2.0",
@@ -56,6 +56,26 @@
       "import": "./dist/matter/export.js",
       "types": "./dist/matter/export.d.ts"
     },
+    "./matter/devices": {
+      "import": "./dist/matter/devices.js",
+      "types": "./dist/matter/devices.d.ts"
+    },
+    "./matter/clusters": {
+      "import": "./dist/matter/clusters.js",
+      "types": "./dist/matter/clusters.d.ts"
+    },
+    "./matter/behaviors": {
+      "import": "./dist/matter/behaviors.js",
+      "types": "./dist/matter/behaviors.d.ts"
+    },
+    "./matter/endpoints": {
+      "import": "./dist/matter/endpoints.js",
+      "types": "./dist/matter/endpoints.d.ts"
+    },
+    "./matter/types": {
+      "import": "./dist/matter/types.js",
+      "types": "./dist/matter/types.d.ts"
+    },
     "./cluster": {
       "import": "./dist/cluster/export.js",
       "types": "./dist/cluster/export.d.ts"