@camera.ui/browser 0.0.74 → 0.0.76

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";
@@ -132,6 +132,25 @@ export declare const ngrokSchema: zod.ZodObject<{
 }, {
     command: string;
 }>;
+export declare const filterSchema: zod.ZodObject<{
+    candidates: zod.ZodDefault<zod.ZodArray<zod.ZodString, "many">>;
+    networks: zod.ZodDefault<zod.ZodArray<zod.ZodString, "many">>;
+    interfaces: zod.ZodDefault<zod.ZodArray<zod.ZodString, "many">>;
+    ips: zod.ZodDefault<zod.ZodArray<zod.ZodString, "many">>;
+    udp_ports: zod.ZodDefault<zod.ZodArray<zod.ZodString, "many">>;
+}, "strict", zod.ZodTypeAny, {
+    candidates: string[];
+    networks: string[];
+    interfaces: string[];
+    ips: string[];
+    udp_ports: string[];
+}, {
+    candidates?: string[] | undefined;
+    networks?: string[] | undefined;
+    interfaces?: string[] | undefined;
+    ips?: string[] | undefined;
+    udp_ports?: string[] | undefined;
+}>;
 export declare const iceServerSchema: zod.ZodObject<{
     urls: zod.ZodDefault<zod.ZodArray<zod.ZodString, "many">>;
     username: zod.ZodOptional<zod.ZodString>;
@@ -161,6 +180,25 @@ export declare const webrtcSchema: zod.ZodObject<{
         username?: string | undefined;
         credential?: string | undefined;
     }>, "many">;
+    filters: zod.ZodOptional<zod.ZodObject<{
+        candidates: zod.ZodDefault<zod.ZodArray<zod.ZodString, "many">>;
+        networks: zod.ZodDefault<zod.ZodArray<zod.ZodString, "many">>;
+        interfaces: zod.ZodDefault<zod.ZodArray<zod.ZodString, "many">>;
+        ips: zod.ZodDefault<zod.ZodArray<zod.ZodString, "many">>;
+        udp_ports: zod.ZodDefault<zod.ZodArray<zod.ZodString, "many">>;
+    }, "strict", zod.ZodTypeAny, {
+        candidates: string[];
+        networks: string[];
+        interfaces: string[];
+        ips: string[];
+        udp_ports: string[];
+    }, {
+        candidates?: string[] | undefined;
+        networks?: string[] | undefined;
+        interfaces?: string[] | undefined;
+        ips?: string[] | undefined;
+        udp_ports?: string[] | undefined;
+    }>>;
 }, "strict", zod.ZodTypeAny, {
     listen: string;
     candidates: string[];
@@ -169,6 +207,13 @@ export declare const webrtcSchema: zod.ZodObject<{
         username?: string | undefined;
         credential?: string | undefined;
     }[];
+    filters?: {
+        candidates: string[];
+        networks: string[];
+        interfaces: string[];
+        ips: string[];
+        udp_ports: string[];
+    } | undefined;
 }, {
     ice_servers: {
         urls?: string[] | undefined;
@@ -177,6 +222,13 @@ export declare const webrtcSchema: zod.ZodObject<{
     }[];
     listen?: string | undefined;
     candidates?: string[] | undefined;
+    filters?: {
+        candidates?: string[] | undefined;
+        networks?: string[] | undefined;
+        interfaces?: string[] | undefined;
+        ips?: string[] | undefined;
+        udp_ports?: string[] | undefined;
+    } | undefined;
 }>;
 export declare const homeKitSettingsSchema: zod.ZodObject<{
     pin: zod.ZodNumber;
@@ -270,11 +322,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 +338,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;
@@ -364,6 +416,25 @@ export declare const patchGo2RtcSchema: zod.ZodObject<{
             username?: string | undefined;
             credential?: string | undefined;
         }>, "many">;
+        filters: zod.ZodOptional<zod.ZodObject<{
+            candidates: zod.ZodDefault<zod.ZodArray<zod.ZodString, "many">>;
+            networks: zod.ZodDefault<zod.ZodArray<zod.ZodString, "many">>;
+            interfaces: zod.ZodDefault<zod.ZodArray<zod.ZodString, "many">>;
+            ips: zod.ZodDefault<zod.ZodArray<zod.ZodString, "many">>;
+            udp_ports: zod.ZodDefault<zod.ZodArray<zod.ZodString, "many">>;
+        }, "strict", zod.ZodTypeAny, {
+            candidates: string[];
+            networks: string[];
+            interfaces: string[];
+            ips: string[];
+            udp_ports: string[];
+        }, {
+            candidates?: string[] | undefined;
+            networks?: string[] | undefined;
+            interfaces?: string[] | undefined;
+            ips?: string[] | undefined;
+            udp_ports?: string[] | undefined;
+        }>>;
     }, "strict", zod.ZodTypeAny, {
         listen: string;
         candidates: string[];
@@ -372,6 +443,13 @@ export declare const patchGo2RtcSchema: zod.ZodObject<{
             username?: string | undefined;
             credential?: string | undefined;
         }[];
+        filters?: {
+            candidates: string[];
+            networks: string[];
+            interfaces: string[];
+            ips: string[];
+            udp_ports: string[];
+        } | undefined;
     }, {
         ice_servers: {
             urls?: string[] | undefined;
@@ -380,6 +458,13 @@ export declare const patchGo2RtcSchema: zod.ZodObject<{
         }[];
         listen?: string | undefined;
         candidates?: string[] | undefined;
+        filters?: {
+            candidates?: string[] | undefined;
+            networks?: string[] | undefined;
+            interfaces?: string[] | undefined;
+            ips?: string[] | undefined;
+            udp_ports?: string[] | undefined;
+        } | undefined;
     }>>;
     ffmpeg: zod.ZodDefault<zod.ZodIntersection<zod.ZodRecord<zod.ZodString, zod.ZodString>, zod.ZodObject<{
         bin: zod.ZodDefault<zod.ZodString>;
@@ -471,6 +556,13 @@ export declare const patchGo2RtcSchema: zod.ZodObject<{
             username?: string | undefined;
             credential?: string | undefined;
         }[];
+        filters?: {
+            candidates: string[];
+            networks: string[];
+            interfaces: string[];
+            ips: string[];
+            udp_ports: string[];
+        } | undefined;
     };
     api: {
         password: string;
@@ -490,11 +582,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;
@@ -543,6 +635,13 @@ export declare const patchGo2RtcSchema: zod.ZodObject<{
         }[];
         listen?: string | undefined;
         candidates?: string[] | undefined;
+        filters?: {
+            candidates?: string[] | undefined;
+            networks?: string[] | undefined;
+            interfaces?: string[] | undefined;
+            ips?: string[] | undefined;
+            udp_ports?: string[] | undefined;
+        } | undefined;
     } | undefined;
     api?: {
         password?: string | undefined;
@@ -581,11 +680,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/auth.service.d.ts

@@ -1,6 +1,5 @@
 import type { ClientData, JwtTokenClientData, JwtTokenEncoded } from '../types/index.js';
 export declare class AuthService {
-    private configService;
     private dbs;
     constructor();
     findById(id: string): JwtTokenEncoded | undefined;

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/services/plugins.service.d.ts

@@ -2,7 +2,6 @@ import type { Plugin } from '../../plugins/plugin.js';
 import type { PluginWorker } from '../../plugins/worker.js';
 import type { DBPlugin } from '../database/types.js';
 export declare class PluginsService {
-    private configService;
     private dbs;
     private pluginManager;
     constructor();

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

@@ -1,6 +1,5 @@
 import type { DBUser } from '../database/types.js';
 export declare class UsersService {
-    private configService;
     private dbs;
     constructor();
     createUser(userData: DBUser): Promise<DBUser>;

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

@@ -1,7 +1,7 @@
 /// <reference types="node" resolution-mode="require"/>
 /// <reference types="node" resolution-mode="require"/>
 import type { Readable } from 'node:stream';
-import type { CameraExtension, PluginContract, PluginRootSchema } from '../../plugins/types.js';
+import type { CameraExtension, PLUGIN_STATUS, PluginContract, PluginRootSchema } from '../../plugins/types.js';
 import type { LoggingLevel } from '../../services/config/types.js';
 import type { CameraExtensions, CameraZone, DBCamera, DBCamviewLayout, DBRoles, DBUser } from '../database/types.js';
 import type { ApplicationResponse } from '../go2rtc/types.js';
@@ -139,6 +139,10 @@ export interface PluginsResponse {
     pagination: Pagination;
     result: CameraUiPlugin[];
 }
+export interface FrameWorkerResponse {
+    pagination: Pagination;
+    result: FrameWorker[];
+}
 export interface PluginContractCamera {
     name: string;
     extensions: CameraExtensions;
@@ -249,11 +253,6 @@ export type CamerasExtensionsRequest = {
         type: CameraExtension;
     };
 };
-export type CameraZonesTypeRequest = {
-    Querystring: {
-        type: 'motion' | 'object';
-    };
-};
 export type CameraZoneInsertPatchRequest = {
     Body: CameraZone;
 };
@@ -296,6 +295,11 @@ export type PluginsParamsNameRequest = {
         pluginname: string;
     };
 };
+export type FrameWorkerParamsNameRequest = {
+    Params: {
+        frameworkername: string;
+    };
+};
 export type PluginsParamsRemoveRequest = {
     Querystring: {
         removeStorage?: boolean;
@@ -539,3 +543,7 @@ export interface CameraUiPlugin {
         node?: string;
     };
 }
+export interface FrameWorker {
+    name: string;
+    status: PLUGIN_STATUS;
+}

package/dist/types/server/src/api/websocket/nsp/frameWorker.d.ts

@@ -0,0 +1,13 @@
+import type { Namespace, Server } from 'socket.io';
+import type { PLUGIN_STATUS } from '../../../plugins/types.js';
+import type { SocketNsp } from '../types.js';
+export declare class FrameWorkerNamespace {
+    nsp: Namespace;
+    nspName: SocketNsp;
+    private frameManager;
+    constructor(io: Server);
+    frameWorkerStatus(frameWorkerName: string, callback?: Function): Promise<void | {
+        frameWorkerName: string;
+        status: PLUGIN_STATUS;
+    }>;
+}

package/dist/types/server/src/api/websocket/nsp/metrics.d.ts

@@ -1,23 +1,28 @@
 import type { Namespace, Server } from 'socket.io';
-import type { CpuInfo, CpuTempInfo, MemoryInfo, NetworkInfo, PluginProcessesInfo, ProcessesInfo, SocketNsp } from '../types.js';
+import type { CpuInfo, CpuTempInfo, FrameWorkerProcessesInfo, MemoryInfo, NetworkInfo, PluginProcessesInfo, ProcessesInfo, SocketNsp } from '../types.js';
 export declare class MetricsNamespace {
     nsp: Namespace;
     nspName: SocketNsp;
     private logger;
     private configService;
     private pluginManager;
+    private frameManager;
     private go2rtc;
+    private natsServer;
     private cpuHistory;
     private cpuTempHistory;
     private memHistory;
     private networkHistory;
     private processServerHistory;
     private processGo2RtcHistory;
+    private processNatHistory;
     private processPluginsHistory;
+    private processFrameWorkerHistory;
     private memoryInfo?;
     constructor(io: Server);
     getProcessesInfo(payload: any, callback?: Function): Promise<ProcessesInfo>;
     getPluginsProcessesInfo(payload: any, callback?: Function): Promise<PluginProcessesInfo>;
+    getFrameWorkerProcessesInfo(payload: any, callback?: Function): Promise<FrameWorkerProcessesInfo>;
     getServerCpuInfo(payload?: any, callback?: Function): Promise<CpuInfo>;
     getServerMemoryInfo(payload?: any, callback?: Function): Promise<MemoryInfo>;
     getCpuTempInfo(payload?: any, callback?: Function): Promise<CpuTempInfo>;

package/dist/types/server/src/api/websocket/nsp/status.d.ts

@@ -7,7 +7,9 @@ export declare class StatusNamespace {
     nspName: SocketNsp;
     private configService;
     private pluginManager;
+    private frameManager;
     private go2rtc;
+    private natsServer;
     constructor(io: Server);
     watchStats(socket: Socket, payload: any, callback?: Function): {
         name: string;
@@ -17,4 +19,8 @@ export declare class StatusNamespace {
         name: string;
         status: PLUGIN_STATUS;
     }[];
+    watchFrameWorkerStats(socket: Socket, payload: any, callback?: Function): {
+        name: string;
+        status: PLUGIN_STATUS;
+    }[];
 }

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

@@ -2,7 +2,7 @@ import type { Namespace } from 'socket.io';
 import type { WebSocket } from 'ws';
 import type { PLUGIN_STATUS } from '../../plugins/types.js';
 import type { VideoStreamingMode } from '../database/types.js';
-export type SocketNsp = '/camera.ui' | '/metrics' | '/logs' | '/status' | '/notifications' | '/streams' | '/plugins' | '/proxy' | '/frame';
+export type SocketNsp = '/camera.ui' | '/metrics' | '/logs' | '/status' | '/notifications' | '/streams' | '/plugins' | '/proxy' | '/frame' | '/frameWorker';
 export interface SocketNspMap {
     nsp: Namespace;
     [key: string]: any;
@@ -52,11 +52,15 @@ export interface ProcessInfo {
 export interface ProcessesInfo {
     server: ProcessInfo;
     go2rtc: ProcessInfo;
+    nats: ProcessInfo;
 }
 export interface PluginProcessesInfo {
     plugins: ProcessInfo[];
 }
-export interface AllProcessesInfo extends ProcessesInfo, PluginProcessesInfo {
+export interface FrameWorkerProcessesInfo {
+    worker: ProcessInfo[];
+}
+export interface AllProcessesInfo extends ProcessesInfo, PluginProcessesInfo, FrameWorkerProcessesInfo {
 }
 export interface CpuInfo {
     currentLoad: number;

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

@@ -1,7 +1,7 @@
 /// <reference types="node" resolution-mode="require"/>
 import 'reflect-metadata';
 import { EventEmitter } from 'node:events';
-import { CameraController } from './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.js';
 import type { BasePlugin } from './plugins/base.js';

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

@@ -1,20 +1,23 @@
-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 { MotionFrame, 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>;
     reboot(): Promise<void>;
-    generateFrames(): AsyncIterableIterator<VideoFrame>;
+    getFrames(): AsyncIterableIterator<VideoFrame>;
+    getMotionFrames(): AsyncIterableIterator<MotionFrame>;
+    getPrebufferedFrames(): AsyncIterableIterator<VideoFrame>;
     getFfmpegPath(): Promise<string>;
     getIceServers(): Promise<IceServer[]>;
     updateCamera(updatedCamera: Camera): void;

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

@@ -1,19 +1,27 @@
+import type { Observable } from 'rxjs';
+import { BehaviorSubject } from 'rxjs';
 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 { MotionFrame, VideoFrame } from '../decoder/types.js';
 import type { StreamingConnectionOptions } from './streaming/peer-connection.js';
+import type { CameraDelegate, CameraPrebufferDelegate, FfmpegOptions, FrameState } from './types.js';
 export declare abstract class CameraDevice extends BaseCameraDevice {
+    protected readonly frameState: BehaviorSubject<FrameState>;
+    protected readonly onFrame: Observable<FrameState>;
     private _delegate?;
     private _prebufferDelegate?;
     get delegate(): CameraDelegate | undefined;
     set delegate(delegate: CameraDelegate);
     get prebufferDelegate(): CameraPrebufferDelegate | undefined;
     set prebufferDelegate(delegate: CameraPrebufferDelegate);
-    abstract generateFrames(): AsyncIterableIterator<VideoFrame>;
+    abstract getFrames(): AsyncIterableIterator<VideoFrame>;
+    abstract getMotionFrames(): AsyncIterableIterator<MotionFrame>;
+    abstract getPrebufferedFrames(): AsyncIterableIterator<VideoFrame>;
     abstract getFfmpegPath(): Promise<string>;
     snapshot(forceNew?: boolean): Promise<ArrayBuffer>;
     createSession(sourceName: string, options?: StreamingConnectionOptions): Promise<StreamingSession>;
     streamVideo(sourceName: string, options: FfmpegOptions): Promise<StreamingSession>;
     recordToFile(sourceName: string, outputPath: string, duration?: number): Promise<void>;
+    removeAllListeners(): void;
+    private createMotionFrameObservable;
 }

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

@@ -1,9 +1,10 @@
+/// <reference types="node" resolution-mode="require"/>
 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 { 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, DoorbellSetEvent, DoorbellState, LightSetEvent, LightState, MotionSetEvent, MotionState, ObjectSetEvent, ObjectState, PrebufferContainer, PrebufferState, SetValues, Sets, SirenSetEvent, SirenState, StateValues, States } from './controller/types.js';
+import type { AudioSetEvent, AudioState, BaseLogger, BatterySetEvent, BatteryState, CameraSource, Container, DetectionZone, DoorbellSetEvent, DoorbellState, LightSetEvent, LightState, MotionSetEvent, MotionState, ObjectSetEvent, ObjectState, PrebufferState, SetValues, Sets, SirenSetEvent, SirenState, StateValues, States } from './types.js';
 declare class Subscribed {
     private readonly subscriptions;
     private readonly additionalSubscriptions;
@@ -56,8 +57,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;
@@ -71,7 +72,14 @@ 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(stateName: 'light', eventData: LightSetEvent): Promise<void>;
+    updateState(stateName: 'motion', eventData: MotionSetEvent, frame?: Buffer): Promise<void>;
+    updateState(stateName: 'audio', eventData: AudioSetEvent): Promise<void>;
+    updateState(stateName: 'object', eventData: ObjectSetEvent): Promise<void>;
+    updateState(stateName: 'doorbell', eventData: DoorbellSetEvent): Promise<void>;
+    updateState(stateName: 'siren', eventData: SirenSetEvent): Promise<void>;
+    updateState(stateName: 'battery', eventData: BatterySetEvent): Promise<void>;
+    protected updateStateInternal<T extends keyof SetValues>(stateName: T, eventData: SetValues[T], skipCheck?: boolean, frame?: Buffer): Promise<void>;
     onStateChange<T extends keyof StateValues>(stateName: T): Observable<{
         newState: StateValues[T];
         oldState: StateValues[T];
@@ -81,6 +89,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: StateValues[T];
+    };
     protected getAudioState(event: AudioSetEvent): AudioState;
     protected getMotionState(event: MotionSetEvent): MotionState;
     protected getObjectState(event: ObjectSetEvent): ObjectState;
@@ -89,19 +101,13 @@ export declare abstract class BaseCameraDevice extends Subscribed {
     protected getSirenState(event: SirenSetEvent): SirenState;
     protected getBatteryState(event: BatterySetEvent): BatteryState;
     protected updateCamera(updatedCamera: Camera): void;
-    protected updatePrebuffer(sourceId: string, container: PrebufferContainer, state: PrebufferState): Promise<void>;
+    protected updatePrebuffer(sourceId: string, container: Container, state: PrebufferState): Promise<void>;
     protected updateCameraSourcesState(): void;
     protected updateCameraState(state: boolean): void;
-    protected cameraSourcePrebufferState(sourceId: string, container: PrebufferContainer): PrebufferState;
+    protected cameraSourcePrebufferState(sourceId: string, container: Container): PrebufferState;
     private createStateObservable;
-    protected createPrebufferStateObservable(sourceId: string, container: PrebufferContainer): Observable<PrebufferState>;
-    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 createPrebufferStateObservable(sourceId: string, container: Container): 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/camera/streaming/peer-connection.d.ts

@@ -4,8 +4,8 @@ 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 { CameraDevice } from '../device.js';
+import type { BaseLogger } from '../types.js';
 export interface BasicPeerConnection {
     createOffer(): Promise<RTCSessionDescription>;
     acceptAnswer(answer: {

package/dist/types/server/src/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 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/camera/streaming/webrtc-connection.d.ts

@@ -2,8 +2,8 @@ import { ReplaySubject, Subject, type Observable } from 'rxjs';
 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 { 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>;