@camera.ui/browser 0.0.71 → 0.0.73

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

@@ -1,8 +1,7 @@
 import type { Camera } from '../api/database/types.js';
-import type { CameraDevice } from '../camera/base/cameraDevice.js';
-import type { BrowserCameraDevice } from '../camera/base/cameraDeviceBrowser.js';
-import type { CameraConfig, FfmpegOptions, PrebufferType, SetValues, StateValues, StreamInfo } from '../camera/types.js';
-import type { FrameMetadata, FrameSession } from '../decoder/types.js';
+import type { FrameMetadata } from '../decoder/types.js';
+import type { CameraDevice } from '../devices/camera/cameraDevice.js';
+import type { CameraConfig, FfmpegOptions, PrebufferType, SetValues, StateValues, StreamInfo } from '../devices/camera/controller/types.js';
 import type { BasePlugin } from '../plugins/base.js';
 import type { CameraStorage } from '../plugins/node/cameraStorage.js';
 import type { CameraExtension } from '../plugins/types.js';
@@ -27,7 +26,7 @@ export interface ProxyMessageStructure {
     fn: string;
     args: any;
     timeout: number;
-    timestamp: number;
+    timestamp: string;
     response?: any;
     error?: any;
 }
@@ -42,9 +41,9 @@ export interface ProxyAuth {
     };
 }
 export interface MethodNamesByManager {
-    systemManager: SystemManagerBrowserProxyMethodNames;
-    deviceManager: DeviceManagerBrowserProxyMethodNames;
-    pluginsManager: PluginsManagerBrowserProxyMethodNames;
+    systemManager: SystemManagerProxyMethodNames;
+    deviceManager: DeviceManagerProxyMethodNames;
+    pluginsManager: PluginsManagerProxyMethodNames;
     cameraDevice: CameraDeviceProxyMethodNames;
 }
 export type ManagerNames = keyof MethodNamesByManager;
@@ -114,10 +113,6 @@ export interface CameraDeviceProxyMethods {
         cameraId: string;
         pluginId: string;
     }): Promise<FrameMetadata>;
-    getFrameSession(data: {
-        cameraId: string;
-        pluginId: string;
-    }): Promise<FrameSession>;
     getFfmpegPath(data: {
         cameraId: string;
         pluginId: string;
@@ -164,17 +159,14 @@ export interface DeviceManagerListenerMessagePayload {
     type: keyof DeviceManagerProxyEventCallbacks;
     data: any;
 }
-export interface DeviceManagerBrowserProxyMethods {
-    getCameraByName(name: string): Promise<CameraDevice | BrowserCameraDevice | undefined>;
-    getCameraById(id: string): Promise<CameraDevice | BrowserCameraDevice | undefined>;
-}
-export interface DeviceManagerProxyMethods extends DeviceManagerBrowserProxyMethods {
+export interface DeviceManagerProxyMethods {
+    getCameraByName(name: string): Promise<CameraDevice | undefined>;
+    getCameraById(id: string): Promise<CameraDevice | undefined>;
     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;
@@ -189,9 +181,9 @@ export interface DeviceManagerProxyEvents {
     };
 }
 export interface DeviceManagerProxyEventCallbacks {
-    cameraSelected: ((camera: CameraDevice, extension: CameraExtension) => void) | ((camera: BrowserCameraDevice, extension: CameraExtension) => void);
+    cameraSelected: (camera: CameraDevice, extension: CameraExtension) => void;
     cameraDeselected: (cameraId: string, extension: CameraExtension) => void;
-    cameraUpdated: ((cameraId: string, camera: CameraDevice) => void) | ((cameraId: string, camera: BrowserCameraDevice) => void);
+    cameraUpdated: (cameraId: string, camera: CameraDevice) => void;
 }
 export interface DeviceManagerProxyGenericEvent<K extends keyof DeviceManagerProxyEvents> {
     type: K;
@@ -201,12 +193,9 @@ export interface SystemManagerListenerMessagePayload {
     type: keyof SystemManagerProxyEventCallbacks;
     data: any;
 }
-export interface SystemManagerBrowserProxyMethods {
-}
-export interface SystemManagerProxyMethods extends SystemManagerBrowserProxyMethods {
+export interface SystemManagerProxyMethods {
 }
 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;
@@ -223,12 +212,9 @@ export interface PluginsManagerListenerMessagePayload {
     type: keyof PluginsManagerProxyEventCallbacks;
     data: any;
 }
-export interface PluginsManagerBrowserProxyMethods {
-}
-export interface PluginsManagerProxyMethods extends PluginsManagerBrowserProxyMethods {
+export interface PluginsManagerProxyMethods {
 }
 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;

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

@@ -1,11 +1,12 @@
 import type { Namespace, Server } from 'socket.io';
 import type { SocketNsp } from '../api/websocket/types.js';
-import type { StateValues } from '../camera/types.js';
+import type { StateValues } from '../devices/camera/controller/types.js';
 import type { CameraDeviceListenerMessagePayload } from './types.js';
 export declare class WebsocketProxy {
     nsp: Namespace;
     nspName: SocketNsp;
     private proxy;
+    private camerasService;
     constructor(io: Server);
     init(): void;
     publishCameraEvent<K extends keyof StateValues>(cameraId: string, stateName: K, data: {
@@ -17,6 +18,6 @@ export declare class WebsocketProxy {
     private isSystemManagerMethod;
     private isDeviceManagerMethod;
     private isPluginsManagerMethod;
-    private isCameraManagerMethod;
+    private isCameraProxyMethod;
     private isCameraState;
 }

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

@@ -1,7 +1,7 @@
-import type { CameraDevice } from '../camera/base/cameraDevice.js';
+import type { CameraDevice } from '../devices/camera/cameraDevice.js';
 export declare abstract class BasePlugin {
     abstract onFormSubmit(actionId: string, payload: any): Promise<{
         toast?: string;
     }>;
-    abstract configureCameras(cameras: CameraDevice[]): Promise<void>;
+    abstract configureCameras(cameras: CameraDevice[]): void;
 }

package/dist/types/server/src/plugins/node/logger.d.ts

@@ -2,6 +2,8 @@ export declare class PluginLogger {
     private _prefix;
     private _loggerPrefix;
     private _disableTimestamps;
+    debugEnabled: boolean;
+    traceEnabled: boolean;
     private get prefix();
     constructor(prefix: string, disableTimestamps: boolean);
     log(...args: any[]): void;

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

@@ -1,7 +1,7 @@
-import { CameraDevice } from '../../../camera/base/cameraDevice.js';
+import { CameraDevice } from '../../../devices/camera/cameraDevice.js';
 import type { Camera } from '../../../api/database/types.js';
-import type { CameraSource, SetValues } from '../../../camera/types.js';
-import type { Frame } from '../../../decoder/types.js';
+import type { VideoFrame } from '../../../decoder/types.js';
+import type { CameraSource, SetValues } from '../../../devices/camera/controller/types.js';
 import type { IceServer } from '../../../services/config/types.js';
 import type { PluginAPI } from '../api.js';
 import type { PluginLogger } from '../logger.js';
@@ -12,8 +12,9 @@ export declare class CameraDeviceProxy extends CameraDevice {
     private client;
     private cameraSubscriber;
     private cameraPluginSubscriber;
+    private signalingSubscriber;
     private frameSubscriber?;
-    private activeSockets;
+    private activeRequests;
     private messageQueue;
     private auth;
     private pluginID;
@@ -22,6 +23,8 @@ export declare class CameraDeviceProxy extends CameraDevice {
     private cameraSubscriberSubject;
     private cameraPluginSubscriberSubject;
     private frameSubject;
+    private signalingSubject;
+    private signalingTargetSubject;
     get sources(): CameraSource[];
     constructor(api: PluginAPI, logger: PluginLogger, camera: Camera, pluginId: string, pluginName: string, auth: {
         user: string;
@@ -31,15 +34,16 @@ export declare class CameraDeviceProxy extends CameraDevice {
     connect(): Promise<void>;
     disconnect(): Promise<void>;
     reboot(): Promise<void>;
-    generateFrames(): AsyncIterableIterator<Frame>;
+    generateFrames(): AsyncIterableIterator<VideoFrame>;
     getFfmpegPath(): Promise<string>;
     getIceServers(): Promise<IceServer[]>;
     updateState<T extends keyof SetValues>(stateName: T, eventData: SetValues[T]): Promise<void>;
     refreshStates(): Promise<void>;
     cleanup(): Promise<void>;
-    private connectToServer;
+    private signalDecoder;
     private closeFrameSubscriber;
     private requestHandler;
     private listenToMessages;
+    private listenToSignalingMessages;
     private onRequest;
 }

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

@@ -1,8 +1,8 @@
 /// <reference types="node" resolution-mode="require"/>
 import { EventEmitter } from 'node:events';
 import { CameraDeviceProxy } from './cameraDevice.js';
-import type { CameraDevice } from '../../../camera/base/cameraDevice.js';
-import type { CameraConfig } from '../../../camera/types.js';
+import type { CameraDevice } from '../../../devices/camera/cameraDevice.js';
+import type { CameraConfig } from '../../../devices/camera/controller/types.js';
 import type { DeviceManagerProxyEventCallbacks, DeviceManagerProxyMethods } from '../../../nats/types.js';
 import type { PluginAPI } from '../api.js';
 import type { PluginLogger } from '../logger.js';

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

@@ -1,5 +1,5 @@
-import { type NatsConnection, type Subscription } from 'nats';
-import type { BaseLogger } from '../../../camera/types.js';
+import type { NatsConnection, Subscription } from 'nats';
+import type { BaseLogger } from '../../../devices/camera/controller/types.js';
 import type { ProxyMessageStructure } from '../../../nats/types.js';
 export declare class ClientMessageQueue {
     private logger;

package/dist/types/server/src/plugins/worker-ipc.d.ts

@@ -1,20 +1,23 @@
 /// <reference types="node" resolution-mode="require"/>
 import { EventEmitter } from 'node:events';
+import type { Logger } from '../services/logger/index.js';
 import type { ProcessMessage, ProcessResponse } from './types.js';
 export declare interface WorkerIPC {
     on(event: 'message', listener: (message: ProcessResponse) => void): this;
 }
 export declare class WorkerIPC extends EventEmitter {
+    private logger;
     private publisher?;
     private subscriber?;
+    private name;
     private id;
     private subject;
     private targetSubject;
     private auth;
-    constructor(id: string, auth: {
+    constructor(name: string, id: string, auth: {
         user: string;
         pass: string;
-    });
+    }, logger: Logger);
     listen(): Promise<void>;
     close(): Promise<void>;
     sendMessage(message: ProcessMessage): void;

package/dist/types/server/src/services/logger/index.d.ts

@@ -5,13 +5,13 @@ import type { LoggingLevel } from '../config/types.js';
 export declare class Logger {
     private _loggerPrefix;
     private _debugEnabled;
-    private _traceLogging;
+    private _traceEnabled;
     private _disableTimestamps;
     notifications: UiNotification[];
     get debugEnabled(): boolean;
     set debugEnabled(state: boolean);
-    get traceLogging(): boolean;
-    set traceLogging(state: boolean);
+    get traceEnabled(): boolean;
+    set traceEnabled(state: boolean);
     get disableTimestamps(): boolean;
     set disableTimestamps(state: boolean);
     get prefix(): string;

package/dist/types/server/src/utils/pythonInstaller.d.ts

@@ -1,12 +1,13 @@
 import { PortablePython } from '@bjia56/portable-python';
+import { PluginLogger } from '../plugins/node/logger.js';
 export declare const SERVER_PY_VERSION = "3.11";
 export declare class PythonInstaller {
     static readonly versions: string[];
+    logger: PluginLogger;
     readonly python: PortablePython;
     readonly venvPath?: string;
     readonly installPath: string;
     private identifier;
-    private logger;
     private configService;
     private needsUpdate;
     get isInstalled(): boolean;

package/dist/types/server/src/{camera/utils → utils}/subscribed.d.ts

@@ -1,4 +1,4 @@
-import { Subscription } from 'rxjs';
+import type { Subscription } from 'rxjs';
 export declare class Subscribed {
     private readonly subscriptions;
     private readonly additionalSubscriptions;

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

@@ -1,12 +1,10 @@
 export type * from '../../server/src/api/database/types.js';
 export type * from '../../server/src/api/types/index.js';
 export type * from '../../server/src/api/websocket/types.js';
-export * from '../../server/src/camera/base/cameraDeviceBrowser.js';
-export * from '../../server/src/camera/streaming/browser/browser-streaming-session.js';
-export * from '../../server/src/camera/streaming/browser/webrtc-browser-connection.js';
-export type * from '../../server/src/camera/types.js';
 export type * from '../../server/src/decoder/types.js';
+export type * from '../../server/src/devices/camera/controller/types.js';
 export * from '../../server/src/go2rtc/types.js';
 export type * from '../../server/src/nats/types.js';
 export * from '../../server/src/plugins/types.js';
 export * from '../../server/src/services/config/types.js';
+export * from '../../server/src/utils/subscribed.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@camera.ui/browser",
-  "version": "0.0.71",
+  "version": "0.0.73",
   "description": "camera.ui browser client",
   "author": "seydx (https://github.com/seydx/camera.ui)",
   "module": "./dist/bundle.js",
@@ -23,7 +23,7 @@
     "prepublishOnly": "npm i --package-lock-only && npm run lint && npm run format && npm run build"
   },
   "dependencies": {
-    "axios": "^1.6.8",
+    "axios": "^1.7.2",
     "lodash.clonedeep": "^4.5.0",
     "lodash.isequal": "^4.5.0",
     "lru-cache": "^10.2.2",
@@ -34,8 +34,8 @@
     "@rushstack/eslint-patch": "^1.10.3",
     "@swc/register": "^0.1.10",
     "@types/webrtc": "^0.0.43",
-    "@typescript-eslint/eslint-plugin": "^7.9.0",
-    "@typescript-eslint/parser": "^7.9.0",
+    "@typescript-eslint/eslint-plugin": "^7.10.0",
+    "@typescript-eslint/parser": "^7.10.0",
     "bufferutil": "^4.0.8",
     "eslint": "^8.57.0",
     "eslint-config-prettier": "^9.1.0",

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

@@ -1,10 +0,0 @@
-import type { Namespace, Server, Socket } from 'socket.io';
-import type { SocketNsp } from '../types.js';
-export declare class FrameNamespace {
-    nsp: Namespace;
-    nspName: SocketNsp;
-    readonly connectedClients: Map<string, Set<Socket>>;
-    private decoder;
-    constructor(io: Server);
-    private handleConnection;
-}

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

@@ -1,6 +0,0 @@
-import { BrowserStreamingSession } from '../streaming/browser/browser-streaming-session.js';
-import { BaseCameraDevice } from './index.js';
-export declare abstract class BrowserCameraDevice extends BaseCameraDevice {
-    snapshot(forceNew?: boolean): Promise<ArrayBuffer>;
-    createSession(sourceName: string, videoElement: HTMLVideoElement): Promise<BrowserStreamingSession>;
-}

package/dist/types/server/src/decoder/worker/runtime/base/index.d.ts

@@ -1,36 +0,0 @@
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
-import { Subscribed } from '../../../../camera/utils/subscribed.js';
-import type { ChildProcess } from 'node:child_process';
-import type { Worker } from 'node:worker_threads';
-import type { CameraController } from '../../../../camera/controller.js';
-import type { ConfigService } from '../../../../services/config/index.js';
-import type { Logger } from '../../../../services/logger/index.js';
-import type { FrameMetadata, MainMessage, MainToWorkerMessage, MainToWorkerResponse, WorkerToMainMessage } from '../../../types.js';
-export declare abstract class StreamManager<T extends Worker | ChildProcess = any> extends Subscribed {
-    token: string;
-    protected readonly logger: Logger;
-    protected readonly configService: ConfigService;
-    protected readonly camera: CameraController;
-    protected frameWorker?: T;
-    protected stopped: boolean;
-    protected auth: {
-        user: string;
-        pass: string;
-    };
-    constructor(camera: CameraController, auth: {
-        user: string;
-        pass: string;
-    });
-    abstract listen(): Promise<void>;
-    abstract close(): Promise<void>;
-    abstract workerPID(): number;
-    getMetadata(): Promise<FrameMetadata>;
-    startVideoSession(): Promise<void>;
-    stopVideoSession(): Promise<void>;
-    protected onMessage(workerMessage: WorkerToMainMessage): Promise<void>;
-    protected abstract sendMessage(message: MainMessage, skipResponse?: boolean, data?: Record<string, any>): Promise<any>;
-    protected abstract sendReponse(response: MainToWorkerResponse): void;
-    protected abstract send(message: MainToWorkerMessage | MainToWorkerResponse): void;
-    protected getLogPrefix(): string;
-}

package/dist/types/server/src/decoder/worker/runtime/child-process/index.d.ts

@@ -1,17 +0,0 @@
-/// <reference types="node" resolution-mode="require"/>
-import { ChildProcess } from 'node:child_process';
-import { StreamManager } from '../base/index.js';
-import type { CameraController } from '../../../../camera/controller.js';
-import type { MainMessage, MainToWorkerMessage, MainToWorkerResponse } from '../../../types.js';
-export declare class StreamProcess extends StreamManager<ChildProcess> {
-    constructor(camera: CameraController, auth: {
-        user: string;
-        pass: string;
-    });
-    listen(): Promise<void>;
-    close(): Promise<void>;
-    workerPID(): number;
-    protected sendMessage(message: MainMessage, skipResponse?: boolean, data?: Record<string, any>): Promise<any>;
-    protected sendReponse(response: MainToWorkerResponse): void;
-    protected send(message: MainToWorkerMessage | MainToWorkerResponse): void;
-}

package/dist/types/server/src/decoder/worker/runtime/worker-thread/index.d.ts

@@ -1,22 +0,0 @@
-/// <reference types="node" resolution-mode="require"/>
-import { Worker } from 'node:worker_threads';
-import { StreamManager } from '../base/index.js';
-import type { CameraController } from '../../../../camera/controller.js';
-import type { MainMessage, MainToWorkerMessage, MainToWorkerResponse } from '../../../types.js';
-export declare class StreamWorker extends StreamManager<Worker> {
-    private channel1;
-    private channel2;
-    private messageFromMain;
-    private messageToMain;
-    private responseToMain;
-    constructor(camera: CameraController, auth: {
-        user: string;
-        pass: string;
-    });
-    listen(): Promise<void>;
-    close(): Promise<void>;
-    workerPID(): number;
-    protected sendMessage(message: MainMessage, skipResponse?: boolean, data?: Record<string, any>): Promise<any>;
-    protected sendReponse(response: MainToWorkerResponse): void;
-    protected send(message: MainToWorkerMessage | MainToWorkerResponse): void;
-}