@matterbridge/core 3.8.0-dev-20260531-fafe993 → 3.8.0-dev-20260602-c7525fb

package/dist/matterNode.d.ts

@@ -1,13 +1,13 @@
 import '@matter/nodejs';
 import EventEmitter from 'node:events';
-import { Diagnostic, StorageContext, StorageManager, StorageService } from '@matter/general';
-import { Endpoint, ServerNode, SessionsBehavior } from '@matter/node';
+import { type Diagnostic, type StorageContext, type StorageManager, StorageService } from '@matter/general';
+import { Endpoint, ServerNode, type SessionsBehavior } from '@matter/node';
 import { AggregatorEndpoint } from '@matter/node/endpoints/aggregator';
-import { DeviceCertification, ExposedFabricInformation, MdnsService } from '@matter/protocol';
+import { type DeviceCertification, type ExposedFabricInformation, MdnsService } from '@matter/protocol';
 import { DeviceTypeId, VendorId } from '@matter/types';
 import type { ApiMatter, PluginName, SanitizedExposedFabricInformation, SanitizedSession, SharedMatterbridge, WorkerMessage } from '@matterbridge/types';
 import type { MatterbridgeEndpoint } from './matterbridgeEndpoint.js';
-import { Plugin, PluginManager } from './pluginManager.js';
+import { type Plugin, PluginManager } from './pluginManager.js';
 interface MatterEvents {
     ready: [nodeId: string];
     online: [nodeId: string];
@@ -33,7 +33,7 @@ export declare class MatterNode extends EventEmitter<MatterEvents> {
     passcode: number | undefined;
     discriminator: number | undefined;
     certification: DeviceCertification.Configuration | undefined;
-    serverNode: ServerNode<ServerNode.RootEndpoint> | undefined;
+    serverNode: ServerNode | undefined;
     aggregatorNode: Endpoint<AggregatorEndpoint> | undefined;
     aggregatorVendorId: VendorId;
     aggregatorVendorName: string;
@@ -59,15 +59,15 @@ export declare class MatterNode extends EventEmitter<MatterEvents> {
     backupMatterStorage(storageName: string, backupName: string): Promise<void>;
     stopMatterStorage(): Promise<void>;
     createServerNodeContext(storeId: string, deviceName: string, deviceType: DeviceTypeId, vendorId: VendorId, vendorName: string, productId: number, productName: string, serialNumber?: string, uniqueId?: string): Promise<StorageContext>;
-    createServerNode(port?: number, passcode?: number, discriminator?: number): Promise<ServerNode<ServerNode.RootEndpoint>>;
-    getServerNodeData(serverNode: ServerNode<ServerNode.RootEndpoint>): ApiMatter;
+    createServerNode(port?: number, passcode?: number, discriminator?: number): Promise<ServerNode>;
+    getServerNodeData(serverNode: ServerNode): ApiMatter;
     startServerNode(timeout?: number): Promise<void>;
     stopServerNode(timeout?: number): Promise<void>;
     createAggregatorNode(): Promise<Endpoint<AggregatorEndpoint>>;
-    createMatterbridgeServerNode(): Promise<ServerNode<ServerNode.RootEndpoint>>;
-    createAccessoryPlugin(plugin: Plugin | PluginName, device: MatterbridgeEndpoint): Promise<ServerNode<ServerNode.RootEndpoint> | undefined>;
-    createDynamicPlugin(plugin: Plugin | PluginName): Promise<ServerNode<ServerNode.RootEndpoint> | undefined>;
-    createDeviceServerNode(plugin: Plugin | PluginName, device: MatterbridgeEndpoint): Promise<ServerNode<ServerNode.RootEndpoint> | undefined>;
+    createMatterbridgeServerNode(): Promise<ServerNode>;
+    createAccessoryPlugin(plugin: Plugin | PluginName, device: MatterbridgeEndpoint): Promise<ServerNode | undefined>;
+    createDynamicPlugin(plugin: Plugin | PluginName): Promise<ServerNode | undefined>;
+    createDeviceServerNode(plugin: Plugin | PluginName, device: MatterbridgeEndpoint): Promise<ServerNode | undefined>;
     addBridgedEndpoint(pluginName: string, device: MatterbridgeEndpoint): Promise<MatterbridgeEndpoint | undefined>;
     removeBridgedEndpoint(pluginName: string, device: MatterbridgeEndpoint): Promise<MatterbridgeEndpoint | undefined>;
     removeAllBridgedEndpoints(pluginName: string, delay?: number): Promise<void>;

package/dist/matterNode.js

@@ -158,7 +158,7 @@ export class MatterNode extends EventEmitter {
         });
         this.pluginManager.matterbridge.nodeContext = await this.pluginManager.matterbridge.nodeStorage.createStorage('matterbridge');
         await this.pluginManager.loadFromStorage();
-        if (this.pluginName && this.device && this.device.deviceName) {
+        if (this.pluginName && this.device?.deviceName) {
             this.log.debug(`Creating MatterNode instance for server node device ${CYAN}${this.device.deviceName}${db}...`);
             await this.createDeviceServerNode(this.pluginName, this.device);
             this.log.debug(`Created MatterNode instance for server node device ${CYAN}${this.device.deviceName}${db}`);
@@ -193,7 +193,7 @@ export class MatterNode extends EventEmitter {
         if (!this.serverNode && !this.pluginName)
             throw new Error('Matter server node not created yet. Call create() first.');
         this.log.info('Starting MatterNode...');
-        if (this.pluginName && this.device && this.device.deviceName) {
+        if (this.pluginName && this.device?.deviceName) {
             this.log.debug(`Starting MatterNode for server device ${this.pluginName}:${this.device.deviceName}...`);
             await this.startServerNode();
             this.log.debug(`Started MatterNode for server device ${this.pluginName}:${this.device.deviceName}`);
@@ -237,7 +237,7 @@ export class MatterNode extends EventEmitter {
         if (!this.serverNode)
             throw new Error('Matter server node not created yet. Call create() first.');
         this.log.info('Stopping MatterNode...');
-        if (this.pluginName && this.device && this.device.deviceName) {
+        if (this.pluginName && this.device?.deviceName) {
             this.log.debug(`Stopping MatterNode for server device ${this.pluginName}:${this.device.deviceName}...`);
             await this.stopServerNode();
             this.serverNode = undefined;
@@ -537,7 +537,7 @@ export class MatterNode extends EventEmitter {
             throw new Error('Matter server node context not created yet. Call createServerNodeContext() first.');
         }
         this.log.notice(`Creating ${await this.matterStorageContext.get('storeId')} aggregator...`);
-        const aggregatorNode = new Endpoint(AggregatorEndpoint, { id: `${await this.matterStorageContext.get('storeId')}` });
+        const aggregatorNode = new Endpoint(AggregatorEndpoint, { id: await this.matterStorageContext.get('storeId') });
         this.log.info(`Created ${await this.matterStorageContext.get('storeId')} aggregator`);
         return aggregatorNode;
     }
@@ -785,7 +785,7 @@ export class MatterNode extends EventEmitter {
         return true;
     }
     async subscribeAttributeChanged(plugin, device) {
-        if (!plugin || !device || !device.plugin || !device.serialNumber || !device.uniqueId || !device.maybeNumber)
+        if (!plugin || !device?.plugin || !device.serialNumber || !device.uniqueId || !device.maybeNumber)
             return;
         this.log.debug(`Subscribing attributes for endpoint ${plg}${plugin.name}${db}:${dev}${device.deviceName}${db}:${or}${device.id}${db}:${or}${device.number}${db} (${zb}${device.name}${db})`);
         if (this.matterbridge.bridgeMode === 'childbridge' && plugin.type === 'AccessoryPlatform' && this.serverNode) {

package/dist/matterbridgeDeviceTypes.js

@@ -94,6 +94,8 @@ import { TemperatureControl } from '@matter/types/clusters/temperature-control';
 import { TemperatureMeasurement } from '@matter/types/clusters/temperature-measurement';
 import { Thermostat } from '@matter/types/clusters/thermostat';
 import { ThermostatUserInterfaceConfiguration } from '@matter/types/clusters/thermostat-user-interface-configuration';
+import { TlsCertificateManagement } from '@matter/types/clusters/tls-certificate-management';
+import { TlsClientManagement } from '@matter/types/clusters/tls-client-management';
 import { TotalVolatileOrganicCompoundsConcentrationMeasurement } from '@matter/types/clusters/total-volatile-organic-compounds-concentration-measurement';
 import { UserLabel } from '@matter/types/clusters/user-label';
 import { ValveConfigurationAndControl } from '@matter/types/clusters/valve-configuration-and-control';
@@ -169,8 +171,8 @@ export const OTAProvider = DeviceTypeDefinition({
     revision: 1,
     requiredServerClusters: [OtaSoftwareUpdateProvider.id],
     optionalServerClusters: [],
-    requiredClientClusters: [OtaSoftwareUpdateRequestor.id],
-    optionalClientClusters: [],
+    requiredClientClusters: [],
+    optionalClientClusters: [OtaSoftwareUpdateRequestor.id],
 });
 export const bridgedNode = DeviceTypeDefinition({
     name: 'MA-bridgedNode',
@@ -195,6 +197,8 @@ export const deviceEnergyManagement = DeviceTypeDefinition({
     revision: 3,
     requiredServerClusters: [DeviceEnergyManagement.id],
     optionalServerClusters: [DeviceEnergyManagementMode.id],
+    requiredClientClusters: [],
+    optionalClientClusters: [ElectricalGridConditions.id],
 });
 export const onOffLight = DeviceTypeDefinition({
     name: 'MA-onofflight',
@@ -203,6 +207,8 @@ export const onOffLight = DeviceTypeDefinition({
     revision: 3,
     requiredServerClusters: [Identify.id, Groups.id, ScenesManagement.id, OnOff.id],
     optionalServerClusters: [LevelControl.id],
+    requiredClientClusters: [],
+    optionalClientClusters: [OccupancySensing.id],
 });
 export const dimmableLight = DeviceTypeDefinition({
     name: 'MA-dimmablelight',
@@ -211,6 +217,8 @@ export const dimmableLight = DeviceTypeDefinition({
     revision: 3,
     requiredServerClusters: [Identify.id, Groups.id, ScenesManagement.id, OnOff.id, LevelControl.id],
     optionalServerClusters: [],
+    requiredClientClusters: [],
+    optionalClientClusters: [OccupancySensing.id],
 });
 export const colorTemperatureLight = DeviceTypeDefinition({
     name: 'MA-colortemperaturelight',
@@ -219,6 +227,8 @@ export const colorTemperatureLight = DeviceTypeDefinition({
     revision: 4,
     requiredServerClusters: [Identify.id, Groups.id, ScenesManagement.id, OnOff.id, LevelControl.id, ColorControl.id],
     optionalServerClusters: [],
+    requiredClientClusters: [],
+    optionalClientClusters: [OccupancySensing.id],
 });
 export const extendedColorLight = DeviceTypeDefinition({
     name: 'MA-extendedcolorlight',
@@ -227,6 +237,8 @@ export const extendedColorLight = DeviceTypeDefinition({
     revision: 4,
     requiredServerClusters: [Identify.id, Groups.id, ScenesManagement.id, OnOff.id, LevelControl.id, ColorControl.id],
     optionalServerClusters: [],
+    requiredClientClusters: [],
+    optionalClientClusters: [OccupancySensing.id],
 });
 export const onOffOutlet = DeviceTypeDefinition({
     name: 'MA-onoffpluginunit',
@@ -235,6 +247,8 @@ export const onOffOutlet = DeviceTypeDefinition({
     revision: 4,
     requiredServerClusters: [Identify.id, Groups.id, ScenesManagement.id, OnOff.id],
     optionalServerClusters: [LevelControl.id],
+    requiredClientClusters: [],
+    optionalClientClusters: [OccupancySensing.id],
 });
 export const dimmableOutlet = DeviceTypeDefinition({
     name: 'MA-dimmablepluginunit',
@@ -243,6 +257,8 @@ export const dimmableOutlet = DeviceTypeDefinition({
     revision: 5,
     requiredServerClusters: [Identify.id, Groups.id, ScenesManagement.id, OnOff.id, LevelControl.id],
     optionalServerClusters: [],
+    requiredClientClusters: [],
+    optionalClientClusters: [OccupancySensing.id],
 });
 export const onOffMountedSwitch = DeviceTypeDefinition({
     name: 'MA-onoffmountedswitch',
@@ -251,6 +267,8 @@ export const onOffMountedSwitch = DeviceTypeDefinition({
     revision: 2,
     requiredServerClusters: [Identify.id, Groups.id, ScenesManagement.id, OnOff.id],
     optionalServerClusters: [LevelControl.id],
+    requiredClientClusters: [],
+    optionalClientClusters: [OccupancySensing.id],
 });
 export const dimmableMountedSwitch = DeviceTypeDefinition({
     name: 'MA-dimmablemountedswitch',
@@ -259,6 +277,8 @@ export const dimmableMountedSwitch = DeviceTypeDefinition({
     revision: 2,
     requiredServerClusters: [Identify.id, Groups.id, ScenesManagement.id, OnOff.id, LevelControl.id],
     optionalServerClusters: [],
+    requiredClientClusters: [],
+    optionalClientClusters: [OccupancySensing.id],
 });
 export const pumpDevice = DeviceTypeDefinition({
     name: 'MA-pump',
@@ -267,6 +287,8 @@ export const pumpDevice = DeviceTypeDefinition({
     revision: 3,
     requiredServerClusters: [OnOff.id, PumpConfigurationAndControl.id, Identify.id],
     optionalServerClusters: [LevelControl.id, Groups.id, ScenesManagement.id, TemperatureMeasurement.id, PressureMeasurement.id, FlowMeasurement.id],
+    requiredClientClusters: [],
+    optionalClientClusters: [TemperatureMeasurement.id, PressureMeasurement.id, FlowMeasurement.id, OccupancySensing.id],
 });
 export const waterValve = DeviceTypeDefinition({
     name: 'MA-waterValve',
@@ -275,6 +297,8 @@ export const waterValve = DeviceTypeDefinition({
     revision: 1,
     requiredServerClusters: [Identify.id, ValveConfigurationAndControl.id],
     optionalServerClusters: [FlowMeasurement.id],
+    requiredClientClusters: [],
+    optionalClientClusters: [FlowMeasurement.id],
 });
 export const onOffSwitch = DeviceTypeDefinition({
     name: 'MA-onoffswitch',
@@ -282,7 +306,9 @@ export const onOffSwitch = DeviceTypeDefinition({
     deviceClass: DeviceClasses.Simple,
     revision: 3,
     requiredServerClusters: [Identify.id, OnOff.id],
-    optionalServerClusters: [Groups.id, ScenesManagement.id],
+    optionalServerClusters: [],
+    requiredClientClusters: [Identify.id, OnOff.id],
+    optionalClientClusters: [Groups.id, ScenesManagement.id],
 });
 export const dimmableSwitch = DeviceTypeDefinition({
     name: 'MA-dimmableswitch',
@@ -290,7 +316,9 @@ export const dimmableSwitch = DeviceTypeDefinition({
     deviceClass: DeviceClasses.Simple,
     revision: 3,
     requiredServerClusters: [Identify.id, OnOff.id, LevelControl.id],
-    optionalServerClusters: [Groups.id, ScenesManagement.id],
+    optionalServerClusters: [],
+    requiredClientClusters: [Identify.id, OnOff.id, LevelControl.id],
+    optionalClientClusters: [Groups.id, ScenesManagement.id],
 });
 export const colorTemperatureSwitch = DeviceTypeDefinition({
     name: 'MA-colortemperatureswitch',
@@ -298,7 +326,9 @@ export const colorTemperatureSwitch = DeviceTypeDefinition({
     deviceClass: DeviceClasses.Simple,
     revision: 3,
     requiredServerClusters: [Identify.id, OnOff.id, LevelControl.id, ColorControl.id],
-    optionalServerClusters: [Groups.id, ScenesManagement.id],
+    optionalServerClusters: [],
+    requiredClientClusters: [Identify.id, OnOff.id, LevelControl.id, ColorControl.id],
+    optionalClientClusters: [Groups.id, ScenesManagement.id],
 });
 export const genericSwitch = DeviceTypeDefinition({
     name: 'MA-genericswitch',
@@ -436,6 +466,8 @@ export const thermostatDevice = DeviceTypeDefinition({
     revision: 5,
     requiredServerClusters: [Identify.id, Thermostat.id],
     optionalServerClusters: [Groups.id, ThermostatUserInterfaceConfiguration.id, EnergyPreference.id],
+    requiredClientClusters: [],
+    optionalClientClusters: [FanControl.id, TemperatureMeasurement.id, RelativeHumidityMeasurement.id, OccupancySensing.id],
 });
 export const fanDevice = DeviceTypeDefinition({
     name: 'MA-fan',
@@ -655,7 +687,9 @@ export const heatPump = DeviceTypeDefinition({
     deviceClass: DeviceClasses.Simple,
     revision: 1,
     requiredServerClusters: [],
-    optionalServerClusters: [Identify.id, Thermostat.id],
+    optionalServerClusters: [Identify.id],
+    requiredClientClusters: [],
+    optionalClientClusters: [Thermostat.id],
 });
 export const soilSensor = DeviceTypeDefinition({
     name: 'MA-soilSensor',
@@ -810,8 +844,9 @@ export const cameraController = DeviceTypeDefinition({
         ZoneManagement.id,
         CameraAvStreamManagement.id,
         CameraAvSettingsUserLevelManagement.id,
-        WebRtcTransportRequestor.id,
         PushAvStreamTransport.id,
+        TlsCertificateManagement.id,
+        TlsClientManagement.id,
     ],
 });
 export const doorbell = DeviceTypeDefinition({

package/dist/matterbridgeEndpoint.d.ts

@@ -117,6 +117,7 @@ export declare class MatterbridgeEndpoint extends Endpoint {
     invokeBehaviorCommand<T extends Behavior.Type, C extends BehaviorCommandName<T>>(cluster: T, command: C, params?: BehaviorCommandParams<T, C>): Promise<void>;
     invokeBehaviorCommand<T extends ClusterType, C extends ClusterCommandName<T>>(cluster: T, command: C, params?: ClusterCommandParams<T, C>): Promise<void>;
     invokeBehaviorCommand(cluster: ClusterId | string, command: CommandHandlers, params?: Record<string, boolean | number | bigint | string | object | null>): Promise<void>;
+    addRequiredClusters(): MatterbridgeEndpoint;
     addRequiredClusterServers(): MatterbridgeEndpoint;
     addOptionalClusterServers(): MatterbridgeEndpoint;
     addRequiredClusterClients(): MatterbridgeEndpoint;

package/dist/matterbridgeEndpoint.js

@@ -268,6 +268,11 @@ export class MatterbridgeEndpoint extends Endpoint {
     async invokeBehaviorCommand(cluster, command, params) {
         await invokeBehaviorCommand(this, cluster, command, params);
     }
+    addRequiredClusters() {
+        addRequiredClusterServers(this);
+        addRequiredClusterClients(this);
+        return this;
+    }
     addRequiredClusterServers() {
         addRequiredClusterServers(this);
         return this;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@matterbridge/core",
-  "version": "3.8.0-dev-20260531-fafe993",
+  "version": "3.8.0-dev-20260602-c7525fb",
   "description": "Matterbridge core library",
   "author": "https://github.com/Luligu",
   "homepage": "https://matterbridge.io/",
@@ -130,10 +130,10 @@
   ],
   "dependencies": {
     "@matter/main": "0.17.0",
-    "@matterbridge/dgram": "3.8.0-dev-20260531-fafe993",
-    "@matterbridge/thread": "3.8.0-dev-20260531-fafe993",
-    "@matterbridge/types": "3.8.0-dev-20260531-fafe993",
-    "@matterbridge/utils": "3.8.0-dev-20260531-fafe993",
+    "@matterbridge/dgram": "3.8.0-dev-20260602-c7525fb",
+    "@matterbridge/thread": "3.8.0-dev-20260602-c7525fb",
+    "@matterbridge/types": "3.8.0-dev-20260602-c7525fb",
+    "@matterbridge/utils": "3.8.0-dev-20260602-c7525fb",
     "escape-html": "1.0.3",
     "express": "5.2.1",
     "express-rate-limit": "8.5.2",