@camera.ui/browser 0.0.72 → 0.0.73

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

@@ -1,27 +1,42 @@
 import { Subscribed } from '../../utils/subscribed.js';
 import type { CameraController } from '../../devices/camera/controller/index.js';
 import type { FrameMetadata } from '../types.js';
+interface FrameWorkerClient {
+    pluginId: string;
+    requestIds: string[];
+}
 export declare class FrameWorker extends Subscribed {
     token: string;
-    private readonly logger;
-    private readonly configService;
-    private readonly camera;
+    readonly clients: Map<string, FrameWorkerClient>;
+    private subject;
+    private ipcSubject;
+    private frameWorkerId;
+    private publisher?;
+    private subscriber?;
+    private logger;
+    private configService;
+    private camera;
     private frameWorker?;
+    private initialized;
     private stopped;
     private auth;
+    private ffmpegArgs;
+    private py;
     constructor(camera: CameraController, auth: {
         user: string;
         pass: string;
     });
-    listen(): Promise<void>;
+    init(): Promise<void>;
     close(): Promise<void>;
     workerPID(): number;
     getMetadata(): Promise<FrameMetadata>;
-    startVideoSession(): Promise<void>;
-    stopVideoSession(): Promise<void>;
-    private onMessage;
+    addClient(pluginId: string, requestId: string): Promise<void>;
+    removeClient(pluginId: string, requestId: string): Promise<void>;
+    private startVideoSession;
+    private stopVideoSession;
+    private startWorker;
     private sendMessage;
-    private sendReponse;
-    private send;
+    private listenToMessages;
     private getLogPrefix;
 }
+export {};

package/dist/types/server/src/devices/camera/controller/types.d.ts

@@ -89,7 +89,6 @@ export type CameraConfig = (BaseCameraConfig & {
 export interface BaseDetection {
     id?: string;
     label: string;
-    timestamp: number;
     confidence: number;
     boundingBox: [number, number, number, number];
     inputWidth: number;
@@ -102,7 +101,7 @@ export interface MotionDetection extends BaseDetection {
 export interface ObjectDetection extends BaseDetection {
 }
 export interface BaseState<T extends LightState | AudioState | MotionState | ObjectState | SirenState | BatteryState | DoorbellState> {
-    timestamp: number;
+    timestamp: string;
     lastEvent?: Omit<T, 'lastEvent'>;
 }
 export interface MotionSetEvent {

package/dist/types/server/src/devices/camera/index.d.ts

@@ -1,5 +1,6 @@
 import { LRUCache } from 'lru-cache';
-import { BehaviorSubject, Observable, Subscription } from 'rxjs';
+import { BehaviorSubject } from 'rxjs';
+import type { Observable, Subscription } from 'rxjs';
 import type { Camera, CameraInformation, CameraPublicProperties, CameraType, CameraZone } from '../../api/database/types.js';
 import type { IceServer } from '../../services/config/types.js';
 import type { AudioSetEvent, AudioState, BaseLogger, BatterySetEvent, BatteryState, CameraSource, DoorbellSetEvent, DoorbellState, LightSetEvent, LightState, MotionSetEvent, MotionState, ObjectSetEvent, ObjectState, SetValues, Sets, SirenSetEvent, SirenState, StateValues, States } from './controller/types.js';

package/dist/types/server/src/devices/camera/streaming/peer-connection.d.ts

@@ -1,7 +1,8 @@
-import { Observable, ReplaySubject, Subject } from 'rxjs';
-import { MediaStreamTrack, RTCSessionDescription, RTCIceCandidate as WeriftRTCICECandidate } from 'werift';
+import { ReplaySubject, Subject } from 'rxjs';
+import { MediaStreamTrack } from 'werift';
 import { Subscribed } from '../../../utils/subscribed.js';
-import type { ConnectionState, RTCIceCandidate, RtcpPacket, RtpPacket } from 'werift';
+import type { Observable } from 'rxjs';
+import type { ConnectionState, RTCIceCandidate, RTCSessionDescription, RtcpPacket, RtpPacket, RTCIceCandidate as WeriftRTCICECandidate } from 'werift';
 import type { IceServer } from '../../../services/config/types.js';
 import type { CameraDevice } from '../cameraDevice.js';
 import type { BaseLogger } from '../controller/types.js';
@@ -25,8 +26,8 @@ export declare class WeriftPeerConnection extends Subscribed implements BasicPee
     onAudioRtcp: Subject<RtcpPacket>;
     onVideoRtp: Subject<RtpPacket>;
     onVideoRtcp: Subject<RtcpPacket>;
-    onIceCandidate: Subject<WeriftRTCICECandidate>;
-    onConnectionState: ReplaySubject<"closed" | "failed" | "disconnected" | "new" | "connecting" | "connected">;
+    onIceCandidate: Subject<RTCIceCandidate>;
+    onConnectionState: ReplaySubject<"connected" | "disconnected" | "closed" | "failed" | "new" | "connecting">;
     returnAudioTrack: MediaStreamTrack;
     private onRequestKeyFrame;
     private cameraDevice;

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

@@ -0,0 +1,21 @@
+import 'reflect-metadata';
+export declare class CameraUi {
+    private started;
+    private api;
+    private logger;
+    private configService;
+    private pluginManager;
+    private go2rtc;
+    private server;
+    private proxy;
+    private frameManager;
+    private _restartAttempts;
+    private _maxRestartAttempts;
+    get restartAttempts(): number;
+    get maxRestartAttempts(): number;
+    constructor();
+    start(): Promise<void>;
+    close(): Promise<void>;
+    restart(...args: any[]): Promise<void>;
+    private init;
+}

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

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

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

@@ -1,6 +1,6 @@
 /// <reference types="node" resolution-mode="require"/>
 import type { Camera } from '../../api/database/types.js';
-import type { FrameMetadata, FrameSession } from '../../decoder/types.js';
+import type { FrameMetadata } from '../../decoder/types.js';
 import type { CameraDelegate, CameraPrebufferDelegate, FfmpegOptions, PrebufferType, SetValues, StateValues, StreamInfo } from '../../devices/camera/controller/types.js';
 import type { IceServer } from '../../services/config/types.js';
 import type { MessageQueue } from '../queue.js';
@@ -46,10 +46,6 @@ export declare class CameraDeviceProxy implements CameraDeviceProxyMethods {
         cameraId: string;
         pluginId: string;
     }): Promise<FrameMetadata>;
-    getFrameSession(data: {
-        cameraId: string;
-        pluginId: string;
-    }): Promise<FrameSession>;
     getFfmpegPath(): string;
     getIceServers(): IceServer[];
     snapshot(data: {

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

@@ -2,14 +2,14 @@ import { RUNTIME_STATUS } from '../services/config/types.js';
 import type { ProxyAuth } from './types.js';
 export declare class NatsServer {
     readonly serverPort = 4222;
-    readonly websocketPort = 8223;
     private readonly clusterAmount;
-    private readonly serverClusterPort;
     private readonly auth;
+    private clusterPort?;
     private serverProcess?;
     private clusterProcesses;
     private logger;
     private configService;
+    private process;
     private tmpDir;
     private manuallyKilled;
     private shuttingDown;
@@ -27,6 +27,7 @@ export declare class NatsServer {
     private stringifyConfig;
     private kill;
     private handleClose;
+    private handleCloseCluster;
     private setStatus;
     private processLogger;
     private isIgnorableString;

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

@@ -1,5 +1,5 @@
 import type { Camera } from '../api/database/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';
@@ -26,7 +26,7 @@ export interface ProxyMessageStructure {
     fn: string;
     args: any;
     timeout: number;
-    timestamp: number;
+    timestamp: string;
     response?: any;
     error?: any;
 }
@@ -113,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;

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

@@ -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;
@@ -37,9 +40,10 @@ export declare class CameraDeviceProxy extends CameraDevice {
     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/queue.d.ts

@@ -1,4 +1,4 @@
-import { type NatsConnection, type Subscription } from 'nats';
+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 {

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/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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@camera.ui/browser",
-  "version": "0.0.72",
+  "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;
-}