@camera.ui/browser 0.0.65 → 0.0.67

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

@@ -7,6 +7,7 @@ export interface API {
 }
 export declare class CameraUiClient {
     private api;
+    private socketService?;
     private config;
     private logger;
     private token?;
@@ -17,10 +18,10 @@ export declare class CameraUiClient {
     connect(): Promise<API>;
     disconnect(): Promise<void>;
     updateCredentials(newConfig: CameraUiClientConfig): Promise<void>;
+    private login;
     getDeviceManager(): DeviceManager | undefined;
     getPluginsManager(): PluginsManager | undefined;
     getSystemManager(): SystemManager | undefined;
-    private login;
-    private proxyCredentials;
+    private checkSession;
     private cleanUpClient;
 }

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

@@ -1,25 +1,10 @@
-import { BrowserCameraDeviceBase } from '../../../../../shared/types';
+import { BrowserCameraDevice } from '../../../../../server/src/camera/base/cameraDeviceBrowser';
 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 messageQueue;
-    private options;
-    private pluginID;
-    private pluginName;
-    private clientSubject;
-    private cameraSubscriberSubject;
-    private cameraPluginSubscriberSubject;
+import type { SocketService } from '../socket';
+export declare class CameraDeviceProxy extends BrowserCameraDevice {
+    private socketService;
     get sources(): CameraSource[];
-    constructor(camera: Camera, logger: BaseLogger, options: {
-        servers: string;
-        user: string;
-        pass: string;
-    });
-    init(): Promise<void>;
+    constructor(camera: Camera, socketService: SocketService, logger: BaseLogger);
     connect(): Promise<void>;
     disconnect(): Promise<void>;
     reboot(): Promise<void>;
@@ -28,7 +13,5 @@ export declare class CameraDeviceClient extends BrowserCameraDeviceBase {
     updateState<T extends keyof StateValues>(stateName: T, eventData: OnSetEvent<T>): Promise<void>;
     refreshStates(): Promise<void>;
     cleanup(): Promise<void>;
-    private requestHandler;
-    private listenToMessages;
-    private onRequest;
+    private listenToChanges;
 }

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

@@ -1,41 +1,12 @@
-/// <reference types="node" />
-import { EventEmitter } from 'events';
-import { BrowserCameraDeviceBase as CameraDevice } from '../../../../../server/src/camera/base/base.browser';
-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 DeviceManagerBrowserProxyMethods {
-    private logger;
-    private initialized;
-    private publisher;
-    private client;
-    private subscriber;
-    private messageQueue;
-    private options;
-    private pluginId;
-    private pluginName;
-    private clientSubject;
-    private subscriberSubject;
+import { BrowserCameraDevice } from '../../../../../server/src/camera/base/cameraDeviceBrowser';
+import type { BaseLogger, DeviceManagerBrowserProxyMethods } from '../../../../../shared/types';
+import type { SocketService } from '../socket';
+export declare class DeviceManager implements DeviceManagerBrowserProxyMethods {
+    private socketService;
     private devices;
-    constructor(logger: BaseLogger, options: {
-        servers: string;
-        user: string;
-        pass: string;
-    });
-    init(): Promise<void>;
-    getCameraById(id: string): Promise<CameraDevice | undefined>;
-    getCameraByName(name: string): Promise<CameraDevice | undefined>;
-    removeCameraByName(name: string): Promise<void>;
-    removeCameraById(id: string): Promise<void>;
-    emit(): boolean;
-    close(): Promise<void>;
-    private requestHandler;
-    private listenToMessages;
-    private onRequest;
+    private logger;
+    constructor(socketService: SocketService, logger: BaseLogger);
+    getCameraById(id: string): Promise<BrowserCameraDevice | undefined>;
+    getCameraByName(name: string): Promise<BrowserCameraDevice | undefined>;
     private addOrGetCamera;
 }

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

@@ -1,34 +1,7 @@
-/// <reference types="node" />
-import { EventEmitter } from 'events';
-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 PluginsManagerBrowserProxyMethods {
+import type { BaseLogger, PluginsManagerBrowserProxyMethods } from '../../../../../shared/types';
+import type { SocketService } from '../socket';
+export declare class PluginsManager implements PluginsManagerBrowserProxyMethods {
+    private socketService;
     private logger;
-    private initialized;
-    private publisher;
-    private client;
-    private subscriber;
-    private messageQueue;
-    private options;
-    private pluginId;
-    private pluginName;
-    private clientSubject;
-    private subscriberSubject;
-    constructor(logger: BaseLogger, options: {
-        servers: string;
-        user: string;
-        pass: string;
-    });
-    init(): Promise<void>;
-    emit(): boolean;
-    close(): Promise<void>;
-    private requestHandler;
-    private listenToMessages;
-    private onRequest;
+    constructor(socketService: SocketService, logger: BaseLogger);
 }

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

@@ -1,34 +1,7 @@
-/// <reference types="node" />
-import { EventEmitter } from 'events';
-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 SystemManagerBrowserProxyMethods {
+import type { BaseLogger, SystemManagerBrowserProxyMethods } from '../../../../../shared/types';
+import type { SocketService } from '../socket';
+export declare class SystemManager implements SystemManagerBrowserProxyMethods {
+    private socketService;
     private logger;
-    private initialized;
-    private publisher;
-    private client;
-    private subscriber;
-    private messageQueue;
-    private options;
-    private pluginId;
-    private pluginName;
-    private clientSubject;
-    private subscriberSubject;
-    constructor(logger: BaseLogger, options: {
-        servers: string;
-        user: string;
-        pass: string;
-    });
-    init(): Promise<void>;
-    emit(): boolean;
-    close(): Promise<void>;
-    private requestHandler;
-    private listenToMessages;
-    private onRequest;
+    constructor(socketService: SocketService, logger: BaseLogger);
 }

package/dist/types/packages/client/browser/src/socket.d.ts

@@ -0,0 +1,10 @@
+import { Manager, type Socket } from 'socket.io-client';
+import type { ManagerNames, WebsocketClientRequest } from '../../../../shared/types';
+export declare class SocketService {
+    manager: Manager;
+    private token;
+    get socket(): Socket;
+    constructor(endpoint: string, token: string);
+    sendRequest<T extends ManagerNames>(data: WebsocketClientRequest<T>): Promise<any>;
+    close(): void;
+}

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

@@ -1,5 +1,5 @@
 import type { BaseLogger } from '../../../../shared/types';
-export type { AudioState, BaseLogger, BasicBrowserPeerConnection, Camera, CameraConfig, BrowserCameraDeviceBase as CameraDevice, CameraInput, DoorbellState, FfmpegOptions, Go2RtcAnswerMessage, Go2RtcIceCandidateMessage, Go2RtcIncomingMessage, Go2RtcOfferMessage, Go2RtcOutgoingMessage, LightState, MotionState, ObjectState, SirenState, } from '../../../../shared/types';
+export type { AudioState, BaseLogger, BasicBrowserPeerConnection, BrowserCameraDevice, Camera, CameraConfig, CameraInput, DoorbellState, FfmpegOptions, Go2RtcAnswerMessage, Go2RtcIceCandidateMessage, Go2RtcIncomingMessage, Go2RtcOfferMessage, Go2RtcOutgoingMessage, LightState, MotionState, ObjectState, SirenState, } from '../../../../shared/types';
 export { BrowserStreamingSession } from '../../../../shared/types';
 export type CameraUiClientConfig = WithCredentials | WithToken;
 interface BaseConfig {

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';
+export type SocketNsp = '/camera.ui' | '/metrics' | '/logs' | '/status' | '/notifications' | '/streams' | '/plugins' | '/proxy';
 export interface SocketNspMap {
     nsp: Namespace;
     [key: string]: any;

package/dist/types/server/src/camera/base/{base.server.d.ts → cameraDevice.d.ts}

@@ -1,9 +1,9 @@
+import { BaseCameraDevice } from '.';
 import { StreamingConnectionOptions } from '../streaming/peer-connection';
 import { StreamingSession } from '../streaming/streaming-session';
-import { CameraDeviceBase } from './base';
 import type { Frame } from '../../decoder/types';
 import type { CameraDelegate, CameraPrebufferDelegate, FfmpegOptions } from '../types';
-export declare abstract class ServerCameraDeviceBase extends CameraDeviceBase {
+export declare abstract class CameraDevice extends BaseCameraDevice {
     private _delegate?;
     private _prebufferDelegate?;
     get delegate(): CameraDelegate | undefined;

package/dist/types/server/src/camera/base/{base.browser.d.ts → cameraDeviceBrowser.d.ts}

@@ -1,5 +1,5 @@
+import { BaseCameraDevice } from '.';
 import { BrowserStreamingSession } from '../streaming/browser/browser-streaming-session';
-import { CameraDeviceBase } from './base';
-export declare abstract class BrowserCameraDeviceBase extends CameraDeviceBase {
+export declare abstract class BrowserCameraDevice extends BaseCameraDevice {
     createSession(sourceName: string, videoElement: HTMLVideoElement): Promise<BrowserStreamingSession>;
 }

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

@@ -1,6 +1,80 @@
-import { BrowserCameraDeviceBase } from './base.browser';
-import { ServerCameraDeviceBase } from './base.server';
-export { CameraDeviceBase } from './base';
-export { BrowserCameraDeviceBase } from './base.browser';
-export { ServerCameraDeviceBase } from './base.server';
-export type CameraDevice = BrowserCameraDeviceBase | ServerCameraDeviceBase;
+import { BehaviorSubject, Observable, Subscription } from 'rxjs';
+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';
+declare class Subscribed {
+    private readonly subscriptions;
+    private readonly additionalSubscriptions;
+    protected addSubscriptions(...subscriptions: Subscription[]): void;
+    protected addAdditionalSubscriptions(...subscriptions: Subscription[]): void;
+    protected unsubscribe(): void;
+    protected unsubscribeAdditional(): void;
+}
+export declare abstract class BaseCameraDevice 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;
+}
+export {};

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

@@ -1,7 +1,7 @@
 import { ReplaySubject, Subject } from 'rxjs';
 import { Subscribed } from '../../utils/subscribed';
 import type { IceServer } from '../../../services/config/types';
-import type { BrowserCameraDeviceBase as CameraDevice } from '../../base/base.browser';
+import type { BrowserCameraDevice as CameraDevice } from '../../base/cameraDeviceBrowser';
 import type { BaseLogger, BasicBrowserPeerConnection } from '../../types';
 export declare class BrowserPeerConnection extends Subscribed implements BasicBrowserPeerConnection {
     onIceCandidate: Subject<RTCIceCandidate>;

package/dist/types/server/src/camera/streaming/browser/browser-streaming-session.d.ts

@@ -1,6 +1,6 @@
 import { Observable, ReplaySubject } from 'rxjs';
 import { Subscribed } from '../../utils/subscribed';
-import type { BrowserCameraDeviceBase as CameraDevice } from '../../base/base.browser';
+import type { BrowserCameraDevice as CameraDevice } from '../../base/cameraDeviceBrowser';
 import type { BaseLogger } from '../../types';
 import type { WebrtcBrowserConnection } from './webrtc-browser-connection';
 export declare class BrowserStreamingSession extends Subscribed {

package/dist/types/server/src/camera/streaming/browser/webrtc-browser-connection.d.ts

@@ -2,7 +2,7 @@ import { ReplaySubject, type Observable } from 'rxjs';
 import { Subscribed } from '../../utils/subscribed';
 import { BrowserPeerConnection } from './browser-peer-connection';
 import type { IceServer } from '../../../services/config/types';
-import type { BrowserCameraDeviceBase as CameraDevice } from '../../base/base.browser';
+import type { BrowserCameraDevice as CameraDevice } from '../../base/cameraDeviceBrowser';
 import type { BaseLogger } from '../../types';
 export declare class WebrtcBrowserConnection extends Subscribed {
     readonly onCallAnswered: ReplaySubject<string>;

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

@@ -3,7 +3,7 @@ import { MediaStreamTrack, RTCSessionDescription, RTCIceCandidate as WeriftRTCIC
 import { Subscribed } from '../utils/subscribed';
 import type { ConnectionState, RTCIceCandidate, RtcpPacket, RtpPacket } from 'werift';
 import type { IceServer } from '../../services/config/types';
-import type { ServerCameraDeviceBase as CameraDevice } from '../base/base.server';
+import type { CameraDevice } from '../base/cameraDevice';
 import type { BaseLogger } from '../types';
 export interface BasicPeerConnection {
     createOffer(): Promise<RTCSessionDescription>;

package/dist/types/server/src/camera/streaming/streaming-session.d.ts

@@ -1,7 +1,7 @@
 import { ReplaySubject, Subject } from 'rxjs';
 import { RtpPacket } from 'werift';
 import { Subscribed } from '../utils/subscribed';
-import type { ServerCameraDeviceBase as CameraDevice } from '../base/base.server';
+import type { CameraDevice } from '../base/cameraDevice';
 import type { BaseLogger, FfmpegOptions, SpawnInput } from '../types';
 import type { WebrtcConnection } from './webrtc-connection';
 export declare class StreamingSession extends Subscribed {

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

@@ -2,7 +2,7 @@ import { ReplaySubject, Subject, type Observable } from 'rxjs';
 import { Subscribed } from '../utils/subscribed';
 import type { RtpPacket } from 'werift';
 import type { IceServer } from '../../services/config/types';
-import type { ServerCameraDeviceBase as CameraDevice } from '../base/base.server';
+import type { CameraDevice } from '../base/cameraDevice';
 import type { BaseLogger } from '../types';
 import type { StreamingConnectionOptions } from './peer-connection';
 export declare class WebrtcConnection extends Subscribed {

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

@@ -2,8 +2,8 @@ import { Subscription } from 'rxjs';
 export declare class Subscribed {
     private readonly subscriptions;
     private readonly additionalSubscriptions;
-    protected addSubscriptions(...subscriptions: Subscription[]): void;
-    protected addAdditionalSubscriptions(...subscriptions: Subscription[]): void;
-    protected unsubscribe(): void;
-    protected unsubscribeAdditional(): void;
+    addSubscriptions(...subscriptions: Subscription[]): void;
+    addAdditionalSubscriptions(...subscriptions: Subscription[]): void;
+    unsubscribe(): void;
+    unsubscribeAdditional(): void;
 }