@camera.ui/browser 0.0.65 → 0.0.66

package/dist/types/server/src/{proxy → nats}/types.d.ts

@@ -1,5 +1,6 @@
 import type { Camera } from '../api/database/types';
-import type { BrowserCameraDeviceBase, CameraDevice, ServerCameraDeviceBase } from '../camera/base';
+import type { CameraDevice } from '../camera/base/cameraDevice';
+import type { BrowserCameraDevice } from '../camera/base/cameraDeviceBrowser';
 import type { CameraConfig, FfmpegOptions, OnSetEvent, PrebufferType, StateValues, StreamInfo } from '../camera/types';
 import type { FrameMetadata } from '../decoder/types';
 import type { CameraExtension } from '../plugins/types';
@@ -28,12 +29,34 @@ export interface ProxyMessageStructure {
     response?: any;
     error?: any;
 }
-export interface WsManagerClientMessage {
-    method: ProxyMethodNames;
+export interface ProxyAuth {
+    cluster: {
+        user: string;
+        pass: string;
+    };
+    server: {
+        user: string;
+        pass: string;
+    };
+    websocket: {
+        user: string;
+        pass: string;
+    };
+}
+export interface MethodNamesByManager {
+    system: SystemManagerBrowserProxyMethodNames;
+    device: DeviceManagerBrowserProxyMethodNames;
+    plugins: PluginsManagerBrowserProxyMethodNames;
+    camera: CameraDeviceProxyMethodNames;
+}
+export type ManagerNames = keyof MethodNamesByManager;
+export interface WebsocketClientRequest {
+    name: ManagerNames;
+    method: MethodNamesByManager[ManagerNames];
     args: any[];
 }
-export type ProxyMethodNames = SystemManagerProxyMethodNames | DeviceManagerProxyMethodNames;
-export interface ApiProxyMethods {
+export type WebsocketClientProxyEvent = 'updateDevice' | 'updateState';
+export interface DeviceManagerServerProxyMethods {
     createCamera(data: {
         camera: CameraConfig;
         pluginId: string;
@@ -55,34 +78,101 @@ export interface ApiProxyMethods {
         pluginId: string;
     }): Promise<void>;
 }
-export interface ProxyAuth {
-    cluster: {
-        user: string;
-        pass: string;
-    };
-    server: {
-        user: string;
-        pass: string;
-    };
-    websocket: {
-        user: string;
-        pass: string;
-    };
+export interface SystemManagerServerProxyMethods {
+}
+export interface PluginsManagerServerProxyMethods {
 }
+export interface CameraDeviceProxyMethods {
+    connect(data: {
+        cameraId: string;
+        pluginId: string;
+    }): Promise<void>;
+    disconnect(data: {
+        cameraId: string;
+        pluginId: string;
+    }): Promise<void>;
+    reboot(data: {
+        cameraId: string;
+        pluginId: string;
+    }): Promise<void>;
+    isPrebuffering(data: {
+        sourceName: string;
+        type: PrebufferType;
+        cameraId: string;
+        pluginId: string;
+    }): Promise<boolean>;
+    getPrebufferRawUrl(data: {
+        sourceName: string;
+        type: PrebufferType;
+        cameraId: string;
+        pluginId: string;
+    }): Promise<string | undefined>;
+    getStreamInfo(data: {
+        sourceName: string;
+        cameraId: string;
+        pluginId: string;
+    }): Promise<StreamInfo | undefined>;
+    getFrameMetadata(data: {
+        cameraId: string;
+        pluginId: string;
+    }): Promise<FrameMetadata>;
+    getFfmpegPath(data: {
+        cameraId: string;
+        pluginId: string;
+    }): string;
+    getIceServers(data: {
+        cameraId: string;
+        pluginId: string;
+    }): IceServer[];
+    snapshot(data: {
+        forceNew?: boolean;
+        cameraId: string;
+        pluginId: string;
+    }): Promise<ArrayBuffer>;
+    streamVideo(data: {
+        sourceName: string;
+        options: FfmpegOptions;
+        cameraId: string;
+        pluginId: string;
+    }): Promise<void>;
+    recordToFile(data: {
+        sourceName: string;
+        outputPath: string;
+        duration?: number;
+        cameraId: string;
+        pluginId: string;
+    }): Promise<void>;
+    updateState<T extends keyof StateValues>(data: {
+        stateName: T;
+        eventData: OnSetEvent<T>;
+        cameraId: string;
+        pluginId: string;
+    }): void;
+    refreshStates(data: {
+        cameraId: string;
+        pluginId: string;
+    }): Promise<{
+        camera: Camera;
+        states: StateValues;
+        cameraState: boolean;
+    }>;
+}
+export type CameraDeviceProxyMethodNames = MethodKeys<CameraDeviceProxyMethods>;
 export interface DeviceManagerListenerMessagePayload {
     type: keyof DeviceManagerProxyEventCallbacks;
     data: any;
 }
 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>;
+    getCameraByName(name: string): Promise<CameraDevice | BrowserCameraDevice | undefined>;
+    getCameraById(id: string): Promise<CameraDevice | BrowserCameraDevice | undefined>;
 }
 export interface DeviceManagerProxyMethods extends DeviceManagerBrowserProxyMethods {
     createCamera(camera: CameraConfig): Promise<CameraDevice>;
+    removeCameraByName(name: string): Promise<void>;
+    removeCameraById(id: string): Promise<void>;
 }
 export type DeviceManagerProxyMethodNames = MethodKeys<DeviceManagerProxyMethods>;
+export type DeviceManagerBrowserProxyMethodNames = MethodKeys<DeviceManagerBrowserProxyMethods>;
 export interface DeviceManagerProxyEvents {
     cameraSelected: {
         camera: Camera;
@@ -97,9 +187,9 @@ export interface DeviceManagerProxyEvents {
     };
 }
 export interface DeviceManagerProxyEventCallbacks {
-    cameraSelected: ((camera: ServerCameraDeviceBase, extension: CameraExtension) => void) | ((camera: BrowserCameraDeviceBase, extension: CameraExtension) => void);
+    cameraSelected: ((camera: CameraDevice, extension: CameraExtension) => void) | ((camera: BrowserCameraDevice, extension: CameraExtension) => void);
     cameraDeselected: (cameraId: string, extension: CameraExtension) => void;
-    cameraUpdated: ((cameraId: string, camera: ServerCameraDeviceBase) => void) | ((cameraId: string, camera: BrowserCameraDeviceBase) => void);
+    cameraUpdated: ((cameraId: string, camera: CameraDevice) => void) | ((cameraId: string, camera: BrowserCameraDevice) => void);
 }
 export interface DeviceManagerProxyGenericEvent<K extends keyof DeviceManagerProxyEvents> {
     type: K;
@@ -113,12 +203,13 @@ export interface SystemManagerBrowserProxyMethods {
 }
 export interface SystemManagerProxyMethods extends SystemManagerBrowserProxyMethods {
 }
+export type SystemManagerProxyMethodNames = MethodKeys<SystemManagerProxyMethods>;
+export type SystemManagerBrowserProxyMethodNames = MethodKeys<SystemManagerBrowserProxyMethods>;
 export interface SystemManagerProxyMethodsListener {
     listen<E extends keyof SystemManagerProxyEventCallbacks>(eventType: E, callback: SystemManagerProxyEventCallbacks[E]): void;
     removeListener<E extends keyof SystemManagerProxyEventCallbacks>(eventType: E, callbackToRemove: SystemManagerProxyEventCallbacks[E]): void;
     removeAllListeners<E extends keyof SystemManagerProxyEventCallbacks>(eventType?: E): void;
 }
-export type SystemManagerProxyMethodNames = MethodKeys<SystemManagerProxyMethods>;
 export interface SystemManagerProxyEvents {
 }
 export type SystemManagerProxyEventCallbacks = {};
@@ -134,12 +225,13 @@ export interface PluginsManagerBrowserProxyMethods {
 }
 export interface PluginsManagerProxyMethods extends PluginsManagerBrowserProxyMethods {
 }
+export type PluginsManagerProxyMethodNames = MethodKeys<PluginsManagerProxyMethods>;
+export type PluginsManagerBrowserProxyMethodNames = MethodKeys<PluginsManagerBrowserProxyMethods>;
 export interface PluginsManagerProxyMethodsListener {
     listen<E extends keyof PluginsManagerProxyEventCallbacks>(eventType: E, callback: PluginsManagerProxyEventCallbacks[E]): void;
     removeListener<E extends keyof PluginsManagerProxyEventCallbacks>(eventType: E, callbackToRemove: PluginsManagerProxyEventCallbacks[E]): void;
     removeAllListeners<E extends keyof PluginsManagerProxyEventCallbacks>(eventType?: E): void;
 }
-export type PluginsManagerProxyMethodNames = MethodKeys<PluginsManagerProxyMethods>;
 export interface PluginsManagerProxyEvents {
 }
 export type PluginsManagerProxyEventCallbacks = {};
@@ -158,90 +250,3 @@ export interface CameraDeviceListenerMessagePayload {
     type: 'removed' | 'updated' | 'cameraState';
     data?: any;
 }
-export interface CameraDeviceProxyMethods {
-    connect(data: {
-        cameraId: string;
-        pluginId: string;
-    }): Promise<void>;
-    disconnect(data: {
-        cameraId: string;
-        pluginId: string;
-    }): Promise<void>;
-    reboot(data: {
-        cameraId: string;
-        pluginId: string;
-    }): Promise<void>;
-    isPrebuffering(data: {
-        sourceName: string;
-        type: PrebufferType;
-        cameraId: string;
-        pluginId: string;
-    }): Promise<boolean>;
-    getPrebufferRawUrl(data: {
-        sourceName: string;
-        type: PrebufferType;
-        cameraId: string;
-        pluginId: string;
-    }): Promise<string | undefined>;
-    getStreamInfo(data: {
-        sourceName: string;
-        cameraId: string;
-        pluginId: string;
-    }): Promise<StreamInfo | undefined>;
-    getFrameMetadata(data: {
-        cameraId: string;
-        pluginId: string;
-    }): Promise<FrameMetadata>;
-    getFffmpegPath(data: {
-        cameraId: string;
-        pluginId: string;
-    }): string;
-    getIceServers(data: {
-        cameraId: string;
-        pluginId: string;
-    }): IceServer[];
-    snapshot(data: {
-        forceNew?: boolean;
-        cameraId: string;
-        pluginId: string;
-    }): Promise<ArrayBuffer>;
-    streamVideo(data: {
-        sourceName: string;
-        options: FfmpegOptions;
-        cameraId: string;
-        pluginId: string;
-    }): Promise<void>;
-    recordToFile(data: {
-        sourceName: string;
-        outputPath: string;
-        duration?: number;
-        cameraId: string;
-        pluginId: string;
-    }): Promise<void>;
-    updateState<T extends keyof StateValues>(data: {
-        stateName: T;
-        eventData: OnSetEvent<T>;
-        cameraId: string;
-        pluginId: string;
-    }): void;
-    refreshStates(data: {
-        cameraId: string;
-        pluginId: string;
-    }): Promise<{
-        camera: Camera;
-        states: StateValues;
-        cameraState: boolean;
-    }>;
-}
-export type CameraDeviceProxyMethodNames = MethodKeys<CameraDeviceProxyMethods>;
-export type CameraDeviceProxyEventCallbacks = {
-    [K in keyof StateValues]: (newData: StateValues[K], oldData: StateValues[K]) => void;
-};
-export interface CameraDeviceProxyGenericEvent<K extends keyof StateValues> {
-    type: K;
-    data: StateValues[K];
-}
-export interface WsCameraDeviceClientMessage {
-    method: CameraDeviceProxyMethodNames;
-    args: any[];
-}

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

@@ -1,12 +1,12 @@
 export type * from '../../server/src/api/database/types';
 export type * from '../../server/src/api/types';
 export type * from '../../server/src/api/ws/types';
-export * from '../../server/src/camera/base/base.browser';
+export * from '../../server/src/camera/base/cameraDeviceBrowser';
 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/decoder/types';
 export * from '../../server/src/go2rtc/types';
+export type * from '../../server/src/nats/types';
 export * from '../../server/src/plugins/types';
-export type * from '../../server/src/proxy/types';
 export * from '../../server/src/services/config/types';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@camera.ui/browser",
-  "version": "0.0.65",
+  "version": "0.0.66",
   "description": "camera.ui browser client",
   "author": "seydx (https://github.com/seydx/camera.ui)",
   "module": "./dist/bundle.js",
@@ -26,9 +26,8 @@
     "axios": "^1.6.8",
     "lodash.clonedeep": "^4.5.0",
     "lodash.isequal": "^4.5.0",
-    "nats.ws": "^1.26.0",
     "rxjs": "^7.8.1",
-    "util": "^0.12.5"
+    "socket.io-client": "^4.7.5"
   },
   "devDependencies": {
     "@rushstack/eslint-patch": "^1.10.2",

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

@@ -1,72 +0,0 @@
-import { BehaviorSubject, Observable } from 'rxjs';
-import { Subscribed } from '../utils/subscribed';
-import type { Camera, CameraInformation, CameraPublicProperties, CameraType, CameraZone } from '../../api/database/types';
-import type { IceServer } from '../../services/config/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>;
-    protected cameraState: BehaviorSubject<boolean>;
-    protected lightState: BehaviorSubject<LightState>;
-    protected motionState: BehaviorSubject<MotionState>;
-    protected audioState: BehaviorSubject<AudioState>;
-    protected objectState: BehaviorSubject<ObjectState>;
-    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>;
-    get id(): string;
-    get nativeId(): string | undefined;
-    get pluginId(): string;
-    get state(): boolean;
-    get disabled(): boolean;
-    get name(): string;
-    get type(): CameraType;
-    get info(): CameraInformation;
-    get isCloud(): boolean;
-    get hasLight(): boolean;
-    get hasSiren(): boolean;
-    get hasBinarySensor(): boolean;
-    get hasBattery(): boolean;
-    get hasMotionDetector(): boolean;
-    get hasAudioDetector(): boolean;
-    get hasObjectDetector(): boolean;
-    get hasPtz(): boolean;
-    get hasPrebuffer(): boolean;
-    get hasIntercom(): boolean;
-    get motionZones(): CameraZone[];
-    get objectZones(): CameraZone[];
-    get sources(): CameraSource[];
-    get streamSource(): CameraSource;
-    get snapshotSource(): CameraSource;
-    get recordingSource(): CameraSource;
-    get detectionSource(): CameraSource;
-    constructor(camera: Camera, logger: BaseLogger);
-    abstract connect(): Promise<void>;
-    abstract disconnect(): Promise<void>;
-    abstract reboot(): Promise<void>;
-    abstract snapshot(forceNew?: boolean): Promise<ArrayBuffer>;
-    abstract getIceServers(): Promise<IceServer[]>;
-    protected abstract cleanup(): void;
-    getValue<T extends keyof StateValues>(stateName: T): StateValues[T];
-    updateState<T extends keyof StateValues>(stateName: T, eventData: OnSetEvent<T>): Promise<void>;
-    onStateChange<T extends keyof StateValues>(stateName: T): Observable<{
-        newState: StateValues[T];
-        oldState: StateValues[T];
-    }>;
-    onPropertyChange<T extends keyof CameraPublicProperties>(property: T): Observable<{
-        oldData: Camera[T];
-        newData: Camera[T];
-    }>;
-    removeAllListeners(): void;
-    private createStateObservable;
-    protected updateCamera(updatedCamera: Camera): void;
-    protected updateCameraState(state: boolean): void;
-}

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

@@ -1,29 +0,0 @@
-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<Msg> {
-}
-interface JSONCodec<T> {
-    encode(d: T): Uint8Array;
-    decode(a: Uint8Array): T;
-}
-export declare class ClientMessageQueue {
-    private logger;
-    private publisher;
-    private subscriber;
-    private requestHandler;
-    private jc;
-    private aborted;
-    private isProcessing;
-    private queue;
-    private pendingResponses;
-    constructor(logger: BaseLogger, publisher: NatsConnection, subscriber: Subscription, codec: JSONCodec<any>, requestHandler: (message: ProxyMessageStructure) => void);
-    abortQueue(): void;
-    enqueue(message: ProxyMessageStructure): Promise<any>;
-    private processQueue;
-    private listenToMessages;
-}
-export {};

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

@@ -1 +0,0 @@
-export declare const NATS_SERVER_SUBJECT = "camera.ui-server";