@camera.ui/browser 0.0.64 → 0.0.65

package/dist/types/packages/client/browser/src/proxy/cameraDevice.d.ts

@@ -1,12 +1,11 @@
 import { BrowserCameraDeviceBase } from '../../../../../shared/types';
-import type { BaseLogger, Camera, CameraSource, Frame, IceServer, OnSetEvent, StateValues } from '../../../../../shared/types';
+import type { BaseLogger, Camera, CameraSource, IceServer, OnSetEvent, StateValues } from '../../../../../shared/types';
 export declare class CameraDeviceClient extends BrowserCameraDeviceBase {
     private initialized;
     private publisher;
     private client;
     private cameraSubscriber;
     private cameraPluginSubscriber;
-    private frameSubscriber;
     private messageQueue;
     private options;
     private pluginID;
@@ -14,7 +13,6 @@ export declare class CameraDeviceClient extends BrowserCameraDeviceBase {
     private clientSubject;
     private cameraSubscriberSubject;
     private cameraPluginSubscriberSubject;
-    private frameSubject;
     get sources(): CameraSource[];
     constructor(camera: Camera, logger: BaseLogger, options: {
         servers: string;
@@ -25,14 +23,12 @@ export declare class CameraDeviceClient extends BrowserCameraDeviceBase {
     connect(): Promise<void>;
     disconnect(): Promise<void>;
     reboot(): Promise<void>;
-    generateFrames(): AsyncIterableIterator<Frame>;
-    getFfmpegPath(): Promise<string>;
     getIceServers(): Promise<IceServer[]>;
     snapshot(forceNew?: boolean): Promise<ArrayBuffer>;
     updateState<T extends keyof StateValues>(stateName: T, eventData: OnSetEvent<T>): Promise<void>;
     refreshStates(): Promise<void>;
     cleanup(): Promise<void>;
-    private handleRouterRequest;
+    private requestHandler;
     private listenToMessages;
     private onRequest;
 }

package/dist/types/packages/client/browser/src/proxy/deviceManager.d.ts

@@ -1,15 +1,15 @@
 /// <reference types="node" />
 import { EventEmitter } from 'events';
 import { BrowserCameraDeviceBase as CameraDevice } from '../../../../../server/src/camera/base/base.browser';
-import type { BaseLogger, CameraConfig, DeviceManagerProxyEventCallbacks, DeviceManagerProxyMethods } from '../../../../../shared/types';
-export declare interface DeviceManager extends DeviceManagerProxyMethods {
+import type { BaseLogger, DeviceManagerBrowserProxyMethods, DeviceManagerProxyEventCallbacks } from '../../../../../shared/types';
+export declare interface DeviceManager extends DeviceManagerBrowserProxyMethods {
     on<E extends keyof DeviceManagerProxyEventCallbacks>(event: E, listener: DeviceManagerProxyEventCallbacks[E]): this;
     once<E extends keyof DeviceManagerProxyEventCallbacks>(event: E, listener: DeviceManagerProxyEventCallbacks[E]): this;
     off<E extends keyof DeviceManagerProxyEventCallbacks>(event: E, listener: DeviceManagerProxyEventCallbacks[E]): this;
     removeListener<E extends keyof DeviceManagerProxyEventCallbacks>(event: E, listener: DeviceManagerProxyEventCallbacks[E]): this;
     removeAllListeners<E extends keyof DeviceManagerProxyEventCallbacks>(event?: E): this;
 }
-export declare class DeviceManager extends EventEmitter implements DeviceManagerProxyMethods {
+export declare class DeviceManager extends EventEmitter implements DeviceManagerBrowserProxyMethods {
     private logger;
     private initialized;
     private publisher;
@@ -30,7 +30,6 @@ export declare class DeviceManager extends EventEmitter implements DeviceManager
     init(): Promise<void>;
     getCameraById(id: string): Promise<CameraDevice | undefined>;
     getCameraByName(name: string): Promise<CameraDevice | undefined>;
-    createCamera(cameraConfig: CameraConfig): Promise<CameraDevice>;
     removeCameraByName(name: string): Promise<void>;
     removeCameraById(id: string): Promise<void>;
     emit(): boolean;

package/dist/types/packages/client/browser/src/proxy/pluginsManager.d.ts

@@ -1,14 +1,14 @@
 /// <reference types="node" />
 import { EventEmitter } from 'events';
-import type { BaseLogger, PluginsManagerProxyEventCallbacks, PluginsManagerProxyMethods } from '../../../../../shared/types';
-export declare interface PluginsManager extends PluginsManagerProxyMethods {
+import type { BaseLogger, PluginsManagerBrowserProxyMethods, PluginsManagerProxyEventCallbacks } from '../../../../../shared/types';
+export declare interface PluginsManager extends PluginsManagerBrowserProxyMethods {
     on<E extends keyof PluginsManagerProxyEventCallbacks>(event: E, listener: PluginsManagerProxyEventCallbacks[E]): this;
     once<E extends keyof PluginsManagerProxyEventCallbacks>(event: E, listener: PluginsManagerProxyEventCallbacks[E]): this;
     off<E extends keyof PluginsManagerProxyEventCallbacks>(event: E, listener: PluginsManagerProxyEventCallbacks[E]): this;
     removeListener<E extends keyof PluginsManagerProxyEventCallbacks>(event: E, listener: PluginsManagerProxyEventCallbacks[E]): this;
     removeAllListeners<E extends keyof PluginsManagerProxyEventCallbacks>(event?: E): this;
 }
-export declare class PluginsManager extends EventEmitter implements PluginsManagerProxyMethods {
+export declare class PluginsManager extends EventEmitter implements PluginsManagerBrowserProxyMethods {
     private logger;
     private initialized;
     private publisher;

package/dist/types/packages/client/browser/src/proxy/systemManager.d.ts

@@ -1,14 +1,14 @@
 /// <reference types="node" />
 import { EventEmitter } from 'events';
-import type { BaseLogger, SystemManagerProxyEventCallbacks, SystemManagerProxyMethods } from '../../../../../shared/types';
-export declare interface SystemManager extends SystemManagerProxyMethods {
+import type { BaseLogger, SystemManagerBrowserProxyMethods, SystemManagerProxyEventCallbacks } from '../../../../../shared/types';
+export declare interface SystemManager extends SystemManagerBrowserProxyMethods {
     on<E extends keyof SystemManagerProxyEventCallbacks>(event: E, listener: SystemManagerProxyEventCallbacks[E]): this;
     once<E extends keyof SystemManagerProxyEventCallbacks>(event: E, listener: SystemManagerProxyEventCallbacks[E]): this;
     off<E extends keyof SystemManagerProxyEventCallbacks>(event: E, listener: SystemManagerProxyEventCallbacks[E]): this;
     removeListener<E extends keyof SystemManagerProxyEventCallbacks>(event: E, listener: SystemManagerProxyEventCallbacks[E]): this;
     removeAllListeners<E extends keyof SystemManagerProxyEventCallbacks>(event?: E): this;
 }
-export declare class SystemManager extends EventEmitter implements SystemManagerProxyMethods {
+export declare class SystemManager extends EventEmitter implements SystemManagerBrowserProxyMethods {
     private logger;
     private initialized;
     private publisher;

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

@@ -95,6 +95,8 @@ export interface Camera extends BaseCamera {
     hasMotionDetector: boolean;
     hasObjectDetector: boolean;
     hasPtz: boolean;
+    hasPrebuffer: boolean;
+    hasIntercom: boolean;
     sources: CameraInput[];
 }
 export interface CameraZone {

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

@@ -2,7 +2,7 @@ import { PLUGIN_STATUS } from '../../plugins/types';
 import type { Namespace } from 'socket.io';
 import type { WebSocket } from 'ws';
 import type { VideoStreamingMode } from '../database/types';
-export type SocketNsp = '/camera.ui' | '/metrics' | '/logs' | '/status' | '/notifications' | '/streams' | '/plugins' | '/proxy';
+export type SocketNsp = '/camera.ui' | '/metrics' | '/logs' | '/status' | '/notifications' | '/streams' | '/plugins';
 export interface SocketNspMap {
     nsp: Namespace;
     [key: string]: any;

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

@@ -1,9 +1,8 @@
 import { BehaviorSubject, Observable } from 'rxjs';
 import { Subscribed } from '../utils/subscribed';
 import type { Camera, CameraInformation, CameraPublicProperties, CameraType, CameraZone } from '../../api/database/types';
-import type { Frame } from '../../detector/types';
 import type { IceServer } from '../../services/config/types';
-import type { AudioState, BaseLogger, BatteryState, CameraDelegate, CameraPrebufferDelegate, CameraSource, DoorbellState, LightState, MotionState, ObjectState, OnSetEvent, SirenState, StateValues } from '../types';
+import type { AudioState, BaseLogger, BatteryState, CameraSource, DoorbellState, LightState, MotionState, ObjectState, OnSetEvent, SirenState, StateValues } from '../types';
 export declare abstract class CameraDeviceBase extends Subscribed {
     protected logger: BaseLogger;
     protected cameraSubject: BehaviorSubject<Camera>;
@@ -23,8 +22,6 @@ export declare abstract class CameraDeviceBase extends Subscribed {
     onDoorbellPressed: Observable<DoorbellState>;
     onSirenDetected: Observable<SirenState>;
     onBatteryChanged: Observable<BatteryState>;
-    private _delegate?;
-    private _prebufferDelegate?;
     get id(): string;
     get nativeId(): string | undefined;
     get pluginId(): string;
@@ -42,6 +39,8 @@ export declare abstract class CameraDeviceBase extends Subscribed {
     get hasAudioDetector(): boolean;
     get hasObjectDetector(): boolean;
     get hasPtz(): boolean;
+    get hasPrebuffer(): boolean;
+    get hasIntercom(): boolean;
     get motionZones(): CameraZone[];
     get objectZones(): CameraZone[];
     get sources(): CameraSource[];
@@ -49,17 +48,11 @@ export declare abstract class CameraDeviceBase extends Subscribed {
     get snapshotSource(): CameraSource;
     get recordingSource(): CameraSource;
     get detectionSource(): CameraSource;
-    get delegate(): CameraDelegate | undefined;
-    set delegate(delegate: CameraDelegate);
-    get prebufferDelegate(): CameraPrebufferDelegate | undefined;
-    set prebufferDelegate(delegate: CameraPrebufferDelegate);
     constructor(camera: Camera, logger: BaseLogger);
     abstract connect(): Promise<void>;
     abstract disconnect(): Promise<void>;
     abstract reboot(): Promise<void>;
     abstract snapshot(forceNew?: boolean): Promise<ArrayBuffer>;
-    abstract generateFrames(): AsyncIterableIterator<Frame>;
-    abstract getFfmpegPath(): Promise<string>;
     abstract getIceServers(): Promise<IceServer[]>;
     protected abstract cleanup(): void;
     getValue<T extends keyof StateValues>(stateName: T): StateValues[T];

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

@@ -1,8 +1,17 @@
 import { StreamingConnectionOptions } from '../streaming/peer-connection';
 import { StreamingSession } from '../streaming/streaming-session';
 import { CameraDeviceBase } from './base';
-import type { FfmpegOptions } from '../types';
+import type { Frame } from '../../decoder/types';
+import type { CameraDelegate, CameraPrebufferDelegate, FfmpegOptions } from '../types';
 export declare abstract class ServerCameraDeviceBase extends CameraDeviceBase {
+    private _delegate?;
+    private _prebufferDelegate?;
+    get delegate(): CameraDelegate | undefined;
+    set delegate(delegate: CameraDelegate);
+    get prebufferDelegate(): CameraPrebufferDelegate | undefined;
+    set prebufferDelegate(delegate: CameraPrebufferDelegate);
+    abstract generateFrames(): AsyncIterableIterator<Frame>;
+    abstract getFfmpegPath(): Promise<string>;
     createSession(sourceName: string, options?: StreamingConnectionOptions): Promise<StreamingSession>;
     streamVideo(sourceName: string, options: FfmpegOptions): Promise<StreamingSession>;
     recordToFile(sourceName: string, outputPath: string, duration?: number): Promise<void>;

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

@@ -1,8 +1,6 @@
 /// <reference types="node" />
 /// <reference types="node" />
-/// <reference types="node" />
 import type { ChildProcess } from 'child_process';
-import type { Server } from 'net';
 export interface FrameMetadata {
     format: string;
     frameSize: number;
@@ -16,7 +14,6 @@ export interface Frame {
 export interface VideoSession {
     isActive(): boolean;
     kill: (reason?: string) => void;
-    server: Server;
     cp: ChildProcess;
 }
 export interface BaseFrameWorkerConfig {
@@ -27,7 +24,7 @@ export interface BaseFrameWorkerConfig {
     disableTimestamps?: boolean;
     auth: {
         user: string;
-        password: string;
+        pass: string;
     };
 }
 export type WorkerMessage = 'ready' | 'getCameraSource';

package/dist/types/server/src/plugins/node/proxy/queue.d.ts

@@ -1,9 +1,10 @@
+import type { Msg } from 'nats';
 import type { BaseLogger } from '../../../camera/types';
 import type { ProxyMessageStructure } from '../../../proxy/types';
 interface NatsConnection {
     publish(subject: string, data: Uint8Array): void;
 }
-interface Subscription extends AsyncIterable<any> {
+interface Subscription extends AsyncIterable<Msg> {
 }
 interface JSONCodec<T> {
     encode(d: T): Uint8Array;

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

@@ -1,7 +1,7 @@
 import type { Camera } from '../api/database/types';
 import type { BrowserCameraDeviceBase, CameraDevice, ServerCameraDeviceBase } from '../camera/base';
 import type { CameraConfig, FfmpegOptions, OnSetEvent, PrebufferType, StateValues, StreamInfo } from '../camera/types';
-import type { FrameMetadata } from '../detector/types';
+import type { FrameMetadata } from '../decoder/types';
 import type { CameraExtension } from '../plugins/types';
 import type { IceServer } from '../services/config/types';
 export type MethodKeys<T> = {
@@ -73,13 +73,15 @@ export interface DeviceManagerListenerMessagePayload {
     type: keyof DeviceManagerProxyEventCallbacks;
     data: any;
 }
-export interface DeviceManagerProxyMethods {
-    createCamera(camera: CameraConfig): Promise<CameraDevice>;
+export interface DeviceManagerBrowserProxyMethods {
     getCameraByName(name: string): Promise<CameraDevice | undefined>;
     getCameraById(id: string): Promise<CameraDevice | undefined>;
     removeCameraByName(name: string): Promise<void>;
     removeCameraById(id: string): Promise<void>;
 }
+export interface DeviceManagerProxyMethods extends DeviceManagerBrowserProxyMethods {
+    createCamera(camera: CameraConfig): Promise<CameraDevice>;
+}
 export type DeviceManagerProxyMethodNames = MethodKeys<DeviceManagerProxyMethods>;
 export interface DeviceManagerProxyEvents {
     cameraSelected: {
@@ -107,7 +109,9 @@ export interface SystemManagerListenerMessagePayload {
     type: keyof SystemManagerProxyEventCallbacks;
     data: any;
 }
-export interface SystemManagerProxyMethods {
+export interface SystemManagerBrowserProxyMethods {
+}
+export interface SystemManagerProxyMethods extends SystemManagerBrowserProxyMethods {
 }
 export interface SystemManagerProxyMethodsListener {
     listen<E extends keyof SystemManagerProxyEventCallbacks>(eventType: E, callback: SystemManagerProxyEventCallbacks[E]): void;
@@ -126,7 +130,9 @@ export interface PluginsManagerListenerMessagePayload {
     type: keyof PluginsManagerProxyEventCallbacks;
     data: any;
 }
-export interface PluginsManagerProxyMethods {
+export interface PluginsManagerBrowserProxyMethods {
+}
+export interface PluginsManagerProxyMethods extends PluginsManagerBrowserProxyMethods {
 }
 export interface PluginsManagerProxyMethodsListener {
     listen<E extends keyof PluginsManagerProxyEventCallbacks>(eventType: E, callback: PluginsManagerProxyEventCallbacks[E]): void;
@@ -141,7 +147,6 @@ export interface PluginsManagerProxyGenericEvent<K extends keyof PluginsManagerP
     type: K;
     data: PluginsManagerProxyEvents[K];
 }
-export type CameraDeviceListenerSocketEventType = 'updateDevice' | 'updateState';
 export interface CameraDeviceListenerStatePayload<K extends keyof StateValues> {
     stateName: K;
     data: {
@@ -156,86 +161,72 @@ export interface CameraDeviceListenerMessagePayload {
 export interface CameraDeviceProxyMethods {
     connect(data: {
         cameraId: string;
-        pluginId?: string;
-        ws?: boolean;
+        pluginId: string;
     }): Promise<void>;
     disconnect(data: {
         cameraId: string;
-        pluginId?: string;
-        ws?: boolean;
+        pluginId: string;
     }): Promise<void>;
     reboot(data: {
         cameraId: string;
-        pluginId?: string;
-        ws?: boolean;
+        pluginId: string;
     }): Promise<void>;
     isPrebuffering(data: {
         sourceName: string;
         type: PrebufferType;
         cameraId: string;
-        pluginId?: string;
-        ws?: boolean;
+        pluginId: string;
     }): Promise<boolean>;
     getPrebufferRawUrl(data: {
         sourceName: string;
         type: PrebufferType;
         cameraId: string;
-        pluginId?: string;
-        ws?: boolean;
+        pluginId: string;
     }): Promise<string | undefined>;
     getStreamInfo(data: {
         sourceName: string;
         cameraId: string;
-        pluginId?: string;
-        ws?: boolean;
+        pluginId: string;
     }): Promise<StreamInfo | undefined>;
     getFrameMetadata(data: {
         cameraId: string;
-        pluginId?: string;
-        ws?: boolean;
-    }): Promise<FrameMetadata | undefined>;
+        pluginId: string;
+    }): Promise<FrameMetadata>;
     getFffmpegPath(data: {
         cameraId: string;
-        pluginId?: string;
-        ws?: boolean;
+        pluginId: string;
     }): string;
     getIceServers(data: {
         cameraId: string;
-        pluginId?: string;
-        ws?: boolean;
+        pluginId: string;
     }): IceServer[];
     snapshot(data: {
         forceNew?: boolean;
         cameraId: string;
-        pluginId?: string;
-        ws?: boolean;
+        pluginId: string;
     }): Promise<ArrayBuffer>;
     streamVideo(data: {
         sourceName: string;
         options: FfmpegOptions;
         cameraId: string;
-        pluginId?: string;
-        ws?: boolean;
+        pluginId: string;
     }): Promise<void>;
     recordToFile(data: {
         sourceName: string;
         outputPath: string;
         duration?: number;
         cameraId: string;
-        pluginId?: string;
-        ws?: boolean;
+        pluginId: string;
     }): Promise<void>;
     updateState<T extends keyof StateValues>(data: {
         stateName: T;
         eventData: OnSetEvent<T>;
         cameraId: string;
-        pluginId?: string;
-        ws?: boolean;
+        pluginId: string;
     }): void;
     refreshStates(data: {
         cameraId: string;
-        pluginId?: string;
-        ws?: boolean;
+        pluginId: string;
     }): Promise<{
         camera: Camera;
         states: StateValues;

package/dist/types/shared/types/index.d.ts

@@ -5,7 +5,7 @@ export * from '../../server/src/camera/base/base.browser';
 export * from '../../server/src/camera/streaming/browser/browser-streaming-session';
 export * from '../../server/src/camera/streaming/browser/webrtc-browser-connection';
 export type * from '../../server/src/camera/types';
-export type * from '../../server/src/detector/types';
+export type * from '../../server/src/decoder/types';
 export * from '../../server/src/go2rtc/types';
 export * from '../../server/src/plugins/types';
 export type * from '../../server/src/proxy/types';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@camera.ui/browser",
-  "version": "0.0.64",
+  "version": "0.0.65",
   "description": "camera.ui browser client",
   "author": "seydx (https://github.com/seydx/camera.ui)",
   "module": "./dist/bundle.js",
@@ -26,7 +26,7 @@
     "axios": "^1.6.8",
     "lodash.clonedeep": "^4.5.0",
     "lodash.isequal": "^4.5.0",
-    "nats.ws": "^1.25.0",
+    "nats.ws": "^1.26.0",
     "rxjs": "^7.8.1",
     "util": "^0.12.5"
   },
@@ -41,11 +41,11 @@
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-prettier": "^5.1.3",
     "prettier": "^3.2.5",
-    "rimraf": "^5.0.5",
+    "rimraf": "^5.0.6",
     "ts-loader": "^9.5.1",
     "typescript": "^5.4.5",
     "updates": "^16.0.1",
-    "utf-8-validate": "^6.0.3",
+    "utf-8-validate": "^6.0.4",
     "webpack": "^5.91.0",
     "webpack-cli": "^5.1.4"
   },