@matterbridge/core 3.10.10-dev-20260912-2c1c047 → 3.10.10-dev-20260914-784e019

package/dist/behaviors/cameraAvSettingsUserLevelManagementServer.d.ts

@@ -9,6 +9,7 @@ declare const MatterbridgeCameraAvSettingsUserLevelManagementServer_base: import
     mechanicalZoom: true;
 }>, import("@matter/types").ClusterType.Concrete, new () => {}, "cameraAvSettingsUserLevelManagement">;
 export declare class MatterbridgeCameraAvSettingsUserLevelManagementServer extends MatterbridgeCameraAvSettingsUserLevelManagementServer_base {
+    readonly endpoint: MatterbridgeEndpoint;
     mptzSetPosition(request: CameraAvSettingsUserLevelManagement.MptzSetPositionRequest): void;
     mptzRelativeMove(request: CameraAvSettingsUserLevelManagement.MptzRelativeMoveRequest): void;
 }

package/dist/behaviors/cameraAvSettingsUserLevelManagementServer.js

@@ -1,7 +1,6 @@
 import { CameraAvSettingsUserLevelManagementServer } from '@matter/node/behaviors/camera-av-settings-user-level-management';
 import { Status, StatusResponseError } from '@matter/types';
 import { CameraAvSettingsUserLevelManagement } from '@matter/types/clusters/camera-av-settings-user-level-management';
-import { emitCommand } from '../matterbridgeEndpointHelpers.js';
 import { MatterbridgeServer } from './matterbridgeServer.js';
 function clamp(value, min, max) {
     return Math.min(Math.max(value, min), max);
@@ -28,7 +27,7 @@ export class MatterbridgeCameraAvSettingsUserLevelManagementServer extends Camer
             zoom: zoom ?? this.state.mptzPosition.zoom,
         };
         device.log.info(`MatterbridgeCameraAvSettingsUserLevelManagementServer: set mechanical PTZ position to pan ${this.state.mptzPosition.pan}°, tilt ${this.state.mptzPosition.tilt}°, zoom ${this.state.mptzPosition.zoom} (endpoint ${this.endpoint.maybeId}.${this.endpoint.maybeNumber})`);
-        emitCommand(this.endpoint, CameraAvSettingsUserLevelManagementServer.id, 'mptzSetPosition', request, this.context);
+        this.endpoint.emitCommand(CameraAvSettingsUserLevelManagement, 'mptzSetPosition', request, this.context);
     }
     mptzRelativeMove(request) {
         const device = this.endpoint.stateOf(MatterbridgeServer);
@@ -41,7 +40,7 @@ export class MatterbridgeCameraAvSettingsUserLevelManagementServer extends Camer
         const zoom = request.zoomDelta === undefined ? current.zoom : clamp((current.zoom ?? 1) + request.zoomDelta, 1, this.state.zoomMax);
         this.state.mptzPosition = { pan, tilt, zoom };
         device.log.info(`MatterbridgeCameraAvSettingsUserLevelManagementServer: moved mechanical PTZ position by pan ${request.panDelta ?? 0}°, tilt ${request.tiltDelta ?? 0}°, zoom ${request.zoomDelta ?? 0} to pan ${pan}°, tilt ${tilt}°, zoom ${zoom} (endpoint ${this.endpoint.maybeId}.${this.endpoint.maybeNumber})`);
-        emitCommand(this.endpoint, CameraAvSettingsUserLevelManagementServer.id, 'mptzRelativeMove', request, this.context);
+        this.endpoint.emitCommand(CameraAvSettingsUserLevelManagement, 'mptzRelativeMove', request, this.context);
     }
 }
 export function createDefaultCameraAvSettingsUserLevelManagementClusterServer(endpoint, options) {

package/dist/behaviors/cameraAvStreamManagementServer.d.ts

@@ -23,6 +23,7 @@ declare const MatterbridgeCameraAvStreamManagementServer_base: import("@matter/n
 }>, import("@matter/types").ClusterType.Concrete, new () => {}, "cameraAvStreamManagement">;
 export declare class MatterbridgeCameraAvStreamManagementServer extends MatterbridgeCameraAvStreamManagementServer_base {
     #private;
+    readonly endpoint: MatterbridgeEndpoint;
     initialize(): void;
     setStreamPriorities(request: CameraAvStreamManagement.SetStreamPrioritiesRequest): void;
     videoStreamAllocate(request: CameraAvStreamManagement.VideoStreamAllocateRequest): CameraAvStreamManagement.VideoStreamAllocateResponse;

package/dist/behaviors/cameraAvStreamManagementServer.js

@@ -2,7 +2,6 @@ import { readFileSync } from 'node:fs';
 import { CameraAvStreamManagementServer } from '@matter/node/behaviors/camera-av-stream-management';
 import { Status, StatusResponseError, StreamUsage, ThreeLevelAuto } from '@matter/types';
 import { CameraAvStreamManagement } from '@matter/types/clusters/camera-av-stream-management';
-import { emitCommand } from '../matterbridgeEndpointHelpers.js';
 import { MatterbridgeServer } from './matterbridgeServer.js';
 const DEFAULT_CAMERA_COLOR_TEST_RESOLUTION = '640x480';
 const AUDIO_STREAM_BIT_DEPTHS = [8, 16, 24, 32];
@@ -112,7 +111,7 @@ export class MatterbridgeCameraAvStreamManagementServer extends CameraAvStreamMa
         }
         device.log.info(`MatterbridgeCameraAvStreamManagementServer: setting stream priorities to [${request.streamPriorities.join(', ')}] (endpoint ${this.endpoint.maybeId}.${this.endpoint.maybeNumber})`);
         this.state.streamUsagePriorities = request.streamPriorities;
-        emitCommand(this.endpoint, CameraAvStreamManagementServer.id, 'setStreamPriorities', request, this.context);
+        this.endpoint.emitCommand(CameraAvStreamManagement, 'setStreamPriorities', request, this.context);
     }
     videoStreamAllocate(request) {
         const device = this.endpoint.stateOf(MatterbridgeServer);
@@ -153,7 +152,7 @@ export class MatterbridgeCameraAvStreamManagementServer extends CameraAvStreamMa
             stream.keyFrameInterval === request.keyFrameInterval);
         if (existingStream) {
             device.log.info(`MatterbridgeCameraAvStreamManagementServer: reused video stream ${existingStream.videoStreamId} for usage ${request.streamUsage} (endpoint ${this.endpoint.maybeId}.${this.endpoint.maybeNumber})`);
-            emitCommand(this.endpoint, CameraAvStreamManagementServer.id, 'videoStreamAllocate', request, this.context);
+            this.endpoint.emitCommand(CameraAvStreamManagement, 'videoStreamAllocate', request, this.context);
             return { videoStreamId: existingStream.videoStreamId };
         }
         if (this.state.allocatedVideoStreams.length >= this.state.maxConcurrentEncoders) {
@@ -182,7 +181,7 @@ export class MatterbridgeCameraAvStreamManagementServer extends CameraAvStreamMa
             },
         ];
         device.log.info(`MatterbridgeCameraAvStreamManagementServer: allocated video stream ${videoStreamId} for usage ${request.streamUsage} (endpoint ${this.endpoint.maybeId}.${this.endpoint.maybeNumber})`);
-        emitCommand(this.endpoint, CameraAvStreamManagementServer.id, 'videoStreamAllocate', request, this.context);
+        this.endpoint.emitCommand(CameraAvStreamManagement, 'videoStreamAllocate', request, this.context);
         return { videoStreamId };
     }
     videoStreamDeallocate(request) {
@@ -192,7 +191,7 @@ export class MatterbridgeCameraAvStreamManagementServer extends CameraAvStreamMa
         }
         this.state.allocatedVideoStreams = this.state.allocatedVideoStreams.filter((stream) => stream.videoStreamId !== request.videoStreamId);
         device.log.info(`MatterbridgeCameraAvStreamManagementServer: deallocated video stream ${request.videoStreamId} (endpoint ${this.endpoint.maybeId}.${this.endpoint.maybeNumber})`);
-        emitCommand(this.endpoint, CameraAvStreamManagementServer.id, 'videoStreamDeallocate', request, this.context);
+        this.endpoint.emitCommand(CameraAvStreamManagement, 'videoStreamDeallocate', request, this.context);
     }
     audioStreamAllocate(request) {
         const device = this.endpoint.stateOf(MatterbridgeServer);
@@ -224,7 +223,7 @@ export class MatterbridgeCameraAvStreamManagementServer extends CameraAvStreamMa
             stream.bitDepth === request.bitDepth);
         if (existingStream) {
             device.log.info(`MatterbridgeCameraAvStreamManagementServer: reused audio stream ${existingStream.audioStreamId} for usage ${request.streamUsage} (endpoint ${this.endpoint.maybeId}.${this.endpoint.maybeNumber})`);
-            emitCommand(this.endpoint, CameraAvStreamManagementServer.id, 'audioStreamAllocate', request, this.context);
+            this.endpoint.emitCommand(CameraAvStreamManagement, 'audioStreamAllocate', request, this.context);
             return { audioStreamId: existingStream.audioStreamId };
         }
         let audioStreamId = 0;
@@ -245,7 +244,7 @@ export class MatterbridgeCameraAvStreamManagementServer extends CameraAvStreamMa
             },
         ];
         device.log.info(`MatterbridgeCameraAvStreamManagementServer: allocated audio stream ${audioStreamId} for usage ${request.streamUsage} (endpoint ${this.endpoint.maybeId}.${this.endpoint.maybeNumber})`);
-        emitCommand(this.endpoint, CameraAvStreamManagementServer.id, 'audioStreamAllocate', request, this.context);
+        this.endpoint.emitCommand(CameraAvStreamManagement, 'audioStreamAllocate', request, this.context);
         return { audioStreamId };
     }
     audioStreamDeallocate(request) {
@@ -255,7 +254,7 @@ export class MatterbridgeCameraAvStreamManagementServer extends CameraAvStreamMa
         }
         this.state.allocatedAudioStreams = this.state.allocatedAudioStreams.filter((stream) => stream.audioStreamId !== request.audioStreamId);
         device.log.info(`MatterbridgeCameraAvStreamManagementServer: deallocated audio stream ${request.audioStreamId} (endpoint ${this.endpoint.maybeId}.${this.endpoint.maybeNumber})`);
-        emitCommand(this.endpoint, CameraAvStreamManagementServer.id, 'audioStreamDeallocate', request, this.context);
+        this.endpoint.emitCommand(CameraAvStreamManagement, 'audioStreamDeallocate', request, this.context);
     }
     async snapshotStreamAllocate(request) {
         const device = this.endpoint.stateOf(MatterbridgeServer);
@@ -293,7 +292,7 @@ export class MatterbridgeCameraAvStreamManagementServer extends CameraAvStreamMa
                 }
                 : stream);
             device.log.info(`MatterbridgeCameraAvStreamManagementServer: reused snapshot stream ${existingStream.snapshotStreamId} (endpoint ${this.endpoint.maybeId}.${this.endpoint.maybeNumber})`);
-            emitCommand(this.endpoint, CameraAvStreamManagementServer.id, 'snapshotStreamAllocate', request, this.context);
+            this.endpoint.emitCommand(CameraAvStreamManagement, 'snapshotStreamAllocate', request, this.context);
             return { snapshotStreamId: existingStream.snapshotStreamId };
         }
         let snapshotStreamId = 0;
@@ -317,7 +316,7 @@ export class MatterbridgeCameraAvStreamManagementServer extends CameraAvStreamMa
             },
         ];
         device.log.info(`MatterbridgeCameraAvStreamManagementServer: allocated snapshot stream ${snapshotStreamId} (endpoint ${this.endpoint.maybeId}.${this.endpoint.maybeNumber})`);
-        emitCommand(this.endpoint, CameraAvStreamManagementServer.id, 'snapshotStreamAllocate', request, this.context);
+        this.endpoint.emitCommand(CameraAvStreamManagement, 'snapshotStreamAllocate', request, this.context);
         return { snapshotStreamId };
     }
     async snapshotStreamDeallocate(request) {
@@ -327,7 +326,7 @@ export class MatterbridgeCameraAvStreamManagementServer extends CameraAvStreamMa
         }
         this.state.allocatedSnapshotStreams = this.state.allocatedSnapshotStreams.filter((stream) => stream.snapshotStreamId !== request.snapshotStreamId);
         device.log.info(`MatterbridgeCameraAvStreamManagementServer: deallocated snapshot stream ${request.snapshotStreamId} (endpoint ${this.endpoint.maybeId}.${this.endpoint.maybeNumber})`);
-        emitCommand(this.endpoint, CameraAvStreamManagementServer.id, 'snapshotStreamDeallocate', request, this.context);
+        this.endpoint.emitCommand(CameraAvStreamManagement, 'snapshotStreamDeallocate', request, this.context);
     }
     captureSnapshot(request) {
         const device = this.endpoint.stateOf(MatterbridgeServer);
@@ -339,7 +338,7 @@ export class MatterbridgeCameraAvStreamManagementServer extends CameraAvStreamMa
         device.log.info(`MatterbridgeCameraAvStreamManagementServer: capturing snapshot ${snapshotStreamId ?? 'auto'} (endpoint ${this.endpoint.maybeId}.${this.endpoint.maybeNumber})`);
         device.log.debug(`MatterbridgeCameraAvStreamManagementServer: captureSnapshot called with snapshotStreamId ${request.snapshotStreamId} (endpoint ${this.endpoint.maybeId}.${this.endpoint.maybeNumber})`);
         const { data, resolution } = cameraColorTestJpegForResolution(request.requestedResolution);
-        emitCommand(this.endpoint, CameraAvStreamManagementServer.id, 'captureSnapshot', request, this.context);
+        this.endpoint.emitCommand(CameraAvStreamManagement, 'captureSnapshot', request, this.context);
         return {
             data,
             imageCodec: CameraAvStreamManagement.ImageCodec.Jpeg,

package/dist/behaviors/chimeServer.d.ts

@@ -1,10 +1,11 @@
 import { ChimeServer } from '@matter/node/behaviors/chime';
-import type { Chime } from '@matter/types/clusters/chime';
+import { Chime } from '@matter/types/clusters/chime';
 import type { MatterbridgeEndpoint } from '../matterbridgeEndpoint.js';
 export type ChimeId = number;
 declare const ChimeServerBase: import("@matter/node").ClusterBehavior.Type<typeof ChimeServer, import("@matter/types").ClusterType.WithEnabledAttributes<import("@matter/types").ClusterType.WithEnabledEvents<Chime, "chimeStartedPlaying">, never>, import("@matter/types").ClusterType.Concrete, new () => {}, "chime">;
 export declare class MatterbridgeChimeServer extends ChimeServerBase {
     #private;
+    readonly endpoint: MatterbridgeEndpoint;
     initialize(): void;
     playChimeSound(request: Chime.PlayChimeSoundRequest): Promise<void>;
 }

package/dist/behaviors/chimeServer.js

@@ -1,6 +1,6 @@
 import { ChimeServer } from '@matter/node/behaviors/chime';
 import { Status, StatusResponseError } from '@matter/types';
-import { emitCommand } from '../matterbridgeEndpointHelpers.js';
+import { Chime } from '@matter/types/clusters/chime';
 import { MatterbridgeServer } from './matterbridgeServer.js';
 const ChimeServerBase = ChimeServer.enable({ events: { chimeStartedPlaying: true } });
 export class MatterbridgeChimeServer extends ChimeServerBase {
@@ -24,7 +24,7 @@ export class MatterbridgeChimeServer extends ChimeServerBase {
         }
         device.log.info(`MatterbridgeChimeServer: playing chime sound with chimeId ${chimeId} (endpoint ${this.endpoint.maybeId}.${this.endpoint.maybeNumber})`);
         this.events.chimeStartedPlaying.emit({ chimeId }, this.context);
-        emitCommand(this.endpoint, ChimeServer.id, 'playChimeSound', request, this.context);
+        this.endpoint.emitCommand(Chime, 'playChimeSound', request, this.context);
     }
 }
 export function createDefaultChimeClusterServer(endpoint, installedChimeSounds, selectedChime, enabled = true) {

package/dist/behaviors/colorControlServer.d.ts

@@ -1,6 +1,7 @@
 import type { MaybePromise } from '@matter/general';
 import { ColorControlServer } from '@matter/node/behaviors/color-control';
 import { ColorControl } from '@matter/types/clusters/color-control';
+import type { MatterbridgeEndpoint } from '../matterbridgeEndpoint.js';
 declare const MatterbridgeColorControlServer_base: import("@matter/node").ClusterBehavior.Type<typeof ColorControlServer, import("@matter/types").ClusterType.WithSupportedFeatures<ColorControl, {
     colorLoop: false;
     colorTemperature: true;
@@ -9,6 +10,7 @@ declare const MatterbridgeColorControlServer_base: import("@matter/node").Cluste
     xy: true;
 }>, import("@matter/types").ClusterType.Concrete, typeof import("@matter/node/behaviors/color-control").ColorControlBaseServer.Internal, "colorControl">;
 export declare class MatterbridgeColorControlServer extends MatterbridgeColorControlServer_base {
+    readonly endpoint: MatterbridgeEndpoint;
     initialize(): MaybePromise;
     moveToHue(request: ColorControl.MoveToHueRequest): Promise<void>;
     moveHue(request: ColorControl.MoveHueRequest): Promise<void>;

package/dist/behaviors/colorControlServer.js

@@ -24,6 +24,7 @@ export class MatterbridgeColorControlServer extends ColorControlServer.with(Colo
         });
         device.log.debug(`MatterbridgeColorControlServer: moveToHue called (endpoint ${this.endpoint.maybeId}.${this.endpoint.maybeNumber})`);
         await super.moveToHue(request);
+        this.endpoint.emitCommand(ColorControl, 'moveToHue', request, this.context);
     }
     async moveHue(request) {
         if (process.env.MATTERBRIDGE_CHIP_TEST) {
@@ -42,6 +43,7 @@ export class MatterbridgeColorControlServer extends ColorControlServer.with(Colo
         });
         device.log.debug(`MatterbridgeColorControlServer: moveHue called (endpoint ${this.endpoint.maybeId}.${this.endpoint.maybeNumber})`);
         await super.moveHue(request);
+        this.endpoint.emitCommand(ColorControl, 'moveHue', request, this.context);
     }
     async stepHue(request) {
         if (process.env.MATTERBRIDGE_CHIP_TEST) {
@@ -60,6 +62,7 @@ export class MatterbridgeColorControlServer extends ColorControlServer.with(Colo
         });
         device.log.debug(`MatterbridgeColorControlServer: stepHue called (endpoint ${this.endpoint.maybeId}.${this.endpoint.maybeNumber})`);
         await super.stepHue(request);
+        this.endpoint.emitCommand(ColorControl, 'stepHue', request, this.context);
     }
     async enhancedMoveToHue(request) {
         if (process.env.MATTERBRIDGE_CHIP_TEST) {
@@ -78,6 +81,7 @@ export class MatterbridgeColorControlServer extends ColorControlServer.with(Colo
         });
         device.log.debug(`MatterbridgeColorControlServer: enhancedMoveToHue called (endpoint ${this.endpoint.maybeId}.${this.endpoint.maybeNumber})`);
         await super.enhancedMoveToHue(request);
+        this.endpoint.emitCommand(ColorControl, 'enhancedMoveToHue', request, this.context);
     }
     async enhancedMoveHue(request) {
         if (process.env.MATTERBRIDGE_CHIP_TEST) {
@@ -96,6 +100,7 @@ export class MatterbridgeColorControlServer extends ColorControlServer.with(Colo
         });
         device.log.debug(`MatterbridgeColorControlServer: enhancedMoveHue called (endpoint ${this.endpoint.maybeId}.${this.endpoint.maybeNumber})`);
         await super.enhancedMoveHue(request);
+        this.endpoint.emitCommand(ColorControl, 'enhancedMoveHue', request, this.context);
     }
     async enhancedStepHue(request) {
         if (process.env.MATTERBRIDGE_CHIP_TEST) {
@@ -114,6 +119,7 @@ export class MatterbridgeColorControlServer extends ColorControlServer.with(Colo
         });
         device.log.debug(`MatterbridgeColorControlServer: enhancedStepHue called (endpoint ${this.endpoint.maybeId}.${this.endpoint.maybeNumber})`);
         await super.enhancedStepHue(request);
+        this.endpoint.emitCommand(ColorControl, 'enhancedStepHue', request, this.context);
     }
     async moveToSaturation(request) {
         if (process.env.MATTERBRIDGE_CHIP_TEST) {
@@ -132,6 +138,7 @@ export class MatterbridgeColorControlServer extends ColorControlServer.with(Colo
         });
         device.log.debug(`MatterbridgeColorControlServer: moveToSaturation called (endpoint ${this.endpoint.maybeId}.${this.endpoint.maybeNumber})`);
         await super.moveToSaturation(request);
+        this.endpoint.emitCommand(ColorControl, 'moveToSaturation', request, this.context);
     }
     async moveSaturation(request) {
         if (process.env.MATTERBRIDGE_CHIP_TEST) {
@@ -150,6 +157,7 @@ export class MatterbridgeColorControlServer extends ColorControlServer.with(Colo
         });
         device.log.debug(`MatterbridgeColorControlServer: moveSaturation called (endpoint ${this.endpoint.maybeId}.${this.endpoint.maybeNumber})`);
         await super.moveSaturation(request);
+        this.endpoint.emitCommand(ColorControl, 'moveSaturation', request, this.context);
     }
     async stepSaturation(request) {
         if (process.env.MATTERBRIDGE_CHIP_TEST) {
@@ -168,6 +176,7 @@ export class MatterbridgeColorControlServer extends ColorControlServer.with(Colo
         });
         device.log.debug(`MatterbridgeColorControlServer: stepSaturation called (endpoint ${this.endpoint.maybeId}.${this.endpoint.maybeNumber})`);
         await super.stepSaturation(request);
+        this.endpoint.emitCommand(ColorControl, 'stepSaturation', request, this.context);
     }
     async moveToHueAndSaturation(request) {
         if (process.env.MATTERBRIDGE_CHIP_TEST) {
@@ -186,6 +195,7 @@ export class MatterbridgeColorControlServer extends ColorControlServer.with(Colo
         });
         device.log.debug(`MatterbridgeColorControlServer: moveToHueAndSaturation called (endpoint ${this.endpoint.maybeId}.${this.endpoint.maybeNumber})`);
         await super.moveToHueAndSaturation(request);
+        this.endpoint.emitCommand(ColorControl, 'moveToHueAndSaturation', request, this.context);
     }
     async enhancedMoveToHueAndSaturation(request) {
         if (process.env.MATTERBRIDGE_CHIP_TEST) {
@@ -204,6 +214,7 @@ export class MatterbridgeColorControlServer extends ColorControlServer.with(Colo
         });
         device.log.debug(`MatterbridgeColorControlServer: enhancedMoveToHueAndSaturation called (endpoint ${this.endpoint.maybeId}.${this.endpoint.maybeNumber})`);
         await super.enhancedMoveToHueAndSaturation(request);
+        this.endpoint.emitCommand(ColorControl, 'enhancedMoveToHueAndSaturation', request, this.context);
     }
     async moveToColor(request) {
         if (process.env.MATTERBRIDGE_CHIP_TEST) {
@@ -222,6 +233,7 @@ export class MatterbridgeColorControlServer extends ColorControlServer.with(Colo
         });
         device.log.debug(`MatterbridgeColorControlServer: moveToColor called (endpoint ${this.endpoint.maybeId}.${this.endpoint.maybeNumber})`);
         await super.moveToColor(request);
+        this.endpoint.emitCommand(ColorControl, 'moveToColor', request, this.context);
     }
     async moveColor(request) {
         if (process.env.MATTERBRIDGE_CHIP_TEST) {
@@ -240,6 +252,7 @@ export class MatterbridgeColorControlServer extends ColorControlServer.with(Colo
         });
         device.log.debug(`MatterbridgeColorControlServer: moveColor called (endpoint ${this.endpoint.maybeId}.${this.endpoint.maybeNumber})`);
         await super.moveColor(request);
+        this.endpoint.emitCommand(ColorControl, 'moveColor', request, this.context);
     }
     async stepColor(request) {
         if (process.env.MATTERBRIDGE_CHIP_TEST) {
@@ -258,6 +271,7 @@ export class MatterbridgeColorControlServer extends ColorControlServer.with(Colo
         });
         device.log.debug(`MatterbridgeColorControlServer: stepColor called (endpoint ${this.endpoint.maybeId}.${this.endpoint.maybeNumber})`);
         await super.stepColor(request);
+        this.endpoint.emitCommand(ColorControl, 'stepColor', request, this.context);
     }
     async moveToColorTemperature(request) {
         if (process.env.MATTERBRIDGE_CHIP_TEST) {
@@ -276,6 +290,7 @@ export class MatterbridgeColorControlServer extends ColorControlServer.with(Colo
         });
         device.log.debug(`MatterbridgeColorControlServer: moveToColorTemperature called (endpoint ${this.endpoint.maybeId}.${this.endpoint.maybeNumber})`);
         await super.moveToColorTemperature(request);
+        this.endpoint.emitCommand(ColorControl, 'moveToColorTemperature', request, this.context);
     }
     async moveColorTemperature(request) {
         if (process.env.MATTERBRIDGE_CHIP_TEST) {
@@ -294,6 +309,7 @@ export class MatterbridgeColorControlServer extends ColorControlServer.with(Colo
         });
         device.log.debug(`MatterbridgeColorControlServer: moveColorTemperature called (endpoint ${this.endpoint.maybeId}.${this.endpoint.maybeNumber})`);
         await super.moveColorTemperature(request);
+        this.endpoint.emitCommand(ColorControl, 'moveColorTemperature', request, this.context);
     }
     async stepColorTemperature(request) {
         if (process.env.MATTERBRIDGE_CHIP_TEST) {
@@ -312,6 +328,7 @@ export class MatterbridgeColorControlServer extends ColorControlServer.with(Colo
         });
         device.log.debug(`MatterbridgeColorControlServer: stepColorTemperature called (endpoint ${this.endpoint.maybeId}.${this.endpoint.maybeNumber})`);
         await super.stepColorTemperature(request);
+        this.endpoint.emitCommand(ColorControl, 'stepColorTemperature', request, this.context);
     }
     async stopMoveStep(request) {
         if (process.env.MATTERBRIDGE_CHIP_TEST) {
@@ -330,5 +347,6 @@ export class MatterbridgeColorControlServer extends ColorControlServer.with(Colo
         });
         device.log.debug(`MatterbridgeColorControlServer: stopMoveStep called (endpoint ${this.endpoint.maybeId}.${this.endpoint.maybeNumber})`);
         await super.stopMoveStep(request);
+        this.endpoint.emitCommand(ColorControl, 'stopMoveStep', request, this.context);
     }
 }

package/dist/behaviors/levelControlServer.d.ts

@@ -1,7 +1,9 @@
 import type { MaybePromise } from '@matter/general';
 import { LevelControlServer } from '@matter/node/behaviors/level-control';
-import type { LevelControl } from '@matter/types/clusters/level-control';
+import { LevelControl } from '@matter/types/clusters/level-control';
+import type { MatterbridgeEndpoint } from '../matterbridgeEndpoint.js';
 export declare class MatterbridgeLevelControlServer extends LevelControlServer {
+    readonly endpoint: MatterbridgeEndpoint;
     initialize(): MaybePromise;
     moveToLevel(request: LevelControl.MoveToLevelRequest): Promise<void>;
     moveToLevelWithOnOff(request: LevelControl.MoveToLevelRequest): Promise<void>;

package/dist/behaviors/levelControlServer.js

@@ -1,4 +1,5 @@
 import { LevelControlServer } from '@matter/node/behaviors/level-control';
+import { LevelControl } from '@matter/types/clusters/level-control';
 import { MatterbridgeServer } from './matterbridgeServer.js';
 export class MatterbridgeLevelControlServer extends LevelControlServer {
     initialize() {
@@ -23,6 +24,7 @@ export class MatterbridgeLevelControlServer extends LevelControlServer {
         });
         device.log.debug(`MatterbridgeLevelControlServer: moveToLevel called (endpoint ${this.endpoint.maybeId}.${this.endpoint.maybeNumber})`);
         await super.moveToLevel(request);
+        this.endpoint.emitCommand(LevelControl, 'moveToLevel', request, this.context);
     }
     async moveToLevelWithOnOff(request) {
         if (process.env.MATTERBRIDGE_CHIP_TEST) {
@@ -41,6 +43,7 @@ export class MatterbridgeLevelControlServer extends LevelControlServer {
         });
         device.log.debug(`MatterbridgeLevelControlServer: moveToLevelWithOnOff called (endpoint ${this.endpoint.maybeId}.${this.endpoint.maybeNumber})`);
         await super.moveToLevelWithOnOff(request);
+        this.endpoint.emitCommand(LevelControl, 'moveToLevelWithOnOff', request, this.context);
     }
     async move(request) {
         if (process.env.MATTERBRIDGE_CHIP_TEST) {
@@ -59,6 +62,7 @@ export class MatterbridgeLevelControlServer extends LevelControlServer {
         });
         device.log.debug(`MatterbridgeLevelControlServer: move called (endpoint ${this.endpoint.maybeId}.${this.endpoint.maybeNumber})`);
         await super.move(request);
+        this.endpoint.emitCommand(LevelControl, 'move', request, this.context);
     }
     async moveWithOnOff(request) {
         if (process.env.MATTERBRIDGE_CHIP_TEST) {
@@ -77,6 +81,7 @@ export class MatterbridgeLevelControlServer extends LevelControlServer {
         });
         device.log.debug(`MatterbridgeLevelControlServer: moveWithOnOff called (endpoint ${this.endpoint.maybeId}.${this.endpoint.maybeNumber})`);
         await super.moveWithOnOff(request);
+        this.endpoint.emitCommand(LevelControl, 'moveWithOnOff', request, this.context);
     }
     async step(request) {
         if (process.env.MATTERBRIDGE_CHIP_TEST) {
@@ -95,6 +100,7 @@ export class MatterbridgeLevelControlServer extends LevelControlServer {
         });
         device.log.debug(`MatterbridgeLevelControlServer: step called (endpoint ${this.endpoint.maybeId}.${this.endpoint.maybeNumber})`);
         await super.step(request);
+        this.endpoint.emitCommand(LevelControl, 'step', request, this.context);
     }
     async stepWithOnOff(request) {
         if (process.env.MATTERBRIDGE_CHIP_TEST) {
@@ -113,6 +119,7 @@ export class MatterbridgeLevelControlServer extends LevelControlServer {
         });
         device.log.debug(`MatterbridgeLevelControlServer: stepWithOnOff called (endpoint ${this.endpoint.maybeId}.${this.endpoint.maybeNumber})`);
         await super.stepWithOnOff(request);
+        this.endpoint.emitCommand(LevelControl, 'stepWithOnOff', request, this.context);
     }
     async stop(request) {
         if (process.env.MATTERBRIDGE_CHIP_TEST) {
@@ -131,6 +138,7 @@ export class MatterbridgeLevelControlServer extends LevelControlServer {
         });
         device.log.debug(`MatterbridgeLevelControlServer: stop called (endpoint ${this.endpoint.maybeId}.${this.endpoint.maybeNumber})`);
         await super.stop(request);
+        this.endpoint.emitCommand(LevelControl, 'stop', request, this.context);
     }
     async stopWithOnOff(request) {
         if (process.env.MATTERBRIDGE_CHIP_TEST) {
@@ -149,5 +157,6 @@ export class MatterbridgeLevelControlServer extends LevelControlServer {
         });
         device.log.debug(`MatterbridgeLevelControlServer: stopWithOnOff called (endpoint ${this.endpoint.maybeId}.${this.endpoint.maybeNumber})`);
         await super.stopWithOnOff(request);
+        this.endpoint.emitCommand(LevelControl, 'stopWithOnOff', request, this.context);
     }
 }

package/dist/behaviors/onOffServer.d.ts

@@ -1,5 +1,6 @@
 import { OnOffServer } from '@matter/node/behaviors/on-off';
 import { OnOff } from '@matter/types/clusters/on-off';
+import type { MatterbridgeEndpoint } from '../matterbridgeEndpoint.js';
 declare const MatterbridgeOnOffServer_base: import("@matter/node").ClusterBehavior.Type<typeof OnOffServer, import("@matter/types").ClusterType.WithSupportedFeatures<import("@matter/types").ClusterType.WithSupportedFeatures<import("@matter/types").ClusterType.WithSupportedFeatures<OnOff, {
     deadFrontBehavior: false;
     lighting: true;
@@ -14,6 +15,7 @@ declare const MatterbridgeOnOffServer_base: import("@matter/node").ClusterBehavi
     offOnly: false;
 }>, import("@matter/types").ClusterType.Concrete, typeof import("@matter/node/behaviors/on-off").OnOffBaseServer.Internal, "onOff">;
 export declare class MatterbridgeOnOffServer extends MatterbridgeOnOffServer_base {
+    readonly endpoint: MatterbridgeEndpoint;
     on(): Promise<void>;
     off(): Promise<void>;
     toggle(): Promise<void>;

package/dist/behaviors/onOffServer.js

@@ -19,6 +19,7 @@ export class MatterbridgeOnOffServer extends OnOffServer.with(OnOff.Feature.Ligh
         });
         device.log.debug(`MatterbridgeOnOffServer: on called (endpoint ${this.endpoint.maybeId}.${this.endpoint.maybeNumber})`);
         await super.on();
+        this.endpoint.emitCommand(OnOff, 'on', {}, this.context);
     }
     async off() {
         if (process.env.MATTERBRIDGE_CHIP_TEST) {
@@ -37,6 +38,7 @@ export class MatterbridgeOnOffServer extends OnOffServer.with(OnOff.Feature.Ligh
         });
         device.log.debug(`MatterbridgeOnOffServer: off called (endpoint ${this.endpoint.maybeId}.${this.endpoint.maybeNumber})`);
         await super.off();
+        this.endpoint.emitCommand(OnOff, 'off', {}, this.context);
     }
     async toggle() {
         if (process.env.MATTERBRIDGE_CHIP_TEST) {
@@ -55,6 +57,7 @@ export class MatterbridgeOnOffServer extends OnOffServer.with(OnOff.Feature.Ligh
         });
         device.log.debug(`MatterbridgeOnOffServer: toggle called (endpoint ${this.endpoint.maybeId}.${this.endpoint.maybeNumber})`);
         await super.toggle();
+        this.endpoint.emitCommand(OnOff, 'toggle', {}, this.context);
     }
     async offWithEffect(request) {
         if (process.env.MATTERBRIDGE_CHIP_TEST) {
@@ -73,6 +76,7 @@ export class MatterbridgeOnOffServer extends OnOffServer.with(OnOff.Feature.Ligh
         });
         device.log.debug(`MatterbridgeOnOffServer: offWithEffect called (endpoint ${this.endpoint.maybeId}.${this.endpoint.maybeNumber})`);
         await super.offWithEffect(request);
+        this.endpoint.emitCommand(OnOff, 'offWithEffect', request, this.context);
     }
     async onWithRecallGlobalScene() {
         if (process.env.MATTERBRIDGE_CHIP_TEST) {
@@ -91,6 +95,7 @@ export class MatterbridgeOnOffServer extends OnOffServer.with(OnOff.Feature.Ligh
         });
         device.log.debug(`MatterbridgeOnOffServer: onWithRecallGlobalScene called (endpoint ${this.endpoint.maybeId}.${this.endpoint.maybeNumber})`);
         await super.onWithRecallGlobalScene();
+        this.endpoint.emitCommand(OnOff, 'onWithRecallGlobalScene', {}, this.context);
     }
     async onWithTimedOff(request) {
         if (process.env.MATTERBRIDGE_CHIP_TEST) {
@@ -109,5 +114,6 @@ export class MatterbridgeOnOffServer extends OnOffServer.with(OnOff.Feature.Ligh
         });
         device.log.debug(`MatterbridgeOnOffServer: onWithTimedOff called (endpoint ${this.endpoint.maybeId}.${this.endpoint.maybeNumber})`);
         await super.onWithTimedOff(request);
+        this.endpoint.emitCommand(OnOff, 'onWithTimedOff', request, this.context);
     }
 }

package/dist/behaviors/webRtcTransportProviderServer.d.ts

@@ -1,5 +1,5 @@
 import { WebRtcTransportProviderServer } from '@matter/node/behaviors/web-rtc-transport-provider';
-import type { WebRtcTransportProvider } from '@matter/types/clusters/web-rtc-transport-provider';
+import { WebRtcTransportProvider } from '@matter/types/clusters/web-rtc-transport-provider';
 import type { MatterbridgeEndpoint } from '../matterbridgeEndpoint.js';
 import { type WeriftOfferOptions, WeriftWebRtcSession } from './weriftSession.js';
 export declare function allocateWebRtcSessionId(nextCandidate: number, activeSessionIds: ReadonlySet<number>): {
@@ -8,6 +8,7 @@ export declare function allocateWebRtcSessionId(nextCandidate: number, activeSes
 };
 export declare class MatterbridgeWebRtcTransportProviderServer extends WebRtcTransportProviderServer {
     #private;
+    readonly endpoint: MatterbridgeEndpoint;
     state: MatterbridgeWebRtcTransportProviderServer.State;
     internal: MatterbridgeWebRtcTransportProviderServer.Internal;
     solicitOffer(request: WebRtcTransportProvider.SolicitOfferRequest): Promise<WebRtcTransportProvider.SolicitOfferResponse>;

package/dist/behaviors/webRtcTransportProviderServer.js

@@ -3,7 +3,7 @@ import { WebRtcTransportProviderServer } from '@matter/node/behaviors/web-rtc-tr
 import { WebRtcTransportRequestorClient } from '@matter/node/behaviors/web-rtc-transport-requestor';
 import { EndpointNumber, FabricIndex, NodeId, StreamUsage, Status, StatusResponseError } from '@matter/types';
 import { WebRtcTransportDefinitions } from '@matter/types/clusters/web-rtc-transport-definitions';
-import { emitCommand } from '../matterbridgeEndpointHelpers.js';
+import { WebRtcTransportProvider } from '@matter/types/clusters/web-rtc-transport-provider';
 import { MatterbridgeCameraAvStreamManagementServer } from './cameraAvStreamManagementServer.js';
 import { MatterbridgeServer } from './matterbridgeServer.js';
 import { WeriftWebRtcSession } from './weriftSession.js';
@@ -249,7 +249,7 @@ export class MatterbridgeWebRtcTransportProviderServer extends WebRtcTransportPr
         device.log.info(`MatterbridgeWebRtcTransportProviderServer.solicitOffer: solicited a WebRTC offer for session ${webRtcSessionId} (stream usage ${request.streamUsage}) (endpoint ${this.endpoint.maybeId}.${this.endpoint.maybeNumber})`);
         const requestorEndpoint = await this.#resolvePeerRequestorEndpoint(peerNodeId, fabricIndex, request.originatingEndpointId);
         if (this.#evictIfOverCapacity(webRtcSessionId, requestorEndpoint)) {
-            emitCommand(this.endpoint, WebRtcTransportProviderServer.id, 'solicitOffer', request, this.context);
+            this.endpoint.emitCommand(WebRtcTransportProvider, 'solicitOffer', request, this.context);
             return { webRtcSessionId, deferredOffer: false, ...this.#echoDeprecatedStreamIds(request, videoStreams, audioStreams) };
         }
         const webRtcPeer = new WeriftWebRtcSession(webRtcSessionId, this.state.weriftOfferOptions);
@@ -266,7 +266,7 @@ export class MatterbridgeWebRtcTransportProviderServer extends WebRtcTransportPr
         else {
             device.log.info(`MatterbridgeWebRtcTransportProviderServer.solicitOffer: could not reach the peer's WebRtcTransportRequestor; the Offer for session ${webRtcSessionId} was not sent (endpoint ${this.endpoint.maybeId}.${this.endpoint.maybeNumber})`);
         }
-        emitCommand(this.endpoint, WebRtcTransportProviderServer.id, 'solicitOffer', request, this.context);
+        this.endpoint.emitCommand(WebRtcTransportProvider, 'solicitOffer', request, this.context);
         return { webRtcSessionId, deferredOffer: false, ...this.#echoDeprecatedStreamIds(request, videoStreams, audioStreams) };
     }
     async provideOffer(request) {
@@ -311,7 +311,7 @@ export class MatterbridgeWebRtcTransportProviderServer extends WebRtcTransportPr
             ];
             const requestorEndpointForCapacityCheck = await this.#resolvePeerRequestorEndpoint(peerNodeId, fabricIndex, request.originatingEndpointId ?? EndpointNumber(0));
             if (this.#evictIfOverCapacity(webRtcSessionId, requestorEndpointForCapacityCheck)) {
-                emitCommand(this.endpoint, WebRtcTransportProviderServer.id, 'provideOffer', request, this.context);
+                this.endpoint.emitCommand(WebRtcTransportProvider, 'provideOffer', request, this.context);
                 return { webRtcSessionId, ...this.#echoDeprecatedStreamIds(request, videoStreams, audioStreams) };
             }
         }
@@ -336,7 +336,7 @@ export class MatterbridgeWebRtcTransportProviderServer extends WebRtcTransportPr
         else {
             device.log.info(`MatterbridgeWebRtcTransportProviderServer.provideOffer: could not reach the peer's WebRtcTransportRequestor; the Answer for session ${webRtcSessionId} was not sent (endpoint ${this.endpoint.maybeId}.${this.endpoint.maybeNumber})`);
         }
-        emitCommand(this.endpoint, WebRtcTransportProviderServer.id, 'provideOffer', request, this.context);
+        this.endpoint.emitCommand(WebRtcTransportProvider, 'provideOffer', request, this.context);
         return { webRtcSessionId, ...this.#echoDeprecatedStreamIds(request, session.videoStreams && [...session.videoStreams], session.audioStreams && [...session.audioStreams]) };
     }
     async provideAnswer(request) {
@@ -350,7 +350,7 @@ export class MatterbridgeWebRtcTransportProviderServer extends WebRtcTransportPr
         if (webRtcPeer) {
             await webRtcPeer.applyAnswer(request.sdp);
         }
-        emitCommand(this.endpoint, WebRtcTransportProviderServer.id, 'provideAnswer', request, this.context);
+        this.endpoint.emitCommand(WebRtcTransportProvider, 'provideAnswer', request, this.context);
     }
     async provideIceCandidates(request) {
         const device = this.endpoint.stateOf(MatterbridgeServer);
@@ -388,7 +388,7 @@ export class MatterbridgeWebRtcTransportProviderServer extends WebRtcTransportPr
                 }
             }));
         }
-        emitCommand(this.endpoint, WebRtcTransportProviderServer.id, 'provideIceCandidates', request, this.context);
+        this.endpoint.emitCommand(WebRtcTransportProvider, 'provideIceCandidates', request, this.context);
     }
     async endSession(request) {
         const device = this.endpoint.stateOf(MatterbridgeServer);
@@ -402,7 +402,7 @@ export class MatterbridgeWebRtcTransportProviderServer extends WebRtcTransportPr
             await webRtcPeer.close();
         }
         device.log.info(`MatterbridgeWebRtcTransportProviderServer.endSession: ended webRTC session ${request.webRtcSessionId} (reason ${request.reason}) (endpoint ${this.endpoint.maybeId}.${this.endpoint.maybeNumber})`);
-        emitCommand(this.endpoint, WebRtcTransportProviderServer.id, 'endSession', request, this.context);
+        this.endpoint.emitCommand(WebRtcTransportProvider, 'endSession', request, this.context);
     }
 }
 (function (MatterbridgeWebRtcTransportProviderServer) {

package/dist/behaviors/webRtcTransportRequestorServer.d.ts

@@ -1,7 +1,8 @@
 import { WebRtcTransportRequestorServer } from '@matter/node/behaviors/web-rtc-transport-requestor';
-import type { WebRtcTransportRequestor } from '@matter/types/clusters/web-rtc-transport-requestor';
+import { WebRtcTransportRequestor } from '@matter/types/clusters/web-rtc-transport-requestor';
 import type { MatterbridgeEndpoint } from '../matterbridgeEndpoint.js';
 export declare class MatterbridgeWebRtcTransportRequestorServer extends WebRtcTransportRequestorServer {
+    readonly endpoint: MatterbridgeEndpoint;
     offer(request: WebRtcTransportRequestor.OfferRequest): Promise<void>;
     answer(request: WebRtcTransportRequestor.AnswerRequest): Promise<void>;
     iceCandidates(request: WebRtcTransportRequestor.IceCandidatesRequest): Promise<void>;

package/dist/behaviors/webRtcTransportRequestorServer.js

@@ -1,21 +1,21 @@
 import { WebRtcTransportRequestorServer } from '@matter/node/behaviors/web-rtc-transport-requestor';
-import { emitCommand } from '../matterbridgeEndpointHelpers.js';
+import { WebRtcTransportRequestor } from '@matter/types/clusters/web-rtc-transport-requestor';
 export class MatterbridgeWebRtcTransportRequestorServer extends WebRtcTransportRequestorServer {
     async offer(request) {
         await super.offer(request);
-        emitCommand(this.endpoint, WebRtcTransportRequestorServer.id, 'offer', request, this.context);
+        this.endpoint.emitCommand(WebRtcTransportRequestor, 'offer', request, this.context);
     }
     async answer(request) {
         await super.answer(request);
-        emitCommand(this.endpoint, WebRtcTransportRequestorServer.id, 'answer', request, this.context);
+        this.endpoint.emitCommand(WebRtcTransportRequestor, 'answer', request, this.context);
     }
     async iceCandidates(request) {
         await super.iceCandidates(request);
-        emitCommand(this.endpoint, WebRtcTransportRequestorServer.id, 'iceCandidates', request, this.context);
+        this.endpoint.emitCommand(WebRtcTransportRequestor, 'iceCandidates', request, this.context);
     }
     async end(request) {
         await super.end(request);
-        emitCommand(this.endpoint, WebRtcTransportRequestorServer.id, 'end', request, this.context);
+        this.endpoint.emitCommand(WebRtcTransportRequestor, 'end', request, this.context);
     }
 }
 export function createDefaultWebRtcTransportRequestorClusterServer(endpoint) {

package/dist/behaviors/weriftSession.d.ts

@@ -29,6 +29,8 @@ export declare class WeriftWebRtcSession {
     private static readonly DIAGNOSTICS_INTERVAL_MS;
     private lastDiagnosticsCounters?;
     private readonly dtlsTransportsWithStateLogging;
+    private static parseIcePortRange;
+    private static parseIceAdditionalHostAddresses;
     constructor(webRtcSessionId: number, options: WeriftOfferOptions);
     private summarizeSdp;
     private getFreeUdpPort;

package/dist/behaviors/weriftSession.js

@@ -22,11 +22,35 @@ export class WeriftWebRtcSession {
     static DIAGNOSTICS_INTERVAL_MS = 10_000;
     lastDiagnosticsCounters;
     dtlsTransportsWithStateLogging = new Set();
+    static parseIcePortRange() {
+        const raw = process.env.MATTERBRIDGE_ICE_PORT_RANGE?.trim();
+        if (!raw)
+            return undefined;
+        const match = /^(\d{1,5})-(\d{1,5})$/.exec(raw);
+        if (!match)
+            return undefined;
+        const min = Number(match[1]);
+        const max = Number(match[2]);
+        if (min < 1024 || max > 65_535 || min >= max)
+            return undefined;
+        return [min, max];
+    }
+    static parseIceAdditionalHostAddresses() {
+        const addresses = process.env.MATTERBRIDGE_ICE_HOST_ADDRESSES?.split(',')
+            .map((address) => address.trim())
+            .filter((address) => address.length > 0) ?? [];
+        return addresses.length > 0 ? addresses : undefined;
+    }
     constructor(webRtcSessionId, options) {
         this.webRtcSessionId = webRtcSessionId;
         this.options = { ...options };
-        this.peerConnection = new RTCPeerConnection({ codecs: { audio: [useOPUS(), usePCMU()], video: [useH264(), useVP8()] } });
+        const icePortRange = WeriftWebRtcSession.parseIcePortRange();
+        const iceAdditionalHostAddresses = WeriftWebRtcSession.parseIceAdditionalHostAddresses();
+        this.peerConnection = new RTCPeerConnection({ codecs: { audio: [useOPUS(), usePCMU()], video: [useH264(), useVP8()] }, icePortRange, iceAdditionalHostAddresses });
         this.log = new AnsiLogger({ logName: `WebRTC session ${webRtcSessionId}`, logLevel: "debug", logNameColor: MAGENTA, logTimestampFormat: 4 });
+        if (icePortRange || iceAdditionalHostAddresses) {
+            this.log.debug(`ICE overrides: portRange=${icePortRange ? `${icePortRange[0]}-${icePortRange[1]}` : 'default'} additionalHostAddresses=${iceAdditionalHostAddresses?.join(', ') ?? 'none'}`);
+        }
         this.peerConnection.iceGatheringStateChange.subscribe((state) => {
             this.log.info(`ICE gathering state: ${state}`);
         });

package/dist/demoDevices.js

@@ -5,6 +5,7 @@ import { AirQuality } from '@matter/types/clusters/air-quality';
 import { ClosureDimension } from '@matter/types/clusters/closure-dimension';
 import { DoorLock } from '@matter/types/clusters/door-lock';
 import { FanControl } from '@matter/types/clusters/fan-control';
+import { Identify } from '@matter/types/clusters/identify';
 import { PowerSource } from '@matter/types/clusters/power-source';
 import { PowerTopology } from '@matter/types/clusters/power-topology';
 import { ResourceMonitoring } from '@matter/types/clusters/resource-monitoring';
@@ -14,18 +15,25 @@ import { Thermostat } from '@matter/types/clusters/thermostat';
 import { EndpointNumber } from '@matter/types/datatype';
 import { getErrorMessage } from '@matterbridge/utils/error';
 import { AirConditioner } from './devices/airConditioner.js';
+import { AudioDoorbell } from './devices/audioDoorbell.js';
 import { BasicVideoPlayer } from './devices/basicVideoPlayer.js';
 import { BatteryStorage } from './devices/batteryStorage.js';
+import { Camera } from './devices/camera.js';
+import { CameraController } from './devices/cameraController.js';
 import { CastingVideoClient } from './devices/castingVideoClient.js';
 import { CastingVideoPlayer } from './devices/castingVideoPlayer.js';
+import { Chime } from './devices/chime.js';
 import { Closure } from './devices/closure.js';
 import { ContentApp } from './devices/contentApp.js';
 import { Cooktop } from './devices/cooktop.js';
 import { Dishwasher } from './devices/dishwasher.js';
+import { Doorbell } from './devices/doorbell.js';
 import { ElectricalUtilityMeter } from './devices/electricalUtilityMeter.js';
 import { Evse } from './devices/evse.js';
 import { ExtractorHood } from './devices/extractorHood.js';
+import { FloodlightCamera } from './devices/floodlightCamera.js';
 import { HeatPump } from './devices/heatPump.js';
+import { Intercom } from './devices/intercom.js';
 import { IrrigationSystem } from './devices/irrigationSystem.js';
 import { LaundryDryer } from './devices/laundryDryer.js';
 import { LaundryWasher } from './devices/laundryWasher.js';
@@ -33,8 +41,10 @@ import { MicrowaveOven } from './devices/microwaveOven.js';
 import { Oven } from './devices/oven.js';
 import { Refrigerator } from './devices/refrigerator.js';
 import { RoboticVacuumCleaner } from './devices/roboticVacuumCleaner.js';
+import { SnapshotCamera } from './devices/snapshotCamera.js';
 import { SolarPower } from './devices/solarPower.js';
 import { Speaker } from './devices/speaker.js';
+import { VideoDoorbell } from './devices/videoDoorbell.js';
 import { VideoRemoteControl } from './devices/videoRemoteControl.js';
 import { WaterHeater } from './devices/waterHeater.js';
 import { getSupportedDeviceType } from './matterbridgeDeviceTypes.js';
@@ -823,4 +833,58 @@ export async function createDemoDevices(matterbridge) {
         tagList: [getSemtag(ElectricalMeasurementTag.Ac), getSemtag(PowerSourceTag.Ev), getSemtag(CommodityTariffFlowTag.Import), getSemtag(CommodityTariffChronologyTag.Upcoming)],
     });
     await registerDevice(electricalUtilityMeterEvEndpoint, 'Electrical Utility Meter Ev', 'ENERGY-14-10');
+    ep = new Camera('Camera', 'CAMERA-16-01', {
+        id: 'Camera',
+        number: EndpointNumber(16_01),
+        weriftOfferOptions: { video: true, audio: true, videoSource: 'test', audioSource: 'test' },
+    });
+    await registerDevice(ep, 'Camera', 'CAMERA-16-01');
+    ep = new Camera('Camera Ptz', 'CAMERA-16-01-1', {
+        id: 'CameraPtz',
+        number: EndpointNumber(16_01_1),
+        ptz: true,
+        identifyType: Identify.IdentifyType.VisibleIndicator,
+        weriftOfferOptions: { video: true, audio: true, videoSource: 'test', audioSource: 'test' },
+    });
+    await registerDevice(ep, 'Camera Ptz', 'CAMERA-16-01-1');
+    ep = new FloodlightCamera('Floodlight Camera', 'CAMERA-16-02', {
+        id: 'FloodlightCamera',
+        number: EndpointNumber(16_02),
+        cameraOptions: { number: EndpointNumber(16_02_1), ptz: true, identifyType: Identify.IdentifyType.VisibleIndicator },
+        lightOptions: { number: EndpointNumber(16_02_2) },
+    });
+    await registerDevice(ep, 'Floodlight Camera', 'CAMERA-16-02');
+    ep = new VideoDoorbell('Video Doorbell', 'CAMERA-16-03', {
+        id: 'VideoDoorbell',
+        number: EndpointNumber(16_03),
+        cameraOptions: { number: EndpointNumber(16_03_1), ptz: true, identifyType: Identify.IdentifyType.VisibleIndicator },
+        doorbellOptions: { number: EndpointNumber(16_03_2) },
+    });
+    await registerDevice(ep, 'Video Doorbell', 'CAMERA-16-03');
+    ep = new Intercom('Intercom I', 'CAMERA-16-04', { id: 'Intercom', number: EndpointNumber(16_04), identifyType: Identify.IdentifyType.VisibleIndicator });
+    await registerDevice(ep, 'Intercom I', 'CAMERA-16-04');
+    ep = new Intercom('Intercom II', 'CAMERA-16-04-1', { id: 'IntercomII', number: EndpointNumber(16_04_1), identifyType: Identify.IdentifyType.VisibleIndicator });
+    await registerDevice(ep, 'Intercom II', 'CAMERA-16-04-1');
+    ep = new AudioDoorbell('Audio Doorbell', 'CAMERA-16-05', { id: 'AudioDoorbell', number: EndpointNumber(16_05) });
+    await registerDevice(ep, 'Audio Doorbell', 'CAMERA-16-05');
+    ep = new SnapshotCamera('Snapshot Camera', 'CAMERA-16-06', {
+        id: 'SnapshotCamera',
+        number: EndpointNumber(16_06),
+        identifyType: Identify.IdentifyType.VisibleIndicator,
+    });
+    await registerDevice(ep, 'Snapshot Camera', 'CAMERA-16-06');
+    ep = new Chime('Chime', 'CAMERA-16-07', {
+        id: 'Chime',
+        number: EndpointNumber(16_07),
+        identifyType: Identify.IdentifyType.AudibleBeep,
+        installedChimeSounds: [
+            { chimeId: 0, name: 'Default Chime' },
+            { chimeId: 1, name: 'Westminster' },
+        ],
+    });
+    await registerDevice(ep, 'Chime', 'CAMERA-16-07');
+    ep = new CameraController('Camera Controller', 'CAMERA-16-08', { id: 'CameraController', number: EndpointNumber(16_08) });
+    await registerDevice(ep, 'Camera Controller', 'CAMERA-16-08');
+    ep = new Doorbell('Doorbell', 'CAMERA-16-09', { id: 'Doorbell', number: EndpointNumber(16_09) });
+    await registerDevice(ep, 'Doorbell', 'CAMERA-16-09');
 }

package/dist/devices/camera/export.d.ts

@@ -0,0 +1,9 @@
+export * from '../audioDoorbell.js';
+export * from '../camera.js';
+export * from '../cameraController.js';
+export * from '../chime.js';
+export * from '../doorbell.js';
+export * from '../floodlightCamera.js';
+export * from '../intercom.js';
+export * from '../snapshotCamera.js';
+export * from '../videoDoorbell.js';

package/dist/devices/camera/export.js

@@ -0,0 +1,9 @@
+export * from '../audioDoorbell.js';
+export * from '../camera.js';
+export * from '../cameraController.js';
+export * from '../chime.js';
+export * from '../doorbell.js';
+export * from '../floodlightCamera.js';
+export * from '../intercom.js';
+export * from '../snapshotCamera.js';
+export * from '../videoDoorbell.js';

package/dist/devices/cameraController.d.ts

@@ -0,0 +1,8 @@
+import { MatterbridgeEndpoint } from '../matterbridgeEndpoint.js';
+import type { MatterbridgeEndpointOptions } from '../matterbridgeEndpointTypes.js';
+export interface CameraControllerOptions extends MatterbridgeEndpointOptions {
+    powerSourceType?: 'Rechargeable' | 'Replaceable' | 'Battery' | 'Wired' | 'None';
+}
+export declare class CameraController extends MatterbridgeEndpoint {
+    constructor(name: string, serial: string, options?: CameraControllerOptions);
+}

package/dist/devices/cameraController.js

@@ -0,0 +1,35 @@
+import { addWebRtcTransportProviderClient } from '../behaviors/clients.js';
+import { createDefaultWebRtcTransportRequestorClusterServer } from '../behaviors/webRtcTransportRequestorServer.js';
+import { cameraController, powerSource } from '../matterbridgeDeviceTypes.js';
+import { MatterbridgeEndpoint } from '../matterbridgeEndpoint.js';
+export class CameraController extends MatterbridgeEndpoint {
+    constructor(name, serial, options = {}) {
+        const { powerSourceType = 'Wired', id, number, tagList, mode } = options;
+        super(powerSourceType === 'None' ? [cameraController] : [cameraController, powerSource], {
+            id: id ?? `${name.replaceAll(' ', '')}-${serial.replaceAll(' ', '')}`,
+            number,
+            tagList,
+            mode,
+        });
+        this.createDefaultBasicInformationClusterServer(name, serial, 0xfff1, 'Matterbridge', 0x8000, 'Matterbridge Camera Controller');
+        switch (powerSourceType) {
+            case 'Rechargeable':
+                this.createDefaultPowerSourceRechargeableBatteryClusterServer();
+                break;
+            case 'Replaceable':
+                this.createDefaultPowerSourceReplaceableBatteryClusterServer();
+                break;
+            case 'Battery':
+                this.createDefaultPowerSourceBatteryClusterServer();
+                break;
+            case 'Wired':
+                this.createDefaultPowerSourceWiredClusterServer();
+                break;
+            case 'None':
+                break;
+        }
+        createDefaultWebRtcTransportRequestorClusterServer(this);
+        addWebRtcTransportProviderClient(this);
+        this.addRequiredClusters();
+    }
+}

package/dist/devices/floodlightCamera.d.ts

@@ -1,11 +1,13 @@
 import type { Semtag } from '@matter/types';
+import type { EndpointNumber } from '@matter/types/datatype';
 import { MatterbridgeEndpoint } from '../matterbridgeEndpoint.js';
 import type { MatterbridgeEndpointOptions } from '../matterbridgeEndpointTypes.js';
 import type { CameraOptions } from './camera.js';
-export type FloodlightCameraCameraOptions = Omit<CameraOptions, 'id' | 'number' | 'tagList' | 'mode' | 'powerSourceType'>;
+export type FloodlightCameraCameraOptions = Omit<CameraOptions, 'id' | 'mode' | 'powerSourceType'>;
 export interface FloodlightCameraLightOptions {
     name?: string;
     tagList?: Semtag[];
+    number?: EndpointNumber;
     onOff?: boolean;
 }
 export interface FloodlightCameraOptions extends MatterbridgeEndpointOptions {
@@ -15,5 +17,5 @@ export interface FloodlightCameraOptions extends MatterbridgeEndpointOptions {
 }
 export declare class FloodlightCamera extends MatterbridgeEndpoint {
     constructor(name: string, serial: string, options?: FloodlightCameraOptions);
-    addLight(name: string, tagList?: Semtag[], onOff?: boolean): MatterbridgeEndpoint;
+    addLight(name: string, options?: FloodlightCameraLightOptions): MatterbridgeEndpoint;
 }

package/dist/devices/floodlightCamera.js

@@ -43,8 +43,8 @@ export class FloodlightCamera extends MatterbridgeEndpoint {
             { resolution: { width: 640, height: 480 }, maxFrameRate: 10, imageCodec: CameraAvStreamManagement.ImageCodec.Jpeg, requiresEncodedPixels: false },
             { resolution: { width: 1280, height: 720 }, maxFrameRate: 10, imageCodec: CameraAvStreamManagement.ImageCodec.Jpeg, requiresEncodedPixels: false },
             { resolution: { width: 1920, height: 1080 }, maxFrameRate: 10, imageCodec: CameraAvStreamManagement.ImageCodec.Jpeg, requiresEncodedPixels: false },
-        ], weriftOfferOptions, } = cameraOptions;
-        const cameraChild = this.addChildDeviceType('Camera', camera, {});
+        ], weriftOfferOptions, number: cameraNumber, tagList: cameraTagList = [], } = cameraOptions;
+        const cameraChild = this.addChildDeviceType('Camera', camera, { number: cameraNumber, ...(cameraTagList.length > 0 ? { tagList: cameraTagList } : {}) });
         cameraChild.log.logName = 'Camera';
         if (identifyType !== Identify.IdentifyType.None) {
             cameraChild.createDefaultIdentifyClusterServer(identifyTime, identifyType);
@@ -67,11 +67,12 @@ export class FloodlightCamera extends MatterbridgeEndpoint {
         createDefaultWebRtcTransportProviderClusterServer(cameraChild, weriftOfferOptions);
         addWebRtcTransportRequestorClient(cameraChild);
         cameraChild.addRequiredClusters();
-        const { name: lightName = 'Light', tagList: lightTagList = [], onOff: lightOnOff = false } = lightOptions;
-        this.addLight(lightName, lightTagList, lightOnOff);
+        const { name: lightName = 'Light', tagList: lightTagList = [], number: lightNumber, onOff: lightOnOff = false } = lightOptions;
+        this.addLight(lightName, { tagList: lightTagList, number: lightNumber, onOff: lightOnOff });
     }
-    addLight(name, tagList = [], onOff = false) {
-        const light = this.addChildDeviceType(name, onOffLight, tagList.length > 0 ? { tagList } : {});
+    addLight(name, options = {}) {
+        const { tagList = [], number, onOff = false } = options;
+        const light = this.addChildDeviceType(name, onOffLight, { number, ...(tagList.length > 0 ? { tagList } : {}) });
         light.log.logName = name;
         light.createDefaultIdentifyClusterServer();
         light.createDefaultOnOffClusterServer(onOff);

package/dist/devices/videoDoorbell.d.ts

@@ -1,12 +1,14 @@
 import type { Semtag } from '@matter/types';
 import { Identify } from '@matter/types/clusters/identify';
+import type { EndpointNumber } from '@matter/types/datatype';
 import { MatterbridgeEndpoint } from '../matterbridgeEndpoint.js';
 import type { MatterbridgeEndpointOptions } from '../matterbridgeEndpointTypes.js';
 import type { CameraOptions } from './camera.js';
-export type VideoDoorbellCameraOptions = Omit<CameraOptions, 'id' | 'number' | 'tagList' | 'mode' | 'powerSourceType'>;
+export type VideoDoorbellCameraOptions = Omit<CameraOptions, 'id' | 'mode' | 'powerSourceType'>;
 export interface VideoDoorbellDoorbellOptions {
     name?: string;
     tagList?: Semtag[];
+    number?: EndpointNumber;
     identifyTime?: number;
     identifyType?: Identify.IdentifyType;
 }
@@ -17,5 +19,5 @@ export interface VideoDoorbellOptions extends MatterbridgeEndpointOptions {
 }
 export declare class VideoDoorbell extends MatterbridgeEndpoint {
     constructor(name: string, serial: string, options?: VideoDoorbellOptions);
-    addDoorbell(name: string, tagList?: Semtag[], identifyTime?: number, identifyType?: Identify.IdentifyType): MatterbridgeEndpoint;
+    addDoorbell(name: string, options?: VideoDoorbellDoorbellOptions): MatterbridgeEndpoint;
 }

package/dist/devices/videoDoorbell.js

@@ -43,8 +43,8 @@ export class VideoDoorbell extends MatterbridgeEndpoint {
             { resolution: { width: 640, height: 480 }, maxFrameRate: 10, imageCodec: CameraAvStreamManagement.ImageCodec.Jpeg, requiresEncodedPixels: false },
             { resolution: { width: 1280, height: 720 }, maxFrameRate: 10, imageCodec: CameraAvStreamManagement.ImageCodec.Jpeg, requiresEncodedPixels: false },
             { resolution: { width: 1920, height: 1080 }, maxFrameRate: 10, imageCodec: CameraAvStreamManagement.ImageCodec.Jpeg, requiresEncodedPixels: false },
-        ], weriftOfferOptions, } = cameraOptions;
-        const cameraChild = this.addChildDeviceType('Camera', camera, {});
+        ], weriftOfferOptions, number: cameraNumber, tagList: cameraTagList = [], } = cameraOptions;
+        const cameraChild = this.addChildDeviceType('Camera', camera, { number: cameraNumber, ...(cameraTagList.length > 0 ? { tagList: cameraTagList } : {}) });
         cameraChild.log.logName = 'Camera';
         if (cameraIdentifyType !== Identify.IdentifyType.None) {
             cameraChild.createDefaultIdentifyClusterServer(cameraIdentifyTime, cameraIdentifyType);
@@ -67,11 +67,12 @@ export class VideoDoorbell extends MatterbridgeEndpoint {
         createDefaultWebRtcTransportProviderClusterServer(cameraChild, weriftOfferOptions);
         addWebRtcTransportRequestorClient(cameraChild);
         cameraChild.addRequiredClusters();
-        const { name: doorbellName = 'Doorbell', tagList: doorbellTagList = [], identifyTime = 0, identifyType = Identify.IdentifyType.None } = doorbellOptions;
-        this.addDoorbell(doorbellName, doorbellTagList, identifyTime, identifyType);
+        const { name: doorbellName = 'Doorbell', tagList: doorbellTagList = [], number: doorbellNumber, identifyTime = 0, identifyType = Identify.IdentifyType.None } = doorbellOptions;
+        this.addDoorbell(doorbellName, { tagList: doorbellTagList, number: doorbellNumber, identifyTime, identifyType });
     }
-    addDoorbell(name, tagList = [], identifyTime = 0, identifyType = Identify.IdentifyType.None) {
-        const doorbellChild = this.addChildDeviceType(name, doorbell, tagList.length > 0 ? { tagList } : {});
+    addDoorbell(name, options = {}) {
+        const { tagList = [], number, identifyTime = 0, identifyType = Identify.IdentifyType.None } = options;
+        const doorbellChild = this.addChildDeviceType(name, doorbell, { number, ...(tagList.length > 0 ? { tagList } : {}) });
         doorbellChild.log.logName = name;
         doorbellChild.createDefaultIdentifyClusterServer(identifyTime, identifyType);
         doorbellChild.createDefaultMomentarySwitchClusterServer();

package/dist/helpers.d.ts

@@ -3,3 +3,4 @@ import type { AggregatorEndpoint } from '@matter/node/endpoints/aggregator';
 import type { Matterbridge } from './matterbridge.js';
 export declare function addVirtualDevice(aggregatorEndpoint: Endpoint<AggregatorEndpoint>, name: string, type: 'light' | 'outlet' | 'switch' | 'mounted_switch', callback: () => Promise<void>): Promise<Endpoint>;
 export declare function addVirtualDevices(matterbridge: Matterbridge, aggregatorEndpoint: Endpoint<AggregatorEndpoint>): Promise<void>;
+export declare function resolveRootDirectory(currentFileDirectory: string, maxLevels?: number): Promise<string | undefined>;

package/dist/helpers.js

@@ -1,3 +1,5 @@
+import fs from 'node:fs';
+import path from 'node:path';
 import { Endpoint } from '@matter/node';
 import { BindingServer } from '@matter/node/behaviors/binding';
 import { BridgedDeviceBasicInformationServer } from '@matter/node/behaviors/bridged-device-basic-information';
@@ -71,3 +73,27 @@ export async function addVirtualDevices(matterbridge, aggregatorEndpoint) {
         });
     }
 }
+async function isMatterbridgePackageDirectory(directory) {
+    try {
+        const packageJson = JSON.parse(await fs.promises.readFile(path.join(directory, 'package.json'), 'utf8'));
+        return packageJson?.name === 'matterbridge';
+    }
+    catch {
+        return false;
+    }
+}
+export async function resolveRootDirectory(currentFileDirectory, maxLevels = 10) {
+    let directory = currentFileDirectory;
+    for (let level = 0; level < maxLevels; level++) {
+        if (await isMatterbridgePackageDirectory(directory))
+            return directory;
+        const nodeModulesDirectory = path.join(directory, 'node_modules', 'matterbridge');
+        if (await isMatterbridgePackageDirectory(nodeModulesDirectory))
+            return nodeModulesDirectory;
+        const parentDirectory = path.dirname(directory);
+        if (parentDirectory === directory)
+            break;
+        directory = parentDirectory;
+    }
+    return undefined;
+}

package/dist/matterbridge.js

@@ -30,7 +30,7 @@ import { AnsiLogger, BLUE, BRIGHT, CYAN, db, debugStringify, er, GREEN, nf, nt,
 import { NodeStorageManager } from 'node-persist-manager';
 import { DeviceManager } from './deviceManager.js';
 import { Frontend } from './frontend.js';
-import { addVirtualDevice, addVirtualDevices } from './helpers.js';
+import { addVirtualDevice, addVirtualDevices, resolveRootDirectory } from './helpers.js';
 import { bridge } from './matterbridgeDeviceTypes.js';
 import { MatterbridgeEndpoint } from './matterbridgeEndpoint.js';
 import { PluginManager } from './pluginManager.js';
@@ -408,25 +408,14 @@ export class Matterbridge extends EventEmitter {
         await createDirectory(this.matterbridgeCertDirectory, 'Matterbridge Matter Certificate Directory', this.log);
         const currentFileDirectory = path.dirname(fileURLToPath(import.meta.url));
         this.log.debug(`Determining root directory from currentFileDirectory = ${CYAN}${currentFileDirectory}${db}`);
-        if (currentFileDirectory.endsWith(path.join('matterbridge', 'packages', 'core', 'src')) ||
-            currentFileDirectory.endsWith(path.join('matterbridge', 'packages', 'core', 'dist'))) {
-            this.rootDirectory = path.resolve(currentFileDirectory, '..', '..', '..');
-            this.log.debug(`Found packages core >>> root directory: ${CYAN}${this.rootDirectory}${db}`);
-        }
-        else if (currentFileDirectory.endsWith(path.join('matterbridge', 'dist'))) {
-            this.rootDirectory = path.resolve(currentFileDirectory, '..');
-            this.log.debug(`Found bundled core >>> root directory: ${CYAN}${this.rootDirectory}${db}`);
-        }
-        else {
-            if (isBun()) {
-                this.rootDirectory = path.join(getGlobalBunModules(), 'matterbridge');
-                this.log.debug(`Found bun global core >>> root directory: ${CYAN}${this.rootDirectory}${db}`);
-            }
-            else {
-                this.rootDirectory = path.resolve(currentFileDirectory, '..', '..', '..', '..');
-                this.log.debug(`Found production core >>> root directory: ${CYAN}${this.rootDirectory}${db}`);
-            }
-        }
+        const rootDirectory = await resolveRootDirectory(currentFileDirectory);
+        if (rootDirectory === undefined) {
+            const message = `Cannot determine the matterbridge root directory from ${currentFileDirectory}: no matterbridge package.json found in the parent directories.`;
+            this.log.fatal(message);
+            throw new Error(message);
+        }
+        this.rootDirectory = rootDirectory;
+        this.log.debug(`Found root directory: ${CYAN}${this.rootDirectory}${db}`);
         this.environment.vars.set('log.level', MatterLogLevel.DEBUG);
         this.environment.vars.set('log.format', hasParameter('no-ansi') || process.env.NO_COLOR === '1' ? MatterLogFormat.PLAIN : MatterLogFormat.ANSI);
         this.environment.vars.set('path.root', path.join(this.matterbridgeDirectory, MATTER_STORAGE_DIR));

package/dist/matterbridgeEndpoint.d.ts

@@ -30,6 +30,7 @@ import type { DeviceTypeDefinition } from './matterbridgeDeviceTypes.js';
 import { CommandHandler, type CommandHandlerData, type CommandHandlerExecutionResult, type CommandHandlerFunction, type CommandHandlers } from './matterbridgeEndpointCommandHandler.js';
 import type { MatterbridgeEndpointOptions, SerializedMatterbridgeEndpoint, SubscribeCommandListener } from './matterbridgeEndpointTypes.js';
 type FirstCommandParam<Params extends unknown[]> = Params extends [] ? undefined : Params[0];
+type CommandRequest<P> = [P] extends [undefined] ? Record<string, never> : P;
 type BehaviorCluster<T extends Behavior.Type> = T extends {
     cluster: infer C extends ClusterType;
 } ? C : ClusterType;
@@ -109,6 +110,9 @@ export declare class MatterbridgeEndpoint extends Endpoint {
     subscribeCommand<T extends Behavior.Type, C extends BehaviorCommandName<T>>(cluster: T, command: C, listener: SubscribeCommandListener<BehaviorCommandParams<T, C>>, log?: AnsiLogger): MatterbridgeEndpoint;
     subscribeCommand<T extends ClusterType, C extends ClusterCommandName<T>>(cluster: T, command: C, listener: SubscribeCommandListener<ClusterCommandParams<T, C>>, log?: AnsiLogger): MatterbridgeEndpoint;
     subscribeCommand(cluster: ClusterId | string, command: string, listener: SubscribeCommandListener, log?: AnsiLogger): MatterbridgeEndpoint;
+    emitCommand<T extends Behavior.Type, C extends BehaviorCommandName<T>>(cluster: T, command: C, request: CommandRequest<BehaviorCommandParams<T, C>>, context: ActionContext): void;
+    emitCommand<T extends ClusterType, C extends ClusterCommandName<T>>(cluster: T, command: C, request: CommandRequest<ClusterCommandParams<T, C>>, context: ActionContext): void;
+    emitCommand(cluster: string, command: string, request: unknown, context: ActionContext): void;
     setCluster<T extends Behavior.Type>(cluster: T, value: Behavior.StateOf<T>, log?: AnsiLogger): Promise<boolean>;
     setCluster<T extends ClusterType>(cluster: T, value: Partial<ClusterAttributesOf<T>>, log?: AnsiLogger): Promise<boolean>;
     setCluster(cluster: ClusterId | string, value: Record<string, boolean | number | bigint | string | object | undefined | null>, log?: AnsiLogger): Promise<boolean>;
@@ -149,7 +153,7 @@ export declare class MatterbridgeEndpoint extends Endpoint {
     createDefaultPowerSourceReplaceableBatteryClusterServer(batPercentRemaining?: number | null, batChargeLevel?: PowerSource.BatChargeLevel, batVoltage?: number | null, batReplacementDescription?: string, batQuantity?: number, batReplaceability?: PowerSource.BatReplaceability): this;
     createDefaultPowerSourceRechargeableBatteryClusterServer(batPercentRemaining?: number | null, batChargeLevel?: PowerSource.BatChargeLevel, batVoltage?: number | null, batReplaceability?: PowerSource.BatReplaceability): this;
     createDefaultBasicInformationClusterServer(deviceName: string, serialNumber: string, vendorId?: number, vendorName?: string, productId?: number, productName?: string, softwareVersion?: number, softwareVersionString?: string, hardwareVersion?: number, hardwareVersionString?: string, productLabel?: string, productUrl?: string, configurationVersion?: number): this;
-    createDefaultBridgedDeviceBasicInformationClusterServer(deviceName: string, serialNumber: string, vendorId?: number, vendorName?: string, productName?: string, softwareVersion?: number, softwareVersionString?: string, hardwareVersion?: number, hardwareVersionString?: string, productLabel?: string, productUrl?: string, configurationVersion?: number): this;
+    createDefaultBridgedDeviceBasicInformationClusterServer(deviceName: string, serialNumber: string, vendorId?: number, vendorName?: string, productName?: string, softwareVersion?: number, softwareVersionString?: string, hardwareVersion?: number, hardwareVersionString?: string, productLabel?: string, productUrl?: string, configurationVersion?: number, productId?: number): this;
     createDefaultPowerTopologyClusterServer(feature?: PowerTopology.Feature, availableEndpoints?: EndpointNumber[], activeEndpoints?: EndpointNumber[]): this;
     createDefaultElectricalEnergyMeasurementClusterServer(energyImported?: number | bigint | null, energyExported?: number | bigint | null): this;
     createImportedElectricalEnergyMeasurementClusterServer(energyImported?: number | bigint | null): this;

package/dist/matterbridgeEndpoint.js

@@ -85,7 +85,7 @@ import { MatterbridgeValveConfigurationAndControlServer } from './behaviors/valv
 import { MatterbridgeWaterTankLevelMonitoringServer } from './behaviors/waterTankLevelMonitoringServer.js';
 import { MatterbridgeWindowCoveringServer } from './behaviors/windowCoveringServer.js';
 import { CommandHandler, } from './matterbridgeEndpointCommandHandler.js';
-import { addClusterClients, addClusterServers, addFixedLabel, addOptionalClusterClients, addOptionalClusterServers, addRequiredClusterClients, addRequiredClusterServers, addUserLabel, checkNotLatinCharacters, createUniqueId, defaultFor, featuresFor, generateUniqueId, getApparentElectricalPowerMeasurementClusterServer, getAttribute, getAttributeId, getBehavior, getBehaviourTypesFromClusterClientIds, getBehaviourTypesFromClusterServerIds, getCluster, getClusterId, getDefaultDeviceEnergyManagementClusterServer, getDefaultDeviceEnergyManagementModeClusterServer, getDefaultElectricalEnergyMeasurementClusterServer, getDefaultElectricalPowerMeasurementClusterServer, getDefaultFlowMeasurementClusterServer, getDefaultIlluminanceMeasurementClusterServer, getDefaultOccupancySensingClusterServer, getDefaultOperationalStateClusterServer, getDefaultPowerSourceBatteryClusterServer, getDefaultPowerSourceRechargeableBatteryClusterServer, getDefaultPowerSourceReplaceableBatteryClusterServer, getDefaultPowerSourceWiredClusterServer, getDefaultPressureMeasurementClusterServer, getDefaultRelativeHumidityMeasurementClusterServer, getDefaultSoilMeasurementClusterServer, getDefaultTemperatureMeasurementClusterServer, getExportedElectricalEnergyMeasurementClusterServer, getImportedElectricalEnergyMeasurementClusterServer, invokeBehaviorCommand, lowercaseFirstLetter, setAttribute, setCluster, subscribeAttribute, subscribeCommand, triggerEvent, updateAttribute, } from './matterbridgeEndpointHelpers.js';
+import { addClusterClients, addClusterServers, addFixedLabel, addOptionalClusterClients, addOptionalClusterServers, addRequiredClusterClients, addRequiredClusterServers, addUserLabel, checkNotLatinCharacters, createUniqueId, defaultFor, emitCommand, featuresFor, generateUniqueId, getApparentElectricalPowerMeasurementClusterServer, getAttribute, getAttributeId, getBehavior, getBehaviourTypesFromClusterClientIds, getBehaviourTypesFromClusterServerIds, getCluster, getClusterId, getDefaultDeviceEnergyManagementClusterServer, getDefaultDeviceEnergyManagementModeClusterServer, getDefaultElectricalEnergyMeasurementClusterServer, getDefaultElectricalPowerMeasurementClusterServer, getDefaultFlowMeasurementClusterServer, getDefaultIlluminanceMeasurementClusterServer, getDefaultOccupancySensingClusterServer, getDefaultOperationalStateClusterServer, getDefaultPowerSourceBatteryClusterServer, getDefaultPowerSourceRechargeableBatteryClusterServer, getDefaultPowerSourceReplaceableBatteryClusterServer, getDefaultPowerSourceWiredClusterServer, getDefaultPressureMeasurementClusterServer, getDefaultRelativeHumidityMeasurementClusterServer, getDefaultSoilMeasurementClusterServer, getDefaultTemperatureMeasurementClusterServer, getExportedElectricalEnergyMeasurementClusterServer, getImportedElectricalEnergyMeasurementClusterServer, invokeBehaviorCommand, lowercaseFirstLetter, setAttribute, setCluster, subscribeAttribute, subscribeCommand, triggerEvent, updateAttribute, } from './matterbridgeEndpointHelpers.js';
 logModuleLoaded('MatterbridgeEndpoint');
 const MATTERBRIDGE_ENDPOINT_BRAND = Symbol('MatterbridgeEndpoint.brand');
 export function isMatterbridgeEndpoint(value) {
@@ -254,6 +254,10 @@ export class MatterbridgeEndpoint extends Endpoint {
     subscribeCommand(cluster, command, listener, log) {
         return subscribeCommand(this, cluster, command, listener, log);
     }
+    emitCommand(cluster, command, request, context) {
+        const clusterName = typeof cluster === 'string' ? cluster : typeof cluster.id === 'string' ? cluster.id : cluster.name;
+        emitCommand(this, clusterName, command, request, context);
+    }
     async setCluster(cluster, value, log) {
         return await setCluster(this, cluster, value, log);
     }
@@ -518,7 +522,7 @@ export class MatterbridgeEndpoint extends Endpoint {
         device.hardwareVersionString = serializedDevice.hardwareVersionString;
         for (const clusterId of serializedDevice.clusterServersId) {
             if (clusterId === BridgedDeviceBasicInformation.id)
-                device.createDefaultBridgedDeviceBasicInformationClusterServer(serializedDevice.deviceName, serializedDevice.serialNumber, serializedDevice.vendorId ?? 0xfff1, serializedDevice.vendorName ?? 'Matterbridge', serializedDevice.productName ?? 'Matterbridge device', serializedDevice.softwareVersion, serializedDevice.softwareVersionString, serializedDevice.hardwareVersion, serializedDevice.hardwareVersionString, serializedDevice.productLabel, serializedDevice.productUrl, serializedDevice.configurationVersion);
+                device.createDefaultBridgedDeviceBasicInformationClusterServer(serializedDevice.deviceName, serializedDevice.serialNumber, serializedDevice.vendorId ?? 0xfff1, serializedDevice.vendorName ?? 'Matterbridge', serializedDevice.productName ?? 'Matterbridge device', serializedDevice.softwareVersion, serializedDevice.softwareVersionString, serializedDevice.hardwareVersion, serializedDevice.hardwareVersionString, serializedDevice.productLabel, serializedDevice.productUrl, serializedDevice.configurationVersion, serializedDevice.productId);
             else if (clusterId === BasicInformation.id)
                 device.createDefaultBasicInformationClusterServer(serializedDevice.deviceName, serializedDevice.serialNumber, serializedDevice.vendorId ?? 0xfff1, serializedDevice.vendorName ?? 'Matterbridge', serializedDevice.productId ?? 0x8000, serializedDevice.productName ?? 'Matterbridge device', serializedDevice.softwareVersion, serializedDevice.softwareVersionString, serializedDevice.hardwareVersion, serializedDevice.hardwareVersionString, serializedDevice.productLabel, serializedDevice.productUrl, serializedDevice.configurationVersion);
             else if (clusterId === PowerSource.id)
@@ -560,12 +564,12 @@ export class MatterbridgeEndpoint extends Endpoint {
         this.configurationVersion = configurationVersion;
         return this;
     }
-    createDefaultBridgedDeviceBasicInformationClusterServer(deviceName, serialNumber, vendorId = 0xfff1, vendorName = 'Matterbridge', productName = 'Matterbridge device', softwareVersion = 1, softwareVersionString = '1.0.0', hardwareVersion = 1, hardwareVersionString = '1.0.0', productLabel = 'Matter Bridged Endpoint', productUrl = 'https://matterbridge.io', configurationVersion = 1) {
+    createDefaultBridgedDeviceBasicInformationClusterServer(deviceName, serialNumber, vendorId = 0xfff1, vendorName = 'Matterbridge', productName = 'Matterbridge device', softwareVersion = 1, softwareVersionString = '1.0.0', hardwareVersion = 1, hardwareVersionString = '1.0.0', productLabel = 'Matter Bridged Endpoint', productUrl = 'https://matterbridge.io', configurationVersion = 1, productId) {
         this.log.logName = deviceName;
         this.deviceName = deviceName;
         this.serialNumber = serialNumber;
         this.uniqueId = createUniqueId(deviceName, serialNumber, vendorName, productName);
-        this.productId = undefined;
+        this.productId = productId;
         this.productName = productName;
         this.productLabel = productLabel;
         this.productUrl = productUrl;
@@ -593,6 +597,7 @@ export class MatterbridgeEndpoint extends Endpoint {
             hardwareVersionString: isValidString(hardwareVersionString, 1, 64) ? hardwareVersionString : '1.0.0',
             configurationVersion: isValidInteger(configurationVersion, 1, UINT32_MAX) ? configurationVersion : 1,
             reachable: true,
+            ...(isValidInteger(productId, 0, UINT16_MAX) ? { productId } : {}),
         });
         return this;
     }

package/dist/matterbridgeEndpointHelpers.d.ts

@@ -59,7 +59,7 @@ export declare function setAttribute(endpoint: MatterbridgeEndpoint, cluster: Be
 export declare function updateAttribute(endpoint: MatterbridgeEndpoint, cluster: Behavior.Type | ClusterType | ClusterId | string, attribute: string, value: boolean | number | bigint | string | object | null, log?: AnsiLogger): Promise<boolean>;
 export declare function subscribeAttribute(endpoint: MatterbridgeEndpoint, cluster: Behavior.Type | ClusterType | ClusterId | string, attribute: string, listener: (newValue: any, oldValue: any, context: ActionContext) => void, log?: AnsiLogger): MatterbridgeEndpoint;
 export declare function subscribeCommand(endpoint: MatterbridgeEndpoint, cluster: Behavior.Type | ClusterType | ClusterId | string, command: string, listener: SubscribeCommandListener, log?: AnsiLogger): MatterbridgeEndpoint;
-export declare function emitCommand(endpoint: Endpoint, cluster: string, command: string, request: unknown, context: ActionContext): void;
+export declare function emitCommand(endpoint: MatterbridgeEndpoint, cluster: string, command: string, request: unknown, context: ActionContext): void;
 export declare function setCluster(endpoint: MatterbridgeEndpoint, cluster: Behavior.Type | ClusterType | ClusterId | string, value: Record<string, boolean | number | bigint | string | object | undefined | null>, log?: AnsiLogger): Promise<boolean>;
 export declare function getCluster(endpoint: MatterbridgeEndpoint, cluster: Behavior.Type | ClusterType | ClusterId | string, log?: AnsiLogger): Record<string, boolean | number | bigint | string | object | undefined | null> | undefined;
 export declare function triggerEvent(endpoint: MatterbridgeEndpoint, cluster: Behavior.Type | ClusterType | ClusterId | string, event: string, payload: Record<string, boolean | number | bigint | string | object | undefined | null>, log?: AnsiLogger): Promise<boolean>;

package/dist/matterbridgeEndpointHelpers.js

@@ -836,15 +836,10 @@ export function subscribeCommand(endpoint, cluster, command, listener, log) {
     return endpoint;
 }
 export function emitCommand(endpoint, cluster, command, request, context) {
-    if (!isCommandEndpoint(endpoint))
-        return;
     const clusterName = lowercaseFirstLetter(cluster);
     const commandName = lowercaseFirstLetter(command);
     getCommandObservable(endpoint, clusterName, commandName, false)?.emit({ command: commandName, cluster: clusterName, request, endpoint, context });
 }
-function isCommandEndpoint(endpoint) {
-    return 'subscribeCommand' in endpoint && typeof endpoint.subscribeCommand === 'function';
-}
 export async function setCluster(endpoint, cluster, value, log) {
     const clusterName = getBehavior(endpoint, cluster)?.id;
     if (!clusterName) {

package/dist/matterbridgePlatform.js

@@ -247,7 +247,7 @@ export class MatterbridgePlatform {
             }
             if (!device.hasClusterServer(BridgedDeviceBasicInformation.id)) {
                 this.log.debug(`Device with name ${CYAN}${device.deviceName}${db} has no BridgedDeviceBasicInformation cluster. Adding it...`);
-                device.createDefaultBridgedDeviceBasicInformationClusterServer(device.deviceName, device.serialNumber, device.vendorId, device.vendorName, device.productName, device.softwareVersion, device.softwareVersionString, device.hardwareVersion, device.hardwareVersionString, device.productLabel === 'Matter Endpoint' ? 'Matter Bridged Endpoint' : device.productLabel, device.productUrl, device.configurationVersion);
+                device.createDefaultBridgedDeviceBasicInformationClusterServer(device.deviceName, device.serialNumber, device.vendorId, device.vendorName, device.productName, device.softwareVersion, device.softwareVersionString, device.hardwareVersion, device.hardwareVersionString, device.productLabel === 'Matter Endpoint' ? 'Matter Bridged Endpoint' : device.productLabel, device.productUrl, device.configurationVersion, device.productId);
             }
         }
         await this.#addBridgedEndpoint?.(this.name, device);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@matterbridge/core",
-  "version": "3.10.10-dev-20260912-2c1c047",
+  "version": "3.10.10-dev-20260914-784e019",
   "description": "Matterbridge core library",
   "author": "https://github.com/Luligu",
   "homepage": "https://matterbridge.io/",
@@ -54,6 +54,10 @@
       "types": "./dist/devices/export.d.ts",
       "import": "./dist/devices/export.js"
     },
+    "./devices/camera": {
+      "types": "./dist/devices/camera/export.d.ts",
+      "import": "./dist/devices/camera/export.js"
+    },
     "./clusters": {
       "types": "./dist/clusters/export.d.ts",
       "import": "./dist/clusters/export.js"
@@ -132,10 +136,10 @@
   },
   "dependencies": {
     "@matter/main": "0.17.9",
-    "@matterbridge/dgram": "3.10.10-dev-20260912-2c1c047",
-    "@matterbridge/thread": "3.10.10-dev-20260912-2c1c047",
-    "@matterbridge/types": "3.10.10-dev-20260912-2c1c047",
-    "@matterbridge/utils": "3.10.10-dev-20260912-2c1c047",
+    "@matterbridge/dgram": "3.10.10-dev-20260914-784e019",
+    "@matterbridge/thread": "3.10.10-dev-20260914-784e019",
+    "@matterbridge/types": "3.10.10-dev-20260914-784e019",
+    "@matterbridge/utils": "3.10.10-dev-20260914-784e019",
     "escape-html": "1.0.3",
     "express": "5.2.1",
     "express-rate-limit": "8.7.0",