@camera.ui/browser 0.0.73 → 0.0.75

package/dist/types/server/src/api/schemas/go2rtc.schema.d.ts

@@ -17,11 +17,11 @@ export declare const logSchema: zod.ZodObject<{
     streams: zod.ZodUnion<[zod.ZodLiteral<"info">, zod.ZodLiteral<"debug">, zod.ZodLiteral<"trace">, zod.ZodLiteral<"warn">, zod.ZodLiteral<"error">, zod.ZodLiteral<"fatal">]>;
     webrtc: zod.ZodUnion<[zod.ZodLiteral<"info">, zod.ZodLiteral<"debug">, zod.ZodLiteral<"trace">, zod.ZodLiteral<"warn">, zod.ZodLiteral<"error">, zod.ZodLiteral<"fatal">]>;
 }, "strict", zod.ZodTypeAny, {
+    mp4: "error" | "info" | "debug" | "warn" | "trace" | "fatal";
     rtsp: "error" | "info" | "debug" | "warn" | "trace" | "fatal";
     webrtc: "error" | "info" | "debug" | "warn" | "trace" | "fatal";
     mjpeg: "error" | "info" | "debug" | "warn" | "trace" | "fatal";
     hls: "error" | "info" | "debug" | "warn" | "trace" | "fatal";
-    mp4: "error" | "info" | "debug" | "warn" | "trace" | "fatal";
     level: "error" | "info" | "debug" | "warn" | "trace" | "fatal";
     format: string;
     api: "error" | "info" | "debug" | "warn" | "trace" | "fatal";
@@ -33,11 +33,11 @@ export declare const logSchema: zod.ZodObject<{
     hass: "error" | "info" | "debug" | "warn" | "trace" | "fatal";
     streams: "error" | "info" | "debug" | "warn" | "trace" | "fatal";
 }, {
+    mp4: "error" | "info" | "debug" | "warn" | "trace" | "fatal";
     rtsp: "error" | "info" | "debug" | "warn" | "trace" | "fatal";
     webrtc: "error" | "info" | "debug" | "warn" | "trace" | "fatal";
     mjpeg: "error" | "info" | "debug" | "warn" | "trace" | "fatal";
     hls: "error" | "info" | "debug" | "warn" | "trace" | "fatal";
-    mp4: "error" | "info" | "debug" | "warn" | "trace" | "fatal";
     api: "error" | "info" | "debug" | "warn" | "trace" | "fatal";
     exec: "error" | "info" | "debug" | "warn" | "trace" | "fatal";
     ngrok: "error" | "info" | "debug" | "warn" | "trace" | "fatal";
@@ -270,11 +270,11 @@ export declare const patchGo2RtcSchema: zod.ZodObject<{
         streams: zod.ZodOptional<zod.ZodUnion<[zod.ZodLiteral<"info">, zod.ZodLiteral<"debug">, zod.ZodLiteral<"trace">, zod.ZodLiteral<"warn">, zod.ZodLiteral<"error">, zod.ZodLiteral<"fatal">]>>;
         webrtc: zod.ZodOptional<zod.ZodUnion<[zod.ZodLiteral<"info">, zod.ZodLiteral<"debug">, zod.ZodLiteral<"trace">, zod.ZodLiteral<"warn">, zod.ZodLiteral<"error">, zod.ZodLiteral<"fatal">]>>;
     }, "strict", zod.ZodTypeAny, {
+        mp4?: "error" | "info" | "debug" | "warn" | "trace" | "fatal" | undefined;
         rtsp?: "error" | "info" | "debug" | "warn" | "trace" | "fatal" | undefined;
         webrtc?: "error" | "info" | "debug" | "warn" | "trace" | "fatal" | undefined;
         mjpeg?: "error" | "info" | "debug" | "warn" | "trace" | "fatal" | undefined;
         hls?: "error" | "info" | "debug" | "warn" | "trace" | "fatal" | undefined;
-        mp4?: "error" | "info" | "debug" | "warn" | "trace" | "fatal" | undefined;
         level?: "error" | "info" | "debug" | "warn" | "trace" | "fatal" | undefined;
         format?: string | undefined;
         api?: "error" | "info" | "debug" | "warn" | "trace" | "fatal" | undefined;
@@ -286,11 +286,11 @@ export declare const patchGo2RtcSchema: zod.ZodObject<{
         hass?: "error" | "info" | "debug" | "warn" | "trace" | "fatal" | undefined;
         streams?: "error" | "info" | "debug" | "warn" | "trace" | "fatal" | undefined;
     }, {
+        mp4?: "error" | "info" | "debug" | "warn" | "trace" | "fatal" | undefined;
         rtsp?: "error" | "info" | "debug" | "warn" | "trace" | "fatal" | undefined;
         webrtc?: "error" | "info" | "debug" | "warn" | "trace" | "fatal" | undefined;
         mjpeg?: "error" | "info" | "debug" | "warn" | "trace" | "fatal" | undefined;
         hls?: "error" | "info" | "debug" | "warn" | "trace" | "fatal" | undefined;
-        mp4?: "error" | "info" | "debug" | "warn" | "trace" | "fatal" | undefined;
         level?: "error" | "info" | "debug" | "warn" | "trace" | "fatal" | undefined;
         format?: string | undefined;
         api?: "error" | "info" | "debug" | "warn" | "trace" | "fatal" | undefined;
@@ -490,11 +490,11 @@ export declare const patchGo2RtcSchema: zod.ZodObject<{
         output: string;
     };
     log: {
+        mp4?: "error" | "info" | "debug" | "warn" | "trace" | "fatal" | undefined;
         rtsp?: "error" | "info" | "debug" | "warn" | "trace" | "fatal" | undefined;
         webrtc?: "error" | "info" | "debug" | "warn" | "trace" | "fatal" | undefined;
         mjpeg?: "error" | "info" | "debug" | "warn" | "trace" | "fatal" | undefined;
         hls?: "error" | "info" | "debug" | "warn" | "trace" | "fatal" | undefined;
-        mp4?: "error" | "info" | "debug" | "warn" | "trace" | "fatal" | undefined;
         level?: "error" | "info" | "debug" | "warn" | "trace" | "fatal" | undefined;
         format?: string | undefined;
         api?: "error" | "info" | "debug" | "warn" | "trace" | "fatal" | undefined;
@@ -581,11 +581,11 @@ export declare const patchGo2RtcSchema: zod.ZodObject<{
         output?: string | undefined;
     }) | undefined;
     log?: {
+        mp4?: "error" | "info" | "debug" | "warn" | "trace" | "fatal" | undefined;
         rtsp?: "error" | "info" | "debug" | "warn" | "trace" | "fatal" | undefined;
         webrtc?: "error" | "info" | "debug" | "warn" | "trace" | "fatal" | undefined;
         mjpeg?: "error" | "info" | "debug" | "warn" | "trace" | "fatal" | undefined;
         hls?: "error" | "info" | "debug" | "warn" | "trace" | "fatal" | undefined;
-        mp4?: "error" | "info" | "debug" | "warn" | "trace" | "fatal" | undefined;
         level?: "error" | "info" | "debug" | "warn" | "trace" | "fatal" | undefined;
         format?: string | undefined;
         api?: "error" | "info" | "debug" | "warn" | "trace" | "fatal" | undefined;

package/dist/types/server/src/api/schemas/users.schema.d.ts

@@ -243,8 +243,8 @@ export declare const createUserSchema: zod.ZodEffects<zod.ZodObject<{
         };
     }>>;
 }, "strict", zod.ZodTypeAny, {
-    password: string;
     _id: string;
+    password: string;
     preferences: {
         camview: {
             grids: {
@@ -287,8 +287,8 @@ export declare const createUserSchema: zod.ZodEffects<zod.ZodObject<{
     oneLogin?: boolean | undefined;
     firstLogin?: boolean | undefined;
 }>, {
-    password: string;
     _id: string;
+    password: string;
     preferences: {
         camview: {
             grids: {

package/dist/types/server/src/api/services/cameras.service.d.ts

@@ -13,9 +13,9 @@ export declare class CamerasService {
     constructor();
     createCamera(cameraData: DBCamera): Promise<DBCamera>;
     createTransformedCamera(cameraData: DBCamera): Promise<Camera>;
-    createZone(cameraname: string, zoneData: CameraZone, zoneType: 'motion' | 'object'): Promise<DBCamera | undefined>;
-    patchZoneByName(cameraname: string, zonename: string, zoneData: CameraZone, zoneType: 'motion' | 'object'): Promise<DBCamera | undefined>;
-    removeZoneByName(cameraname: string, zonename: string, zoneType: 'motion' | 'object'): Promise<void>;
+    createZone(cameraname: string, zoneData: CameraZone): Promise<DBCamera | undefined>;
+    patchZoneByName(cameraname: string, zonename: string, zoneData: CameraZone): Promise<DBCamera | undefined>;
+    removeZoneByName(cameraname: string, zonename: string): Promise<void>;
     createCameraSource(cameraname: string, sourceName: string, address: string): Promise<void>;
     resetCameraSource(cameraname: string, sourceName: string): Promise<void>;
     list(): DBCamera[];
@@ -50,5 +50,6 @@ export declare class CamerasService {
     private generateFFmpegUrls;
     private generateWWWUrls;
     private extensionIsEnabled;
+    private convertToDetectionZones;
 }
 export {};

package/dist/types/server/src/api/types/index.d.ts

@@ -249,11 +249,6 @@ export type CamerasExtensionsRequest = {
         type: CameraExtension;
     };
 };
-export type CameraZonesTypeRequest = {
-    Querystring: {
-        type: 'motion' | 'object';
-    };
-};
 export type CameraZoneInsertPatchRequest = {
     Body: CameraZone;
 };

package/dist/types/server/src/api.d.ts

@@ -1,13 +1,13 @@
 /// <reference types="node" resolution-mode="require"/>
 import 'reflect-metadata';
 import { EventEmitter } from 'node:events';
-import { CameraController } from './devices/camera/controller/index.js';
+import { CameraController } from './camera/controller.js';
 import type { Camera, CameraExtensions } from './api/database/types.js';
-import type { FrameWorker } from './decoder/worker/index.js';
+import type { FrameWorker } from './decoder/worker.js';
 import type { BasePlugin } from './plugins/base.js';
-import type { API } from './plugins/node/api.js';
-import type { PluginLogger } from './plugins/node/logger.js';
 import type { CameraExtension } from './plugins/types.js';
+import type { API } from './polyglot/node/plugins/api.js';
+import type { PluginLogger } from './polyglot/node/plugins/logger.js';
 export interface PluginConstructor {
     new (logger: PluginLogger, api: API): BasePlugin;
 }

package/dist/types/server/src/{devices/camera/controller/index.d.ts → camera/controller.d.ts}

@@ -1,14 +1,16 @@
-import { CameraDevice } from '../cameraDevice.js';
-import type { Camera } from '../../../api/database/types.js';
-import type { VideoFrame } from '../../../decoder/types.js';
-import type { ProxyServer } from '../../../nats/index.js';
-import type { IceServer } from '../../../services/config/types.js';
-import type { BaseLogger } from './types.js';
+import { CameraDevice } from './device.js';
+import type { Camera } from '../api/database/types.js';
+import type { VideoFrame } from '../decoder/types.js';
+import type { ProxyServer } from '../nats/index.js';
+import type { IceServer } from '../services/config/types.js';
+import type { BaseLogger, CameraSource } from './types.js';
 export declare class CameraController extends CameraDevice {
     private proxy;
     private motionTimeout?;
     private doorbellTimeout?;
     private doorbellTimeoutDuration;
+    private prebufferStateSubscriptions;
+    get sources(): CameraSource[];
     constructor(camera: Camera, logger: BaseLogger, proxy: ProxyServer);
     connect(): Promise<void>;
     disconnect(): Promise<void>;
@@ -19,9 +21,11 @@ export declare class CameraController extends CameraDevice {
     updateCamera(updatedCamera: Camera): void;
     cleanup(): void;
     private subscribeToCameraState;
+    private subscribeToCameraSourcesState;
     private subscribeToMotionState;
     private subscribeToDoorbellState;
     private subscribeToCameraChanges;
     private subscribeToStateChanges;
     private triggerProxyEvent;
+    private isCameraEvent;
 }

package/dist/types/server/src/{devices/camera/cameraDevice.d.ts → camera/device.d.ts}

@@ -1,8 +1,8 @@
 import { BaseCameraDevice } from './index.js';
 import { StreamingSession } from './streaming/streaming-session.js';
-import type { VideoFrame } from '../../decoder/types.js';
-import type { CameraDelegate, CameraPrebufferDelegate, FfmpegOptions } from './controller/types.js';
+import type { VideoFrame } from '../decoder/types.js';
 import type { StreamingConnectionOptions } from './streaming/peer-connection.js';
+import type { CameraDelegate, CameraPrebufferDelegate, FfmpegOptions } from './types.js';
 export declare abstract class CameraDevice extends BaseCameraDevice {
     private _delegate?;
     private _prebufferDelegate?;

package/dist/types/server/src/{devices/camera → camera}/index.d.ts

@@ -1,9 +1,9 @@
 import { LRUCache } from 'lru-cache';
 import { BehaviorSubject } from 'rxjs';
 import type { Observable, Subscription } from 'rxjs';
-import type { Camera, CameraInformation, CameraPublicProperties, CameraType, CameraZone } from '../../api/database/types.js';
-import type { IceServer } from '../../services/config/types.js';
-import type { AudioSetEvent, AudioState, BaseLogger, BatterySetEvent, BatteryState, CameraSource, DoorbellSetEvent, DoorbellState, LightSetEvent, LightState, MotionSetEvent, MotionState, ObjectSetEvent, ObjectState, SetValues, Sets, SirenSetEvent, SirenState, StateValues, States } from './controller/types.js';
+import type { Camera, CameraActivitySettings, CameraInformation, CameraPublicProperties, CameraType } from '../api/database/types.js';
+import type { IceServer } from '../services/config/types.js';
+import type { AudioSetEvent, AudioState, BaseLogger, BatterySetEvent, BatteryState, CameraSource, DetectionZone, DoorbellSetEvent, DoorbellState, LightSetEvent, LightState, MotionSetEvent, MotionState, ObjectSetEvent, ObjectState, PrebufferContainer, PrebufferState, SetValues, Sets, SirenSetEvent, SirenState, StateValues, States } from './types.js';
 declare class Subscribed {
     private readonly subscriptions;
     private readonly additionalSubscriptions;
@@ -24,18 +24,23 @@ export declare abstract class BaseCameraDevice extends Subscribed {
     protected doorbellState: BehaviorSubject<DoorbellState>;
     protected sirenState: BehaviorSubject<SirenState>;
     protected batteryState: BehaviorSubject<BatteryState>;
-    onConnected: Observable<boolean>;
-    onLightSwitched: Observable<LightState>;
-    onMotionDetected: Observable<MotionState>;
-    onAudioDetected: Observable<AudioState>;
-    onObjectDetected: Observable<ObjectState>;
-    onDoorbellPressed: Observable<DoorbellState>;
-    onSirenDetected: Observable<SirenState>;
-    onBatteryChanged: Observable<BatteryState>;
+    protected prebufferStateSubjects: {
+        [sourceId: string]: {
+            [container: string]: BehaviorSubject<PrebufferState>;
+        };
+    };
+    readonly onConnected: Observable<boolean>;
+    readonly onLightSwitched: Observable<LightState>;
+    readonly onMotionDetected: Observable<MotionState>;
+    readonly onAudioDetected: Observable<AudioState>;
+    readonly onObjectDetected: Observable<ObjectState>;
+    readonly onDoorbellPressed: Observable<DoorbellState>;
+    readonly onSirenDetected: Observable<SirenState>;
+    readonly onBatteryChanged: Observable<BatteryState>;
     get id(): string;
     get nativeId(): string | undefined;
     get pluginId(): string;
-    get state(): boolean;
+    get connected(): boolean;
     get disabled(): boolean;
     get name(): string;
     get type(): CameraType;
@@ -51,8 +56,8 @@ export declare abstract class BaseCameraDevice extends Subscribed {
     get hasPtz(): boolean;
     get hasPrebuffer(): boolean;
     get hasIntercom(): boolean;
-    get motionZones(): CameraZone[];
-    get objectZones(): CameraZone[];
+    get activityZones(): DetectionZone[];
+    get activitySettings(): CameraActivitySettings;
     get sources(): CameraSource[];
     get streamSource(): CameraSource;
     get snapshotSource(): CameraSource;
@@ -66,7 +71,7 @@ export declare abstract class BaseCameraDevice extends Subscribed {
     abstract getIceServers(): Promise<IceServer[]>;
     protected abstract cleanup(): void;
     getValue<T extends keyof StateValues>(stateName: T): StateValues[T];
-    updateState<T extends keyof SetValues>(stateName: T, eventData: SetValues[T]): Promise<void>;
+    updateState<T extends keyof SetValues>(stateName: T, eventData: SetValues[T], skipCheck?: boolean): Promise<void>;
     onStateChange<T extends keyof StateValues>(stateName: T): Observable<{
         newState: StateValues[T];
         oldState: StateValues[T];
@@ -76,6 +81,10 @@ export declare abstract class BaseCameraDevice extends Subscribed {
         newData: Camera[T];
     }>;
     removeAllListeners(): void;
+    protected checkStateInternal<T extends keyof SetValues>(stateName: T, event: SetValues[T]): {
+        changed: boolean;
+        event: SetValues[T];
+    };
     protected getAudioState(event: AudioSetEvent): AudioState;
     protected getMotionState(event: MotionSetEvent): MotionState;
     protected getObjectState(event: ObjectSetEvent): ObjectState;
@@ -83,16 +92,14 @@ export declare abstract class BaseCameraDevice extends Subscribed {
     protected getLightState(event: LightSetEvent | LightState): LightState;
     protected getSirenState(event: SirenSetEvent): SirenState;
     protected getBatteryState(event: BatterySetEvent): BatteryState;
-    private createStateObservable;
     protected updateCamera(updatedCamera: Camera): void;
+    protected updatePrebuffer(sourceId: string, container: PrebufferContainer, state: PrebufferState): Promise<void>;
+    protected updateCameraSourcesState(): void;
     protected updateCameraState(state: boolean): void;
-    protected stateChanged<T extends keyof SetValues>(oldState?: SetValues[T], newState?: SetValues[T]): boolean;
-    protected isAudioState(state: Sets): state is AudioSetEvent;
-    protected isMotionState(state: Sets): state is MotionSetEvent;
-    protected isObjectState(state: Sets): state is ObjectSetEvent;
-    protected isSirenState(state: Sets): state is SirenSetEvent;
-    protected isBatteryState(state: Sets): state is BatterySetEvent;
-    protected isGenericState(state: Sets): state is DoorbellSetEvent;
+    protected cameraSourcePrebufferState(sourceId: string, container: PrebufferContainer): PrebufferState;
+    private createStateObservable;
+    protected createPrebufferStateObservable(sourceId: string, container: PrebufferContainer): Observable<PrebufferState>;
+    protected stateChanged<T extends keyof SetValues>(oldState?: SetValues[T], newState?: SetValues[T], type?: keyof StateValues): boolean;
     protected isStateEvent(state: States | Sets): state is States;
 }
 export {};

package/dist/types/server/src/camera/polygon.d.ts

@@ -0,0 +1,3 @@
+import type { Detection, DetectionZone } from './types.js';
+export declare const areObjectDetectionsValid: (detections: Detection[], zones: DetectionZone[]) => Detection[];
+export declare const areMotionDetectionsValid: (detections: Detection[], zones: DetectionZone[]) => Detection[];

package/dist/types/server/src/{devices/camera → camera}/streaming/peer-connection.d.ts

@@ -1,11 +1,11 @@
 import { ReplaySubject, Subject } from 'rxjs';
 import { MediaStreamTrack } from 'werift';
-import { Subscribed } from '../../../utils/subscribed.js';
+import { Subscribed } from '../../utils/subscribed.js';
 import type { Observable } from 'rxjs';
 import type { ConnectionState, RTCIceCandidate, RTCSessionDescription, RtcpPacket, RtpPacket, RTCIceCandidate as WeriftRTCICECandidate } from 'werift';
-import type { IceServer } from '../../../services/config/types.js';
-import type { CameraDevice } from '../cameraDevice.js';
-import type { BaseLogger } from '../controller/types.js';
+import type { IceServer } from '../../services/config/types.js';
+import type { CameraDevice } from '../device.js';
+import type { BaseLogger } from '../types.js';
 export interface BasicPeerConnection {
     createOffer(): Promise<RTCSessionDescription>;
     acceptAnswer(answer: {

package/dist/types/server/src/{devices/camera → camera}/streaming/streaming-session.d.ts

@@ -1,8 +1,8 @@
 import { ReplaySubject, Subject } from 'rxjs';
 import { RtpPacket } from 'werift';
-import { Subscribed } from '../../../utils/subscribed.js';
-import type { CameraDevice } from '../cameraDevice.js';
-import type { BaseLogger, FfmpegOptions, SpawnInput } from '../controller/types.js';
+import { Subscribed } from '../../utils/subscribed.js';
+import type { CameraDevice } from '../device.js';
+import type { BaseLogger, FfmpegOptions, SpawnInput } from '../types.js';
 import type { WebrtcConnection } from './webrtc-connection.js';
 export declare class StreamingSession extends Subscribed {
     readonly onCallEnded: ReplaySubject<void>;

package/dist/types/server/src/{devices/camera → camera}/streaming/webrtc-connection.d.ts

@@ -1,9 +1,9 @@
 import { ReplaySubject, Subject, type Observable } from 'rxjs';
-import { Subscribed } from '../../../utils/subscribed.js';
+import { Subscribed } from '../../utils/subscribed.js';
 import type { RtpPacket } from 'werift';
-import type { IceServer } from '../../../services/config/types.js';
-import type { CameraDevice } from '../cameraDevice.js';
-import type { BaseLogger } from '../controller/types.js';
+import type { IceServer } from '../../services/config/types.js';
+import type { CameraDevice } from '../device.js';
+import type { BaseLogger } from '../types.js';
 import type { StreamingConnectionOptions } from './peer-connection.js';
 export declare class WebrtcConnection extends Subscribed {
     readonly onCameraConnected: ReplaySubject<void>;

package/dist/types/server/src/{devices/camera/controller → camera}/types.d.ts

@@ -1,12 +1,6 @@
 /// <reference types="node" resolution-mode="require"/>
-import type { CameraInformation, CameraInput, CameraInputSettings } from '../../../api/database/types.js';
-export type SpawnInput = string | number;
-export type PrebufferType = 'recording' | 'stream';
-export interface CameraSource extends CameraInput {
-    isPrebuffering(type: PrebufferType): Promise<boolean>;
-    getPrebufferRawUrl(type: PrebufferType): Promise<string | undefined>;
-    getStreamInfo(): Promise<StreamInfo | undefined>;
-}
+import type { Observable } from 'rxjs';
+import type { CameraInformation, CameraInput, CameraInputSettings, Point, ZoneFilter, ZoneType } from '../api/database/types.js';
 export interface BaseLogger {
     log: (...args: any[]) => void;
     error: (...args: any[]) => void;
@@ -14,12 +8,35 @@ export interface BaseLogger {
     debug: (...args: any[]) => void;
     trace: (...args: any[]) => void;
 }
+export type SpawnInput = string | number;
 export interface FfmpegOptions {
     input?: SpawnInput[];
     video?: SpawnInput[] | false;
     audio?: SpawnInput[];
     output: SpawnInput[];
 }
+export type PrebufferContainer = 'mp4' | 'mpegts';
+export interface BasePrebufferState {
+    maxDuration: number;
+    availableDuration: number;
+}
+export interface PrebufferStateTrue extends BasePrebufferState {
+    state: true;
+    url: string;
+}
+export interface PrebufferStateFalse extends BasePrebufferState {
+    state: false;
+}
+export type PrebufferState = PrebufferStateTrue | PrebufferStateFalse;
+export interface CameraSource extends CameraInput {
+    updatePrebufferingState(container: PrebufferContainer, state: PrebufferState): Promise<void>;
+    getPrebufferingState(container: PrebufferContainer): PrebufferState;
+    onPrebuffering(container: PrebufferContainer): Observable<PrebufferState>;
+    getStreamInfo(): Promise<StreamInfo | undefined>;
+}
+export interface CameraPrebufferDelegate {
+    getStreamInfo(sourceName: string): Promise<StreamInfo | undefined>;
+}
 export interface CameraDelegate {
     snapshotRequest(requestId: string): Promise<Buffer>;
     prepareStream(requestId: string): Promise<void>;
@@ -27,10 +44,9 @@ export interface CameraDelegate {
     onCandidates(requestId: string, candidates: string): Promise<void>;
     reboot(): Promise<void>;
 }
-export interface CameraPrebufferDelegate {
-    isPrebuffering(sourceName: string, type: PrebufferType): Promise<boolean>;
-    getPrebufferRawUrl(sourceName: string, type: PrebufferType): Promise<string | undefined>;
-    getStreamInfo(sourceName: string): Promise<StreamInfo | undefined>;
+export interface StreamInfo {
+    audio: AudioStreamOptions;
+    video: VideoStreamOptions;
 }
 export interface AudioStreamOptions {
     enabled?: boolean;
@@ -46,10 +62,6 @@ export interface VideoStreamOptions {
     fps?: number;
     idrInterval?: number;
 }
-export interface StreamInfo {
-    audio: AudioStreamOptions;
-    video: VideoStreamOptions;
-}
 export type Sdp = string;
 export type IceCandiate = string;
 export interface Go2RtcOfferMessage {
@@ -86,7 +98,7 @@ export type CameraConfig = (BaseCameraConfig & {
 }) | (BaseCameraConfig & {
     delegate?: CameraDelegate;
 });
-export interface BaseDetection {
+export interface Detection {
     id?: string;
     label: string;
     confidence: number;
@@ -96,24 +108,28 @@ export interface BaseDetection {
     origWidth: number;
     origHeight: number;
 }
-export interface MotionDetection extends BaseDetection {
-}
-export interface ObjectDetection extends BaseDetection {
+export interface DetectionZone {
+    name: string;
+    points: Point[];
+    type: ZoneType;
+    filter: ZoneFilter;
+    classes: string[];
+    isPrivacyMask: boolean;
 }
 export interface BaseState<T extends LightState | AudioState | MotionState | ObjectState | SirenState | BatteryState | DoorbellState> {
     timestamp: string;
     lastEvent?: Omit<T, 'lastEvent'>;
 }
 export interface MotionSetEvent {
-    state: boolean;
-    detections: MotionDetection[];
+    state?: boolean;
+    detections: Detection[];
 }
 export interface AudioSetEvent {
     state: boolean;
     db?: number;
 }
 export interface ObjectSetEvent {
-    detections: ObjectDetection[];
+    detections: Detection[];
 }
 export interface LightSetEvent {
     state: boolean;

package/dist/types/server/src/camera/videoFrame.d.ts

@@ -0,0 +1,18 @@
+/// <reference types="node" resolution-mode="require"/>
+import { type NatsConnection } from 'nats';
+import type { Sharp } from 'sharp';
+import type { FrameMetadata, ImageOptions, VideoFrame } from '../decoder/types.js';
+export declare class VideoFrameUtil implements VideoFrame {
+    private frameGeneratorSubject;
+    private publisher;
+    private imageBuffer;
+    private _metadata;
+    get metadata(): FrameMetadata;
+    get inputWidth(): number;
+    get inputHeight(): number;
+    get inputFormat(): string;
+    constructor(cameraId: string, publisher: NatsConnection, imageBuffer: Buffer, metadata: FrameMetadata);
+    toBuffer(options?: ImageOptions): Promise<Buffer>;
+    toImage(options?: ImageOptions): Promise<Sharp>;
+    private send;
+}

package/dist/types/server/src/decoder/ffmpeg.d.ts

@@ -1 +1,2 @@
-export declare function buildFfmpegArguments(ffmpegPath: string, streamUrl: string, port: number): Promise<string[]>;
+import type { FfmpegArgs } from './types.js';
+export declare const getHwaccelInfo: (port: number) => Promise<FfmpegArgs>;

package/dist/types/server/src/decoder/index.d.ts

@@ -1,22 +1,11 @@
-import { FrameWorker } from './worker/index.js';
-import type { CameraController } from '../devices/camera/controller/index.js';
+import { FrameWorker } from './worker.js';
+import type { CameraController } from '../camera/controller.js';
 export declare class FrameManager {
     frameWorkers: Map<string, FrameWorker>;
-    private initialized;
     private api;
     private proxyServer;
     private logger;
-    private publisher?;
-    private subscriber?;
-    private subject;
     constructor();
-    init(): Promise<void>;
     addCamera(camera: CameraController): Promise<FrameWorker>;
     removeCamera(camera: CameraController): Promise<void>;
-    private handleConnectMessage;
-    private handleDisconnectMessage;
-    private disconnectClient;
-    private disconnectAllClients;
-    private startPingPongForClient;
-    private listenToMessages;
 }

package/dist/types/server/src/decoder/types.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="node" resolution-mode="require"/>
 /// <reference types="node" resolution-mode="require"/>
 import type { ChildProcess } from 'node:child_process';
-import type { ResizeOptions, RotateOptions, Sharp } from 'sharp';
+import type { Sharp } from 'sharp';
 export interface FrameMetadata {
     format: string;
     frameSize: number;
@@ -19,14 +19,12 @@ export interface ImageCrop {
 export interface ImageResize {
     width?: number;
     height?: number;
-    options?: ResizeOptions;
 }
 export interface ImageRotate {
     angle: number;
-    options?: RotateOptions;
 }
 export interface ImageFormat {
-    format: 'rgba' | 'gray';
+    to: 'rgba' | 'gray';
 }
 export interface ImageOptions {
     format?: ImageFormat;
@@ -62,9 +60,10 @@ export interface BaseFrameWorkerConfig {
         user: string;
         pass: string;
     };
+    proxyPort: number;
 }
-export type WorkerMessage = 'started' | 'getFFmpegArgs';
-export type MainMessage = 'getMetadata' | 'startVideoSession' | 'stopVideoSession' | 'setCameraName';
+export type WorkerMessage = 'started' | 'getFFmpegArgs' | 'updateClient' | 'removeClient' | 'clearClients';
+export type MainMessage = 'setCameraName' | 'recoverClients';
 export interface MainToWorkerMessage {
     message: MainMessage;
     data: Record<string, any>;
@@ -80,15 +79,15 @@ export interface MainToWorkerResponse {
     response?: Record<string, any>;
 }
 export interface SignalingRequest {
-    type: 'connect' | 'disconnect';
+    type: 'connect' | 'disconnect' | 'metadata';
     requestId: string;
     cameraId: string;
     pluginId: string;
 }
 export interface SignalingResponse {
-    type: 'connected' | 'disconnected' | 'error';
+    type: 'connected' | 'disconnected' | 'metadata';
     requestId: string;
-    message?: string;
+    metadata?: FrameMetadata;
 }
 export interface PingMessage {
     type: 'ping';
@@ -98,3 +97,24 @@ export interface PongMessage {
     type: 'pong';
     requestId: string;
 }
+export interface HardwareSource {
+    name: string;
+    url: string;
+}
+export interface HardwareResponse {
+    sources: HardwareSource[];
+}
+export interface FfmpegArgs {
+    hwaccel: string;
+    hwaccelArgs: string[];
+    hwaccelFilter: string;
+    threads: string;
+}
+export interface FrameWorkerClient {
+    pluginId: string;
+    requestIds: string[];
+}
+export interface RecoveredClient {
+    pluginId: string;
+    requestIds: string[];
+}

package/dist/types/server/src/decoder/{worker/index.d.ts → worker.d.ts}

@@ -1,13 +1,8 @@
-import { Subscribed } from '../../utils/subscribed.js';
-import type { CameraController } from '../../devices/camera/controller/index.js';
-import type { FrameMetadata } from '../types.js';
-interface FrameWorkerClient {
-    pluginId: string;
-    requestIds: string[];
-}
+import { Subscribed } from '../utils/subscribed.js';
+import type { CameraController } from '../camera/controller.js';
 export declare class FrameWorker extends Subscribed {
     token: string;
-    readonly clients: Map<string, FrameWorkerClient>;
+    private readonly clients;
     private subject;
     private ipcSubject;
     private frameWorkerId;
@@ -20,23 +15,20 @@ export declare class FrameWorker extends Subscribed {
     private initialized;
     private stopped;
     private auth;
+    private proxyPort;
     private ffmpegArgs;
     private py;
-    constructor(camera: CameraController, auth: {
+    constructor(camera: CameraController, proxyPort: number, auth: {
         user: string;
         pass: string;
     });
     init(): Promise<void>;
     close(): Promise<void>;
     workerPID(): number;
-    getMetadata(): Promise<FrameMetadata>;
-    addClient(pluginId: string, requestId: string): Promise<void>;
-    removeClient(pluginId: string, requestId: string): Promise<void>;
-    private startVideoSession;
-    private stopVideoSession;
     private startWorker;
+    private restartWorker;
+    private killWorker;
     private sendMessage;
     private listenToMessages;
     private getLogPrefix;
 }
-export {};