camera.ui3 0.0.30-alpha.3 → 0.0.31-alpha.2

package/dist/server/src/api/schemas/users.schema.d.ts

@@ -30,22 +30,22 @@ export declare const userPreferencesCamviewViewsLayout: zod.ZodObject<{
     }>, "many">;
     type: zod.ZodUnion<[zod.ZodLiteral<"dnd">, zod.ZodLiteral<"view">]>;
 }, "strip", zod.ZodTypeAny, {
-    _id: string;
-    name: string;
     type: "dnd" | "view";
-    viewSize: 1 | 4 | 6 | 20 | 12 | 10 | 7 | 9 | 13 | 15 | 16 | 26;
+    name: string;
     cameras: {
         index: number;
         cameraId: string;
     }[];
+    _id: string;
+    viewSize: 1 | 6 | 4 | 7 | 9 | 10 | 12 | 13 | 15 | 16 | 20 | 26;
 }, {
-    name: string;
     type: "dnd" | "view";
-    viewSize: 1 | 4 | 6 | 20 | 12 | 10 | 7 | 9 | 13 | 15 | 16 | 26;
+    name: string;
     cameras: {
         index: number;
         cameraId: string;
     }[];
+    viewSize: 1 | 6 | 4 | 7 | 9 | 10 | 12 | 13 | 15 | 16 | 20 | 26;
     _id?: string | undefined;
 }>;
 export declare const patchPreferencesCamviewViewsLayout: zod.ZodOptional<zod.ZodObject<{
@@ -63,18 +63,18 @@ export declare const patchPreferencesCamviewViewsLayout: zod.ZodOptional<zod.Zod
     }>, "many">>;
 }, "strip", zod.ZodTypeAny, {
     name?: string | undefined;
-    viewSize?: 1 | 4 | 6 | 20 | 12 | 10 | 7 | 9 | 13 | 15 | 16 | 26 | undefined;
     cameras?: {
         index: number;
         cameraId: string;
     }[] | undefined;
+    viewSize?: 1 | 6 | 4 | 7 | 9 | 10 | 12 | 13 | 15 | 16 | 20 | 26 | undefined;
 }, {
     name?: string | undefined;
-    viewSize?: 1 | 4 | 6 | 20 | 12 | 10 | 7 | 9 | 13 | 15 | 16 | 26 | undefined;
     cameras?: {
         index: number;
         cameraId: string;
     }[] | undefined;
+    viewSize?: 1 | 6 | 4 | 7 | 9 | 10 | 12 | 13 | 15 | 16 | 20 | 26 | undefined;
 }>>;
 export declare const userPreferencesCamview: zod.ZodObject<{
     views: zod.ZodArray<zod.ZodObject<{
@@ -93,44 +93,44 @@ export declare const userPreferencesCamview: zod.ZodObject<{
         }>, "many">;
         type: zod.ZodUnion<[zod.ZodLiteral<"dnd">, zod.ZodLiteral<"view">]>;
     }, "strip", zod.ZodTypeAny, {
-        _id: string;
-        name: string;
         type: "dnd" | "view";
-        viewSize: 1 | 4 | 6 | 20 | 12 | 10 | 7 | 9 | 13 | 15 | 16 | 26;
+        name: string;
         cameras: {
             index: number;
             cameraId: string;
         }[];
+        _id: string;
+        viewSize: 1 | 6 | 4 | 7 | 9 | 10 | 12 | 13 | 15 | 16 | 20 | 26;
     }, {
-        name: string;
         type: "dnd" | "view";
-        viewSize: 1 | 4 | 6 | 20 | 12 | 10 | 7 | 9 | 13 | 15 | 16 | 26;
+        name: string;
         cameras: {
             index: number;
             cameraId: string;
         }[];
+        viewSize: 1 | 6 | 4 | 7 | 9 | 10 | 12 | 13 | 15 | 16 | 20 | 26;
         _id?: string | undefined;
     }>, "many">;
 }, "strip", zod.ZodTypeAny, {
     views: {
-        _id: string;
-        name: string;
         type: "dnd" | "view";
-        viewSize: 1 | 4 | 6 | 20 | 12 | 10 | 7 | 9 | 13 | 15 | 16 | 26;
+        name: string;
         cameras: {
             index: number;
             cameraId: string;
         }[];
+        _id: string;
+        viewSize: 1 | 6 | 4 | 7 | 9 | 10 | 12 | 13 | 15 | 16 | 20 | 26;
     }[];
 }, {
     views: {
-        name: string;
         type: "dnd" | "view";
-        viewSize: 1 | 4 | 6 | 20 | 12 | 10 | 7 | 9 | 13 | 15 | 16 | 26;
+        name: string;
         cameras: {
             index: number;
             cameraId: string;
         }[];
+        viewSize: 1 | 6 | 4 | 7 | 9 | 10 | 12 | 13 | 15 | 16 | 20 | 26;
         _id?: string | undefined;
     }[];
 }>;
@@ -253,44 +253,44 @@ export declare const userPreferences: zod.ZodObject<{
             }>, "many">;
             type: zod.ZodUnion<[zod.ZodLiteral<"dnd">, zod.ZodLiteral<"view">]>;
         }, "strip", zod.ZodTypeAny, {
-            _id: string;
-            name: string;
             type: "dnd" | "view";
-            viewSize: 1 | 4 | 6 | 20 | 12 | 10 | 7 | 9 | 13 | 15 | 16 | 26;
+            name: string;
             cameras: {
                 index: number;
                 cameraId: string;
             }[];
+            _id: string;
+            viewSize: 1 | 6 | 4 | 7 | 9 | 10 | 12 | 13 | 15 | 16 | 20 | 26;
         }, {
-            name: string;
             type: "dnd" | "view";
-            viewSize: 1 | 4 | 6 | 20 | 12 | 10 | 7 | 9 | 13 | 15 | 16 | 26;
+            name: string;
             cameras: {
                 index: number;
                 cameraId: string;
             }[];
+            viewSize: 1 | 6 | 4 | 7 | 9 | 10 | 12 | 13 | 15 | 16 | 20 | 26;
             _id?: string | undefined;
         }>, "many">;
     }, "strip", zod.ZodTypeAny, {
         views: {
-            _id: string;
-            name: string;
             type: "dnd" | "view";
-            viewSize: 1 | 4 | 6 | 20 | 12 | 10 | 7 | 9 | 13 | 15 | 16 | 26;
+            name: string;
             cameras: {
                 index: number;
                 cameraId: string;
             }[];
+            _id: string;
+            viewSize: 1 | 6 | 4 | 7 | 9 | 10 | 12 | 13 | 15 | 16 | 20 | 26;
         }[];
     }, {
         views: {
-            name: string;
             type: "dnd" | "view";
-            viewSize: 1 | 4 | 6 | 20 | 12 | 10 | 7 | 9 | 13 | 15 | 16 | 26;
+            name: string;
             cameras: {
                 index: number;
                 cameraId: string;
             }[];
+            viewSize: 1 | 6 | 4 | 7 | 9 | 10 | 12 | 13 | 15 | 16 | 20 | 26;
             _id?: string | undefined;
         }[];
     }>;
@@ -355,14 +355,14 @@ export declare const userPreferences: zod.ZodObject<{
     }>;
     camview: {
         views: {
-            _id: string;
-            name: string;
             type: "dnd" | "view";
-            viewSize: 1 | 4 | 6 | 20 | 12 | 10 | 7 | 9 | 13 | 15 | 16 | 26;
+            name: string;
             cameras: {
                 index: number;
                 cameraId: string;
             }[];
+            _id: string;
+            viewSize: 1 | 6 | 4 | 7 | 9 | 10 | 12 | 13 | 15 | 16 | 20 | 26;
         }[];
     };
 }, {
@@ -378,13 +378,13 @@ export declare const userPreferences: zod.ZodObject<{
     }>;
     camview: {
         views: {
-            name: string;
             type: "dnd" | "view";
-            viewSize: 1 | 4 | 6 | 20 | 12 | 10 | 7 | 9 | 13 | 15 | 16 | 26;
+            name: string;
             cameras: {
                 index: number;
                 cameraId: string;
             }[];
+            viewSize: 1 | 6 | 4 | 7 | 9 | 10 | 12 | 13 | 15 | 16 | 20 | 26;
             _id?: string | undefined;
         }[];
     };
@@ -417,44 +417,44 @@ export declare const createUserSchema: zod.ZodEffects<zod.ZodObject<{
                 }>, "many">;
                 type: zod.ZodUnion<[zod.ZodLiteral<"dnd">, zod.ZodLiteral<"view">]>;
             }, "strip", zod.ZodTypeAny, {
-                _id: string;
-                name: string;
                 type: "dnd" | "view";
-                viewSize: 1 | 4 | 6 | 20 | 12 | 10 | 7 | 9 | 13 | 15 | 16 | 26;
+                name: string;
                 cameras: {
                     index: number;
                     cameraId: string;
                 }[];
+                _id: string;
+                viewSize: 1 | 6 | 4 | 7 | 9 | 10 | 12 | 13 | 15 | 16 | 20 | 26;
             }, {
-                name: string;
                 type: "dnd" | "view";
-                viewSize: 1 | 4 | 6 | 20 | 12 | 10 | 7 | 9 | 13 | 15 | 16 | 26;
+                name: string;
                 cameras: {
                     index: number;
                     cameraId: string;
                 }[];
+                viewSize: 1 | 6 | 4 | 7 | 9 | 10 | 12 | 13 | 15 | 16 | 20 | 26;
                 _id?: string | undefined;
             }>, "many">;
         }, "strip", zod.ZodTypeAny, {
             views: {
-                _id: string;
-                name: string;
                 type: "dnd" | "view";
-                viewSize: 1 | 4 | 6 | 20 | 12 | 10 | 7 | 9 | 13 | 15 | 16 | 26;
+                name: string;
                 cameras: {
                     index: number;
                     cameraId: string;
                 }[];
+                _id: string;
+                viewSize: 1 | 6 | 4 | 7 | 9 | 10 | 12 | 13 | 15 | 16 | 20 | 26;
             }[];
         }, {
             views: {
-                name: string;
                 type: "dnd" | "view";
-                viewSize: 1 | 4 | 6 | 20 | 12 | 10 | 7 | 9 | 13 | 15 | 16 | 26;
+                name: string;
                 cameras: {
                     index: number;
                     cameraId: string;
                 }[];
+                viewSize: 1 | 6 | 4 | 7 | 9 | 10 | 12 | 13 | 15 | 16 | 20 | 26;
                 _id?: string | undefined;
             }[];
         }>;
@@ -519,14 +519,14 @@ export declare const createUserSchema: zod.ZodEffects<zod.ZodObject<{
         }>;
         camview: {
             views: {
-                _id: string;
-                name: string;
                 type: "dnd" | "view";
-                viewSize: 1 | 4 | 6 | 20 | 12 | 10 | 7 | 9 | 13 | 15 | 16 | 26;
+                name: string;
                 cameras: {
                     index: number;
                     cameraId: string;
                 }[];
+                _id: string;
+                viewSize: 1 | 6 | 4 | 7 | 9 | 10 | 12 | 13 | 15 | 16 | 20 | 26;
             }[];
         };
     }, {
@@ -542,21 +542,21 @@ export declare const createUserSchema: zod.ZodEffects<zod.ZodObject<{
         }>;
         camview: {
             views: {
-                name: string;
                 type: "dnd" | "view";
-                viewSize: 1 | 4 | 6 | 20 | 12 | 10 | 7 | 9 | 13 | 15 | 16 | 26;
+                name: string;
                 cameras: {
                     index: number;
                     cameraId: string;
                 }[];
+                viewSize: 1 | 6 | 4 | 7 | 9 | 10 | 12 | 13 | 15 | 16 | 20 | 26;
                 _id?: string | undefined;
             }[];
         };
     }>>;
 }, "strict", zod.ZodTypeAny, {
-    _id: string;
     username: string;
     password: string;
+    _id: string;
     passwordConfirm: string;
     role: "admin" | "user";
     sessionTimer: number;
@@ -576,14 +576,14 @@ export declare const createUserSchema: zod.ZodEffects<zod.ZodObject<{
         }>;
         camview: {
             views: {
-                _id: string;
-                name: string;
                 type: "dnd" | "view";
-                viewSize: 1 | 4 | 6 | 20 | 12 | 10 | 7 | 9 | 13 | 15 | 16 | 26;
+                name: string;
                 cameras: {
                     index: number;
                     cameraId: string;
                 }[];
+                _id: string;
+                viewSize: 1 | 6 | 4 | 7 | 9 | 10 | 12 | 13 | 15 | 16 | 20 | 26;
             }[];
         };
     };
@@ -610,21 +610,21 @@ export declare const createUserSchema: zod.ZodEffects<zod.ZodObject<{
         }>;
         camview: {
             views: {
-                name: string;
                 type: "dnd" | "view";
-                viewSize: 1 | 4 | 6 | 20 | 12 | 10 | 7 | 9 | 13 | 15 | 16 | 26;
+                name: string;
                 cameras: {
                     index: number;
                     cameraId: string;
                 }[];
+                viewSize: 1 | 6 | 4 | 7 | 9 | 10 | 12 | 13 | 15 | 16 | 20 | 26;
                 _id?: string | undefined;
             }[];
         };
     } | undefined;
 }>, {
-    _id: string;
     username: string;
     password: string;
+    _id: string;
     passwordConfirm: string;
     role: "admin" | "user";
     sessionTimer: number;
@@ -644,14 +644,14 @@ export declare const createUserSchema: zod.ZodEffects<zod.ZodObject<{
         }>;
         camview: {
             views: {
-                _id: string;
-                name: string;
                 type: "dnd" | "view";
-                viewSize: 1 | 4 | 6 | 20 | 12 | 10 | 7 | 9 | 13 | 15 | 16 | 26;
+                name: string;
                 cameras: {
                     index: number;
                     cameraId: string;
                 }[];
+                _id: string;
+                viewSize: 1 | 6 | 4 | 7 | 9 | 10 | 12 | 13 | 15 | 16 | 20 | 26;
             }[];
         };
     };
@@ -678,13 +678,13 @@ export declare const createUserSchema: zod.ZodEffects<zod.ZodObject<{
         }>;
         camview: {
             views: {
-                name: string;
                 type: "dnd" | "view";
-                viewSize: 1 | 4 | 6 | 20 | 12 | 10 | 7 | 9 | 13 | 15 | 16 | 26;
+                name: string;
                 cameras: {
                     index: number;
                     cameraId: string;
                 }[];
+                viewSize: 1 | 6 | 4 | 7 | 9 | 10 | 12 | 13 | 15 | 16 | 20 | 26;
                 _id?: string | undefined;
             }[];
         };
@@ -731,44 +731,44 @@ export declare const patchUserSchema: zod.ZodEffects<zod.ZodObject<{
                 }>, "many">;
                 type: zod.ZodUnion<[zod.ZodLiteral<"dnd">, zod.ZodLiteral<"view">]>;
             }, "strip", zod.ZodTypeAny, {
-                _id: string;
-                name: string;
                 type: "dnd" | "view";
-                viewSize: 1 | 4 | 6 | 20 | 12 | 10 | 7 | 9 | 13 | 15 | 16 | 26;
+                name: string;
                 cameras: {
                     index: number;
                     cameraId: string;
                 }[];
+                _id: string;
+                viewSize: 1 | 6 | 4 | 7 | 9 | 10 | 12 | 13 | 15 | 16 | 20 | 26;
             }, {
-                name: string;
                 type: "dnd" | "view";
-                viewSize: 1 | 4 | 6 | 20 | 12 | 10 | 7 | 9 | 13 | 15 | 16 | 26;
+                name: string;
                 cameras: {
                     index: number;
                     cameraId: string;
                 }[];
+                viewSize: 1 | 6 | 4 | 7 | 9 | 10 | 12 | 13 | 15 | 16 | 20 | 26;
                 _id?: string | undefined;
             }>, "many">;
         }, "strip", zod.ZodTypeAny, {
             views: {
-                _id: string;
-                name: string;
                 type: "dnd" | "view";
-                viewSize: 1 | 4 | 6 | 20 | 12 | 10 | 7 | 9 | 13 | 15 | 16 | 26;
+                name: string;
                 cameras: {
                     index: number;
                     cameraId: string;
                 }[];
+                _id: string;
+                viewSize: 1 | 6 | 4 | 7 | 9 | 10 | 12 | 13 | 15 | 16 | 20 | 26;
             }[];
         }, {
             views: {
-                name: string;
                 type: "dnd" | "view";
-                viewSize: 1 | 4 | 6 | 20 | 12 | 10 | 7 | 9 | 13 | 15 | 16 | 26;
+                name: string;
                 cameras: {
                     index: number;
                     cameraId: string;
                 }[];
+                viewSize: 1 | 6 | 4 | 7 | 9 | 10 | 12 | 13 | 15 | 16 | 20 | 26;
                 _id?: string | undefined;
             }[];
         }>>;
@@ -833,14 +833,14 @@ export declare const patchUserSchema: zod.ZodEffects<zod.ZodObject<{
         }> | undefined;
         camview?: {
             views: {
-                _id: string;
-                name: string;
                 type: "dnd" | "view";
-                viewSize: 1 | 4 | 6 | 20 | 12 | 10 | 7 | 9 | 13 | 15 | 16 | 26;
+                name: string;
                 cameras: {
                     index: number;
                     cameraId: string;
                 }[];
+                _id: string;
+                viewSize: 1 | 6 | 4 | 7 | 9 | 10 | 12 | 13 | 15 | 16 | 20 | 26;
             }[];
         } | undefined;
     }, {
@@ -856,21 +856,21 @@ export declare const patchUserSchema: zod.ZodEffects<zod.ZodObject<{
         }> | undefined;
         camview?: {
             views: {
-                name: string;
                 type: "dnd" | "view";
-                viewSize: 1 | 4 | 6 | 20 | 12 | 10 | 7 | 9 | 13 | 15 | 16 | 26;
+                name: string;
                 cameras: {
                     index: number;
                     cameraId: string;
                 }[];
+                viewSize: 1 | 6 | 4 | 7 | 9 | 10 | 12 | 13 | 15 | 16 | 20 | 26;
                 _id?: string | undefined;
             }[];
         } | undefined;
     }>>;
 }, "strict", zod.ZodTypeAny, {
-    upload?: MultipartFile | File | undefined;
     username?: string | undefined;
     password?: string | undefined;
+    upload?: MultipartFile | File | undefined;
     passwordConfirm?: string | undefined;
     role?: "admin" | "user" | undefined;
     sessionTimer?: number | undefined;
@@ -890,21 +890,21 @@ export declare const patchUserSchema: zod.ZodEffects<zod.ZodObject<{
         }> | undefined;
         camview?: {
             views: {
-                _id: string;
-                name: string;
                 type: "dnd" | "view";
-                viewSize: 1 | 4 | 6 | 20 | 12 | 10 | 7 | 9 | 13 | 15 | 16 | 26;
+                name: string;
                 cameras: {
                     index: number;
                     cameraId: string;
                 }[];
+                _id: string;
+                viewSize: 1 | 6 | 4 | 7 | 9 | 10 | 12 | 13 | 15 | 16 | 20 | 26;
             }[];
         } | undefined;
     } | undefined;
 }, {
-    upload?: MultipartFile | File | undefined;
     username?: string | undefined;
     password?: string | undefined;
+    upload?: MultipartFile | File | undefined;
     passwordConfirm?: string | undefined;
     role?: "admin" | "user" | undefined;
     sessionTimer?: number | undefined;
@@ -924,21 +924,21 @@ export declare const patchUserSchema: zod.ZodEffects<zod.ZodObject<{
         }> | undefined;
         camview?: {
             views: {
-                name: string;
                 type: "dnd" | "view";
-                viewSize: 1 | 4 | 6 | 20 | 12 | 10 | 7 | 9 | 13 | 15 | 16 | 26;
+                name: string;
                 cameras: {
                     index: number;
                     cameraId: string;
                 }[];
+                viewSize: 1 | 6 | 4 | 7 | 9 | 10 | 12 | 13 | 15 | 16 | 20 | 26;
                 _id?: string | undefined;
             }[];
         } | undefined;
     } | undefined;
 }>, {
-    upload?: MultipartFile | File | undefined;
     username?: string | undefined;
     password?: string | undefined;
+    upload?: MultipartFile | File | undefined;
     passwordConfirm?: string | undefined;
     role?: "admin" | "user" | undefined;
     sessionTimer?: number | undefined;
@@ -958,21 +958,21 @@ export declare const patchUserSchema: zod.ZodEffects<zod.ZodObject<{
         }> | undefined;
         camview?: {
             views: {
-                _id: string;
-                name: string;
                 type: "dnd" | "view";
-                viewSize: 1 | 4 | 6 | 20 | 12 | 10 | 7 | 9 | 13 | 15 | 16 | 26;
+                name: string;
                 cameras: {
                     index: number;
                     cameraId: string;
                 }[];
+                _id: string;
+                viewSize: 1 | 6 | 4 | 7 | 9 | 10 | 12 | 13 | 15 | 16 | 20 | 26;
             }[];
         } | undefined;
     } | undefined;
 }, {
-    upload?: MultipartFile | File | undefined;
     username?: string | undefined;
     password?: string | undefined;
+    upload?: MultipartFile | File | undefined;
     passwordConfirm?: string | undefined;
     role?: "admin" | "user" | undefined;
     sessionTimer?: number | undefined;
@@ -992,13 +992,13 @@ export declare const patchUserSchema: zod.ZodEffects<zod.ZodObject<{
         }> | undefined;
         camview?: {
             views: {
-                name: string;
                 type: "dnd" | "view";
-                viewSize: 1 | 4 | 6 | 20 | 12 | 10 | 7 | 9 | 13 | 15 | 16 | 26;
+                name: string;
                 cameras: {
                     index: number;
                     cameraId: string;
                 }[];
+                viewSize: 1 | 6 | 4 | 7 | 9 | 10 | 12 | 13 | 15 | 16 | 20 | 26;
                 _id?: string | undefined;
             }[];
         } | undefined;

package/dist/server/src/api/services/cameras.service.d.ts

@@ -1,6 +1,6 @@
-import type { CameraExtension } from '../../plugins/types.js';
+import type { Camera, CameraExtension, CameraZone } from '@camera.ui/types';
 import type { DeepPartial } from '../../types.js';
-import type { Camera, CameraInputSettings, CameraZone, DBCamera } from '../database/types.js';
+import type { DBCamera } from '../database/types.js';
 export declare class CamerasService {
     private configService;
     private api;
@@ -39,14 +39,15 @@ export declare class CamerasService {
     removeByPluginIdAndName(cameraname: string, pluginId: string): Promise<void>;
     removeAll(): Promise<void>;
     transformCamera(camera: DBCamera): Camera;
-    addCameraSources(cameraname: string, sources: CameraInputSettings[]): Promise<void>;
-    removeCameraSources(cameraname: string, sources: CameraInputSettings[]): Promise<void>;
+    private addInternalSources;
+    private addCameraSourcesToConfig;
+    private removeCameraSourcesFromConfig;
     private sourceExistAndEqual;
     private generateWsUrls;
     private generateRTSPUrls;
-    private generateFFmpegUrls;
     private generateWWWUrls;
     private extensionIsEnabled;
     private defaultZone;
     private convertToDetectionZones;
+    private isInternalSource;
 }