@matterbridge/core 3.10.10-dev-20260912-8fddbe4 → 3.10.10-dev-20260914-784e019

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@matterbridge/core",
-  "version": "3.10.10-dev-20260912-8fddbe4",
+  "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-8fddbe4",
-    "@matterbridge/thread": "3.10.10-dev-20260912-8fddbe4",
-    "@matterbridge/types": "3.10.10-dev-20260912-8fddbe4",
-    "@matterbridge/utils": "3.10.10-dev-20260912-8fddbe4",
+    "@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",