@camera.ui/browser 0.0.74 → 0.0.75

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

@@ -2,7 +2,7 @@ import type { Observable, Subject } from 'rxjs';
 import type { BaseCameraDevice } from '../../../../server/src/camera/index.js';
 import type { BaseLogger } from '../../../../shared/types/index.js';
 import type { StreamingSession } from './streaming/streaming-session.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 { AudioSetEvent, AudioState, BaseLogger, BatterySetEvent, BatteryState, CameraActivitySettings, CameraSource, CameraZone, Detection, DetectionZone, DoorbellState, LightSetEvent, LightState, MotionSetEvent, MotionState, ObjectSetEvent, ObjectState, Point, PrebufferContainer, PrebufferState, SirenSetEvent, SirenState, ZoneFilter, ZoneType, } from '../../../../shared/types/index.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';

package/dist/types/server/src/api/controllers/cameras.controller.d.ts

@@ -1,6 +1,6 @@
 import type { FastifyInstance, FastifyReply, FastifyRequest } from 'fastify';
 import type { DBCamera } from '../database/types.js';
-import type { AuthLoginRequest, CameraZoneInsertPatchRequest, CameraZonesParamsRequest, CameraZonesTypeRequest, CamerasExtensionsParamsRequest, CamerasExtensionsRequest, CamerasInsertRequest, CamerasParamsRequest, CamerasPatchRequest, CamerasPreviewRequest, ExtensionsPatchRequest, PaginationRequest } from '../types/index.js';
+import type { AuthLoginRequest, CameraZoneInsertPatchRequest, CameraZonesParamsRequest, CamerasExtensionsParamsRequest, CamerasExtensionsRequest, CamerasInsertRequest, CamerasParamsRequest, CamerasPatchRequest, CamerasPreviewRequest, ExtensionsPatchRequest, PaginationRequest } from '../types/index.js';
 export declare class CamerasController {
     private app;
     private api;
@@ -11,10 +11,10 @@ export declare class CamerasController {
     private proxyServer;
     constructor(app: FastifyInstance);
     getByName(req: FastifyRequest<AuthLoginRequest & CamerasParamsRequest>, reply: FastifyReply): FastifyReply;
-    getZoneByName(req: FastifyRequest<AuthLoginRequest & CamerasParamsRequest & CameraZonesParamsRequest & CameraZonesTypeRequest>, reply: FastifyReply): FastifyReply;
-    insertZone(req: FastifyRequest<AuthLoginRequest & CamerasParamsRequest & CameraZonesTypeRequest & CameraZoneInsertPatchRequest>, reply: FastifyReply): Promise<FastifyReply>;
-    patchZoneByName(req: FastifyRequest<AuthLoginRequest & CamerasParamsRequest & CameraZonesParamsRequest & CameraZonesTypeRequest & CameraZoneInsertPatchRequest>, reply: FastifyReply): Promise<FastifyReply>;
-    removeZoneByName(req: FastifyRequest<AuthLoginRequest & CamerasParamsRequest & CameraZonesParamsRequest & CameraZonesTypeRequest>, reply: FastifyReply): Promise<FastifyReply>;
+    getZoneByName(req: FastifyRequest<AuthLoginRequest & CamerasParamsRequest & CameraZonesParamsRequest>, reply: FastifyReply): FastifyReply;
+    insertZone(req: FastifyRequest<AuthLoginRequest & CamerasParamsRequest & CameraZoneInsertPatchRequest>, reply: FastifyReply): Promise<FastifyReply>;
+    patchZoneByName(req: FastifyRequest<AuthLoginRequest & CamerasParamsRequest & CameraZonesParamsRequest & CameraZoneInsertPatchRequest>, reply: FastifyReply): Promise<FastifyReply>;
+    removeZoneByName(req: FastifyRequest<AuthLoginRequest & CamerasParamsRequest & CameraZonesParamsRequest>, reply: FastifyReply): Promise<FastifyReply>;
     getExtensionsByName(req: FastifyRequest<AuthLoginRequest & CamerasParamsRequest>, reply: FastifyReply): FastifyReply;
     getExtensionConfigByName(req: FastifyRequest<AuthLoginRequest & CamerasExtensionsParamsRequest>, reply: FastifyReply): Promise<FastifyReply>;
     patchExtensionConfigByName(req: FastifyRequest<AuthLoginRequest & CamerasExtensionsParamsRequest & ExtensionsPatchRequest>, reply: FastifyReply): Promise<FastifyReply>;

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

@@ -1,3 +1,4 @@
+import type { DetectionZone } from '../../camera/types.js';
 import type { ClientData, JwtTokenEncoded } from '../types/index.js';
 export interface DBAuth {
     tokens: JwtTokenEncoded[];
@@ -64,11 +65,10 @@ export interface BaseCamera {
     hasBattery: boolean;
     info: CameraInformation;
     type: CameraType;
-    motionZones: CameraZone[];
-    objectZones: CameraZone[];
-    motionTimeout: number;
+    activityZones: CameraZone[];
+    activitySettings: CameraActivitySettings;
 }
-export interface Camera extends BaseCamera {
+export interface Camera extends Omit<BaseCamera, 'activityZones'> {
     hasAudioDetector: boolean;
     hasMotionDetector: boolean;
     hasObjectDetector: boolean;
@@ -76,7 +76,20 @@ export interface Camera extends BaseCamera {
     hasPrebuffer: boolean;
     hasIntercom: boolean;
     sources: CameraInput[];
+    activityZones: DetectionZone[];
 }
+export interface CameraActivitySettings {
+    motion: MotionDetectionSettings;
+    object: ObjectDetectionSettings;
+}
+export interface MotionDetectionSettings {
+    timeout: number;
+}
+export interface ObjectDetectionSettings {
+}
+export type Point = [number, number];
+export type ZoneType = 'intersect' | 'contain';
+export type ZoneFilter = 'include' | 'exclude';
 export interface CameraZone {
     name: string;
     regions: ZoneRegion[];
@@ -84,10 +97,14 @@ export interface CameraZone {
 export interface ZoneRegion {
     _id: string;
     coords: ZoneCoord[];
+    type: ZoneType;
+    filter: ZoneFilter;
+    classes: string[];
+    isPrivacyMask: boolean;
 }
 export interface ZoneCoord {
     _id: string;
-    points: [number, number];
+    points: Point;
 }
 export type CameraPrivateProperties = '_id' | 'nativeId' | 'pluginId';
 export interface CameraPublicProperties extends Omit<Camera, CameraPrivateProperties> {