@camera.ui/browser 0.0.70 → 0.0.72

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, OnSetEvent, PrebufferType, StateValues, StreamInfo } from '../camera/types.js';
 import type { FrameMetadata, FrameSession } 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';
@@ -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;
@@ -144,9 +143,9 @@ export interface CameraDeviceProxyMethods {
         cameraId: string;
         pluginId: string;
     }): Promise<void>;
-    updateState<T extends keyof StateValues>(data: {
+    updateState<T extends keyof SetValues>(data: {
         stateName: T;
-        eventData: OnSetEvent<T>;
+        eventData: SetValues[T];
         cameraId: string;
         pluginId: string;
     }): void;
@@ -164,17 +163,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 +185,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 +197,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 +216,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 { 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/index.d.ts

@@ -6,6 +6,7 @@ export declare class PluginManager {
     private logger;
     private api;
     private configService;
+    private pythonVersionsToInstall;
     plugins: Map<string, Plugin>;
     pluginWorkers: Map<string, PluginWorker>;
     searchPaths: Set<string>;
@@ -22,6 +23,7 @@ export declare class PluginManager {
     startPluginChild(pluginName: string): Promise<void>;
     stopPluginChild(pluginName: string): Promise<void>;
     initializePlugins(): Promise<void>;
+    installRequiredPythonEnvs(): Promise<void>;
     private loadInstalledPlugins;
     private removeOrphanedPlugins;
     private loadDefaultPaths;

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, OnSetEvent, StateValues } 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';
@@ -31,13 +31,14 @@ 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 StateValues>(stateName: T, eventData: OnSetEvent<T>): Promise<void>;
+    updateState<T extends keyof SetValues>(stateName: T, eventData: SetValues[T]): Promise<void>;
     refreshStates(): Promise<void>;
     cleanup(): Promise<void>;
     private connectToServer;
+    private closeFrameSubscriber;
     private requestHandler;
     private listenToMessages;
     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 { 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/plugin.d.ts

@@ -1,4 +1,4 @@
-import { PythonInstaller } from '../../bin/python.js';
+import { PythonInstaller } from '../utils/pythonInstaller.js';
 import { PluginConfigService } from './node/config.js';
 import type { PluginConstructor } from '../api.js';
 import type { CameraUiPlugin, IPackageJson } from '../api/types/index.js';

package/dist/types/server/{bin/python.d.ts → src/utils/pythonInstaller.d.ts}

@@ -5,10 +5,10 @@ export declare class PythonInstaller {
     readonly python: PortablePython;
     readonly venvPath?: string;
     readonly installPath: string;
-    private _version;
     private identifier;
     private logger;
     private configService;
+    private needsUpdate;
     get isInstalled(): boolean;
     get pluginPythonPath(): string;
     get serverPythonPath(): string;
@@ -24,6 +24,8 @@ export declare class PythonInstaller {
     updateServerDependencies(): Promise<void>;
     installPluginPackages(pkgs: string[]): Promise<string>;
     installServerPackages(pkgs: string[]): Promise<string>;
+    reinstallPluginPackes(pkgs: string[]): Promise<string>;
+    reinstallServerPackages(pkgs: string[]): Promise<string>;
     uninstallPluginPackages(pkgs: string[]): Promise<string>;
     uninstallServerPackages(pkgs: string[]): Promise<string>;
     private installPluginRequirements;
@@ -34,10 +36,12 @@ export declare class PythonInstaller {
     private installRequirements;
     private installPackages;
     private uninstallPackages;
-    private getInstalledPackages;
+    private reinstallPackages;
     private ensureVenv;
     private createVenv;
     private removeVenv;
+    private removeOldVersions;
+    private getMajorMinorVersion;
     private cleanPackageName;
     private difference;
 }

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.70",
+  "version": "0.0.72",
   "description": "camera.ui browser client",
   "author": "seydx (https://github.com/seydx/camera.ui)",
   "module": "./dist/bundle.js",
@@ -31,7 +31,7 @@
     "socket.io-client": "^4.7.5"
   },
   "devDependencies": {
-    "@rushstack/eslint-patch": "^1.10.2",
+    "@rushstack/eslint-patch": "^1.10.3",
     "@swc/register": "^0.1.10",
     "@types/webrtc": "^0.0.43",
     "@typescript-eslint/eslint-plugin": "^7.9.0",
@@ -44,7 +44,7 @@
     "rimraf": "^5.0.7",
     "ts-loader": "^9.5.1",
     "typescript": "^5.4.5",
-    "updates": "^16.0.1",
+    "updates": "^16.1.1",
     "utf-8-validate": "^6.0.4",
     "webpack": "^5.91.0",
     "webpack-cli": "^5.1.4"

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;
-}