@camera.ui/browser 0.0.5 → 0.0.6

package/dist/client/node/src/client.d.ts

@@ -4,6 +4,8 @@ export declare class CameraUiClient {
     private api;
     private socketService?;
     private config;
+    private logger;
+    private ffmpegPath;
     private token?;
     private deviceManager?;
     private pluginsManager?;

package/dist/client/node/src/proxy/cameraDevice/cameraDevice.browser.d.ts

@@ -1,6 +1,6 @@
 import { Observable } from 'rxjs';
 import type { SocketService } from '../../socket';
-import type { Camera, CameraDevice, StateValue, StateValues, OnSetEvent, CameraInput, LightState, MotionState, AudioState, ObjectState, DoorbellState, SirenState } from '../../../../../shared/types';
+import type { Camera, CameraDevice, StateValue, StateValues, OnSetEvent, CameraInput, LightState, MotionState, AudioState, ObjectState, DoorbellState, SirenState, BaseLogger } from '../../../../../shared/types';
 export declare interface CameraDeviceClient {
     createSession(cameraInput: CameraInput, options?: {}): Promise<any>;
     streamVideo(cameraInput: CameraInput, options: {}): Promise<any>;
@@ -8,6 +8,7 @@ export declare interface CameraDeviceClient {
 }
 export declare class CameraDeviceClient implements CameraDevice {
     private socketService;
+    private logger;
     private cameraSubject;
     private lightState;
     private motionState;
@@ -28,7 +29,7 @@ export declare class CameraDeviceClient implements CameraDevice {
     get type(): string;
     get model(): string;
     get sources(): CameraInput[];
-    constructor(camera: Camera, socketService: SocketService);
+    constructor(camera: Camera, socketService: SocketService, logger: BaseLogger);
     getValue<T extends keyof StateValues>(stateName: T): StateValue<T>;
     updateState<T extends keyof StateValues>(stateName: T, eventData: OnSetEvent<T>, isRemote?: boolean): Promise<void>;
     onStateChange<T extends keyof StateValues>(stateName: T): Observable<{

package/dist/client/node/src/proxy/cameraDevice/cameraDevice.node.d.ts

@@ -1,9 +1,9 @@
 import { CameraDeviceHub } from '../../../../../src/camera';
 import type { SocketService } from '../../socket';
-import type { Camera, StateValues, OnSetEvent } from '../../../../../shared/types';
+import type { Camera, StateValues, OnSetEvent, BaseLogger } from '../../../../../shared/types';
 export declare class CameraDeviceClient extends CameraDeviceHub {
     private socketService;
-    constructor(camera: Camera, socketService: SocketService);
+    constructor(camera: Camera, socketService: SocketService, logger: BaseLogger, ffmpegPath: string);
     updateState<T extends keyof StateValues>(stateName: T, eventData: OnSetEvent<T>): Promise<void>;
     refreshStates(): Promise<void>;
     removeAllListeners(): void;

package/dist/client/node/src/proxy/deviceManager.d.ts

@@ -1,9 +1,11 @@
 import type { SocketService } from '../socket';
-import type { DeviceManagerProxyMethods, DeviceManagerProxyEventCallbacks, CameraConfig, CameraDevice } from '../../../../shared/types';
+import type { DeviceManagerProxyMethods, DeviceManagerProxyEventCallbacks, CameraConfig, CameraDevice, BaseLogger } from '../../../../shared/types';
 export declare class DeviceManagerClient implements DeviceManagerProxyMethods {
     private socketService;
     private devices;
-    constructor(socketService: SocketService);
+    private logger;
+    private ffmpegPath;
+    constructor(socketService: SocketService, logger: BaseLogger, ffmpegPath: string);
     getCameraByName(name: string): Promise<CameraDevice | undefined>;
     getCameraById(id: string): Promise<CameraDevice | undefined>;
     createCamera(camera: CameraConfig): Promise<CameraDevice>;

package/dist/client/node/src/types.d.ts

@@ -1,22 +1,25 @@
 import type { DeviceManagerClient, PluginsManagerClient, SystemManagerClient } from './proxy';
-export type { BasicPeerConnection, CameraConfig, CameraDevice, Camera, CameraInput, Go2RtcIceCandidateMessage, Go2RtcOfferMessage, Go2RtcAnswerMessage, Go2RtcIncomingMessage, Go2RtcOutgoingMessage, LightState, MotionState, AudioState, ObjectState, DoorbellState, SirenState, } from '../../../shared/types';
+import type { BaseLogger } from '../../../shared/types';
+export type { BaseLogger, BasicPeerConnection, CameraConfig, CameraDevice, Camera, CameraInput, Go2RtcIceCandidateMessage, Go2RtcOfferMessage, Go2RtcAnswerMessage, Go2RtcIncomingMessage, Go2RtcOutgoingMessage, LightState, MotionState, AudioState, ObjectState, DoorbellState, SirenState, } from '../../../shared/types';
 export type CameraUiClientConfig = WithCredentials | WithToken;
 export interface API {
     deviceManager: DeviceManagerClient;
     pluginsManager: PluginsManagerClient;
     systemManager: SystemManagerClient;
 }
-type WithCredentials = {
+interface BaseConfig {
     endpoint: string;
     skipCheck?: boolean;
+    logger?: BaseLogger;
+    ffmpegPath?: string;
+}
+interface WithCredentials extends BaseConfig {
     username: string;
     password: string;
     token?: never;
-};
-type WithToken = {
-    endpoint: string;
-    skipCheck?: boolean;
+}
+interface WithToken extends BaseConfig {
     username?: never;
     password?: never;
     token: string;
-};
+}

package/dist/src/camera/index.d.ts

@@ -1,12 +1,10 @@
-import 'reflect-metadata';
 import { Observable } from 'rxjs';
 import { StreamingSession } from './streaming/streaming-session';
 import type { Camera, CameraInput } from '../api/database/types';
+import type { ProxyServer } from '../proxy';
 import type { StateValues, OnSetEvent, LightState, MotionState, AudioState, ObjectState, DoorbellState, SirenState, StreamingConnectionOptions, FfmpegOptions } from './types';
-import type { CameraDevice } from './types';
-import type { Logger, PluginLogger } from '../services/logger';
+import type { CameraDevice, BaseLogger } from './types';
 export declare class CameraDeviceHub implements CameraDevice {
-    private isWorker;
     private ffmpegPath;
     private logger;
     private proxy?;
@@ -30,7 +28,7 @@ export declare class CameraDeviceHub implements CameraDevice {
     get type(): string;
     get model(): string;
     get sources(): CameraInput[];
-    constructor(camera: Camera, logger: Logger | PluginLogger | Console);
+    constructor(camera: Camera, logger: BaseLogger, ffmpegPath: string, proxy?: ProxyServer);
     getValue<T extends keyof StateValues>(stateName: T): StateValues[T];
     createSession(cameraInput: CameraInput, options?: StreamingConnectionOptions): Promise<StreamingSession>;
     streamVideo(cameraInput: CameraInput, options: FfmpegOptions): Promise<StreamingSession>;

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

@@ -3,22 +3,21 @@ import { MediaStreamTrack } from 'werift';
 import { Subscribed } from '../subscribed';
 import type { WebSocket } from 'ws';
 import type { RtpPacket, RtcpPacket, RTCIceCandidate } from 'werift';
-import type { BasicPeerConnection } from '../types';
-import type { Logger, PluginLogger } from '../../services/logger';
+import type { BasicPeerConnection, BaseLogger } from '../types';
 export declare class WeriftPeerConnection extends Subscribed implements BasicPeerConnection {
     onAudioRtp: Subject<RtpPacket>;
     onAudioRtcp: Subject<RtcpPacket>;
     onVideoRtp: Subject<RtpPacket>;
     onVideoRtcp: Subject<RtcpPacket>;
     onIceCandidate: Subject<RTCIceCandidate>;
-    onConnectionState: ReplaySubject<"closed" | "connected" | "disconnected" | "connecting" | "failed" | "new">;
+    onConnectionState: ReplaySubject<"closed" | "failed" | "disconnected" | "new" | "connecting" | "connected">;
     returnAudioTrack: MediaStreamTrack;
     private pc;
     private ws?;
     private cameraName;
     private logger;
     private onRequestKeyFrame;
-    constructor(cameraName: string, logger: Logger | PluginLogger | Console, ws?: WebSocket);
+    constructor(cameraName: string, logger: BaseLogger, ws?: WebSocket);
     createOffer(): Promise<import("werift").RTCSessionDescription>;
     acceptAnswer(answer: {
         type: 'answer';

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

@@ -2,8 +2,7 @@ import { RtpPacket } from 'werift';
 import { ReplaySubject, Subject } from 'rxjs';
 import { Subscribed } from '../subscribed';
 import type { WebrtcConnection } from './webrtc-connection';
-import type { Logger, PluginLogger } from '../../services/logger';
-import type { FfmpegOptions, SpawnInput } from '../types';
+import type { FfmpegOptions, SpawnInput, BaseLogger } from '../types';
 export declare class StreamingSession extends Subscribed {
     readonly onCallEnded: ReplaySubject<void>;
     readonly onVideoRtp: Subject<RtpPacket>;
@@ -18,7 +17,7 @@ export declare class StreamingSession extends Subscribed {
     private connection;
     private logger;
     get isUsingOpus(): Promise<boolean>;
-    constructor(cameraName: string, ffmpegPath: string, connection: WebrtcConnection, logger: Logger | PluginLogger | Console);
+    constructor(cameraName: string, ffmpegPath: string, connection: WebrtcConnection, logger: BaseLogger);
     private bindToConnection;
     reservePort(bufferPorts?: number): Promise<number>;
     startTranscoding(ffmpegOptions: FfmpegOptions): Promise<void>;

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

@@ -1,9 +1,8 @@
 import { ReplaySubject, Subject, type Observable } from 'rxjs';
 import { Subscribed } from '../subscribed';
 import type { RtpPacket } from 'werift';
-import type { Logger, PluginLogger } from '../../services/logger';
 import type { CameraInput } from '../../api/database/types';
-import type { StreamingConnectionOptions } from '../types';
+import type { StreamingConnectionOptions, BaseLogger } from '../types';
 export declare class WebrtcConnection extends Subscribed {
     readonly onCameraConnected: ReplaySubject<void>;
     readonly onCallAnswered: ReplaySubject<string>;
@@ -22,7 +21,7 @@ export declare class WebrtcConnection extends Subscribed {
     private logger;
     private cameraName;
     private cameraInput;
-    constructor(cameraName: string, cameraInput: CameraInput, options: StreamingConnectionOptions, logger: Logger | PluginLogger | Console);
+    constructor(cameraName: string, cameraInput: CameraInput, options: StreamingConnectionOptions, logger: BaseLogger);
     private initiateCall;
     private handleMessage;
     private sendMessage;

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

@@ -3,6 +3,12 @@ import type { ConnectionState, RTCIceCandidate } from 'werift';
 import type { CameraInputSettings, CameraInput, Camera } from '../api/database/types';
 import type { StreamingSession } from './streaming/streaming-session';
 export type SpawnInput = string | number;
+export interface BaseLogger {
+    log: (...args: any[]) => void;
+    error: (...args: any[]) => void;
+    warn: (...args: any[]) => void;
+    debug: (...args: any[]) => void;
+}
 export interface FfmpegOptions {
     input?: SpawnInput[];
     video?: SpawnInput[] | false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@camera.ui/browser",
-  "version": "0.0.5",
+  "version": "0.0.6",
   "description": "camera.ui browser client",
   "author": "seydx (https://github.com/seydx/camera.ui)",
   "main": "./dist/bundle.browser.js",
@@ -29,7 +29,7 @@
     "ts-loader": "^9.5.1",
     "typescript": "^5.3.3",
     "updates": "^15.1.1",
-    "utf-8-validate": "^5.0.10",
+    "utf-8-validate": "^6.0.3",
     "webpack": "^5.89.0",
     "webpack-cli": "^5.1.4"
   },