matterbridge 1.6.8-dev.1 → 1.6.8-dev.4

package/CHANGELOG.md

@@ -13,15 +13,13 @@ It is also available the official Matterbridge Home Assistant plugin https://git
 
 Tamer (https://github.com/tammeryousef1006) has created the Matterbridge Discord group: https://discord.gg/QX58CDe6hd.
 
-### Breaking Changes
-
-In this release some device types and the OnOff, LevelControl and ColorControl have been updated to be fully compliant with Matter 1.3 specifications.
-It is possible that some controllers see them as new devices or need time to read the new clusters. It can be useful after the upgrade to power off the controller, wait a few minutes and power it on again.
-
-## [1.6.8-dev.1] - 2024-12-16
+## [1.6.8-dev.4] - 2024-12-17
 
 ### Added
 
+- [storage]: Added conversion from old matter storage to the new api format with fabrics, resumptionRecords, network, commissioning, operationalCredentials, acl and parts number. The conversion is automatic the first time you run this release. 
+- [package]: Update README.md and README-SERVICE.md to include instructions for using SSL on port 443.
+
 ### Changed
 
 - [edge]: Fixes to edge mode.
@@ -35,6 +33,11 @@ It is possible that some controllers see them as new devices or need time to rea
 
 ## [1.6.7] - 2024-12-15
 
+### Breaking Changes
+
+In this release some device types and the OnOff, LevelControl and ColorControl have been updated to be fully compliant with Matter 1.3 specifications.
+It is possible that some controllers see them as new devices or need time to read the new clusters. It can be useful after the upgrade to power off the controller, wait a few minutes and power it on again.
+
 ### Added
 
 - [readme]: Update README to clarify Node.js installation instructions and emphasize LTS version.

package/README-SERVICE.md

@@ -35,7 +35,7 @@ Create a systemctl configuration file for Matterbridge
 sudo nano /etc/systemd/system/matterbridge.service
 ```
 
-Add the following to this file, replacing twice (!) USER with your user name (e.g. WorkingDirectory=/home/pi/Matterbridge and User=pi):
+Add the following to this file, replacing 3 times (!) USER with your user name (e.g. WorkingDirectory=/home/pi/Matterbridge, User=pi and Group=pi):
 
 You may need to adapt the configuration to your setup:
 
@@ -49,18 +49,27 @@ After=network-online.target
 [Service]
 Type=simple
 ExecStart=matterbridge -service
-WorkingDirectory=/home/<USER>/Matterbridge
+WorkingDirectory=/home/<USER>/Matterbridge  # Replace <USER> with your system username
 StandardOutput=inherit
 StandardError=inherit
 Restart=always
 RestartSec=10s
 TimeoutStopSec=30s
-User=<USER>
+User=<USER>                                 # Replace <USER> with your system username
+Group=<USER>                                # Replace <USER> with your system username
 
 [Install]
 WantedBy=multi-user.target
 ```
 
+If you use the frontend with -ssl -frontend 443 and get an error message: "Port 443 requires elevated privileges",
+add this:
+
+```
+[Service]
+AmbientCapabilities=CAP_NET_BIND_SERVICE
+```
+
 If you modify it after, then run:
 
 ```

package/README.md

@@ -116,6 +116,8 @@ Here's how to specify a different port number:
 matterbridge -frontend [port number]
 ```
 
+To use the frontend with ssl place the certificates in the .matterbridge/certs directory: cert.pem, key.pem and ca.pem (optional).
+
 From the frontend you can do all operations in an easy way.
 
 Home page:

package/dist/matterbridge.js

@@ -17,12 +17,13 @@ import { logInterfaces, wait, waiter, createZip, copyDirectory, getParameter, ge
 import { PluginManager } from './pluginManager.js';
 import { DeviceManager } from './deviceManager.js';
 import { MatterbridgeEndpoint } from './matterbridgeEndpoint.js';
-import { DeviceTypeId, Logger, LogLevel as MatterLogLevel, LogFormat as MatterLogFormat, VendorId, StorageManager, EndpointServer } from '@matter/main';
+import { DeviceTypeId, Logger, LogLevel as MatterLogLevel, LogFormat as MatterLogFormat, VendorId, StorageManager, EndpointServer, StorageService, Environment } from '@matter/main';
 import { BasicInformationCluster, BridgedDeviceBasicInformation, BridgedDeviceBasicInformationCluster, FixedLabelCluster, GeneralCommissioning, PowerSourceCluster, SwitchCluster, ThreadNetworkDiagnosticsCluster, UserLabelCluster, } from '@matter/main/clusters';
 import { getClusterNameById, ManualPairingCodeCodec, QrCodeSchema } from '@matter/main/types';
 import { StorageBackendDisk, StorageBackendJsonFile } from '@matter/nodejs';
 import { CommissioningController, CommissioningServer, MatterServer } from '@project-chip/matter.js';
 import { Aggregator, DeviceTypes, NodeStateInformation } from '@project-chip/matter.js/device';
+import { aggregator } from './matterbridgeDeviceTypes.js';
 const plg = '\u001B[38;5;33m';
 const dev = '\u001B[38;5;79m';
 const typ = '\u001B[38;5;207m';
@@ -1539,7 +1540,110 @@ export class Matterbridge extends EventEmitter {
             }
         }
         this.log.debug(`Creating commissioning server context for ${plg}Matterbridge${db}`);
-        this.matterbridgeContext = await this.createCommissioningServerContext('Matterbridge', 'Matterbridge', DeviceTypes.AGGREGATOR.code, 0xfff1, 'Matterbridge', 0x8000, 'Matterbridge aggregator');
+        this.matterbridgeContext = await this.createCommissioningServerContext('Matterbridge', 'Matterbridge', aggregator.code, 0xfff1, 'Matterbridge', 0x8000, 'Matterbridge aggregator');
+        await this.matterbridgeContext.set('port', this.port);
+        await this.matterbridgeContext.set('passcode', this.passcode);
+        await this.matterbridgeContext.set('discriminator', this.discriminator);
+    }
+    async convertStorage(context, pluginName) {
+        if (!this.matterbridgeContext)
+            return;
+        const storageService = Environment.default.get(StorageService);
+        Environment.default.vars.set('path.root', path.join(this.matterbridgeDirectory, 'matterstorage' + (this.profile ? '.' + this.profile : '')));
+        const nodeStorage = await storageService.open('Matterbridge');
+        if ((await nodeStorage.createContext('persist').get('upgraded', false)) === true) {
+            this.log.info(`Matter node storage already upgraded to Matterbridge edge for ${plg}Matterbridge${nf}`);
+            return;
+        }
+        else {
+            this.log.info(`Upgrading matter node storage to Matterbridge edge for ${plg}Matterbridge${nf}`);
+        }
+        const fabricManagerContext = this.matterbridgeContext.createContext('FabricManager');
+        const fabrics = (await fabricManagerContext.get('fabrics', []));
+        const nextFabricIndex = await fabricManagerContext.get('nextFabricIndex', 1);
+        const eventHandlerContext = this.matterbridgeContext.createContext('EventHandler');
+        const sessionManagerContext = this.matterbridgeContext.createContext('SessionManager');
+        const endpointStructureContext = this.matterbridgeContext.createContext('EndpointStructure');
+        const generalCommissioningContext = this.matterbridgeContext.createContext('Cluster-0-48');
+        const basicInformationContext = this.matterbridgeContext.createContext('Cluster-0-40');
+        const fabricInfo = {};
+        const fabricInfoArray = [];
+        const nocArray = [];
+        const trcArray = [];
+        const aclArray = [];
+        this.log.debug(`Found ${CYAN}${fabrics.length}${db} fabrics (nextFabricIndex ${CYAN}${nextFabricIndex}${db}) for ${plg}Matterbridge${db}:`);
+        for (const fabric of fabrics) {
+            this.log.debug(`- fabricIndex ${CYAN}${fabric.fabricIndex}${db} fabricId ${CYAN}${fabric.fabricId}${db} nodeId ${CYAN}${fabric.nodeId}${db} rootNodeId ${CYAN}${fabric.rootNodeId}${db} rootVendorId ${CYAN}${fabric.rootVendorId}${db} label ${CYAN}${fabric.label}${db}`);
+            fabricInfo[fabric.fabricIndex] = {
+                fabricIndex: fabric.fabricIndex,
+                fabricId: fabric.fabricId,
+                nodeId: fabric.nodeId,
+                rootNodeId: fabric.rootNodeId,
+                rootVendorId: fabric.rootVendorId,
+                label: fabric.label,
+            };
+            fabricInfoArray.push({
+                fabricIndex: fabric.fabricIndex,
+                fabricId: fabric.fabricId,
+                nodeId: fabric.nodeId,
+                vendorId: fabric.rootVendorId,
+                rootPublicKey: fabric.rootPublicKey,
+                label: fabric.label,
+            });
+            nocArray.push({ noc: fabric.operationalCert, icac: null, fabricIndex: fabric.fabricIndex });
+            trcArray.push('{\"__object__\":\"Uint8Array\",\"__value__\":\"' + Buffer.from(fabric.rootCert).toString('hex') + '\"}');
+            aclArray.push({ fabricIndex: fabric.fabricIndex, privilege: 5, authMode: 2, subjects: ['{\"__object__\":\"BigInt\",\"__value__\":\"' + fabric.rootNodeId.toString().replace('n', '') + '\"}'], targets: null });
+        }
+        await nodeStorage.createContext('fabrics').set('fabrics', fabrics);
+        await nodeStorage.createContext('fabrics').set('nextFabricIndex', nextFabricIndex);
+        await nodeStorage.createContext('sessions').set('resumptionRecords', await sessionManagerContext.get('resumptionRecords', []));
+        await nodeStorage.createContext('events').set('lastEventNumber', await eventHandlerContext.get('lastEventNumber', 1));
+        await nodeStorage.createContext('root').set('__number__', 0);
+        await nodeStorage.createContext('root').set('__nextNumber__', 1);
+        await nodeStorage.createContext('root').createContext('commissioning').set('enabled', true);
+        await nodeStorage.createContext('root').createContext('commissioning').set('commissioned', true);
+        await nodeStorage.createContext('root').createContext('commissioning').set('fabrics', fabricInfo);
+        await nodeStorage.createContext('root').createContext('operationalCredentials').set('commissionedFabrics', fabricInfoArray.length);
+        await nodeStorage.createContext('root').createContext('operationalCredentials').set('fabrics', fabricInfoArray);
+        await nodeStorage.createContext('root').createContext('operationalCredentials').set('nocs', nocArray);
+        await nodeStorage.createContext('root').createContext('operationalCredentials').set('trustedRootCertificates', trcArray);
+        await nodeStorage.createContext('root').createContext('accessControl').set('acl', aclArray);
+        await nodeStorage
+            .createContext('root')
+            .createContext('generalCommissioning')
+            .set('breadcrumb', await generalCommissioningContext.get('breadcrumb', BigInt(0)));
+        await nodeStorage
+            .createContext('root')
+            .createContext('basicInformation')
+            .set('location', await basicInformationContext.get('location', 'XX'));
+        await nodeStorage.createContext('root').createContext('network').set('ble', false);
+        await nodeStorage.createContext('root').createContext('network').set('operationalPort', 5540);
+        await nodeStorage.createContext('root').createContext('productDescription').set('productId', 0x8000);
+        await nodeStorage.createContext('root').createContext('productDescription').set('vendorId', 0xfff1);
+        for (const key of await endpointStructureContext.keys()) {
+            if (key === 'nextEndpointId')
+                continue;
+            const parts = key.split('-');
+            const number = await endpointStructureContext.get(key);
+            if (parts.length === 2) {
+                this.log.debug(`Converting Matterbridge.EndpointStructure:${key}:${number} to root.parts.Matterbridge.__number__:${number}`);
+                await nodeStorage.createContext('root').createContext('parts').createContext('Matterbridge').set('__number__', number);
+            }
+            else if (parts.length === 3 && parts[2].startsWith('custom_')) {
+                this.log.debug(`Converting Matterbridge.EndpointStructure:${key}:${number} to root.parts.Matterbridge.parts.${parts[2].replace('custom_', '')}.__number__:${number}`);
+                await nodeStorage.createContext('root').createContext('parts').createContext('Matterbridge').createContext('parts').createContext(parts[2].replace('custom_', '')).set('__number__', number);
+            }
+            else if (parts.length === 3 && parts[2].startsWith('unique_')) {
+                const device = this.devices.get(parts[2].replace('unique_', ''));
+                if (device && device.deviceName && device.maybeNumber) {
+                    this.log.debug(`Converting Matterbridge.EndpointStructure:${key}:${number} to root.parts.Matterbridge.parts.${device.deviceName.replace(/[ .]/g, '')}.__number__:${device.maybeNumber}`);
+                    await nodeStorage.createContext('root').createContext('parts').createContext('Matterbridge').createContext('parts').createContext(device.deviceName.replace(/[ .]/g, '')).set('__number__', device.maybeNumber);
+                }
+            }
+        }
+        await nodeStorage.createContext('root').createContext('parts').createContext('Matterbridge').set('__number__', 1);
+        await nodeStorage.createContext('persist').set('upgraded', true);
+        await this.matterbridgeContext.set('upgraded', true);
     }
     async backupMatterStorage(storageName, backupName) {
         try {

package/dist/matterbridgeDevice.js

@@ -30,6 +30,7 @@ export class MatterbridgeDevice extends extendPublicHandlerMethods(Device) {
             firstDefinition = definition[0];
         else
             firstDefinition = definition;
+        options.uniqueStorageKey?.replace(/[ .]/g, '');
         super(firstDefinition, options);
         this.log = new AnsiLogger({ logName: 'MatterbridgeDevice', logTimestampFormat: 4, logLevel: debug === true ? "debug" : MatterbridgeDevice.logLevel });
         this.log.debug(`new MatterbridgeDevice with deviceType: ${zb}${firstDefinition.code}${db}-${zb}${firstDefinition.name}${db}`);
@@ -430,10 +431,12 @@ export class MatterbridgeDevice extends extendPublicHandlerMethods(Device) {
     }
     createDefaultGroupsClusterServer() {
         this.addClusterServer(this.getDefaultGroupsClusterServer());
+        return this;
     }
     getDefaultScenesClusterServer() {
     }
     createDefaultScenesClusterServer() {
+        return this;
     }
     createUniqueId(param1, param2, param3, param4) {
         const hash = createHash('md5');
@@ -487,6 +490,7 @@ export class MatterbridgeDevice extends extendPublicHandlerMethods(Device) {
             return;
         }
         this.addClusterServer(this.getDefaultBasicInformationClusterServer(deviceName, serialNumber, vendorId, vendorName, productId, productName, softwareVersion, softwareVersionString, hardwareVersion, hardwareVersionString));
+        return this;
     }
     getDefaultBridgedDeviceBasicInformationClusterServer(deviceName, serialNumber, vendorId, vendorName, productName, softwareVersion = 1, softwareVersionString = '1.0.0', hardwareVersion = 1, hardwareVersionString = '1.0.0') {
         this.log.logName = deviceName;
@@ -524,6 +528,7 @@ export class MatterbridgeDevice extends extendPublicHandlerMethods(Device) {
     }
     createDefaultBridgedDeviceBasicInformationClusterServer(deviceName, serialNumber, vendorId, vendorName, productName, softwareVersion = 1, softwareVersionString = '1.0.0', hardwareVersion = 1, hardwareVersionString = '1.0.0') {
         this.addClusterServer(this.getDefaultBridgedDeviceBasicInformationClusterServer(deviceName, serialNumber, vendorId, vendorName, productName, softwareVersion, softwareVersionString, hardwareVersion, hardwareVersionString));
+        return this;
     }
     getDefaultPowerTopologyClusterServer() {
         return ClusterServer(PowerTopologyCluster.with(PowerTopology.Feature.TreeTopology), {}, {}, {});
@@ -647,6 +652,7 @@ export class MatterbridgeDevice extends extendPublicHandlerMethods(Device) {
     }
     createDefaultOnOffClusterServer(onOff = false, globalSceneControl = false, onTime = 0, offWaitTime = 0, startUpOnOff = null) {
         this.addClusterServer(this.getDefaultOnOffClusterServer(onOff, globalSceneControl, onTime, offWaitTime, startUpOnOff));
+        return this;
     }
     getDeadFrontOnOffClusterServer(onOff = false) {
         return ClusterServer(OnOffCluster.with(OnOff.Feature.DeadFrontBehavior), {
@@ -668,6 +674,7 @@ export class MatterbridgeDevice extends extendPublicHandlerMethods(Device) {
     }
     createDeadFrontOnOffClusterServer(onOff = false) {
         this.addClusterServer(this.getDeadFrontOnOffClusterServer(onOff));
+        return this;
     }
     getOnOffClusterServer(onOff = false) {
         return ClusterServer(OnOffCluster, {
@@ -689,6 +696,7 @@ export class MatterbridgeDevice extends extendPublicHandlerMethods(Device) {
     }
     createOnOffClusterServer(onOff = false) {
         this.addClusterServer(this.getOnOffClusterServer(onOff));
+        return this;
     }
     getDefaultLevelControlClusterServer(currentLevel = 254, minLevel = 1, maxLevel = 254, onLevel = null, startUpCurrentLevel = null) {
         return ClusterServer(LevelControlCluster.with(LevelControl.Feature.OnOff, LevelControl.Feature.Lighting), {
@@ -733,6 +741,7 @@ export class MatterbridgeDevice extends extendPublicHandlerMethods(Device) {
     }
     createDefaultLevelControlClusterServer(currentLevel = 254, minLevel = 1, maxLevel = 254, onLevel = null, startUpCurrentLevel = null) {
         this.addClusterServer(this.getDefaultLevelControlClusterServer(currentLevel, minLevel, maxLevel, onLevel, startUpCurrentLevel));
+        return this;
     }
     getDefaultColorControlClusterServer(currentX = 0, currentY = 0, currentHue = 0, currentSaturation = 0, colorTemperatureMireds = 500, colorTempPhysicalMinMireds = 147, colorTempPhysicalMaxMireds = 500) {
         return ClusterServer(ColorControlCluster.with(ColorControl.Feature.Xy, ColorControl.Feature.HueSaturation, ColorControl.Feature.ColorTemperature), {
@@ -805,6 +814,7 @@ export class MatterbridgeDevice extends extendPublicHandlerMethods(Device) {
     }
     createDefaultColorControlClusterServer(currentX = 0, currentY = 0, currentHue = 0, currentSaturation = 0, colorTemperatureMireds = 500, colorTempPhysicalMinMireds = 147, colorTempPhysicalMaxMireds = 500) {
         this.addClusterServer(this.getDefaultColorControlClusterServer(currentX, currentY, currentHue, currentSaturation, colorTemperatureMireds, colorTempPhysicalMinMireds, colorTempPhysicalMaxMireds));
+        return this;
     }
     getXyColorControlClusterServer(currentX = 0, currentY = 0, colorTemperatureMireds = 500, colorTempPhysicalMinMireds = 147, colorTempPhysicalMaxMireds = 500) {
         return ClusterServer(ColorControlCluster.with(ColorControl.Feature.Xy, ColorControl.Feature.ColorTemperature), {
@@ -851,6 +861,7 @@ export class MatterbridgeDevice extends extendPublicHandlerMethods(Device) {
     }
     createXyColorControlClusterServer(currentX = 0, currentY = 0, colorTemperatureMireds = 500, colorTempPhysicalMinMireds = 147, colorTempPhysicalMaxMireds = 500) {
         this.addClusterServer(this.getXyColorControlClusterServer(currentX, currentY, colorTemperatureMireds, colorTempPhysicalMinMireds, colorTempPhysicalMaxMireds));
+        return this;
     }
     getHsColorControlClusterServer(currentHue = 0, currentSaturation = 0, colorTemperatureMireds = 500, colorTempPhysicalMinMireds = 147, colorTempPhysicalMaxMireds = 500) {
         return ClusterServer(ColorControlCluster.with(ColorControl.Feature.HueSaturation, ColorControl.Feature.ColorTemperature), {
@@ -911,6 +922,7 @@ export class MatterbridgeDevice extends extendPublicHandlerMethods(Device) {
     }
     createHsColorControlClusterServer(currentHue = 0, currentSaturation = 0, colorTemperatureMireds = 500, colorTempPhysicalMinMireds = 147, colorTempPhysicalMaxMireds = 500) {
         this.addClusterServer(this.getHsColorControlClusterServer(currentHue, currentSaturation, colorTemperatureMireds, colorTempPhysicalMinMireds, colorTempPhysicalMaxMireds));
+        return this;
     }
     getCtColorControlClusterServer(colorTemperatureMireds = 500, colorTempPhysicalMinMireds = 147, colorTempPhysicalMaxMireds = 500) {
         return ClusterServer(ColorControlCluster.with(ColorControl.Feature.ColorTemperature), {
@@ -945,6 +957,7 @@ export class MatterbridgeDevice extends extendPublicHandlerMethods(Device) {
     }
     createCtColorControlClusterServer(colorTemperatureMireds = 500, colorTempPhysicalMinMireds = 147, colorTempPhysicalMaxMireds = 500) {
         this.addClusterServer(this.getCtColorControlClusterServer(colorTemperatureMireds, colorTempPhysicalMinMireds, colorTempPhysicalMaxMireds));
+        return this;
     }
     configureColorControlCluster(hueSaturation, xy, colorTemperature, colorMode, endpoint) {
         if (!endpoint)
@@ -955,6 +968,7 @@ export class MatterbridgeDevice extends extendPublicHandlerMethods(Device) {
             endpoint.getClusterServer(ColorControlCluster)?.setColorModeAttribute(colorMode);
             endpoint.getClusterServer(ColorControlCluster)?.setEnhancedColorModeAttribute(colorMode);
         }
+        return this;
     }
     configureColorControlMode(colorMode, endpoint) {
         if (!endpoint)
@@ -963,6 +977,7 @@ export class MatterbridgeDevice extends extendPublicHandlerMethods(Device) {
             endpoint.getClusterServer(ColorControlCluster)?.setColorModeAttribute(colorMode);
             endpoint.getClusterServer(ColorControlCluster)?.setEnhancedColorModeAttribute(colorMode);
         }
+        return this;
     }
     getDefaultWindowCoveringClusterServer(positionPercent100ths) {
         return ClusterServer(WindowCoveringCluster.with(WindowCovering.Feature.Lift, WindowCovering.Feature.PositionAwareLift), {

package/dist/matterbridgeEdge.js

@@ -272,8 +272,8 @@ export class MatterbridgeEdge extends Matterbridge {
     }
     async createAggregatorNode(storageContext) {
         this.log.notice(`Creating ${await storageContext.get('storeId')} aggregator `);
-        const aggregator = new EndpointNode(AggregatorEndpoint, { id: `${await storageContext.get('storeId')}` });
-        return aggregator;
+        const aggregatorNode = new EndpointNode(AggregatorEndpoint, { id: `${await storageContext.get('storeId')}` });
+        return aggregatorNode;
     }
     async addBridgedEndpoint(pluginName, device) {
         const plugin = this.plugins.get(pluginName);

package/dist/matterbridgeEndpoint.js

@@ -690,10 +690,12 @@ export class MatterbridgeEndpoint extends Endpoint {
     }
     createDefaultGroupsClusterServer() {
         this.addClusterServer(this.getDefaultGroupsClusterServer());
+        return this;
     }
     getDefaultScenesClusterServer() {
     }
     createDefaultScenesClusterServer() {
+        return this;
     }
     createUniqueId(param1, param2, param3, param4) {
         const hash = createHash('md5');
@@ -747,6 +749,7 @@ export class MatterbridgeEndpoint extends Endpoint {
             return;
         }
         this.addClusterServer(this.getDefaultBasicInformationClusterServer(deviceName, serialNumber, vendorId, vendorName, productId, productName, softwareVersion, softwareVersionString, hardwareVersion, hardwareVersionString));
+        return this;
     }
     getDefaultBridgedDeviceBasicInformationClusterServer(deviceName, serialNumber, vendorId, vendorName, productName, softwareVersion = 1, softwareVersionString = '1.0.0', hardwareVersion = 1, hardwareVersionString = '1.0.0') {
         this.log.logName = deviceName;
@@ -784,6 +787,7 @@ export class MatterbridgeEndpoint extends Endpoint {
     }
     createDefaultBridgedDeviceBasicInformationClusterServer(deviceName, serialNumber, vendorId, vendorName, productName, softwareVersion = 1, softwareVersionString = '1.0.0', hardwareVersion = 1, hardwareVersionString = '1.0.0') {
         this.addClusterServer(this.getDefaultBridgedDeviceBasicInformationClusterServer(deviceName, serialNumber, vendorId, vendorName, productName, softwareVersion, softwareVersionString, hardwareVersion, hardwareVersionString));
+        return this;
     }
     getDefaultPowerTopologyClusterServer() {
         return ClusterServer(PowerTopologyCluster.with(PowerTopology.Feature.TreeTopology), {}, {}, {});
@@ -868,6 +872,7 @@ export class MatterbridgeEndpoint extends Endpoint {
     }
     createDefaultOnOffClusterServer(onOff = false, globalSceneControl = false, onTime = 0, offWaitTime = 0, startUpOnOff = null) {
         this.addClusterServer(this.getDefaultOnOffClusterServer(onOff, globalSceneControl, onTime, offWaitTime, startUpOnOff));
+        return this;
     }
     getOnOffClusterServer(onOff = false) {
         return ClusterServer(OnOffCluster, {
@@ -883,6 +888,7 @@ export class MatterbridgeEndpoint extends Endpoint {
     }
     createOnOffClusterServer(onOff = false) {
         this.addClusterServer(this.getOnOffClusterServer(onOff));
+        return this;
     }
     getDeadFrontOnOffClusterServer(onOff = false) {
         return ClusterServer(OnOffCluster.with(OnOff.Feature.DeadFrontBehavior), {
@@ -898,6 +904,7 @@ export class MatterbridgeEndpoint extends Endpoint {
     }
     createDeadFrontOnOffClusterServer(onOff = false) {
         this.addClusterServer(this.getDeadFrontOnOffClusterServer(onOff));
+        return this;
     }
     getDefaultLevelControlClusterServer(currentLevel = 254, minLevel = 1, maxLevel = 254, onLevel = null, startUpCurrentLevel = null) {
         return ClusterServer(LevelControlCluster.with(LevelControl.Feature.OnOff, LevelControl.Feature.Lighting), {
@@ -932,6 +939,7 @@ export class MatterbridgeEndpoint extends Endpoint {
     }
     createDefaultLevelControlClusterServer(currentLevel = 254, minLevel = 1, maxLevel = 254, onLevel = null, startUpCurrentLevel = null) {
         this.addClusterServer(this.getDefaultLevelControlClusterServer(currentLevel, minLevel, maxLevel, onLevel, startUpCurrentLevel));
+        return this;
     }
     getDefaultColorControlClusterServer(currentX = 0, currentY = 0, currentHue = 0, currentSaturation = 0, colorTemperatureMireds = 500, colorTempPhysicalMinMireds = 147, colorTempPhysicalMaxMireds = 500) {
         return ClusterServer(ColorControlCluster.with(ColorControl.Feature.Xy, ColorControl.Feature.HueSaturation, ColorControl.Feature.ColorTemperature), {
@@ -985,6 +993,7 @@ export class MatterbridgeEndpoint extends Endpoint {
     }
     createDefaultColorControlClusterServer(currentX = 0, currentY = 0, currentHue = 0, currentSaturation = 0, colorTemperatureMireds = 500, colorTempPhysicalMinMireds = 147, colorTempPhysicalMaxMireds = 500) {
         this.addClusterServer(this.getDefaultColorControlClusterServer(currentX, currentY, currentHue, currentSaturation, colorTemperatureMireds, colorTempPhysicalMinMireds, colorTempPhysicalMaxMireds));
+        return this;
     }
     getXyColorControlClusterServer(currentX = 0, currentY = 0, colorTemperatureMireds = 500, colorTempPhysicalMinMireds = 147, colorTempPhysicalMaxMireds = 500) {
         return ClusterServer(ColorControlCluster.with(ColorControl.Feature.Xy, ColorControl.Feature.ColorTemperature), {
@@ -1022,6 +1031,7 @@ export class MatterbridgeEndpoint extends Endpoint {
     }
     createXyColorControlClusterServer(currentX = 0, currentY = 0, colorTemperatureMireds = 500, colorTempPhysicalMinMireds = 147, colorTempPhysicalMaxMireds = 500) {
         this.addClusterServer(this.getXyColorControlClusterServer(currentX, currentY, colorTemperatureMireds, colorTempPhysicalMinMireds, colorTempPhysicalMaxMireds));
+        return this;
     }
     getHsColorControlClusterServer(currentHue = 0, currentSaturation = 0, colorTemperatureMireds = 500, colorTempPhysicalMinMireds = 147, colorTempPhysicalMaxMireds = 500) {
         return ClusterServer(ColorControlCluster.with(ColorControl.Feature.HueSaturation, ColorControl.Feature.ColorTemperature), {
@@ -1067,6 +1077,7 @@ export class MatterbridgeEndpoint extends Endpoint {
     }
     createHsColorControlClusterServer(currentHue = 0, currentSaturation = 0, colorTemperatureMireds = 500, colorTempPhysicalMinMireds = 147, colorTempPhysicalMaxMireds = 500) {
         this.addClusterServer(this.getHsColorControlClusterServer(currentHue, currentSaturation, colorTemperatureMireds, colorTempPhysicalMinMireds, colorTempPhysicalMaxMireds));
+        return this;
     }
     getCtColorControlClusterServer(colorTemperatureMireds = 500, colorTempPhysicalMinMireds = 147, colorTempPhysicalMaxMireds = 500) {
         return ClusterServer(ColorControlCluster.with(ColorControl.Feature.ColorTemperature), {
@@ -1096,6 +1107,7 @@ export class MatterbridgeEndpoint extends Endpoint {
     }
     createCtColorControlClusterServer(colorTemperatureMireds = 500, colorTempPhysicalMinMireds = 147, colorTempPhysicalMaxMireds = 500) {
         this.addClusterServer(this.getCtColorControlClusterServer(colorTemperatureMireds, colorTempPhysicalMinMireds, colorTempPhysicalMaxMireds));
+        return this;
     }
     isColorControlConfigured = false;
     async configureColorControlCluster(hueSaturation, xy, colorTemperature, colorMode, endpoint) {
@@ -1119,6 +1131,7 @@ export class MatterbridgeEndpoint extends Endpoint {
             await endpoint.setAttribute(ColorControlCluster.id, 'enhancedColorMode', colorMode, this.log, endpoint);
         }
         this.isColorControlConfigured = true;
+        return this;
     }
     async configureColorControlMode(colorMode, endpoint) {
         if (!endpoint)
@@ -1127,6 +1140,7 @@ export class MatterbridgeEndpoint extends Endpoint {
             await endpoint.setAttribute(ColorControlCluster.id, 'colorMode', colorMode, this.log, endpoint);
             await endpoint.setAttribute(ColorControlCluster.id, 'enhancedColorMode', colorMode, this.log, endpoint);
         }
+        return this;
     }
     getDefaultWindowCoveringClusterServer(positionPercent100ths) {
         return ClusterServer(WindowCoveringCluster.with(WindowCovering.Feature.Lift, WindowCovering.Feature.PositionAwareLift), {

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "matterbridge",
-  "version": "1.6.8-dev.1",
+  "version": "1.6.8-dev.4",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "matterbridge",
-      "version": "1.6.8-dev.1",
+      "version": "1.6.8-dev.4",
       "license": "Apache-2.0",
       "dependencies": {
         "@matter/main": "0.11.9",
@@ -652,12 +652,12 @@
       }
     },
     "node_modules/dunder-proto": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.0.tgz",
-      "integrity": "sha512-9+Sj30DIu+4KvHqMfLUGLFYL2PkURSYMVXJyXe92nFRvlYq5hBjLEhblKB+vkd/WVlUYMWigiY07T91Fkk0+4A==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz",
+      "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==",
       "license": "MIT",
       "dependencies": {
-        "call-bind-apply-helpers": "^1.0.0",
+        "call-bind-apply-helpers": "^1.0.1",
         "es-errors": "^1.3.0",
         "gopd": "^1.2.0"
       },

package/package.json

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