@camera.ui/server 2.0.15 → 2.0.17

package/dist/server/src/camera/sensors/types.js

@@ -1,166 +1,32 @@
-import { AudioProperty, BatteryCapability, BatteryProperty, ClassifierProperty, ContactProperty, DoorbellProperty, FaceProperty, GarageProperty, HumidityProperty, LeakProperty, LicensePlateProperty, LightCapability, LightProperty, LockProperty, MotionProperty, ObjectProperty, OccupancyProperty, PTZProperty, SecuritySystemProperty, SensorCategory, SensorType, SirenCapability, SirenProperty, SmokeProperty, SwitchProperty, TemperatureProperty, } from '@camera.ui/sdk';
-export const SENSOR_TYPE_CONFIG = {
-    [SensorType.Motion]: {
-        category: SensorCategory.Sensor,
-        assignmentKey: 'motion',
-        multiProvider: false,
-        isDetectionType: true,
-    },
-    [SensorType.Object]: {
-        category: SensorCategory.Sensor,
-        assignmentKey: 'object',
-        multiProvider: false,
-        isDetectionType: true,
-    },
-    [SensorType.Audio]: {
-        category: SensorCategory.Sensor,
-        assignmentKey: 'audio',
-        multiProvider: false,
-        isDetectionType: true,
-    },
-    [SensorType.Face]: {
-        category: SensorCategory.Sensor,
-        assignmentKey: 'face',
-        multiProvider: false,
-        isDetectionType: true,
-    },
-    [SensorType.LicensePlate]: {
-        category: SensorCategory.Sensor,
-        assignmentKey: 'licensePlate',
-        multiProvider: false,
-        isDetectionType: true,
-    },
-    [SensorType.Classifier]: {
-        category: SensorCategory.Sensor,
-        assignmentKey: 'classifier',
-        multiProvider: true,
-        isDetectionType: true,
-    },
-    [SensorType.Clip]: {
-        category: SensorCategory.Sensor,
-        assignmentKey: 'clip',
-        multiProvider: false,
-        isDetectionType: true,
-    },
-    [SensorType.Contact]: {
-        category: SensorCategory.Sensor,
-        assignmentKey: 'contact',
-        multiProvider: true,
-        isDetectionType: false,
-        cascadeTrigger: { property: 'detected', value: true, sustained: true },
-    },
-    [SensorType.Light]: {
-        category: SensorCategory.Control,
-        assignmentKey: 'light',
-        multiProvider: true,
-        isDetectionType: false,
-        cascadeTrigger: { property: 'on', value: true, sustained: true },
-    },
-    [SensorType.Siren]: {
-        category: SensorCategory.Control,
-        assignmentKey: 'siren',
-        multiProvider: true,
-        isDetectionType: false,
-        cascadeTrigger: { property: 'active', value: true, sustained: true },
-    },
-    [SensorType.Switch]: {
-        category: SensorCategory.Control,
-        assignmentKey: 'switch',
-        multiProvider: true,
-        isDetectionType: false,
-        cascadeTrigger: { property: 'on', value: true, sustained: true },
-    },
-    [SensorType.PTZ]: {
-        category: SensorCategory.Control,
-        assignmentKey: 'ptz',
-        multiProvider: false,
-        isDetectionType: false,
-    },
-    [SensorType.Lock]: {
-        category: SensorCategory.Control,
-        assignmentKey: 'lock',
-        multiProvider: true,
-        isDetectionType: false,
-        cascadeTrigger: { property: 'currentState', value: 1, sustained: true },
-    },
-    [SensorType.SecuritySystem]: {
-        category: SensorCategory.Control,
-        assignmentKey: 'securitySystem',
-        multiProvider: true,
-        isDetectionType: false,
-        cascadeTrigger: { property: 'currentState', value: 4, sustained: true },
-    },
-    [SensorType.Doorbell]: {
-        category: SensorCategory.Trigger,
-        assignmentKey: 'doorbell',
-        multiProvider: true,
-        isDetectionType: false,
-        cascadeTrigger: { property: 'ring', value: true, sustained: false },
-    },
-    [SensorType.Temperature]: {
-        category: SensorCategory.Info,
-        assignmentKey: 'temperature',
-        multiProvider: true,
-        isDetectionType: false,
-    },
-    [SensorType.Humidity]: {
-        category: SensorCategory.Info,
-        assignmentKey: 'humidity',
-        multiProvider: true,
-        isDetectionType: false,
-    },
-    [SensorType.Occupancy]: {
-        category: SensorCategory.Sensor,
-        assignmentKey: 'occupancy',
-        multiProvider: true,
-        isDetectionType: false,
-        cascadeTrigger: { property: 'detected', value: true, sustained: true },
-    },
-    [SensorType.Smoke]: {
-        category: SensorCategory.Sensor,
-        assignmentKey: 'smoke',
-        multiProvider: true,
-        isDetectionType: false,
-        cascadeTrigger: { property: 'detected', value: true, sustained: true },
-    },
-    [SensorType.Leak]: {
-        category: SensorCategory.Sensor,
-        assignmentKey: 'leak',
-        multiProvider: true,
-        isDetectionType: false,
-        cascadeTrigger: { property: 'detected', value: true, sustained: true },
-    },
-    [SensorType.Garage]: {
-        category: SensorCategory.Control,
-        assignmentKey: 'garage',
-        multiProvider: true,
-        isDetectionType: false,
-        cascadeTrigger: { property: 'currentState', value: 0, sustained: true },
-    },
-    [SensorType.Battery]: {
-        category: SensorCategory.Info,
-        assignmentKey: 'battery',
-        multiProvider: false,
-        isDetectionType: false,
-    },
-};
-export const PROPERTY_CAPABILITY_MAP = {
-    [SensorType.Battery]: {
-        [BatteryProperty.Charging]: BatteryCapability.Charging,
-        [BatteryProperty.Low]: BatteryCapability.LowBattery,
-    },
-    [SensorType.Light]: {
-        [LightProperty.Brightness]: LightCapability.Brightness,
-    },
-    [SensorType.Siren]: {
-        [SirenProperty.Volume]: SirenCapability.Volume,
-    },
-};
+import { SENSOR_META, SensorCategory } from '@camera.ui/sdk';
+function buildSensorTypeConfig() {
+    const config = {};
+    for (const meta of SENSOR_META) {
+        config[meta.type] = {
+            category: meta.category,
+            assignmentKey: meta.assignmentKey,
+            multiProvider: meta.multiProvider,
+            isDetectionType: meta.isDetectionType,
+            ...(meta.cascadeTrigger ? { cascadeTrigger: meta.cascadeTrigger } : {}),
+        };
+    }
+    return config;
+}
+export const SENSOR_TYPE_CONFIG = buildSensorTypeConfig();
+export const PROPERTY_CAPABILITY_MAP = Object.fromEntries(SENSOR_META.filter((meta) => meta.propertyCapabilities).map((meta) => [meta.type, meta.propertyCapabilities]));
 export function getMultiProviderTypes() {
     return Object.entries(SENSOR_TYPE_CONFIG)
         .filter(([, meta]) => meta.multiProvider)
         .map(([type]) => type);
 }
+export function getShortcutableTypes() {
+    return SENSOR_META.filter((meta) => meta.shortcutable).map((meta) => meta.type);
+}
+export function getSingleProviderTypes() {
+    return Object.entries(SENSOR_TYPE_CONFIG)
+        .filter(([, meta]) => !meta.multiProvider)
+        .map(([type]) => type);
+}
 export function getDetectionTypes() {
     return Object.entries(SENSOR_TYPE_CONFIG)
         .filter(([, meta]) => meta.isDetectionType)
@@ -193,71 +59,37 @@ export function getAccessorySensorTypes() {
 export function isSingleProviderType(type) {
     return !SENSOR_TYPE_CONFIG[type].multiProvider;
 }
-export const SENSOR_PROPERTY_MAP = {
-    [SensorType.Motion]: Object.values(MotionProperty),
-    [SensorType.Object]: Object.values(ObjectProperty),
-    [SensorType.Audio]: Object.values(AudioProperty),
-    [SensorType.Face]: Object.values(FaceProperty),
-    [SensorType.LicensePlate]: Object.values(LicensePlateProperty),
-    [SensorType.Classifier]: Object.values(ClassifierProperty),
-    [SensorType.Clip]: [],
-    [SensorType.Contact]: Object.values(ContactProperty),
-    [SensorType.Temperature]: Object.values(TemperatureProperty),
-    [SensorType.Humidity]: Object.values(HumidityProperty),
-    [SensorType.Occupancy]: Object.values(OccupancyProperty),
-    [SensorType.Smoke]: Object.values(SmokeProperty),
-    [SensorType.Leak]: Object.values(LeakProperty),
-    [SensorType.Light]: Object.values(LightProperty),
-    [SensorType.Siren]: Object.values(SirenProperty),
-    [SensorType.Switch]: Object.values(SwitchProperty),
-    [SensorType.Lock]: Object.values(LockProperty),
-    [SensorType.Garage]: Object.values(GarageProperty),
-    [SensorType.PTZ]: Object.values(PTZProperty),
-    [SensorType.SecuritySystem]: Object.values(SecuritySystemProperty),
-    [SensorType.Doorbell]: Object.values(DoorbellProperty),
-    [SensorType.Battery]: Object.values(BatteryProperty),
-};
+export const SENSOR_PROPERTY_MAP = Object.fromEntries(SENSOR_META.map((meta) => [meta.type, Object.keys(meta.properties)]));
+export const SENSOR_PROPERTY_SPECS = Object.fromEntries(SENSOR_META.map((meta) => [meta.type, meta.properties]));
 export function getSensorProperties(type) {
     return SENSOR_PROPERTY_MAP[type] ?? [];
 }
+export function getSensorPropertySpec(type, property) {
+    return SENSOR_PROPERTY_SPECS[type]?.[property];
+}
+export function getObservableSensorProperties(type) {
+    const specs = SENSOR_PROPERTY_SPECS[type];
+    if (!specs)
+        return [];
+    return Object.entries(specs)
+        .filter(([, spec]) => !spec.internal)
+        .map(([name]) => name);
+}
+export function getWritableSensorProperties(type) {
+    const specs = SENSOR_PROPERTY_SPECS[type];
+    if (!specs)
+        return [];
+    return Object.entries(specs)
+        .filter(([, spec]) => spec.writable)
+        .map(([name]) => name);
+}
 export const MULTI_PROVIDER_TYPES = new Set(getMultiProviderTypes());
 export const DETECTION_SENSOR_TYPES = new Set(getDetectionTypes());
 export const VIRTUAL_SENSOR_OWNER_ID = 'cameraui.virtual';
 export const VIRTUAL_SENSOR_OWNER_NAME = 'Virtual';
-export const VIRTUAL_SENSOR_TYPES = [
-    SensorType.Doorbell,
-    SensorType.Switch,
-    SensorType.Contact,
-    SensorType.Occupancy,
-    SensorType.Smoke,
-    SensorType.Leak,
-    SensorType.Light,
-    SensorType.Siren,
-    SensorType.Lock,
-    SensorType.Garage,
-    SensorType.SecuritySystem,
-    SensorType.Temperature,
-    SensorType.Humidity,
-];
-export const VIRTUAL_SENSOR_DEFAULT_PROPERTIES = {
-    [SensorType.Doorbell]: { [DoorbellProperty.Ring]: false },
-    [SensorType.Switch]: { [SwitchProperty.On]: false },
-    [SensorType.Contact]: { [ContactProperty.Detected]: false },
-    [SensorType.Occupancy]: { [OccupancyProperty.Detected]: false },
-    [SensorType.Smoke]: { [SmokeProperty.Detected]: false },
-    [SensorType.Leak]: { [LeakProperty.Detected]: false },
-    [SensorType.Light]: { [LightProperty.On]: false, [LightProperty.Brightness]: 100 },
-    [SensorType.Siren]: { [SirenProperty.Active]: false, [SirenProperty.Volume]: 100 },
-    [SensorType.Lock]: { [LockProperty.CurrentState]: 0, [LockProperty.TargetState]: 0 },
-    [SensorType.Garage]: { [GarageProperty.CurrentState]: 1, [GarageProperty.TargetState]: 1 },
-    [SensorType.SecuritySystem]: { [SecuritySystemProperty.CurrentState]: 3, [SecuritySystemProperty.TargetState]: 3 },
-    [SensorType.Temperature]: { [TemperatureProperty.Current]: 20 },
-    [SensorType.Humidity]: { [HumidityProperty.Current]: 50 },
-};
-export const VIRTUAL_SENSOR_DEFAULT_CAPABILITIES = {
-    [SensorType.Light]: [LightCapability.Brightness],
-    [SensorType.Siren]: [SirenCapability.Volume],
-};
+export const VIRTUAL_SENSOR_TYPES = SENSOR_META.filter((meta) => meta.virtual).map((meta) => meta.type);
+export const VIRTUAL_SENSOR_DEFAULT_PROPERTIES = Object.fromEntries(SENSOR_META.filter((meta) => meta.virtual).map((meta) => [meta.type, meta.virtual?.properties ?? {}]));
+export const VIRTUAL_SENSOR_DEFAULT_CAPABILITIES = Object.fromEntries(SENSOR_META.filter((meta) => meta.virtual?.capabilities).map((meta) => [meta.type, meta.virtual?.capabilities]));
 export function isVirtualSensorType(type) {
     return VIRTUAL_SENSOR_TYPES.includes(type);
 }

package/dist/server/src/camera/sensors/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../../src/camera/sensors/types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../../src/camera/sensors/types.ts"],"names":[],"mappings":"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"}

package/dist/server/src/camera/streaming/fmp4-session.js

@@ -8,6 +8,8 @@ export class Fmp4Session extends SubscribedPublic {
     onError = new Subject();
     onEnded = new ReplaySubject(1);
     #hasEnded = false;
+    #abort = new AbortController();
+    #shutdownPromise;
     #cameraDevice;
     #logger;
     #source;
@@ -28,6 +30,12 @@ export class Fmp4Session extends SubscribedPublic {
         return firstValueFrom(this.#initSegmentSubject);
     }
     async startStream(config) {
+        if (this.#hasEnded || this.#shutdownPromise) {
+            throw new Error('FMP4 session has ended and cannot be restarted.');
+        }
+        if (this.#fmp4Stream) {
+            throw new Error('FMP4 session already started.');
+        }
         this.#options = {
             ...config,
             input: {
@@ -38,12 +46,6 @@ export class Fmp4Session extends SubscribedPublic {
             },
         };
         this.#logger.debug('Starting FMP4 session with options:', this.#options);
-        if (this.#boxDataSubject.closed) {
-            this.#boxDataSubject = new ReplaySubject(1);
-        }
-        if (this.#initSegmentSubject.closed) {
-            this.#initSegmentSubject = new ReplaySubject(1);
-        }
         const supportedVideoCodec = new Set();
         for (const videoCodec of this.#options.supportedVideoCodecs ?? []) {
             switch (videoCodec) {
@@ -76,7 +78,8 @@ export class Fmp4Session extends SubscribedPublic {
         let moovData;
         let initSegment;
         let initSegmentSent = false;
-        this.#fmp4Stream = FMP4Stream.create(this.#url, {
+        const fmp4Stream = FMP4Stream.create(this.#url, {
+            signal: this.#abort.signal,
             onData: (data, info) => {
                 for (const box of info.boxes) {
                     if (box.type === 'ftyp') {
@@ -100,13 +103,11 @@ export class Fmp4Session extends SubscribedPublic {
                     this.#boxDataSubject.next(data);
                 }
             },
-            onClose: async (err) => {
-                if (err) {
-                    await this.#onError(err);
-                }
-                else {
-                    await this.#onEnded();
-                }
+            onClose: (err) => {
+                const shutdown = err ? this.#onError(err) : this.#onEnded();
+                shutdown.catch((error) => {
+                    this.#logger.error('Failed to shut down FMP4 session:', error);
+                });
             },
             boxMode: this.#options.boxMode,
             fragDuration: this.#options.fragDuration,
@@ -124,7 +125,19 @@ export class Fmp4Session extends SubscribedPublic {
                 encoderOptions: this.#options.audio?.encoderOptions,
             },
         });
-        await this.#fmp4Stream.start();
+        this.#fmp4Stream = fmp4Stream;
+        try {
+            await fmp4Stream.start();
+        }
+        catch (error) {
+            try {
+                await this.#onEnded();
+            }
+            catch (stopError) {
+                this.#logger.error('Failed to clean up FMP4 session after start error:', stopError);
+            }
+            throw error;
+        }
     }
     async *streamBoxes(signal) {
         if (!this.#fmp4Stream) {
@@ -183,27 +196,37 @@ export class Fmp4Session extends SubscribedPublic {
         finally {
             cleanup();
             endSub.unsubscribe();
+            signal?.removeEventListener('abort', cleanup);
         }
     }
     async stop() {
-        this.#onEnded();
+        await this.#onEnded();
     }
     async #onError(error) {
         this.onError.next(error);
         await this.#onEnded();
     }
-    async #onEnded() {
-        if (this.#hasEnded) {
-            return;
-        }
+    #onEnded() {
+        this.#shutdownPromise ??= Promise.resolve().then(() => this.#shutdown());
+        return this.#shutdownPromise;
+    }
+    async #shutdown() {
         this.#hasEnded = true;
-        await this.#fmp4Stream?.stop();
+        this.#abort.abort();
+        const fmp4Stream = this.#fmp4Stream;
         this.#fmp4Stream = undefined;
-        this.#boxDataSubject.complete();
-        this.#initSegmentSubject.complete();
-        this.unsubscribe();
-        this.onEnded.next();
-        this.onEnded.complete();
+        try {
+            await fmp4Stream?.stop();
+        }
+        finally {
+            this.#boxDataSubject.complete();
+            this.#initSegmentSubject.complete();
+            this.onStarted.complete();
+            this.onError.complete();
+            this.unsubscribe();
+            this.onEnded.next();
+            this.onEnded.complete();
+        }
     }
 }
 //# sourceMappingURL=fmp4-session.js.map

package/dist/server/src/camera/streaming/fmp4-session.js.map

@@ -1 +1 @@
-{"version":3,"file":"fmp4-session.js","sourceRoot":"","sources":["../../../../../src/camera/streaming/fmp4-session.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"fmp4-session.js","sourceRoot":"","sources":["../../../../../src/camera/streaming/fmp4-session.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AACxE,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAEtD,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAOlD,MAAM,OAAO,WAAY,SAAQ,gBAAgB;IAC/C,MAAM,CAAU,iBAAiB,GAAG,EAAE,CAAC;IAE9B,SAAS,GAAG,IAAI,aAAa,CAAO,CAAC,CAAC,CAAC;IACvC,OAAO,GAAG,IAAI,OAAO,EAAS,CAAC;IAC/B,OAAO,GAAG,IAAI,aAAa,CAAO,CAAC,CAAC,CAAC;IAE9C,SAAS,GAAG,KAAK,CAAC;IAClB,MAAM,GAAG,IAAI,eAAe,EAAE,CAAC;IAC/B,gBAAgB,CAAiB;IACjC,aAAa,CAAe;IAC5B,OAAO,CAAgB;IACvB,OAAO,CAAqB;IAC5B,IAAI,CAAS;IACb,QAAQ,GAAuB,EAAE,CAAC;IAElC,WAAW,CAAc;IACzB,mBAAmB,GAAG,IAAI,aAAa,CAAS,CAAC,CAAC,CAAC;IACnD,eAAe,GAAG,IAAI,OAAO,EAAU,CAAC;IAExC,YAAY,YAA0B,EAAE,MAAmB,EAAE,YAAsC;QACjG,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,aAAa,GAAG,YAAY,CAAC;QAClC,IAAI,CAAC,OAAO,GAAG,YAAY,CAAC,MAAM,CAAC;QACnC,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,MAAM,CAAC,IAAI,CAAE,CAAC;QAC/E,IAAI,CAAC,IAAI,GAAG,OAAO,YAAY,KAAK,QAAQ,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,YAAY,CAAC,CAAC;QACzG,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAC/B,CAAC;IAED,IAAI,WAAW;QACb,OAAO,cAAc,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;IAClD,CAAC;IAEM,KAAK,CAAC,WAAW,CAAC,MAA2B;QAClD,IAAI,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,gBAAgB,EAAE,CAAC;YAC5C,MAAM,IAAI,KAAK,CAAC,iDAAiD,CAAC,CAAC;QACrE,CAAC;QAED,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;YACrB,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAC;QACnD,CAAC;QAED,IAAI,CAAC,QAAQ,GAAG;YACd,GAAG,MAAM;YACT,KAAK,EAAE;gBACL,OAAO,EAAE;oBACP,GAAG,MAAM,EAAE,KAAK,EAAE,OAAO;oBACzB,UAAU,EAAE,uBAAuB;iBACpC;aACF;SACF,CAAC;QAEF,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,qCAAqC,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;QAEzE,MAAM,mBAAmB,GAAG,IAAI,GAAG,EAAU,CAAC;QAC9C,KAAK,MAAM,UAAU,IAAI,IAAI,CAAC,QAAQ,CAAC,oBAAoB,IAAI,EAAE,EAAE,CAAC;YAClE,QAAQ,UAAU,EAAE,CAAC;gBACnB,KAAK,MAAM;oBACT,mBAAmB,CAAC,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;oBAC1C,MAAM;gBACR,KAAK,MAAM;oBACT,mBAAmB,CAAC,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;oBAC1C,MAAM;gBACR,KAAK,KAAK;oBACR,mBAAmB,CAAC,GAAG,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;oBACzC,MAAM;YACV,CAAC;QACH,CAAC;QAED,MAAM,mBAAmB,GAAG,IAAI,GAAG,EAAU,CAAC;QAC9C,KAAK,MAAM,UAAU,IAAI,IAAI,CAAC,QAAQ,CAAC,oBAAoB,IAAI,EAAE,EAAE,CAAC;YAClE,QAAQ,UAAU,EAAE,CAAC;gBACnB,KAAK,KAAK;oBACR,mBAAmB,CAAC,GAAG,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;oBACzC,MAAM;gBACR,KAAK,MAAM;oBACT,mBAAmB,CAAC,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;oBAC1C,MAAM;gBACR,KAAK,MAAM;oBACT,mBAAmB,CAAC,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;oBAC1C,MAAM;YACV,CAAC;QACH,CAAC;QAED,IAAI,QAA4B,CAAC;QACjC,IAAI,QAA4B,CAAC;QAEjC,IAAI,WAA+B,CAAC;QACpC,IAAI,eAAe,GAAG,KAAK,CAAC;QAE5B,MAAM,UAAU,GAAG,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE;YAC9C,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,MAAM;YAC1B,MAAM,EAAE,CAAC,IAAY,EAAE,IAAc,EAAE,EAAE;gBACvC,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;oBAC7B,IAAI,GAAG,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;wBACxB,QAAQ,GAAG,IAAI,CAAC;oBAClB,CAAC;oBAED,IAAI,GAAG,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;wBACxB,QAAQ,GAAG,IAAI,CAAC;oBAClB,CAAC;oBAED,IAAI,QAAQ,IAAI,QAAQ,IAAI,CAAC,WAAW,EAAE,CAAC;wBACzC,WAAW,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC;wBAClD,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;oBAC7C,CAAC;gBACH,CAAC;gBAED,IAAI,WAAW,IAAI,CAAC,eAAe,EAAE,CAAC;oBACpC,eAAe,GAAG,IAAI,CAAC;oBACvB,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC;gBACxB,CAAC;gBAED,8DAA8D;gBAC9D,MAAM,UAAU,GAAG,WAAW,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC;gBAChF,IAAI,UAAU,EAAE,CAAC;oBACf,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBAClC,CAAC;YACH,CAAC;YACD,OAAO,EAAE,CAAC,GAAW,EAAE,EAAE;gBACvB,MAAM,QAAQ,GAAG,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;gBAC5D,QAAQ,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;oBACvB,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,mCAAmC,EAAE,KAAK,CAAC,CAAC;gBACjE,CAAC,CAAC,CAAC;YACL,CAAC;YACD,OAAO,EAAE,IAAI,CAAC,QAAQ,CAAC,OAAO;YAC9B,YAAY,EAAE,IAAI,CAAC,QAAQ,CAAC,YAAY;YACxC,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,QAAQ,KAAK,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,IAAI,CAAC,QAAQ,CAAC,QAA0B,EAAE;YAC/G,eAAe,EAAE,CAAC,GAAG,mBAAmB,EAAE,GAAG,mBAAmB,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC;YAC3E,QAAQ,EAAE,4CAA4C;YACtD,KAAK,EAAE;gBACL,KAAK,EAAE,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,KAAK;gBACjC,MAAM,EAAE,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,MAAM;gBACnC,GAAG,EAAE,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,GAAG;gBAC7B,OAAO,EAAE,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,OAAO;gBACrC,cAAc,EAAE,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,cAAc;aACpD;YACD,KAAK,EAAE;gBACL,cAAc,EAAE,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,cAAc;aACpD;SACF,CAAC,CAAC;QAEH,IAAI,CAAC,WAAW,GAAG,UAAU,CAAC;QAE9B,IAAI,CAAC;YACH,MAAM,UAAU,CAAC,KAAK,EAAE,CAAC;QAC3B,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC;gBACH,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAC;YACxB,CAAC;YAAC,OAAO,SAAS,EAAE,CAAC;gBACnB,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,oDAAoD,EAAE,SAAS,CAAC,CAAC;YACtF,CAAC;YACD,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC;IAEM,KAAK,CAAC,CAAC,WAAW,CAAC,MAAoB;QAC5C,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;YACtB,MAAM,IAAI,KAAK,CAAC,+CAA+C,CAAC,CAAC;QACnE,CAAC;QAED,MAAM,KAAK,GAAa,EAAE,CAAC;QAC3B,IAAI,WAAW,GAA4C,IAAI,CAAC;QAChE,IAAI,IAAI,GAAG,KAAK,CAAC;QACjB,IAAI,UAAU,GAAG,KAAK,CAAC;QAEvB,MAAM,YAAY,GAAG,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC,IAAI,EAAE,EAAE;YAC3D,IAAI,WAAW,EAAE,CAAC;gBAChB,WAAW,CAAC,IAAI,CAAC,CAAC;gBAClB,WAAW,GAAG,IAAI,CAAC;YACrB,CAAC;iBAAM,IAAI,KAAK,CAAC,MAAM,IAAI,WAAW,CAAC,iBAAiB,EAAE,CAAC;gBACzD,UAAU,GAAG,IAAI,CAAC;gBAClB,OAAO,EAAE,CAAC;YACZ,CAAC;iBAAM,CAAC;gBACN,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACnB,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,MAAM,OAAO,GAAG,GAAG,EAAE;YACnB,IAAI,GAAG,IAAI,CAAC;YACZ,YAAY,CAAC,WAAW,EAAE,CAAC;YAC3B,IAAI,WAAW,EAAE,CAAC;gBAChB,WAAW,CAAC,IAAI,CAAC,CAAC;gBAClB,WAAW,GAAG,IAAI,CAAC;YACrB,CAAC;QACH,CAAC,CAAC;QAEF,MAAM,EAAE,gBAAgB,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;QAC3D,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;QAE/C,IAAI,CAAC;YACH,OAAO,CAAC,IAAI,IAAI,CAAC,MAAM,EAAE,OAAO,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;gBACpD,IAAI,IAAmB,CAAC;gBAExB,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBACrB,IAAI,GAAG,KAAK,CAAC,KAAK,EAAG,CAAC;gBACxB,CAAC;qBAAM,CAAC;oBACN,IAAI,GAAG,MAAM,IAAI,OAAO,CAAgB,CAAC,OAAO,EAAE,EAAE;wBAClD,IAAI,IAAI,IAAI,MAAM,EAAE,OAAO,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;4BAC9C,OAAO,CAAC,IAAI,CAAC,CAAC;4BACd,OAAO;wBACT,CAAC;wBACD,WAAW,GAAG,OAAO,CAAC;oBACxB,CAAC,CAAC,CAAC;gBACL,CAAC;gBAED,IAAI,IAAI,KAAK,IAAI;oBAAE,MAAM;gBAEzB,MAAM,IAAI,CAAC;YACb,CAAC;YAED,IAAI,UAAU,EAAE,CAAC;gBACf,MAAM,IAAI,KAAK,CAAC,8CAA8C,WAAW,CAAC,iBAAiB,mBAAmB,CAAC,CAAC;YAClH,CAAC;QACH,CAAC;gBAAS,CAAC;YACT,OAAO,EAAE,CAAC;YACV,MAAM,CAAC,WAAW,EAAE,CAAC;YACrB,MAAM,EAAE,mBAAmB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAChD,CAAC;IACH,CAAC;IAEM,KAAK,CAAC,IAAI;QACf,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAC;IACxB,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,KAAY;QACzB,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACzB,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAC;IACxB,CAAC;IAED,QAAQ;QACN,IAAI,CAAC,gBAAgB,KAAK,OAAO,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC;QACzE,OAAO,IAAI,CAAC,gBAAgB,CAAC;IAC/B,CAAC;IAED,KAAK,CAAC,SAAS;QACb,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;QACtB,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;QAEpB,MAAM,UAAU,GAAG,IAAI,CAAC,WAAW,CAAC;QACpC,IAAI,CAAC,WAAW,GAAG,SAAS,CAAC;QAE7B,IAAI,CAAC;YACH,MAAM,UAAU,EAAE,IAAI,EAAE,CAAC;QAC3B,CAAC;gBAAS,CAAC;YACT,IAAI,CAAC,eAAe,CAAC,QAAQ,EAAE,CAAC;YAChC,IAAI,CAAC,mBAAmB,CAAC,QAAQ,EAAE,CAAC;YACpC,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC;YAC1B,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC;YAExB,IAAI,CAAC,WAAW,EAAE,CAAC;YAEnB,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;YACpB,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC;QAC1B,CAAC;IACH,CAAC"}

package/dist/server/src/camera/streaming/rtp-session.js

@@ -65,6 +65,8 @@ export class RtpSession extends SubscribedPublic {
     onVideoRtp = new Subject();
     onAudioRtp = new Subject();
     #hasEnded = false;
+    #abort = new AbortController();
+    #shutdownPromise;
     #cameraDevice;
     #logger;
     #source;
@@ -92,6 +94,12 @@ export class RtpSession extends SubscribedPublic {
         return this.#backchannelTrackIndex !== undefined;
     }
     async startStream(config) {
+        if (this.#hasEnded || this.#shutdownPromise) {
+            throw new Error('RTP session has ended and cannot be restarted.');
+        }
+        if (this.#rtpStream) {
+            throw new Error('RTP session already started.');
+        }
         this.#options = {
             ...config,
             input: {
@@ -126,20 +134,19 @@ export class RtpSession extends SubscribedPublic {
                 supportedAudioCodec = [AV_CODEC_ID_PCM_MULAW];
                 break;
         }
-        this.#rtpStream = RTPStream.create(this.#url, {
+        const rtpStream = RTPStream.create(this.#url, {
+            signal: this.#abort.signal,
             onAudioPacket: (packet) => {
                 this.onAudioRtp.next(packet);
             },
             onVideoPacket: (packet) => {
                 this.onVideoRtp.next(packet);
             },
-            onClose: async (err) => {
-                if (err) {
-                    await this.#onError(err);
-                }
-                else {
-                    await this.#onEnded();
-                }
+            onClose: (err) => {
+                const shutdown = err ? this.#onError(err) : this.#onEnded();
+                shutdown.catch((error) => {
+                    this.#logger.error('Failed to shut down RTP session:', error);
+                });
             },
             supportedVideoCodecs: supportedVideoCodec,
             supportedAudioCodecs: supportedAudioCodec,
@@ -151,6 +158,7 @@ export class RtpSession extends SubscribedPublic {
                 fps: this.#options.video?.fps,
                 width: this.#options.video?.width,
                 height: this.#options.video?.height,
+                bitrate: this.#options.video?.bitrate,
                 encoderOptions: this.#options.video?.encoderOptions,
             },
             audio: {
@@ -170,7 +178,19 @@ export class RtpSession extends SubscribedPublic {
                 options: this.#options.input?.options,
             },
         });
-        await this.#rtpStream.start();
+        this.#rtpStream = rtpStream;
+        try {
+            await rtpStream.start();
+        }
+        catch (error) {
+            try {
+                await this.#onEnded();
+            }
+            catch (stopError) {
+                this.#logger.error('Failed to clean up RTP session after start error:', stopError);
+            }
+            throw error;
+        }
     }
     async startBackchannel(config) {
         const input = this.#rtpStream?.getInput();
@@ -211,12 +231,13 @@ export class RtpSession extends SubscribedPublic {
         }
         this.#backchannelDecoder = await Decoder.create(audioStream, {
             exitOnError: false,
+            signal: this.#abort.signal,
         });
         const filterChain = FilterPreset.chain();
         const sampleFormatName = config.sampleFormat ? avGetSampleFmtFromName(config.sampleFormat) : AV_SAMPLE_FMT_S16;
         filterChain.aformat(sampleFormatName, cameraSampleRate, cameraChannels === 1 ? 'mono' : 'stereo');
         const filterString = filterChain.build();
-        this.#backchannelFilter = FilterAPI.create(filterString);
+        this.#backchannelFilter = FilterAPI.create(filterString, { signal: this.#abort.signal });
         const cameraCodec = Codec.findEncoder(cameraCodecId);
         if (!cameraCodec) {
             throw new Error(`Camera codec not found: ${cameraCodecId}`);
@@ -224,6 +245,7 @@ export class RtpSession extends SubscribedPublic {
         this.#backchannelEncoder = await Encoder.create(cameraCodec, {
             decoder: this.#backchannelDecoder,
             filter: this.#backchannelFilter,
+            signal: this.#abort.signal,
             options: {
                 sample_rate: cameraSampleRate,
                 channels: cameraChannels,
@@ -253,6 +275,7 @@ export class RtpSession extends SubscribedPublic {
             useSyncQueue: false,
             useAsyncWrite: false,
             maxPacketSize: 1200,
+            signal: this.#abort.signal,
         });
         this.#backchannelStreamIndex = this.#backchannelOutput.addStream(this.#backchannelEncoder);
         this.#backchannelActive = true;
@@ -313,7 +336,7 @@ export class RtpSession extends SubscribedPublic {
             }
         }
         catch (error) {
-            if (!this.#backchannelActive) {
+            if (!this.#backchannelActive || this.#abort.signal.aborted) {
                 return;
             }
             throw error;
@@ -381,15 +404,26 @@ export class RtpSession extends SubscribedPublic {
         this.onError.next(error);
         await this.#onEnded();
     }
-    async #onEnded() {
-        if (this.#hasEnded) {
-            return;
-        }
+    #onEnded() {
+        this.#shutdownPromise ??= Promise.resolve().then(() => this.#shutdown());
+        return this.#shutdownPromise;
+    }
+    async #shutdown() {
         this.#hasEnded = true;
-        this.unsubscribe();
-        await this.#cleanupBackchannel();
-        await this.#cleanupStream();
-        this.onEnded.next();
+        this.#abort.abort();
+        try {
+            await this.#cleanupBackchannel();
+            await this.#cleanupStream();
+        }
+        finally {
+            this.onStarted.complete();
+            this.onError.complete();
+            this.onVideoRtp.complete();
+            this.onAudioRtp.complete();
+            this.unsubscribe();
+            this.onEnded.next();
+            this.onEnded.complete();
+        }
     }
 }
 //# sourceMappingURL=rtp-session.js.map