@camera.ui/server 2.1.3 → 2.1.4

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

@@ -74,20 +74,32 @@ let CamerasService = class CamerasService {
         return (await this.activateDefaultExtensions(cameraData)) ?? cameraData;
     }
     async patchZones(cameraname, zoneData) {
-        const camera = this.findByName(cameraname);
+        const existing = this.findByName(cameraname);
+        if (!existing)
+            return undefined;
+        const camera = await this.dbs.commit(this.dbs.camerasDB, existing._id, (current) => {
+            if (!current)
+                return undefined;
+            current.detectionZones = zoneData;
+            return current;
+        });
         if (!camera)
             return undefined;
-        camera.detectionZones = zoneData;
-        await this.dbs.camerasDB.put(camera._id, camera);
         this.api.updateCamera(this.transformCamera(camera));
         return camera;
     }
     async patchLines(cameraname, lineData) {
-        const camera = this.findByName(cameraname);
+        const existing = this.findByName(cameraname);
+        if (!existing)
+            return undefined;
+        const camera = await this.dbs.commit(this.dbs.camerasDB, existing._id, (current) => {
+            if (!current)
+                return undefined;
+            current.detectionLines = lineData;
+            return current;
+        });
         if (!camera)
             return undefined;
-        camera.detectionLines = lineData;
-        await this.dbs.camerasDB.put(camera._id, camera);
         this.api.updateCamera(this.transformCamera(camera));
         return camera;
     }
@@ -97,21 +109,19 @@ let CamerasService = class CamerasService {
     listTransformed() {
         return this.list().map((camera) => this.transformCamera(camera));
     }
-    // Called once at startup to remove references to uninstalled plugins
     async cleanupNonExistentPlugins() {
         const existingPluginNames = new Set(this.pluginsService.listPlugins().map((p) => p.pluginName));
-        const tasks = [];
-        for (const { value: camera } of this.dbs.camerasDB.getRange()) {
-            let processedCamera = this.migrateAssignments(camera);
+        const cameraIds = [...this.dbs.camerasDB.getRange()].map(({ value }) => value._id);
+        await Promise.all(cameraIds.map((cameraId) => this.dbs.commit(this.dbs.camerasDB, cameraId, (current) => {
+            if (!current)
+                return undefined;
+            let processedCamera = this.migrateAssignments(current);
             const { camera: afterNonExistent, modified: mod1 } = this.cleanupPlugins(processedCamera, existingPluginNames);
             processedCamera = afterNonExistent;
             const { camera: afterDeselected, modified: mod2 } = this.cleanupDeselectedPluginAssignments(processedCamera);
             processedCamera = afterDeselected;
-            if (mod1 || mod2) {
-                tasks.push(this.dbs.camerasDB.put(processedCamera._id, processedCamera));
-            }
-        }
-        await Promise.all(tasks);
+            return mod1 || mod2 ? processedCamera : undefined;
+        })));
     }
     listByPluginId(pluginId) {
         const result = [];
@@ -214,41 +224,50 @@ let CamerasService = class CamerasService {
         return camera ? this.transformCamera(camera) : undefined;
     }
     async patchCameraByName(cameraname, cameraData) {
-        const camera = this.findByName(cameraname);
-        if (!camera)
+        const existing = this.findByName(cameraname);
+        if (!existing)
             return undefined;
-        if (cameraData.name && this.findByConflictingName(cameraData.name, camera._id)) {
+        if (cameraData.name && this.findByConflictingName(cameraData.name, existing._id)) {
             throw new Error(`Camera name "${cameraData.name}" is already in use`);
         }
-        const cameraController = this.api.getCamera(camera._id);
-        const cameraOld = structuredClone(camera);
+        const cameraController = this.api.getCamera(existing._id);
+        const cameraOld = structuredClone(existing);
         const isInputSourceArray = (value) => Array.isArray(value) && value.every((item) => item && typeof item === 'object');
-        mergeWith(camera, cameraData, (source, target, key) => {
-            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;
-                    return objItem ? { ...objItem, ...srcItem, _id: sourceId, name: objItem.name } : srcItem;
-                });
-            }
-            if (key === 'plugins' || key === 'assignments') {
-                return source;
-            }
-            if (Array.isArray(source)) {
-                return target;
-            }
-        });
-        if (!isEqual(cameraOld, camera, true)) {
-            if (cameraOld.name !== camera.name) {
+        const applyPatch = (target) => {
+            mergeWith(target, cameraData, (source, mergeTarget, key) => {
+                if (key === 'sources' && isInputSourceArray(source) && isInputSourceArray(mergeTarget)) {
+                    return mergeTarget.map((srcItem) => {
+                        const objItem = source.find((o) => o.name === srcItem.name);
+                        const sourceId = objItem?._id ?? srcItem._id;
+                        return objItem ? { ...objItem, ...srcItem, _id: sourceId, name: objItem.name } : srcItem;
+                    });
+                }
+                if (key === 'plugins' || key === 'assignments') {
+                    return source;
+                }
+                if (Array.isArray(source)) {
+                    return mergeTarget;
+                }
+            });
+        };
+        const patched = structuredClone(existing);
+        applyPatch(patched);
+        if (!isEqual(cameraOld, patched, true)) {
+            if (cameraOld.name !== patched.name) {
                 await this.removeCameraSourcesFromConfig(cameraOld.name, cameraOld.sources);
             }
-            const orphanedSources = cameraOld.sources.filter((source) => !camera.sources.find((s) => s.name === source.name));
-            await this.removeCameraSourcesFromConfig(camera.name, orphanedSources);
+            const orphanedSources = cameraOld.sources.filter((source) => !patched.sources.find((s) => s.name === source.name));
+            await this.removeCameraSourcesFromConfig(patched.name, orphanedSources);
         }
-        await this.addCameraSourcesToConfig(camera._id, camera.name, camera.sources);
-        await this.dbs.camerasDB.put(camera._id, camera);
-        // keep go2rtc's preload section in step with the disabled flag, a go2rtc
-        // restart must not preload a disabled camera
+        await this.addCameraSourcesToConfig(patched._id, patched.name, patched.sources);
+        const camera = await this.dbs.commit(this.dbs.camerasDB, existing._id, (current) => {
+            if (!current)
+                return undefined;
+            applyPatch(current);
+            return current;
+        });
+        if (!camera)
+            return undefined;
         if (cameraOld.disabled !== camera.disabled) {
             this.dbs.syncCamerasToGo2RtcConfig();
         }
@@ -263,116 +282,129 @@ let CamerasService = class CamerasService {
         return camera;
     }
     async enableAssignmentByName(cameraname, pluginNameOrId, assignmentType) {
-        const camera = this.findByName(cameraname);
+        const existing = this.findByName(cameraname);
         const plugin = this.pluginsService.getPluginByName(pluginNameOrId) ?? this.pluginsService.getPluginById(pluginNameOrId);
-        if (!camera || !plugin || !VALID_SENSOR_TYPES.includes(assignmentType) || !camera.plugins.some((p) => p.name === plugin.pluginName)) {
-            return camera;
+        if (!existing || !plugin || !VALID_SENSOR_TYPES.includes(assignmentType) || !existing.plugins.some((p) => p.name === plugin.pluginName)) {
+            return existing;
         }
         const pluginInfo = { id: plugin.id, name: plugin.pluginName };
-        let mutated = false;
-        if (this.isMultiProviderType(assignmentType)) {
-            const key = assignmentType;
-            if (!Array.isArray(camera.assignments[key])) {
-                camera.assignments[assignmentType] = [];
-            }
-            const arr = camera.assignments[key];
-            if (!arr.some((p) => p.name === plugin.pluginName)) {
-                arr.push(pluginInfo);
-                mutated = true;
+        const camera = await this.dbs.commit(this.dbs.camerasDB, existing._id, (current) => {
+            if (!current)
+                return undefined;
+            let mutated = false;
+            if (this.isMultiProviderType(assignmentType)) {
+                const key = assignmentType;
+                if (!Array.isArray(current.assignments[key])) {
+                    current.assignments[assignmentType] = [];
+                }
+                const arr = current.assignments[key];
+                if (!arr.some((p) => p.name === plugin.pluginName)) {
+                    arr.push(pluginInfo);
+                    mutated = true;
+                }
             }
-        }
-        else {
-            const currentAssignment = camera.assignments[assignmentType];
-            const currentName = currentAssignment && !Array.isArray(currentAssignment) ? currentAssignment.name : undefined;
-            if (currentName !== plugin.pluginName) {
-                camera.assignments[assignmentType] = pluginInfo;
+            else {
+                const currentAssignment = current.assignments[assignmentType];
+                const currentName = currentAssignment && !Array.isArray(currentAssignment) ? currentAssignment.name : undefined;
+                if (currentName !== plugin.pluginName) {
+                    current.assignments[assignmentType] = pluginInfo;
+                    mutated = true;
+                }
+            }
+            if (this.clearInvalidObjectAssist(current)) {
                 mutated = true;
             }
-        }
-        if (this.clearInvalidObjectAssist(camera)) {
-            mutated = true;
-        }
-        if (mutated) {
-            await this.dbs.camerasDB.put(camera._id, camera);
+            return mutated ? current : undefined;
+        });
+        if (camera) {
             this.api.updateCamera(this.transformCamera(camera));
         }
-        return camera;
+        return camera ?? existing;
     }
     async disableAssignmentByName(cameraname, pluginNameOrId, assignmentType) {
-        const camera = this.findByName(cameraname);
+        const existing = this.findByName(cameraname);
         const plugin = this.pluginsService.getPluginByName(pluginNameOrId) ?? this.pluginsService.getPluginById(pluginNameOrId);
-        if (!camera || !plugin || !VALID_SENSOR_TYPES.includes(assignmentType) || !camera.plugins.some((p) => p.name === plugin.pluginName)) {
-            return camera;
+        if (!existing || !plugin || !VALID_SENSOR_TYPES.includes(assignmentType) || !existing.plugins.some((p) => p.name === plugin.pluginName)) {
+            return existing;
         }
-        let mutated = false;
-        if (this.isMultiProviderType(assignmentType)) {
-            const key = assignmentType;
-            const currentAssignments = camera.assignments[key];
-            if (Array.isArray(currentAssignments) && currentAssignments.some((p) => p.name === plugin.pluginName)) {
-                camera.assignments[assignmentType] = currentAssignments.filter((p) => p.name !== plugin.pluginName);
-                mutated = true;
+        const camera = await this.dbs.commit(this.dbs.camerasDB, existing._id, (current) => {
+            if (!current)
+                return undefined;
+            let mutated = false;
+            if (this.isMultiProviderType(assignmentType)) {
+                const key = assignmentType;
+                const currentAssignments = current.assignments[key];
+                if (Array.isArray(currentAssignments) && currentAssignments.some((p) => p.name === plugin.pluginName)) {
+                    current.assignments[assignmentType] = currentAssignments.filter((p) => p.name !== plugin.pluginName);
+                    mutated = true;
+                }
             }
-        }
-        else {
-            const currentAssignment = camera.assignments[assignmentType];
-            const currentName = currentAssignment && !Array.isArray(currentAssignment) ? currentAssignment.name : undefined;
-            if (currentName === plugin.pluginName) {
-                camera.assignments[assignmentType] = undefined;
+            else {
+                const currentAssignment = current.assignments[assignmentType];
+                const currentName = currentAssignment && !Array.isArray(currentAssignment) ? currentAssignment.name : undefined;
+                if (currentName === plugin.pluginName) {
+                    current.assignments[assignmentType] = undefined;
+                    mutated = true;
+                }
+            }
+            if (this.clearInvalidObjectAssist(current)) {
                 mutated = true;
             }
-        }
-        if (this.clearInvalidObjectAssist(camera)) {
-            mutated = true;
-        }
-        if (mutated) {
-            await this.dbs.camerasDB.put(camera._id, camera);
+            return mutated ? current : undefined;
+        });
+        if (camera) {
             this.api.updateCamera(this.transformCamera(camera));
         }
-        return camera;
+        return camera ?? existing;
     }
-    // All-in-one: add plugin and enable all its assignments (used by the "More" tab toggle)
     async activatePluginByName(cameraname, pluginNameOrId) {
-        const camera = this.findByName(cameraname);
+        const existing = this.findByName(cameraname);
         const plugin = this.pluginsService.getPluginByName(pluginNameOrId) ?? this.pluginsService.getPluginById(pluginNameOrId);
-        if (!camera || !plugin)
-            return camera;
-        const isNewPlugin = !camera.plugins.some((p) => p.name === plugin.pluginName);
+        if (!existing || !plugin)
+            return existing;
+        const isNewPlugin = !existing.plugins.some((p) => p.name === plugin.pluginName);
         const pluginInfo = { id: plugin.id, name: plugin.pluginName };
-        if (isNewPlugin) {
-            camera.plugins.push(pluginInfo);
-        }
         const contract = plugin.contract;
         const assignmentTypes = contract.role === PluginRole.Hub ? ['hub'] : contract.provides;
-        for (const assignmentType of assignmentTypes) {
-            if (assignmentType === 'hub') {
-                if (!Array.isArray(camera.assignments.hub)) {
-                    camera.assignments.hub = [];
-                }
-                if (!camera.assignments.hub.some((p) => p.name === plugin.pluginName)) {
-                    camera.assignments.hub.push(pluginInfo);
-                }
+        const camera = await this.dbs.commit(this.dbs.camerasDB, existing._id, (current) => {
+            if (!current)
+                return undefined;
+            if (!current.plugins.some((p) => p.name === plugin.pluginName)) {
+                current.plugins.push(pluginInfo);
             }
-            else if (this.isMultiProviderType(assignmentType)) {
-                const key = assignmentType;
-                if (!Array.isArray(camera.assignments[key])) {
-                    camera.assignments[assignmentType] = [];
+            for (const assignmentType of assignmentTypes) {
+                if (assignmentType === 'hub') {
+                    if (!Array.isArray(current.assignments.hub)) {
+                        current.assignments.hub = [];
+                    }
+                    if (!current.assignments.hub.some((p) => p.name === plugin.pluginName)) {
+                        current.assignments.hub.push(pluginInfo);
+                    }
                 }
-                const arr = camera.assignments[key];
-                if (!arr.some((p) => p.name === plugin.pluginName)) {
-                    arr.push(pluginInfo);
+                else if (this.isMultiProviderType(assignmentType)) {
+                    const key = assignmentType;
+                    if (!Array.isArray(current.assignments[key])) {
+                        current.assignments[assignmentType] = [];
+                    }
+                    const arr = current.assignments[key];
+                    if (!arr.some((p) => p.name === plugin.pluginName)) {
+                        arr.push(pluginInfo);
+                    }
                 }
-            }
-            else if (VALID_SENSOR_TYPES.includes(assignmentType)) {
-                // only assign if not already assigned to another plugin
-                const existing = camera.assignments[assignmentType];
-                if (!existing?.name) {
-                    camera.assignments[assignmentType] = pluginInfo;
+                else if (VALID_SENSOR_TYPES.includes(assignmentType)) {
+                    // only assign if not already assigned to another plugin
+                    const assigned = current.assignments[assignmentType];
+                    if (!assigned?.name) {
+                        current.assignments[assignmentType] = pluginInfo;
+                    }
                 }
             }
-        }
-        this.clearInvalidObjectAssist(camera);
+            this.clearInvalidObjectAssist(current);
+            return current;
+        });
+        if (!camera)
+            return undefined;
         const transformedCamera = this.transformCamera(camera);
-        await this.dbs.camerasDB.put(camera._id, camera);
         this.api.updateCamera(transformedCamera);
         if (isNewPlugin) {
             await this.api.selectCamera(plugin.id, transformedCamera);
@@ -380,46 +412,58 @@ let CamerasService = class CamerasService {
         return camera;
     }
     async addPluginByName(cameraname, pluginNameOrId, _assignmentType) {
-        const camera = this.findByName(cameraname);
+        const existing = this.findByName(cameraname);
         const plugin = this.pluginsService.getPluginByName(pluginNameOrId) ?? this.pluginsService.getPluginById(pluginNameOrId);
-        if (!camera || !plugin || camera.plugins.some((p) => p.name === plugin.pluginName)) {
-            return camera;
-        }
-        camera.plugins.push({
-            id: plugin.id,
-            name: plugin.pluginName,
+        if (!existing || !plugin || existing.plugins.some((p) => p.name === plugin.pluginName)) {
+            return existing;
+        }
+        const camera = await this.dbs.commit(this.dbs.camerasDB, existing._id, (current) => {
+            if (!current || current.plugins.some((p) => p.name === plugin.pluginName))
+                return undefined;
+            current.plugins.push({
+                id: plugin.id,
+                name: plugin.pluginName,
+            });
+            return current;
         });
+        if (!camera)
+            return existing;
         const transformedCamera = this.transformCamera(camera);
-        await this.dbs.camerasDB.put(camera._id, camera);
         this.api.updateCamera(transformedCamera);
         // backend filters which sensors are shown based on assignments
         await this.api.selectCamera(plugin.id, transformedCamera);
         return camera;
     }
     async removePluginByName(cameraname, pluginNameOrId) {
-        const camera = this.findByName(cameraname);
+        const existing = this.findByName(cameraname);
         const plugin = this.pluginsService.getPluginByName(pluginNameOrId) ?? this.pluginsService.getPluginById(pluginNameOrId);
-        if (!camera || !plugin || !camera.plugins.some((p) => p.name === plugin.pluginName)) {
-            return camera;
-        }
-        camera.plugins = camera.plugins.filter((p) => p.name !== plugin.pluginName);
-        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) {
-                camera.assignments[key] = undefined;
+        if (!existing || !plugin || !existing.plugins.some((p) => p.name === plugin.pluginName)) {
+            return existing;
+        }
+        const camera = await this.dbs.commit(this.dbs.camerasDB, existing._id, (current) => {
+            if (!current)
+                return undefined;
+            current.plugins = current.plugins.filter((p) => p.name !== plugin.pluginName);
+            const singleProviderKeys = [...getSingleProviderTypes().map((type) => SENSOR_TYPE_CONFIG[type].assignmentKey), 'cameraController'];
+            for (const key of singleProviderKeys) {
+                const assignment = current.assignments[key];
+                if (assignment && !Array.isArray(assignment) && assignment.name === plugin.pluginName) {
+                    current.assignments[key] = undefined;
+                }
             }
-        }
-        for (const sensorType of [...getMultiProviderTypes(), 'hub']) {
-            const key = sensorType === 'hub' ? 'hub' : SENSOR_TYPE_CONFIG[sensorType].assignmentKey;
-            const assignments = camera.assignments[key];
-            if (Array.isArray(assignments)) {
-                camera.assignments[key] = assignments.filter((p) => p.name !== plugin.pluginName);
+            for (const sensorType of [...getMultiProviderTypes(), 'hub']) {
+                const key = sensorType === 'hub' ? 'hub' : SENSOR_TYPE_CONFIG[sensorType].assignmentKey;
+                const assignments = current.assignments[key];
+                if (Array.isArray(assignments)) {
+                    current.assignments[key] = assignments.filter((p) => p.name !== plugin.pluginName);
+                }
             }
-        }
-        this.clearInvalidObjectAssist(camera);
+            this.clearInvalidObjectAssist(current);
+            return current;
+        });
+        if (!camera)
+            return undefined;
         const transformedCamera = this.transformCamera(camera);
-        await this.dbs.camerasDB.put(camera._id, camera);
         await this.api.deselectCamera(plugin.id, transformedCamera);
         this.api.updateCamera(transformedCamera);
         return camera;
@@ -428,25 +472,30 @@ let CamerasService = class CamerasService {
         const plugin = this.pluginsService.getPluginByName(pluginNameOrId) ?? this.pluginsService.getPluginById(pluginNameOrId);
         if (!plugin)
             return;
-        for (const { value: camera } of this.dbs.camerasDB.getRange()) {
-            if (!camera.plugins.some((p) => p.name === plugin.pluginName))
-                continue;
-            camera.plugins = camera.plugins.filter((p) => p.name !== plugin.pluginName);
-            if (this.isMultiProviderType(assignmentType)) {
-                const key = assignmentType;
-                const currentAssignments = camera.assignments[key];
-                if (Array.isArray(currentAssignments)) {
-                    camera.assignments[assignmentType] = currentAssignments.filter((p) => p.name !== plugin.pluginName);
+        const affected = [...this.dbs.camerasDB.getRange()].filter(({ value }) => value.plugins.some((p) => p.name === plugin.pluginName)).map(({ value }) => value._id);
+        for (const cameraId of affected) {
+            const camera = await this.dbs.commit(this.dbs.camerasDB, cameraId, (current) => {
+                if (!current)
+                    return undefined;
+                current.plugins = current.plugins.filter((p) => p.name !== plugin.pluginName);
+                if (this.isMultiProviderType(assignmentType)) {
+                    const key = assignmentType;
+                    const currentAssignments = current.assignments[key];
+                    if (Array.isArray(currentAssignments)) {
+                        current.assignments[assignmentType] = currentAssignments.filter((p) => p.name !== plugin.pluginName);
+                    }
                 }
-            }
-            else {
-                const assignment = camera.assignments[assignmentType];
-                if (assignment && !Array.isArray(assignment) && assignment.name === plugin.pluginName) {
-                    camera.assignments[assignmentType] = undefined;
+                else {
+                    const assignment = current.assignments[assignmentType];
+                    if (assignment && !Array.isArray(assignment) && assignment.name === plugin.pluginName) {
+                        current.assignments[assignmentType] = undefined;
+                    }
                 }
-            }
+                return current;
+            });
+            if (!camera)
+                continue;
             const transformedCamera = this.transformCamera(camera);
-            await this.dbs.camerasDB.put(camera._id, camera);
             await this.api.deselectCamera(plugin.id, transformedCamera);
             this.api.updateCamera(transformedCamera);
         }
@@ -501,12 +550,12 @@ let CamerasService = class CamerasService {
         return result;
     }
     async setWorkerAgentId(cameraId, agentId) {
-        const camera = this.findById(cameraId);
-        if (!camera)
-            return undefined;
-        camera.workerAgentId = agentId;
-        await this.dbs.camerasDB.put(camera._id, camera);
-        return camera;
+        return this.dbs.commit(this.dbs.camerasDB, cameraId, (current) => {
+            if (!current)
+                return undefined;
+            current.workerAgentId = agentId;
+            return current;
+        });
     }
     async streamSourceInfo(camera, source) {
         const src = createSourceName(camera.name, source.name);