@camera.ui/server 2.0.14 → 2.0.16

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

@@ -5,6 +5,8 @@ export declare class AuthService {
     constructor();
     listTokens(): DBToken[];
     listTokensByUserId(userId: string): DBToken[];
+    listSessionsByUserId(userId: string): DBToken[];
+    listApiTokensByUserId(userId: string): DBToken[];
     findById(id: string): DBToken | undefined;
     findByAccessToken(access_token: string): DBToken | undefined;
     findByRefreshToken(refresh_token: string): DBToken | undefined;
@@ -13,7 +15,9 @@ export declare class AuthService {
     invalidateById(id: string): Promise<void>;
     invalidateByAccessToken(access_token: string): Promise<void>;
     invalidateByUserId(userId: string): Promise<void>;
+    invalidateSessionsByUserId(userId: string): Promise<void>;
     invalidateAll(): Promise<void>;
+    invalidateAllSessions(): Promise<void>;
     invalidateFamily(parentTokenId: string): Promise<number>;
     bumpLastSeen(tokenId: string, ip: string): Promise<void>;
     createToken(params: {
@@ -27,6 +31,11 @@ export declare class AuthService {
         ip: string;
         parentTokenId?: string;
     }): DBToken;
+    createApiToken(params: {
+        userId: string;
+        name: string;
+        ip: string;
+    }): DBToken;
     rotate(oldToken: DBToken, newAccessToken: string): Promise<DBToken>;
     mergeDevice(token: DBToken, patch: Partial<DBTokenDevice>): DBToken;
     private generateRefreshToken;

package/dist/server/src/api/services/auth.service.js

@@ -10,7 +10,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 import { mergeWith } from '@camera.ui/common/utils';
 import { randomBytes, randomUUID } from 'node:crypto';
 import { container, delay, registry } from 'tsyringe';
-import { TOKEN_LIFETIME } from '../types/index.js';
+import { API_TOKEN_PREFIX, TOKEN_LIFETIME } from '../types/index.js';
 import { SocketService } from '../websocket/index.js';
 let AuthService = class AuthService {
     dbs;
@@ -25,6 +25,12 @@ let AuthService = class AuthService {
     listTokensByUserId(userId) {
         return this.listTokens().filter((t) => t.user_id === userId);
     }
+    listSessionsByUserId(userId) {
+        return this.listTokensByUserId(userId).filter((t) => t.type !== 'api');
+    }
+    listApiTokensByUserId(userId) {
+        return this.listTokensByUserId(userId).filter((t) => t.type === 'api');
+    }
     findById(id) {
         return this.dbs.tokensDB.get(id);
     }
@@ -68,12 +74,20 @@ let AuthService = class AuthService {
         const tokens = this.listTokensByUserId(userId);
         await Promise.all(tokens.map((t) => this.invalidateById(t.id)));
     }
+    async invalidateSessionsByUserId(userId) {
+        const tokens = this.listSessionsByUserId(userId);
+        await Promise.all(tokens.map((t) => this.invalidateById(t.id)));
+    }
     async invalidateAll() {
         const tokens = this.listTokens();
         await this.dbs.tokensDB.clearAsync();
         for (const token of tokens)
             this.unauthenticateToken(token.access_token);
     }
+    async invalidateAllSessions() {
+        const tokens = this.listTokens().filter((t) => t.type !== 'api');
+        await Promise.all(tokens.map((t) => this.invalidateById(t.id)));
+    }
     async invalidateFamily(parentTokenId) {
         const family = this.listTokens().filter((t) => t.parent_token_id === parentTokenId || t.id === parentTokenId);
         await Promise.all(family.map((t) => this.invalidateById(t.id)));
@@ -113,6 +127,29 @@ let AuthService = class AuthService {
             parent_token_id: params.parentTokenId,
         };
     }
+    createApiToken(params) {
+        const now = Date.now();
+        const id = randomUUID();
+        return {
+            id,
+            user_id: params.userId,
+            access_token: `${API_TOKEN_PREFIX}${randomBytes(32).toString('base64url')}`,
+            refresh_token: '',
+            refresh_token_expires_at: 0,
+            persistent: true,
+            type: 'api',
+            name: params.name,
+            device: {
+                id: `api_${id}`,
+                name: params.name,
+                kind: 'web',
+                user_agent: '',
+                ip: params.ip,
+                created_at: now,
+                last_seen_at: now,
+            },
+        };
+    }
     async rotate(oldToken, newAccessToken) {
         const now = Date.now();
         const window = oldToken.persistent ? TOKEN_LIFETIME.REFRESH_PERSISTENT_MS : TOKEN_LIFETIME.REFRESH_NON_PERSISTENT_MS;

package/dist/server/src/api/services/auth.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"auth.service.js","sourceRoot":"","sources":["../../../../../src/api/services/auth.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"auth.service.js","sourceRoot":"","sources":["../../../../../src/api/services/auth.service.ts"],"names":[],"mappings":"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"}

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

@@ -1,3 +1,4 @@
+import type { AutomationRun } from '../../automations/trace.js';
 import type { DBAutomation } from '../database/types.js';
 import type { CreateAutomationInput, ImportBlueprintInput, PatchAutomationInput } from '../schemas/automations.schema.js';
 export declare class AutomationsService {
@@ -9,6 +10,10 @@ export declare class AutomationsService {
     create(input: CreateAutomationInput): Promise<DBAutomation>;
     update(id: string, input: PatchAutomationInput): Promise<DBAutomation | undefined>;
     delete(id: string): Promise<boolean>;
+    addRun(run: AutomationRun): Promise<void>;
+    listRuns(flowId: string, limit?: number): AutomationRun[];
+    saveLastTriggerContext(flowId: string, payload: Record<string, unknown>): void;
+    getLastTriggerContext(flowId: string): Record<string, unknown> | undefined;
     setLastRun(id: string, lastRun: DBAutomation['lastRun']): Promise<void>;
     disableFlowsReferencingCamera(cameraId: string): Promise<DBAutomation[]>;
     importBlueprint(input: ImportBlueprintInput): Promise<DBAutomation>;
@@ -19,6 +24,7 @@ export declare class AutomationsService {
         edges: DBAutomation['edges'];
     } | undefined;
     private ensureWebhookSecrets;
+    private clearRunState;
     private notifyEngine;
     private notifyEngineDeleted;
 }

package/dist/server/src/api/services/automations.service.js

@@ -1,5 +1,9 @@
 import { randomBytes } from 'node:crypto';
 import { container } from 'tsyringe';
+import { normalizeSwitchCaseHandles } from '../../automations/switchHandles.js';
+const RUN_PREFIX = 'run:';
+const CONTEXT_PREFIX = 'context:';
+const MAX_RUNS_PER_FLOW = 50;
 export class AutomationsService {
     dbs;
     logger;
@@ -58,10 +62,29 @@ export class AutomationsService {
         if (!automation)
             return false;
         await this.dbs.automationsDB.remove(id);
+        await this.clearRunState(id);
         this.logger.log(`Automation deleted: ${automation.name} (${id})`);
         this.notifyEngineDeleted(id);
         return true;
     }
+    async addRun(run) {
+        const key = `${RUN_PREFIX}${run.flowId}:${String(run.startedAt).padStart(15, '0')}`;
+        await this.dbs.automationStateDB.put(key, run);
+        const keys = [...this.dbs.automationStateDB.getRange({ start: `${RUN_PREFIX}${run.flowId}:`, end: `${RUN_PREFIX}${run.flowId}:￿` })].map((e) => e.key);
+        if (keys.length > MAX_RUNS_PER_FLOW) {
+            await Promise.all(keys.slice(0, keys.length - MAX_RUNS_PER_FLOW).map((k) => this.dbs.automationStateDB.remove(k)));
+        }
+    }
+    listRuns(flowId, limit = MAX_RUNS_PER_FLOW) {
+        const runs = [...this.dbs.automationStateDB.getRange({ start: `${RUN_PREFIX}${flowId}:`, end: `${RUN_PREFIX}${flowId}:￿` })].map((e) => e.value);
+        return runs.slice(-limit).reverse();
+    }
+    saveLastTriggerContext(flowId, payload) {
+        this.dbs.automationStateDB.put(`${CONTEXT_PREFIX}${flowId}`, payload);
+    }
+    getLastTriggerContext(flowId) {
+        return this.dbs.automationStateDB.get(`${CONTEXT_PREFIX}${flowId}`);
+    }
     async setLastRun(id, lastRun) {
         const automation = this.getById(id);
         if (!automation)
@@ -69,14 +92,12 @@ export class AutomationsService {
         automation.lastRun = lastRun;
         await this.dbs.automationsDB.put(id, automation);
     }
-    // Disable any flow whose nodes reference the given camera and flag it for update.
-    // Returns the affected flows so callers (e.g. AutomationEngine) can react.
     async disableFlowsReferencingCamera(cameraId) {
         const affected = [];
         for (const { value: flow } of this.dbs.automationsDB.getRange()) {
             if (flow.requiresUpdate)
                 continue;
-            if (!flow.nodes.some((n) => n.data.cameraId === cameraId))
+            if (!flow.nodes.some((n) => n.data.cameraId === cameraId || n.data.targetId === cameraId))
                 continue;
             flow.requiresUpdate = true;
             flow.enabled = false;
@@ -101,11 +122,15 @@ export class AutomationsService {
             source: idMap.get(edge.source) ?? edge.source,
             target: idMap.get(edge.target) ?? edge.target,
         }));
+        const flow = { nodes, edges };
+        if (input.version === 1) {
+            normalizeSwitchCaseHandles(flow);
+        }
         return this.create({
             name: input.name,
             enabled: false,
-            nodes,
-            edges,
+            nodes: flow.nodes,
+            edges: flow.edges,
             suppressDuplicates: false,
             singleExecution: false,
         });
@@ -115,7 +140,7 @@ export class AutomationsService {
         if (!automation)
             return undefined;
         return {
-            version: 1,
+            version: 2,
             name: automation.name,
             nodes: automation.nodes,
             edges: automation.edges,
@@ -141,6 +166,11 @@ export class AutomationsService {
             return node;
         });
     }
+    async clearRunState(flowId) {
+        const keys = [...this.dbs.automationStateDB.getRange({ start: `${RUN_PREFIX}${flowId}:`, end: `${RUN_PREFIX}${flowId}:￿` })].map((e) => e.key);
+        await Promise.all(keys.map((k) => this.dbs.automationStateDB.remove(k)));
+        await this.dbs.automationStateDB.remove(`${CONTEXT_PREFIX}${flowId}`);
+    }
     notifyEngine(flowId) {
         try {
             const engine = container.resolve('automationEngine');

package/dist/server/src/api/services/automations.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"automations.service.js","sourceRoot":"","sources":["../../../../../src/api/services/automations.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"automations.service.js","sourceRoot":"","sources":["../../../../../src/api/services/automations.service.ts"],"names":[],"mappings":"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"}

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

@@ -1,5 +1,8 @@
 import type { MultipartFile } from '@fastify/multipart';
 import type { BackupStorage, UiLocalStorage } from '../types/index.js';
+export type UploadedBackupFile = MultipartFile & {
+    filepath?: string;
+};
 export declare class BackupService {
     private static activeOperation;
     private logger;
@@ -7,9 +10,11 @@ export declare class BackupService {
     private pluginsService;
     constructor();
     createBackup(localStorage?: Partial<UiLocalStorage>, extraExcludePaths?: string[]): Promise<BackupStorage>;
-    restoreBackup(file: MultipartFile): Promise<any>;
+    restoreBackup(file: UploadedBackupFile): Promise<any>;
     removeBackup(backup: BackupStorage): Promise<void>;
     private acquireLock;
     private runCreateBackup;
+    private ensureStartupComplete;
+    private removeUploadedFile;
     private runRestoreBackup;
 }

package/dist/server/src/api/services/backup.service.js

@@ -1,7 +1,7 @@
-import { copy, pathExists, readJson, remove, writeJson } from 'fs-extra/esm';
+import { copy, move, pathExists, readJson, remove, writeJson } from 'fs-extra/esm';
 import { lstat, mkdtemp, writeFile } from 'node:fs/promises';
 import { platform, tmpdir } from 'node:os';
-import { join, resolve, sep } from 'node:path';
+import { dirname, join, resolve, sep } from 'node:path';
 import { c, x } from 'tar';
 import { container } from 'tsyringe';
 import { ConfigService } from '../../services/config/index.js';
@@ -28,12 +28,19 @@ export class BackupService {
         }
     }
     async restoreBackup(file) {
-        this.acquireLock('restore');
+        try {
+            this.acquireLock('restore');
+        }
+        catch (error) {
+            await this.removeUploadedFile(file);
+            throw error;
+        }
         try {
             return await this.runRestoreBackup(file);
         }
         finally {
             BackupService.activeOperation = null;
+            await this.removeUploadedFile(file);
         }
     }
     async removeBackup(backup) {
@@ -116,11 +123,27 @@ export class BackupService {
             backupFileName,
         };
     }
+    ensureStartupComplete() {
+        const cameraui = container.resolve('cameraui');
+        if (cameraui.status !== 'ready') {
+            throw new Error('The server is still starting up. Please wait a moment and try again.');
+        }
+    }
+    async removeUploadedFile(file) {
+        if (file.filepath) {
+            await remove(dirname(file.filepath)).catch(() => { });
+        }
+    }
     async runRestoreBackup(file) {
+        this.ensureStartupComplete();
         const backupDirectory = await mkdtemp(join(tmpdir(), 'cameraui-restore-'));
         const backupFile = join(backupDirectory, 'upload.tar.gz');
-        const fileBuffer = await file.toBuffer();
-        await writeFile(backupFile, fileBuffer);
+        if (file.filepath) {
+            await move(file.filepath, backupFile, { overwrite: true });
+        }
+        else {
+            await writeFile(backupFile, await file.toBuffer());
+        }
         await x({
             cwd: backupDirectory,
             file: backupFile,

package/dist/server/src/api/services/backup.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"backup.service.js","sourceRoot":"","sources":["../../../../../src/api/services/backup.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC7E,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7D,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAC3C,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,WAAW,CAAC;AAC/C,OAAO,EAAE,CAAC,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAC3B,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAErC,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAC/D,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAClD,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAMtD,MAAM,OAAO,aAAa;IAChB,MAAM,CAAC,eAAe,GAAgC,IAAI,CAAC;IAE3D,MAAM,CAAgB;IACtB,aAAa,CAAgB;IAC7B,cAAc,CAAiB;IAEvC;QACE,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC,OAAO,CAAgB,QAAQ,CAAC,CAAC;QACzD,IAAI,CAAC,aAAa,GAAG,SAAS,CAAC,OAAO,CAAgB,eAAe,CAAC,CAAC;QAEvE,IAAI,CAAC,cAAc,GAAG,IAAI,cAAc,EAAE,CAAC;IAC7C,CAAC;IAEM,KAAK,CAAC,YAAY,CAAC,eAAwC,EAAE,EAAE,oBAA8B,EAAE;QACpG,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;QAE3B,IAAI,CAAC;YACH,OAAO,MAAM,IAAI,CAAC,eAAe,CAAC,YAAY,EAAE,iBAAiB,CAAC,CAAC;QACrE,CAAC;gBAAS,CAAC;YACT,aAAa,CAAC,eAAe,GAAG,IAAI,CAAC;QACvC,CAAC;IACH,CAAC;IAEM,KAAK,CAAC,aAAa,CAAC,IAAmB;QAC5C,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;QAE5B,IAAI,CAAC;YACH,OAAO,MAAM,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC;QAC3C,CAAC;gBAAS,CAAC;YACT,aAAa,CAAC,eAAe,GAAG,IAAI,CAAC;QACvC,CAAC;IACH,CAAC;IAEM,KAAK,CAAC,YAAY,CAAC,MAAqB;QAC7C,MAAM,MAAM,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;IACvC,CAAC;IAEO,WAAW,CAAC,SAA+B;QACjD,IAAI,aAAa,CAAC,eAAe,EAAE,CAAC;YAClC,MAAM,IAAI,KAAK,CAAC,KAAK,aAAa,CAAC,eAAe,gFAAgF,CAAC,CAAC;QACtI,CAAC;QACD,aAAa,CAAC,eAAe,GAAG,SAAS,CAAC;IAC5C,CAAC;IAEO,KAAK,CAAC,eAAe,CAAC,YAAqC,EAAE,iBAA2B;QAC9F,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAC7B,MAAM,eAAe,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,mBAAmB,CAAC,CAAC,CAAC;QAC3E,MAAM,cAAc,GAAG,oBAAoB,SAAS,SAAS,CAAC;QAC9D,MAAM,UAAU,GAAG,IAAI,CAAC,eAAe,EAAE,cAAc,CAAC,CAAC;QAEzD,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,wBAAwB,CAAC,CAAC;QAE1C,MAAM,OAAO,GAAG,IAAI,CAAC,cAAc,CAAC,WAAW,EAAE,CAAC;QAClD,MAAM,WAAW,GAAuB,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAoB,EAAE,CAAC,CAAC;YACjF,EAAE,EAAE,MAAM,CAAC,EAAE;YACb,IAAI,EAAE,MAAM,CAAC,UAAU;YACvB,OAAO,EAAE,MAAM,CAAC,IAAI,CAAC,gBAAgB,IAAI,QAAQ;SAClD,CAAC,CAAC,CAAC;QAEJ,MAAM,YAAY,GAAG;YACnB,IAAI,CAAC,aAAa,CAAC,oBAAoB;YACvC,IAAI,CAAC,aAAa,CAAC,SAAS;YAC5B,IAAI,CAAC,aAAa,CAAC,QAAQ;YAC3B,IAAI,CAAC,aAAa,CAAC,SAAS;YAC5B,IAAI,CAAC,aAAa,CAAC,YAAY;YAC/B,IAAI,CAAC,aAAa,CAAC,gBAAgB;YACnC,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM;YACpC,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ;YACtC,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO;YACrC,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,YAAY,EAAE,iBAAiB,CAAC;YACxD,GAAG,iBAAiB;SACrB,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;QAE/B,MAAM,UAAU,GAAG,CAAC,QAAgB,EAAW,EAAE;YAC/C,MAAM,UAAU,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;YACrC,OAAO,YAAY,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,UAAU,KAAK,QAAQ,IAAI,UAAU,CAAC,UAAU,CAAC,QAAQ,GAAG,GAAG,CAAC,CAAC,CAAC;QAC3G,CAAC,CAAC;QAEF,MAAM,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,YAAY,EAAE,IAAI,CAAC,eAAe,EAAE,SAAS,CAAC,EAAE;YAC5E,MAAM,EAAE,KAAK,EAAE,QAAgB,EAAE,EAAE;gBACjC,IAAI,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;oBACzB,OAAO,KAAK,CAAC;gBACf,CAAC;gBAED,IAAI,CAAC;oBACH,MAAM,IAAI,GAAG,MAAM,KAAK,CAAC,QAAQ,CAAC,CAAC;oBACnC,IAAI,IAAI,CAAC,WAAW,EAAE,EAAE,CAAC;wBACvB,IAAI,MAAM,UAAU,CAAC,IAAI,CAAC,QAAQ,EAAE,eAAe,CAAC,CAAC,EAAE,CAAC;4BACtD,OAAO,KAAK,CAAC;wBACf,CAAC;wBACD,OAAO,IAAI,CAAC;oBACd,CAAC;oBACD,OAAO,IAAI,CAAC,MAAM,EAAE,CAAC;gBACvB,CAAC;gBAAC,MAAM,CAAC;oBACP,OAAO,KAAK,CAAC;gBACf,CAAC;YACH,CAAC;SACF,CAAC,CAAC;QAEH,MAAM,IAAI,GAAe;YACvB,SAAS;YACT,QAAQ,EAAE,QAAQ,EAAE;YACpB,IAAI,EAAE,OAAO,CAAC,OAAO;YACrB,OAAO,EAAE,aAAa,CAAC,OAAO;YAC9B,OAAO,EAAE,WAAW;YACpB,YAAY,EAAE,YAAY;SAC3B,CAAC;QAEF,MAAM,SAAS,CAAC,IAAI,CAAC,eAAe,EAAE,uBAAuB,CAAC,EAAE,IAAI,CAAC,CAAC;QAEtE,MAAM,CAAC,CACL;YACE,QAAQ,EAAE,IAAI;YACd,IAAI,EAAE,IAAI;YACV,IAAI,EAAE,UAAU;YAChB,GAAG,EAAE,eAAe;SACrB,EACD,CAAC,SAAS,EAAE,uBAAuB,CAAC,CACrC,CAAC;QAEF,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,iCAAiC,CAAC,CAAC;QAEnD,OAAO;YACL,eAAe;YACf,UAAU;YACV,cAAc;SACf,CAAC;IACJ,CAAC;IAEO,KAAK,CAAC,gBAAgB,CAAC,IAAmB;QAChD,MAAM,eAAe,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,mBAAmB,CAAC,CAAC,CAAC;QAC3E,MAAM,UAAU,GAAG,IAAI,CAAC,eAAe,EAAE,eAAe,CAAC,CAAC;QAC1D,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAC;QAEzC,MAAM,SAAS,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;QAExC,MAAM,CAAC,CAAC;YACN,GAAG,EAAE,eAAe;YACpB,IAAI,EAAE,UAAU;SACjB,CAAC,CAAC;QAEH,MAAM,QAAQ,GAAG,IAAI,CAAC,eAAe,EAAE,uBAAuB,CAAC,CAAC;QAChE,MAAM,WAAW,GAAG,IAAI,CAAC,eAAe,EAAE,SAAS,CAAC,CAAC;QAErD,IAAI,CAAC,CAAC,MAAM,UAAU,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,UAAU,CAAC,WAAW,CAAC,CAAC,EAAE,CAAC;YACtE,MAAM,MAAM,CAAC,eAAe,CAAC,CAAC;YAC9B,MAAM,IAAI,KAAK,CAAC,wDAAwD,CAAC,CAAC;QAC5E,CAAC;QAED,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,4BAA4B,CAAC,CAAC;QAEpD,MAAM,QAAQ,GAAe,MAAM,QAAQ,CAAC,QAAQ,CAAC,CAAC;QAEtD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,6BAA6B,EAAE,QAAQ,CAAC,CAAC;QAE3D,MAAM,SAAS,CAAC,WAAW,EAAE,IAAI,CAAC,aAAa,CAAC,YAAY,EAAE;YAC5D,SAAS,EAAE,IAAI;SAChB,CAAC,CAAC;QAEH,MAAM,SAAS,CAAC,QAAQ,EAAE,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,YAAY,EAAE,uBAAuB,CAAC,EAAE;YACxF,SAAS,EAAE,IAAI;SAChB,CAAC,CAAC;QAEH,MAAM,SAAS,CAAC,IAAI,CAAC,aAAa,CAAC,2BAA2B,EAAE,EAAE,CAAC,CAAC;QAEpE,MAAM,MAAM,CAAC,eAAe,CAAC,CAAC;QAE9B,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,kCAAkC,CAAC,CAAC;QAEpD,OAAO,QAAQ,CAAC,YAAY,CAAC;IAC/B,CAAC"}
+{"version":3,"file":"backup.service.js","sourceRoot":"","sources":["../../../../../src/api/services/backup.service.ts"],"names":[],"mappings":"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"}

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

@@ -28,6 +28,8 @@ export declare class CamerasService {
     findTransformedById(id: string): Camera | undefined;
     findByName(cameraname: string): DBCamera | undefined;
     findTransformedByName(cameraname: string): Camera | undefined;
+    findByConflictingName(cameraname: string, excludeId?: string): DBCamera | undefined;
+    availableName(base: string): string;
     findByPluginAndName(cameraname: string, pluginId: string): DBCamera | undefined;
     findTransformedByPluginAndName(cameraname: string, pluginId: string): Camera | undefined;
     patchCameraByName(cameraname: string, cameraData: DeepPartial<DBCamera>): Promise<DBCamera | undefined>;

package/dist/server/src/api/services/cameras.service.js

@@ -11,9 +11,9 @@ import { isEqual, mergeWith } from '@camera.ui/common/utils';
 import { canCreateCameras, isHub, PluginRole, SensorType } from '@camera.ui/sdk';
 import { TTLCache } from '@isaacs/ttlcache';
 import { container, delay, registry } from 'tsyringe';
-import { getMultiProviderTypes, getValidSensorTypes, SENSOR_TYPE_CONFIG, VIRTUAL_SENSOR_OWNER_ID } from '../../camera/sensors/types.js';
+import { getMultiProviderTypes, getSingleProviderTypes, getValidSensorTypes, SENSOR_TYPE_CONFIG, VIRTUAL_SENSOR_OWNER_ID } from '../../camera/sensors/types.js';
 import { ConfigService } from '../../services/config/index.js';
-import { applySourceUrlFlags, createSourceName } from '../../utils/camera.js';
+import { applySourceUrlFlags, createSourceName, normalizeCameraName } from '../../utils/camera.js';
 import { Database } from '../database/index.js';
 import { PluginsService } from './plugins.service.js';
 import { UsersService } from './users.service.js';
@@ -37,6 +37,9 @@ let CamerasService = class CamerasService {
         this.pluginsService = new PluginsService();
     }
     async createCamera(cameraData) {
+        if (this.findByConflictingName(cameraData.name)) {
+            throw new Error(`Camera name "${cameraData.name}" is already in use`);
+        }
         const plugin = this.pluginsService.getPluginById(cameraData.pluginInfo?.id ?? '');
         if (plugin) {
             if (!canCreateCameras(plugin.contract)) {
@@ -181,6 +184,23 @@ let CamerasService = class CamerasService {
         const camera = this.findByName(cameraname);
         return camera ? this.transformCamera(camera) : undefined;
     }
+    findByConflictingName(cameraname, excludeId) {
+        const normalized = normalizeCameraName(cameraname);
+        for (const { value } of this.dbs.camerasDB.getRange()) {
+            if (value._id !== excludeId && normalizeCameraName(value.name) === normalized)
+                return value;
+        }
+        return undefined;
+    }
+    availableName(base) {
+        if (!this.findByConflictingName(base))
+            return base;
+        for (let i = 2;; i++) {
+            const candidate = `${base} ${i}`;
+            if (!this.findByConflictingName(candidate))
+                return candidate;
+        }
+    }
     findByPluginAndName(cameraname, pluginId) {
         for (const { value } of this.dbs.camerasDB.getRange()) {
             if (value.name === cameraname && value.pluginInfo?.id === pluginId)
@@ -196,10 +216,14 @@ let CamerasService = class CamerasService {
         const camera = this.findByName(cameraname);
         if (!camera)
             return undefined;
+        if (cameraData.name && this.findByConflictingName(cameraData.name, camera._id)) {
+            throw new Error(`Camera name "${cameraData.name}" is already in use`);
+        }
         const cameraController = this.api.getCamera(camera._id);
         const cameraOld = structuredClone(camera);
+        const isInputSourceArray = (value) => Array.isArray(value) && value.every((item) => item && typeof item === 'object');
         mergeWith(camera, cameraData, (source, target, key) => {
-            if (key === 'sources') {
+            if (key === 'sources' && isInputSourceArray(source) && isInputSourceArray(target)) {
                 return target.map((srcItem) => {
                     const objItem = source.find((o) => o.name === srcItem.name);
                     const sourceId = objItem?._id ?? srcItem._id;
@@ -370,7 +394,7 @@ let CamerasService = class CamerasService {
             return camera;
         }
         camera.plugins = camera.plugins.filter((p) => p.name !== plugin.pluginName);
-        const singleProviderKeys = ['motion', 'object', 'audio', 'face', 'licensePlate', 'ptz', 'battery', 'cameraController'];
+        const singleProviderKeys = [...getSingleProviderTypes().map((type) => SENSOR_TYPE_CONFIG[type].assignmentKey), 'cameraController'];
         for (const key of singleProviderKeys) {
             const assignment = camera.assignments[key];
             if (assignment && !Array.isArray(assignment) && assignment.name === plugin.pluginName) {