@camera.ui/browser 0.0.32 → 0.0.34

package/dist/client/node/src/proxy/cameraDevice/cameraDevice.browser.d.ts

@@ -1,6 +1,6 @@
 import { Observable } from 'rxjs';
 import type { SocketService } from '../../socket';
-import type { Camera, CameraDevice, StateValue, StateValues, OnSetEvent, PrebufferType, LightState, MotionState, AudioState, ObjectState, DoorbellState, SirenState, BaseLogger, FfmpegOptions, Input } from '../../../../../shared/types';
+import type { Camera, CameraDevice, StateValue, StateValues, OnSetEvent, PrebufferType, LightState, MotionState, AudioState, ObjectState, DoorbellState, SirenState, BaseLogger, FfmpegOptions, CameraInput } from '../../../../../shared/types';
 export declare class CameraDeviceClient implements CameraDevice {
     private socketService;
     private cameraSubject;
@@ -30,10 +30,12 @@ export declare class CameraDeviceClient implements CameraDevice {
     get hasAudioDetector(): boolean;
     get hasObjectDetector(): boolean;
     get hasPtz(): boolean;
-    get sources(): Input[];
+    get sources(): CameraInput[];
     constructor(camera: Camera, socketService: SocketService, logger: BaseLogger);
-    snapshot(sourceName?: string): Promise<ArrayBuffer>;
-    setPrebufferSource(sourceName: string, address: string | null, type: PrebufferType, fromCamera?: boolean): Promise<void>;
+    snapshot(sourceName?: string, prebuffer?: boolean): Promise<ArrayBuffer>;
+    setPrebufferSource(sourceName: string, address: string, type: PrebufferType): Promise<void>;
+    removePrebufferSource(sourceName: string, type: 'recording' | 'stream'): Promise<void>;
+    removePrebufferSources(): Promise<void>;
     getFfmpegPath(): Promise<string>;
     getIceServers(): Promise<RTCIceServer[]>;
     getValue<T extends keyof StateValues>(stateName: T): StateValue<T>;

package/dist/client/node/src/proxy/cameraDevice/cameraDevice.node.d.ts

@@ -1,9 +1,12 @@
 import { CameraDeviceHub } from '../../../../../src/camera';
 import type { SocketService } from '../../socket';
-import type { Camera, StateValues, OnSetEvent, BaseLogger, IceServer } from '../../../../../shared/types';
+import type { Camera, StateValues, OnSetEvent, BaseLogger, IceServer, PrebufferType } from '../../../../../shared/types';
 export declare class CameraDeviceClient extends CameraDeviceHub {
     private socketService;
     constructor(camera: Camera, socketService: SocketService, logger: BaseLogger);
+    setPrebufferSource(sourceName: string, address: string | null, type: PrebufferType): Promise<void>;
+    removePrebufferSource(sourceName: string, type: 'recording' | 'stream'): Promise<void>;
+    removePrebufferSources(): Promise<void>;
     getFfmpegPath(): Promise<string>;
     getIceServers(): Promise<IceServer[]>;
     updateState<T extends keyof StateValues>(stateName: T, eventData: OnSetEvent<T>): Promise<void>;

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

@@ -145,9 +145,15 @@ export interface Go2RtcFFMPEGSource {
     aac: string;
     opus: string;
 }
+export interface PrebufferStreamSource {
+    source: string;
+    rawUrl?: string | string[] | null;
+    snapshotUrl: string;
+    prebuffering?: boolean;
+}
 export interface Go2RtcPrebufferSource {
-    stream?: string;
-    recording?: string;
+    stream: PrebufferStreamSource;
+    recording: PrebufferStreamSource;
 }
 export interface StreamSources {
     webrtc: string;

package/dist/src/api/go2rtc/api/application.d.ts

@@ -1,8 +1,8 @@
 import type { ApplicationResponse, ExitData } from '../types';
-declare class ApplicationService {
+declare class ApplicationApi {
     close(data: ExitData): Promise<void>;
     info(): Promise<ApplicationResponse>;
     restart(): Promise<void>;
 }
-declare const _default: ApplicationService;
+declare const _default: ApplicationApi;
 export default _default;

package/dist/src/api/go2rtc/api/config.d.ts

@@ -0,0 +1,8 @@
+import type { AxiosResponse } from 'axios';
+declare class ConfigApi {
+    getConfig(): Promise<AxiosResponse>;
+    rewriteConfig(data: Record<string, any>): Promise<AxiosResponse>;
+    mergeConfig(data: Record<string, any>): Promise<AxiosResponse>;
+}
+declare const _default: ConfigApi;
+export default _default;

package/dist/src/api/go2rtc/api/snapshot.d.ts

@@ -1,7 +1,7 @@
 import type { SourceData } from '../types';
-declare class SnapshotService {
-    jpeg(data: SourceData): Promise<string>;
-    mp4(data: SourceData): Promise<string>;
+declare class SnapshotApi {
+    jpeg(data: SourceData): Promise<ArrayBuffer>;
+    mp4(data: SourceData): Promise<ArrayBuffer>;
 }
-declare const _default: SnapshotService;
+declare const _default: SnapshotApi;
 export default _default;

package/dist/src/api/go2rtc/api/streams.d.ts

@@ -1,11 +1,11 @@
 import type { AxiosResponse } from 'axios';
 import type { StreamData, SourceData, IntercomData } from '../types';
-declare class StreamsService {
+declare class StreamsApi {
     createStream(data: StreamData): Promise<AxiosResponse>;
     deleteStream(data: SourceData): Promise<AxiosResponse>;
     getStreamInfo(data: SourceData): Promise<AxiosResponse>;
     sendStreamToDst(data: IntercomData): Promise<AxiosResponse>;
     updateStreamSource(data: StreamData): Promise<AxiosResponse>;
 }
-declare const _default: StreamsService;
+declare const _default: StreamsApi;
 export default _default;

package/dist/src/api/go2rtc/index.d.ts

@@ -1,3 +1,4 @@
 export { default as ApplicationApi } from './api/application';
-export { default as StreamsService } from './api/streams';
-export { default as SnapshotService } from './api/snapshot';
+export { default as StreamsApi } from './api/streams';
+export { default as SnapshotApi } from './api/snapshot';
+export { default as ConfigApi } from './api/config';

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

@@ -403,7 +403,7 @@ export declare const patchGo2RtcSchema: zod.ZodObject<{
         rtsp?: string | undefined;
         output?: string | undefined;
     }>>>;
-    streams: zod.ZodDefault<zod.ZodRecord<zod.ZodEffects<zod.ZodString, string, string>, zod.ZodUnion<[zod.ZodString, zod.ZodArray<zod.ZodString, "many">, zod.ZodNull]>>>;
+    streams: zod.ZodOptional<zod.ZodRecord<zod.ZodEffects<zod.ZodString, string, string>, zod.ZodUnion<[zod.ZodString, zod.ZodArray<zod.ZodString, "many">, zod.ZodNull]>>>;
     homekit: zod.ZodOptional<zod.ZodRecord<zod.ZodString, zod.ZodUnion<[zod.ZodUnion<[zod.ZodOptional<zod.ZodObject<{
         pin: zod.ZodOptional<zod.ZodNumber>;
         name: zod.ZodOptional<zod.ZodString>;
@@ -481,7 +481,6 @@ export declare const patchGo2RtcSchema: zod.ZodObject<{
     rtmp: {
         listen: string;
     };
-    streams: Record<string, string | string[] | null>;
     ffmpeg: Record<string, string> & {
         rtsp: string;
         bin: string;
@@ -510,6 +509,7 @@ export declare const patchGo2RtcSchema: zod.ZodObject<{
     srtp: {
         listen: string;
     };
+    streams?: Record<string, string | string[] | null> | undefined;
     homekit?: Record<string, {
         pin?: number | undefined;
         name?: string | undefined;

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

@@ -1,6 +1,5 @@
 import type { DBCamera, Camera } from '../database/types';
 import { type CameraExtension } from '../../plugins/types';
-import type { PrebufferType } from '../../camera/types';
 type DeepPartial<T> = T extends object ? {
     [P in keyof T]?: DeepPartial<T[P]>;
 } : T;
@@ -13,7 +12,8 @@ export default class CamerasService {
     private pluginsService;
     constructor();
     createCamera(cameraData: DBCamera): Promise<DBCamera>;
-    createCameraSource(cameraName: string, sourceName: string, address: string | null, type: PrebufferType): Promise<string>;
+    createCameraSource(cameraName: string, sourceName: string, address: string): Promise<void>;
+    resetCameraSource(cameraName: string, sourceName: string): Promise<void>;
     createTransformedCamera(cameraData: DBCamera): Promise<Camera>;
     list(): Promise<DBCamera[]>;
     listTransformed(): Promise<Camera[]>;
@@ -38,6 +38,9 @@ export default class CamerasService {
     removeByPluginId(pluginId: string): Promise<void>;
     removeByPluginIdAndName(cameraname: string, pluginId: string): Promise<void>;
     removeAll(): Promise<void>;
-    private transformCamera;
+    transformCamera(camera: DBCamera): Camera;
+    private addCameraSources;
+    private removeCameraSources;
+    private sourceIsPrebuffering;
 }
 export {};

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

@@ -2,7 +2,7 @@ import { Observable } from 'rxjs';
 import { StreamingSession } from './streaming/streaming-session';
 import type { Camera, CameraInput, CameraPublicProperties } from '../api/database/types';
 import type { ProxyServer } from '../proxy';
-import type { CameraDevice, BaseLogger, Input } from './types';
+import type { CameraDevice, BaseLogger } from './types';
 import type { IceServer } from '../services/config/types';
 import type { StateValues, OnSetEvent, LightState, MotionState, AudioState, ObjectState, DoorbellState, SirenState, StreamingConnectionOptions, FfmpegOptions, PrebufferType } from './types';
 export declare class CameraDeviceHub implements CameraDevice {
@@ -34,10 +34,12 @@ export declare class CameraDeviceHub implements CameraDevice {
     get hasAudioDetector(): boolean;
     get hasObjectDetector(): boolean;
     get hasPtz(): boolean;
-    get sources(): Input[];
+    get sources(): CameraInput[];
     constructor(camera: Camera, logger?: BaseLogger, proxy?: ProxyServer);
-    snapshot(sourceName?: string): Promise<ArrayBuffer>;
-    setPrebufferSource(sourceName: string, address: string | null, type: PrebufferType, fromCamera?: boolean): Promise<void>;
+    snapshot(sourceName?: string, prebuffer?: boolean): Promise<ArrayBuffer>;
+    setPrebufferSource(sourceName: string, address: string, type: PrebufferType): Promise<void>;
+    removePrebufferSource(sourceName: string, type: 'recording' | 'stream'): Promise<void>;
+    removePrebufferSources(): Promise<void>;
     getFfmpegPath(): Promise<string>;
     getIceServers(): Promise<IceServer[]>;
     getValue<T extends keyof StateValues>(stateName: T): StateValues[T];

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

@@ -47,7 +47,7 @@ export interface CameraDevice {
     hasPtz: boolean;
     type: string;
     model: string;
-    sources: Input[];
+    sources: CameraInput[];
     logger: BaseLogger;
     onLightDetected: Observable<LightState>;
     onMotionDetected: Observable<MotionState>;
@@ -55,8 +55,10 @@ export interface CameraDevice {
     onObjectDetected: Observable<ObjectState>;
     onDoorbellPressed: Observable<DoorbellState>;
     onSirenDetected: Observable<SirenState>;
-    snapshot(sourceName?: string): Promise<ArrayBuffer>;
-    setPrebufferSource(sourceName: string, address: string | null, type: 'recording' | 'stream'): Promise<void>;
+    snapshot(sourceName?: string, prebuffer?: boolean): Promise<ArrayBuffer>;
+    setPrebufferSource(sourceName: string, address: string, type: 'recording' | 'stream'): Promise<void>;
+    removePrebufferSource(sourceName: string, type: 'recording' | 'stream'): Promise<void>;
+    removePrebufferSources(): Promise<void>;
     getFfmpegPath(): Promise<string>;
     getIceServers(): Promise<RTCIceServer[]>;
     getValue<T extends keyof StateValues>(stateName: T): StateValue<T>;
@@ -104,10 +106,6 @@ export interface CameraConfig {
     model?: string;
     sources: CameraInputSettings[];
 }
-export interface Input extends CameraInput {
-    readonly isStreamPrebuffering?: boolean;
-    readonly isRecordingPrebuffering?: boolean;
-}
 export interface BaseState {
     timestamp: number;
     lastTriggered: number;

package/dist/src/plugins/cameraStorage.d.ts

@@ -1,11 +1,11 @@
 import type { API } from '../api';
 import type { PluginJsonSchemaForm, PluginJsonSchema, CameraStorage as CameraStorageMethods, SchemaConfig } from './types';
 export declare class CameraStorage implements CameraStorageMethods {
-    schema: PluginJsonSchemaForm;
     private cameraId;
     private instance;
     private api;
     private db;
+    private _schema;
     private _values;
     constructor(api: API, instance: any, cameraId: string, schema?: PluginJsonSchemaForm);
     /**
@@ -13,6 +13,16 @@ export declare class CameraStorage implements CameraStorageMethods {
      * This will load the configuration from the database.
      */
     initializeStorage(): Promise<void>;
+    /**
+     * Get a value from the configuration by its key/path.
+     * If the schema has an onGet function, the onGet function will be called.
+     * If the onGet functions is undefined, the value from the configuration will be returned.
+     * If the schema has a default value, and the configuration value is undefined, the default value will be returned.
+     *
+     * @param path - The path to the configuration value.
+     * @returns The value from the configuration.
+     */
+    getValue<T = string>(path: string): Promise<T> | undefined;
     /**
      * Set a new value for a given key/path in the configuration.
      * If the schema of the value has an onSet function, and the value has changed, the onSet function will be called.
@@ -23,15 +33,12 @@ export declare class CameraStorage implements CameraStorageMethods {
      */
     setValue<T = string>(path: string, newValue: T): Promise<void>;
     /**
-     * Get a value from the configuration by its key/path.
-     * If the schema has an onGet function, the onGet function will be called.
-     * If the onGet functions is undefined, the value from the configuration will be returned.
-     * If the schema has a default value, and the configuration value is undefined, the default value will be returned.
+     * Check if a value exists by its config path/key.
      *
-     * @param path - The path to the configuration value.
-     * @returns The value from the configuration.
+     * @param path - The path to the value to check.
+     * @returns True if the value exists, false otherwise.
      */
-    getValue<T = string>(path: string): T | Promise<T> | undefined;
+    hasValue(path: string): boolean;
     /**
      * Get the root schema and configuration.
      * This will also call the onGet functions for the schema.
@@ -73,6 +80,13 @@ export declare class CameraStorage implements CameraStorageMethods {
      * @param schema - The new schema to set.
      */
     changeSchema(path: string, newSchema: Partial<PluginJsonSchema>): Promise<void>;
+    /**
+     * Get a schema by its config path/key.
+     *
+     * @param path - The path to the schema to get.
+     * @returns The schema.
+     */
+    getSchema<T>(path: string): T | undefined;
     /**
      * Check if a schema exists by its config path/key.
      *
@@ -80,13 +94,6 @@ export declare class CameraStorage implements CameraStorageMethods {
      * @returns True if the schema exists, false otherwise.
      */
     hasSchema(path: string): boolean;
-    /**
-     * Check if a value exists by its config path/key.
-     *
-     * @param path - The path to the value to check.
-     * @returns True if the value exists, false otherwise.
-     */
-    hasValue(path: string): boolean;
     private resolveOnGetFunctions;
     private resolveOnGetFunctionsForObject;
     private resolveOnGetFunctionsForSchema;

package/dist/src/proxy/client/cameraDevice.d.ts

@@ -15,6 +15,8 @@ export declare class CameraDeviceClientProxy extends CameraDeviceHub {
     private close?;
     constructor(camera: Camera, logger: BaseLogger, pluginId: string, pluginName: string, reqServerAddress: string, pubServerAddress: string, serverPublicKey: string);
     setPrebufferSource(sourceName: string, address: string | null, type: PrebufferType): Promise<void>;
+    removePrebufferSource(sourceName: string, type: 'recording' | 'stream'): Promise<void>;
+    removePrebufferSources(): Promise<void>;
     getFfmpegPath(): Promise<string>;
     getIceServers(): Promise<IceServer[]>;
     updateState<T extends keyof StateValues>(stateName: T, eventData: OnSetEvent<T>): Promise<void>;

package/dist/src/proxy/client/queue.d.ts

@@ -1,10 +1,12 @@
 import { Request } from 'zeromq';
+import type { BaseLogger } from '../../camera/types';
 export declare class ClientMessageQueue {
+    private logger;
     private requestClient;
     private queue;
     private isProcessing;
     private pendingResponses;
-    constructor(requestClient: Request);
+    constructor(requestClient: Request, logger: BaseLogger);
     enqueue(message: any, timeout?: number): Promise<any>;
     private processQueue;
     private listenToReplies;

package/dist/src/proxy/index.d.ts

@@ -20,7 +20,4 @@ export declare class ProxyServer {
     close(): Promise<void>;
     sendMessage(item: QueueItem): Promise<void>;
     publishEvent<K extends keyof ProxyEvents>(targetId: TargetID, type: K, data: ProxyEvents[K]): Promise<void>;
-    private listenToRequestMessages;
-    private listenToRouterMessages;
-    private isProxyMessage;
 }

package/dist/src/proxy/proxies/camera.d.ts

@@ -13,16 +13,27 @@ export declare class CameraDeviceProxy implements CameraDeviceProxyMethods {
     constructor(proxyServer: ProxyServer);
     snapshot(data: {
         sourceName: string;
+        prebuffer?: boolean;
         cameraId: string;
         pluginId: string;
     }): Promise<ArrayBuffer>;
     setPrebufferSource(data: {
         sourceName: string;
-        address: string | null;
+        address: string;
         type: PrebufferType;
         cameraId: string;
         pluginId: string;
     }): Promise<void>;
+    removePrebufferSource(data: {
+        sourceName: string;
+        type: PrebufferType;
+        cameraId: string;
+        pluginId: string;
+    }): Promise<void>;
+    removePrebufferSources(data: {
+        cameraId: string;
+        pluginId: string;
+    }): Promise<void>;
     getFffmpegPath(): string;
     getIceServers(): IceServer[];
     updateState<T extends keyof StateValues>(data: {

package/dist/src/proxy/queue.d.ts

@@ -1,15 +1,17 @@
-import type { Reply, Router } from 'zeromq';
 import type { QueueItem } from './types';
+import type { ProxyServer } from '.';
 export declare class MessageQueue {
+    private logger;
     private queue;
     private isProcessing;
     private pendingResponses;
+    private proxyServer;
     private reqServer;
     private router;
-    constructor(reqServer: Reply, router: Router);
+    constructor(proxyServer: ProxyServer);
     addToQueue(item: QueueItem): Promise<void>;
-    receiveResponse(requestId: string, response: any): void;
-    receiveError(requestId: string, error: Error): void;
     private processQueue;
-    private sendMessage;
+    private listenToRouterMessages;
+    private listenToRequestMessages;
+    private isProxyMessage;
 }

package/dist/src/proxy/types.d.ts

@@ -18,6 +18,7 @@ export interface QueueItem {
     targetId: string;
     requestId: string;
     message: any;
+    fn: string;
     timeout?: number;
     onResponse?: (response: any) => void;
     onError?: (error: Error) => void;
@@ -191,16 +192,27 @@ export interface CameraDeviceProxyMessageStructure {
 export interface CameraDeviceProxyMethods {
     snapshot(data: {
         sourceName: string;
+        prebuffer?: boolean;
         cameraId: string;
         pluginId: string;
     }): Promise<ArrayBuffer>;
     setPrebufferSource(data: {
         sourceName: string;
-        address: string | null;
+        address: string;
         type: PrebufferType;
         cameraId: string;
         pluginId: string;
     }): Promise<void>;
+    removePrebufferSource(data: {
+        sourceName: string;
+        type: PrebufferType;
+        cameraId: string;
+        pluginId: string;
+    }): Promise<void>;
+    removePrebufferSources(data: {
+        cameraId: string;
+        pluginId: string;
+    }): Promise<void>;
     getFffmpegPath(data: {
         cameraId: string;
         pluginId: string;

package/dist/src/services/config/index.d.ts

@@ -47,7 +47,8 @@ export declare class ConfigService {
     constructor();
     read(): void;
     writeConfig(newConfig?: IConfig): void;
-    writeGo2RtcConfig(newConfig?: Go2RtcConfig): void;
+    writeGo2RtcConfigFile(newConfig?: Go2RtcConfig): void;
+    writeGo2RtcConfigApi(newConfig?: Go2RtcConfig): Promise<void>;
     mergeGo2RtcConfig(): Promise<void>;
     private defaultConfig;
     private defaultGo2RtcConfig;

package/dist/src/services/config/types.d.ts

@@ -61,8 +61,8 @@ export interface Go2RtcConfig {
     srtp: SRTP;
     rtmp: RTMP;
     webrtc: Webrtc;
-    streams: Partial<Streams>;
     ffmpeg: Ffmpeg;
+    streams?: Partial<Streams>;
     homekit?: Partial<HomeKit>;
     hass?: Partial<Hass>;
     webtorrent?: Partial<Webtorrent>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@camera.ui/browser",
-  "version": "0.0.32",
+  "version": "0.0.34",
   "description": "camera.ui browser client",
   "author": "seydx (https://github.com/seydx/camera.ui)",
   "main": "./dist/bundle.js",