@camera.ui/browser 0.0.71 → 0.0.72

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

@@ -1,14 +1,22 @@
-import { BrowserCameraDevice } from '../../../../../server/src/camera/base/cameraDeviceBrowser.js';
+import { BaseCameraDevice } from '../../../../../server/src/devices/camera/index.js';
+import { StreamingSession } from '../streaming/streaming-session.js';
 import type { BaseLogger, Camera, CameraSource, IceServer, SetValues } from '../../../../../shared/types/index.js';
 import type { SocketService } from '../socket.js';
-export declare class CameraDeviceProxy extends BrowserCameraDevice {
+import type { CameraDevice } from '../types.js';
+export declare class CameraDeviceProxy extends BaseCameraDevice implements CameraDevice {
     private socketService;
+    private socket;
+    private started;
     get sources(): CameraSource[];
     constructor(camera: Camera, socketService: SocketService, logger: BaseLogger);
+    start(): void;
+    stop(): void;
     connect(): Promise<void>;
     disconnect(): Promise<void>;
     reboot(): Promise<void>;
     getIceServers(): Promise<IceServer[]>;
+    snapshot(forceNew?: boolean): Promise<ArrayBuffer>;
+    createSession(sourceName: string, videoElement: HTMLVideoElement): Promise<StreamingSession>;
     updateState<T extends keyof SetValues>(stateName: T, eventData: SetValues[T]): Promise<void>;
     refreshStates(): Promise<void>;
     cleanup(): Promise<void>;

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

@@ -1,12 +1,15 @@
-import { BrowserCameraDevice } from '../../../../../server/src/camera/base/cameraDeviceBrowser.js';
-import type { BaseLogger, DeviceManagerBrowserProxyMethods } from '../../../../../shared/types/index.js';
+import type { BaseLogger } from '../../../../../shared/types/index.js';
 import type { SocketService } from '../socket.js';
+import type { CameraDevice } from '../types.js';
+interface DeviceManagerBrowserProxyMethods {
+    getCameraByName(name: string): Promise<CameraDevice | undefined>;
+    getCameraById(id: string): Promise<CameraDevice | undefined>;
+}
 export declare class DeviceManager implements DeviceManagerBrowserProxyMethods {
     private socketService;
-    private devices;
     private logger;
     constructor(socketService: SocketService, logger: BaseLogger);
-    getCameraById(id: string): Promise<BrowserCameraDevice | undefined>;
-    getCameraByName(name: string): Promise<BrowserCameraDevice | undefined>;
-    private addOrGetCamera;
+    getCameraById(id: string): Promise<CameraDevice | undefined>;
+    getCameraByName(name: string): Promise<CameraDevice | undefined>;
 }
+export {};

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

@@ -1,7 +1,10 @@
-import type { BaseLogger, PluginsManagerBrowserProxyMethods } from '../../../../../shared/types/index.js';
+import type { BaseLogger } from '../../../../../shared/types/index.js';
 import type { SocketService } from '../socket.js';
+interface PluginsManagerBrowserProxyMethods {
+}
 export declare class PluginsManager implements PluginsManagerBrowserProxyMethods {
     private socketService;
     private logger;
     constructor(socketService: SocketService, logger: BaseLogger);
 }
+export {};

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

@@ -1,7 +1,10 @@
-import type { BaseLogger, SystemManagerBrowserProxyMethods } from '../../../../../shared/types/index.js';
+import type { BaseLogger } from '../../../../../shared/types/index.js';
 import type { SocketService } from '../socket.js';
+interface SystemManagerBrowserProxyMethods {
+}
 export declare class SystemManager implements SystemManagerBrowserProxyMethods {
     private socketService;
     private logger;
     constructor(socketService: SocketService, logger: BaseLogger);
 }
+export {};

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

@@ -3,8 +3,13 @@ import type { ManagerNames, WebsocketClientRequest } from '../../../../shared/ty
 export declare class SocketService {
     manager: Manager;
     private token;
+    private endpoint;
     get socket(): Socket;
     constructor(endpoint: string, token: string);
-    sendRequest<T extends ManagerNames>(data: WebsocketClientRequest<T>): Promise<any>;
+    createManager(): {
+        manager: Manager;
+        socket: Socket;
+    };
+    sendRequest<T extends ManagerNames>(data: WebsocketClientRequest<T>, socket?: Socket): Promise<any>;
     close(): void;
 }

package/dist/types/{server/src/camera/streaming/browser/browser-peer-connection.d.ts → packages/client/browser/src/streaming/peer-connection.d.ts}

@@ -1,9 +1,8 @@
 import { ReplaySubject, Subject } from 'rxjs';
-import { Subscribed } from '../../utils/subscribed.js';
-import type { IceServer } from '../../../services/config/types.js';
-import type { BrowserCameraDevice as CameraDevice } from '../../base/cameraDeviceBrowser.js';
-import type { BaseLogger, BasicBrowserPeerConnection } from '../../types.js';
-export declare class BrowserPeerConnection extends Subscribed implements BasicBrowserPeerConnection {
+import { Subscribed } from '../../../../../shared/types/index.js';
+import type { BaseLogger, IceServer } from '../../../../../shared/types/index.js';
+import type { BasicBrowserPeerConnection, CameraDevice } from '../types.js';
+export declare class BasicPeerConnection extends Subscribed implements BasicBrowserPeerConnection {
     onIceCandidate: Subject<RTCIceCandidate>;
     onConnectionState: ReplaySubject<RTCPeerConnectionState>;
     videoTransceiver: RTCRtpTransceiver;

package/dist/types/{server/src/camera/streaming/browser/browser-streaming-session.d.ts → packages/client/browser/src/streaming/streaming-session.d.ts}

@@ -1,9 +1,9 @@
 import { Observable, ReplaySubject } from 'rxjs';
-import { Subscribed } from '../../utils/subscribed.js';
-import type { BrowserCameraDevice as CameraDevice } from '../../base/cameraDeviceBrowser.js';
-import type { BaseLogger } from '../../types.js';
-import type { WebrtcBrowserConnection } from './webrtc-browser-connection.js';
-export declare class BrowserStreamingSession extends Subscribed {
+import { Subscribed } from '../../../../../shared/types/index.js';
+import type { BaseLogger } from '../../../../../shared/types/index.js';
+import type { CameraDevice } from '../types.js';
+import type { WebrtcConnection } from './webrtc-connection.js';
+export declare class StreamingSession extends Subscribed {
     readonly onCallAnswered: ReplaySubject<void>;
     readonly onCallEnded: ReplaySubject<void>;
     private onUsingOpus;
@@ -14,7 +14,7 @@ export declare class BrowserStreamingSession extends Subscribed {
     private logger;
     onMicrophoneEnabled: Observable<boolean>;
     get isUsingOpus(): Promise<boolean>;
-    constructor(cameraDevice: CameraDevice, logger: BaseLogger, connection: WebrtcBrowserConnection);
+    constructor(cameraDevice: CameraDevice, logger: BaseLogger, connection: WebrtcConnection);
     enableMicrophone(track: MediaStreamTrack): void;
     disableMicrophone(): void;
     stop(): void;

package/dist/types/{server/src/camera/streaming/browser/webrtc-browser-connection.d.ts → packages/client/browser/src/streaming/webrtc-connection.d.ts}

@@ -1,10 +1,9 @@
 import { ReplaySubject, type Observable } from 'rxjs';
-import { Subscribed } from '../../utils/subscribed.js';
-import { BrowserPeerConnection } from './browser-peer-connection.js';
-import type { IceServer } from '../../../services/config/types.js';
-import type { BrowserCameraDevice as CameraDevice } from '../../base/cameraDeviceBrowser.js';
-import type { BaseLogger } from '../../types.js';
-export declare class WebrtcBrowserConnection extends Subscribed {
+import { Subscribed } from '../../../../../shared/types/index.js';
+import { BasicPeerConnection } from './peer-connection.js';
+import type { BaseLogger, IceServer } from '../../../../../shared/types/index.js';
+import type { CameraDevice } from '../types.js';
+export declare class WebrtcConnection extends Subscribed {
     readonly onCallAnswered: ReplaySubject<string>;
     readonly onCallEnded: ReplaySubject<void>;
     readonly onError: ReplaySubject<void>;
@@ -12,7 +11,7 @@ export declare class WebrtcBrowserConnection extends Subscribed {
         method: string;
     }>;
     readonly onWsOpen: Observable<unknown>;
-    readonly pc: BrowserPeerConnection;
+    readonly pc: BasicPeerConnection;
     private readonly ws;
     private readonly onOfferSent;
     private hasEnded;

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

@@ -1,7 +1,31 @@
+import type { Observable, Subject } from 'rxjs';
+import type { BaseCameraDevice } from '../../../../server/src/devices/camera/index.js';
 import type { BaseLogger } from '../../../../shared/types/index.js';
-export type { AudioState, BaseLogger, BasicBrowserPeerConnection, BrowserCameraDevice, Camera, CameraConfig, CameraInput, DoorbellState, FfmpegOptions, Go2RtcAnswerMessage, Go2RtcIceCandidateMessage, Go2RtcIncomingMessage, Go2RtcOfferMessage, Go2RtcOutgoingMessage, LightState, MotionState, ObjectState, SirenState, } from '../../../../shared/types/index.js';
-export { BrowserStreamingSession } from '../../../../shared/types/index.js';
+import type { StreamingSession } from './streaming/streaming-session.js';
+export type { BasicPeerConnection } from './streaming/peer-connection.js';
+export type { StreamingSession } from './streaming/streaming-session.js';
+export type { WebrtcConnection } from './streaming/webrtc-connection.js';
+export type { AudioState, BaseDetection, BaseLogger, Camera, CameraConfig, CameraInput, DoorbellState, FfmpegOptions, Go2RtcAnswerMessage, Go2RtcIceCandidateMessage, Go2RtcIncomingMessage, Go2RtcOfferMessage, Go2RtcOutgoingMessage, LightState, MotionDetection, MotionState, ObjectDetection, ObjectState, SirenState, } from '../../../../shared/types/index.js';
 export type CameraUiClientConfig = WithCredentials | WithToken;
+export interface BasicBrowserPeerConnection {
+    enableMicrophone(track: MediaStreamTrack): void;
+    disableMicrophone(): void;
+    createOffer(): Promise<RTCSessionDescriptionInit>;
+    acceptAnswer(answer: {
+        type: 'answer';
+        sdp: string;
+    }): Promise<void>;
+    addIceCandidate(candidate: Partial<RTCIceCandidate>): Promise<void>;
+    onIceCandidate: Subject<RTCIceCandidate>;
+    onConnectionState: Observable<RTCPeerConnectionState>;
+    close(): void;
+}
+export interface CameraDevice extends BaseCameraDevice {
+    start(): void;
+    stop(): void;
+    snapshot(forceNew?: boolean): Promise<ArrayBuffer>;
+    createSession(sourceName: string, videoElement: HTMLVideoElement): Promise<StreamingSession>;
+}
 interface BaseConfig {
     endpoint: string;
     skipCheck?: boolean;

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

@@ -1,9 +1,9 @@
 /// <reference types="node" resolution-mode="require"/>
 import 'reflect-metadata';
 import { EventEmitter } from 'node:events';
-import { CameraController } from './camera/controller.js';
+import { CameraController } from './devices/camera/controller/index.js';
 import type { Camera, CameraExtensions } from './api/database/types.js';
-import type { StreamManager } from './decoder/worker/index.js';
+import type { FrameWorker } from './decoder/worker/index.js';
 import type { BasePlugin } from './plugins/base.js';
 import type { API } from './plugins/node/api.js';
 import type { PluginLogger } from './plugins/node/logger.js';
@@ -27,15 +27,15 @@ export declare class CameraUiAPI extends EventEmitter {
     configureCameras(): Promise<void>;
     addCamera(camera: Camera): Promise<{
         controller: CameraController;
-        manager: StreamManager;
+        worker: FrameWorker;
     }>;
     getCamera(cameraId: string): {
         controller: CameraController;
-        manager: StreamManager;
+        worker: FrameWorker;
     } | undefined;
     getCameras(pluginId?: string): {
         controller: CameraController;
-        manager: StreamManager;
+        worker: FrameWorker;
     }[];
     updateCamera(camera: Camera, extensions: CameraExtensions): void;
     removeCamera(camera: Camera, extensions: CameraExtensions): Promise<void>;

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

@@ -1,11 +1,10 @@
-import type { CameraController } from '../camera/controller.js';
-import type { StreamManager } from './worker/index.js';
+import { FrameWorker } from './worker/index.js';
+import type { CameraController } from '../devices/camera/controller/index.js';
 export declare class Decoder {
-    streamManagers: Map<string, StreamManager<any>>;
+    frameWorkers: Map<string, FrameWorker>;
     private api;
     private proxyServer;
-    private startAsWorker;
     constructor();
-    addCamera(camera: CameraController): Promise<StreamManager>;
+    addCamera(camera: CameraController): Promise<FrameWorker>;
     removeCamera(camera: CameraController): Promise<void>;
 }

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

@@ -1,11 +1,14 @@
 /// <reference types="node" resolution-mode="require"/>
 /// <reference types="node" resolution-mode="require"/>
 import type { ChildProcess } from 'node:child_process';
+import type { ResizeOptions, RotateOptions, Sharp } from 'sharp';
 export interface FrameMetadata {
     format: string;
     frameSize: number;
     width: number;
+    origWidth: number;
     height: number;
+    origHeight: number;
 }
 export interface FrameSession {
     token: string;
@@ -15,6 +18,42 @@ export interface Frame {
     metadata: FrameMetadata;
     data: Buffer;
 }
+export interface ImageCrop {
+    top: number;
+    left: number;
+    bottom: number;
+    right: number;
+}
+export interface ImageResize {
+    width?: number;
+    height?: number;
+    options?: ResizeOptions;
+}
+export interface ImageRotate {
+    angle: number;
+    options?: RotateOptions;
+}
+export interface ImageFormat {
+    format: 'rgba' | 'gray' | 'bgr';
+}
+export interface ImageOptions {
+    format?: ImageFormat;
+    crop?: ImageCrop;
+    resize?: ImageResize;
+    rotate?: ImageRotate;
+}
+export interface ProcessImageRequest {
+    options: ImageOptions;
+    data: Buffer;
+}
+export interface VideoFrame {
+    metadata: FrameMetadata;
+    inputWidth: number;
+    inputHeight: number;
+    inputFormat: string;
+    toBuffer: (options?: ImageOptions) => Promise<Buffer>;
+    toImage: (options?: ImageOptions) => Promise<Sharp>;
+}
 export interface VideoSession {
     isActive(): boolean;
     kill: (reason?: string) => void;

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

@@ -1,3 +1,27 @@
-export { StreamManager } from './runtime/base/index.js';
-export { StreamProcess } from './runtime/child-process/index.js';
-export { StreamWorker } from './runtime/worker-thread/index.js';
+import { Subscribed } from '../../utils/subscribed.js';
+import type { CameraController } from '../../devices/camera/controller/index.js';
+import type { FrameMetadata } from '../types.js';
+export declare class FrameWorker extends Subscribed {
+    token: string;
+    private readonly logger;
+    private readonly configService;
+    private readonly camera;
+    private frameWorker?;
+    private stopped;
+    private auth;
+    constructor(camera: CameraController, auth: {
+        user: string;
+        pass: string;
+    });
+    listen(): Promise<void>;
+    close(): Promise<void>;
+    workerPID(): number;
+    getMetadata(): Promise<FrameMetadata>;
+    startVideoSession(): Promise<void>;
+    stopVideoSession(): Promise<void>;
+    private onMessage;
+    private sendMessage;
+    private sendReponse;
+    private send;
+    private getLogPrefix;
+}

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

@@ -1,8 +1,8 @@
-import { StreamingSession } from '../streaming/streaming-session.js';
 import { BaseCameraDevice } from './index.js';
-import type { Frame } from '../../decoder/types.js';
-import type { StreamingConnectionOptions } from '../streaming/peer-connection.js';
-import type { CameraDelegate, CameraPrebufferDelegate, FfmpegOptions } from '../types.js';
+import { StreamingSession } from './streaming/streaming-session.js';
+import type { VideoFrame } from '../../decoder/types.js';
+import type { CameraDelegate, CameraPrebufferDelegate, FfmpegOptions } from './controller/types.js';
+import type { StreamingConnectionOptions } from './streaming/peer-connection.js';
 export declare abstract class CameraDevice extends BaseCameraDevice {
     private _delegate?;
     private _prebufferDelegate?;
@@ -10,7 +10,7 @@ export declare abstract class CameraDevice extends BaseCameraDevice {
     set delegate(delegate: CameraDelegate);
     get prebufferDelegate(): CameraPrebufferDelegate | undefined;
     set prebufferDelegate(delegate: CameraPrebufferDelegate);
-    abstract generateFrames(): AsyncIterableIterator<Frame>;
+    abstract generateFrames(): AsyncIterableIterator<VideoFrame>;
     abstract getFfmpegPath(): Promise<string>;
     snapshot(forceNew?: boolean): Promise<ArrayBuffer>;
     createSession(sourceName: string, options?: StreamingConnectionOptions): Promise<StreamingSession>;

package/dist/types/server/src/{camera/controller.d.ts → devices/camera/controller/index.d.ts}

@@ -1,8 +1,8 @@
-import { CameraDevice } from './base/cameraDevice.js';
-import type { Camera } from '../api/database/types.js';
-import type { Frame } from '../decoder/types.js';
-import type { ProxyServer } from '../nats/index.js';
-import type { IceServer } from '../services/config/types.js';
+import { CameraDevice } from '../cameraDevice.js';
+import type { Camera } from '../../../api/database/types.js';
+import type { VideoFrame } from '../../../decoder/types.js';
+import type { ProxyServer } from '../../../nats/index.js';
+import type { IceServer } from '../../../services/config/types.js';
 import type { BaseLogger } from './types.js';
 export declare class CameraController extends CameraDevice {
     private proxy;
@@ -13,7 +13,7 @@ export declare class CameraController extends CameraDevice {
     connect(): Promise<void>;
     disconnect(): Promise<void>;
     reboot(): Promise<void>;
-    generateFrames(): AsyncIterableIterator<Frame>;
+    generateFrames(): AsyncIterableIterator<VideoFrame>;
     getFfmpegPath(): Promise<string>;
     getIceServers(): Promise<IceServer[]>;
     updateCamera(updatedCamera: Camera): void;

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

@@ -1,6 +1,5 @@
 /// <reference types="node" resolution-mode="require"/>
-import type { Observable, Subject } from 'rxjs';
-import type { CameraInformation, CameraInput, CameraInputSettings } from '../api/database/types.js';
+import type { CameraInformation, CameraInput, CameraInputSettings } from '../../../api/database/types.js';
 export type SpawnInput = string | number;
 export type PrebufferType = 'recording' | 'stream';
 export interface CameraSource extends CameraInput {
@@ -21,19 +20,6 @@ export interface FfmpegOptions {
     audio?: SpawnInput[];
     output: SpawnInput[];
 }
-export interface BasicBrowserPeerConnection {
-    enableMicrophone(track: MediaStreamTrack): void;
-    disableMicrophone(): void;
-    createOffer(): Promise<RTCSessionDescriptionInit>;
-    acceptAnswer(answer: {
-        type: 'answer';
-        sdp: string;
-    }): Promise<void>;
-    addIceCandidate(candidate: Partial<RTCIceCandidate>): Promise<void>;
-    onIceCandidate: Subject<RTCIceCandidate>;
-    onConnectionState: Observable<RTCPeerConnectionState>;
-    close(): void;
-}
 export interface CameraDelegate {
     snapshotRequest(requestId: string): Promise<Buffer>;
     prepareStream(requestId: string): Promise<void>;
@@ -102,14 +88,18 @@ export type CameraConfig = (BaseCameraConfig & {
 });
 export interface BaseDetection {
     id?: string;
-}
-export interface MotionDetection extends BaseDetection {
     label: string;
+    timestamp: number;
+    confidence: number;
     boundingBox: [number, number, number, number];
+    inputWidth: number;
+    inputHeight: number;
+    origWidth: number;
+    origHeight: number;
+}
+export interface MotionDetection extends BaseDetection {
 }
 export interface ObjectDetection extends BaseDetection {
-    lebel: string;
-    boundingBox: [number, number, number, number];
 }
 export interface BaseState<T extends LightState | AudioState | MotionState | ObjectState | SirenState | BatteryState | DoorbellState> {
     timestamp: number;
@@ -148,7 +138,8 @@ export type DoorbellState = BaseState<DoorbellState> & DoorbellSetEvent;
 export type SirenState = BaseState<SirenState> & SirenSetEvent;
 export type ObjectState = BaseState<ObjectState> & ObjectSetEvent;
 export type BatteryState = BaseState<BatteryState> & BatterySetEvent;
-export type State = LightState | MotionState | AudioState | ObjectState | DoorbellState | SirenState | BatteryState;
+export type States = LightState | MotionState | AudioState | ObjectState | DoorbellState | SirenState | BatteryState;
+export type Sets = LightSetEvent | MotionSetEvent | AudioSetEvent | ObjectSetEvent | DoorbellSetEvent | SirenSetEvent | BatterySetEvent;
 export interface StateValues {
     light: LightState;
     motion: MotionState;

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

@@ -2,7 +2,7 @@ import { LRUCache } from 'lru-cache';
 import { BehaviorSubject, 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, SirenSetEvent, SirenState, State, StateValues } from '../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';
 declare class Subscribed {
     private readonly subscriptions;
     private readonly additionalSubscriptions;
@@ -75,22 +75,23 @@ export declare abstract class BaseCameraDevice extends Subscribed {
         newData: Camera[T];
     }>;
     removeAllListeners(): void;
-    protected getAudioState(event: AudioSetEvent): AudioState | undefined;
-    protected getMotionState(event: MotionSetEvent): MotionState | undefined;
-    protected getObjectState(event: ObjectSetEvent): ObjectState | undefined;
-    protected getDoorbellState(event: DoorbellSetEvent): DoorbellState | undefined;
-    protected getLightState(event: LightSetEvent): LightState | undefined;
-    protected getSirenState(event: SirenSetEvent): SirenState | undefined;
-    protected getBatteryState(event: BatterySetEvent): BatteryState | undefined;
+    protected getAudioState(event: AudioSetEvent): AudioState;
+    protected getMotionState(event: MotionSetEvent): MotionState;
+    protected getObjectState(event: ObjectSetEvent): ObjectState;
+    protected getDoorbellState(event: DoorbellSetEvent): DoorbellState;
+    protected getLightState(event: LightSetEvent | LightState): LightState;
+    protected getSirenState(event: SirenSetEvent): SirenState;
+    protected getBatteryState(event: BatterySetEvent): BatteryState;
     private createStateObservable;
     protected updateCamera(updatedCamera: Camera): void;
     protected updateCameraState(state: boolean): void;
-    protected stateChanged<T extends keyof StateValues>(oldState?: StateValues[T], newState?: StateValues[T]): boolean;
-    protected isAudioState(state: State): state is AudioState;
-    protected isMotionState(state: State): state is MotionState;
-    protected isObjectState(state: State): state is ObjectState;
-    protected isSirenState(state: State): state is SirenState;
-    protected isBatteryState(state: State): state is BatteryState;
-    protected isGenericState(state: State): state is DoorbellState;
+    protected stateChanged<T extends keyof SetValues>(oldState?: SetValues[T], newState?: SetValues[T]): boolean;
+    protected isAudioState(state: Sets): state is AudioSetEvent;
+    protected isMotionState(state: Sets): state is MotionSetEvent;
+    protected isObjectState(state: Sets): state is ObjectSetEvent;
+    protected isSirenState(state: Sets): state is SirenSetEvent;
+    protected isBatteryState(state: Sets): state is BatterySetEvent;
+    protected isGenericState(state: Sets): state is DoorbellSetEvent;
+    protected isStateEvent(state: States | Sets): state is States;
 }
 export {};

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

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

package/dist/types/server/src/{camera → devices/camera}/streaming/streaming-session.d.ts

@@ -1,8 +1,8 @@
 import { ReplaySubject, Subject } from 'rxjs';
 import { RtpPacket } from 'werift';
-import { Subscribed } from '../utils/subscribed.js';
-import type { CameraDevice } from '../base/cameraDevice.js';
-import type { BaseLogger, FfmpegOptions, SpawnInput } from '../types.js';
+import { Subscribed } from '../../../utils/subscribed.js';
+import type { CameraDevice } from '../cameraDevice.js';
+import type { BaseLogger, FfmpegOptions, SpawnInput } from '../controller/types.js';
 import type { WebrtcConnection } from './webrtc-connection.js';
 export declare class StreamingSession extends Subscribed {
     readonly onCallEnded: ReplaySubject<void>;

package/dist/types/server/src/{camera → devices/camera}/streaming/webrtc-connection.d.ts

@@ -1,9 +1,9 @@
 import { ReplaySubject, Subject, type Observable } from 'rxjs';
-import { Subscribed } from '../utils/subscribed.js';
+import { Subscribed } from '../../../utils/subscribed.js';
 import type { RtpPacket } from 'werift';
-import type { IceServer } from '../../services/config/types.js';
-import type { CameraDevice } from '../base/cameraDevice.js';
-import type { BaseLogger } from '../types.js';
+import type { IceServer } from '../../../services/config/types.js';
+import type { CameraDevice } from '../cameraDevice.js';
+import type { BaseLogger } from '../controller/types.js';
 import type { StreamingConnectionOptions } from './peer-connection.js';
 export declare class WebrtcConnection extends Subscribed {
     readonly onCameraConnected: ReplaySubject<void>;

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

@@ -2,7 +2,7 @@ import { type NatsConnection, type Subscription } from 'nats';
 import { CameraDeviceProxy } from './proxy/cameraDevice.js';
 import { DeviceManagerProxy, PluginsManagerProxy, SystemManagerProxy } from './proxy/index.js';
 import { NatsServer } from './server.js';
-import type { StateValues } from '../camera/types.js';
+import type { StateValues } from '../devices/camera/controller/types.js';
 import type { CameraDeviceListenerMessagePayload, DeviceManagerProxyEvents, PluginsManagerProxyEvents, ProxyAuth, SystemManagerProxyEvents } from './types.js';
 import type { WebsocketProxy } from './websocket.js';
 export declare class ProxyServer {

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

@@ -1,7 +1,7 @@
 /// <reference types="node" resolution-mode="require"/>
 import type { Camera } from '../../api/database/types.js';
-import type { CameraDelegate, CameraPrebufferDelegate, FfmpegOptions, PrebufferType, SetValues, StateValues, StreamInfo } from '../../camera/types.js';
 import type { FrameMetadata, FrameSession } 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';
 import type { CameraDeviceProxyMethods, ProxyMessageStructure } from '../types.js';

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

@@ -1,5 +1,5 @@
 import type { Camera } from '../../api/database/types.js';
-import type { CameraConfig } from '../../camera/types.js';
+import type { CameraConfig } from '../../devices/camera/controller/types.js';
 import type { MessageQueue } from '../queue.js';
 import type { DeviceManagerServerProxyMethods, ProxyMessageStructure } from '../types.js';
 export declare class DeviceManagerProxy implements DeviceManagerServerProxyMethods {