@comet/cms-api 9.0.0-beta.2 → 9.0.0-beta.4

package/lib/dam/files/files.service.js

@@ -44,33 +44,6 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 var __param = (this && this.__param) || function (paramIndex, decorator) {
     return function (target, key) { decorator(target, key, paramIndex); }
 };
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
-var __asyncValues = (this && this.__asyncValues) || function (o) {
-    if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
-    var m = o[Symbol.asyncIterator], i;
-    return m ? m.call(o) : (o = typeof __values === "function" ? __values(o) : o[Symbol.iterator](), i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i);
-    function verb(n) { i[n] = o[n] && function (v) { return new Promise(function (resolve, reject) { v = o[n](v), settle(resolve, reject, v.done, v.value); }); }; }
-    function settle(resolve, reject, d, v) { Promise.resolve(v).then(function(v) { resolve({ value: v, done: d }); }, reject); }
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -87,7 +60,9 @@ const hasha = __importStar(require("hasha"));
 const path_1 = require("path");
 const probe_image_size_1 = __importDefault(require("probe-image-size"));
 const rimraf = __importStar(require("rimraf"));
-const sharp_1 = __importDefault(require("sharp"));
+const util_1 = require("util");
+const zlib_1 = require("zlib");
+const inflate = (0, util_1.promisify)(zlib_1.inflate);
 const blob_storage_backend_service_1 = require("../../blob-storage/backends/blob-storage-backend.service");
 const create_hashed_path_util_1 = require("../../blob-storage/utils/create-hashed-path.util");
 const entity_not_found_exception_1 = require("../../common/errors/entity-not-found.exception");
@@ -98,7 +73,6 @@ const imgproxy_service_1 = require("../../imgproxy/imgproxy.service");
 const content_scope_service_1 = require("../../user-permissions/content-scope.service");
 const image_resolution_exception_1 = require("../common/errors/image-resolution.exception");
 const dam_constants_1 = require("../dam.constants");
-const images_util_1 = require("../images/images.util");
 const dam_media_alternative_entity_1 = require("./dam-media-alternatives/entities/dam-media-alternative.entity");
 const file_entity_1 = require("./entities/file.entity");
 const file_image_entity_1 = require("./entities/file-image.entity");
@@ -108,16 +82,24 @@ const withFilesSelect = (qb, args) => {
     if (args.query) {
         qb.andWhere("file.name ILIKE ANY (ARRAY[?])", [args.query.split(" ").map((term) => `%${term}%`)]);
     }
-    if (args.id)
+    if (args.id) {
         qb.andWhere({ id: args.id });
-    if (args.copyOfId)
+    }
+    if (args.ids) {
+        qb.andWhere({ id: { $in: args.ids } });
+    }
+    if (args.copyOfId) {
         qb.andWhere({ copyOf: { id: args.copyOfId } });
-    if (args.filename)
+    }
+    if (args.filename) {
         qb.andWhere({ name: args.filename });
-    if (args.contentHash)
+    }
+    if (args.contentHash) {
         qb.andWhere({ contentHash: args.contentHash });
-    if (args.archived !== undefined)
+    }
+    if (args.archived !== undefined) {
         qb.andWhere({ archived: args.archived });
+    }
     if (args.folderId !== undefined) {
         if (args.folderId) {
             qb.andWhere({ folder: { id: args.folderId } });
@@ -132,8 +114,9 @@ const withFilesSelect = (qb, args) => {
     if (args.mimetypes !== undefined) {
         qb.andWhere({ mimetype: { $in: args.mimetypes } });
     }
-    if (args.imageId)
+    if (args.imageId) {
         qb.andWhere({ image: { id: args.imageId } });
+    }
     if (args.imageCropArea) {
         qb.andWhere({ image: { cropArea: args.imageCropArea } });
     }
@@ -168,443 +151,458 @@ let FilesService = FilesService_1 = class FilesService {
             .leftJoinAndSelect("file.image", "image")
             .leftJoinAndSelect("file.folder", "folder");
     }
-    findAll(_a, scope_1) {
-        return __awaiter(this, arguments, void 0, function* ({ folderId, includeArchived, filter, sortColumnName, sortDirection }, scope) {
-            const isSearching = (filter === null || filter === void 0 ? void 0 : filter.searchText) !== undefined && filter.searchText.length > 0;
-            return withFilesSelect(this.selectQueryBuilder(), {
-                archived: !includeArchived ? false : undefined,
-                folderId: !isSearching ? folderId || null : undefined,
-                mimetypes: filter === null || filter === void 0 ? void 0 : filter.mimetypes,
-                query: filter === null || filter === void 0 ? void 0 : filter.searchText,
-                sortColumnName,
-                sortDirection,
-                scope,
-            }).getResult();
-        });
-    }
-    findAndCount(_a, scope_1) {
-        return __awaiter(this, arguments, void 0, function* ({ folderId, includeArchived, filter, sortColumnName, sortDirection, offset, limit }, scope) {
-            const isSearching = (filter === null || filter === void 0 ? void 0 : filter.searchText) !== undefined && filter.searchText.length > 0;
-            const files = yield withFilesSelect(this.selectQueryBuilder(), {
-                archived: !includeArchived ? false : undefined,
-                folderId: !isSearching ? folderId || null : undefined,
-                mimetypes: filter === null || filter === void 0 ? void 0 : filter.mimetypes,
-                query: filter === null || filter === void 0 ? void 0 : filter.searchText,
-                sortColumnName,
-                sortDirection,
-                offset,
-                limit,
-                scope,
-            }).getResult();
-            const totalCount = yield withFilesSelect(this.selectQueryBuilder(), {
-                archived: !includeArchived ? false : undefined,
-                folderId: !isSearching ? folderId || null : undefined,
-                mimetypes: filter === null || filter === void 0 ? void 0 : filter.mimetypes,
-                query: filter === null || filter === void 0 ? void 0 : filter.searchText,
-                sortColumnName,
-                sortDirection,
-                offset,
-                limit,
-                scope,
-            }).getCount();
-            return [files, totalCount];
-        });
-    }
-    findAllByHash(contentHash, options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return withFilesSelect(this.selectQueryBuilder(), { contentHash, scope: options === null || options === void 0 ? void 0 : options.scope }).getResult();
-        });
-    }
-    findMultipleByIds(ids) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return withFilesSelect(this.selectQueryBuilder(), {})
-                .where({ id: { $in: ids } })
-                .getResult();
-        });
-    }
-    findCopiesOfFileInScope(fileId, imageCropArea, scope) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return withFilesSelect(this.selectQueryBuilder(), { copyOfId: fileId, imageCropArea, scope }).getResult();
-        });
-    }
-    findOneById(id) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return withFilesSelect(this.selectQueryBuilder(), { id }).getSingleResult();
-        });
-    }
-    getDamPath(file) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const folderNames = file.folder ? (yield this.foldersService.findAncestorsByParentId(file.folder.id)).map((folder) => folder.name) : [];
-            return `/${folderNames.join("/")}`;
-        });
-    }
-    findOneByHash(contentHash) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return withFilesSelect(this.selectQueryBuilder(), { contentHash }).getSingleResult();
-        });
-    }
-    calculateHashForFile(filePath) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return hasha.fromFile(filePath, { algorithm: "md5" });
-        });
-    }
-    findOneByFilenameAndFolder(_a, scope_1) {
-        return __awaiter(this, arguments, void 0, function* ({ filename, folderId = null, }, scope) {
-            return withFilesSelect(this.selectQueryBuilder(), { folderId, filename, scope }).getSingleResult();
-        });
-    }
-    findOneByImageId(imageId) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return withFilesSelect(this.selectQueryBuilder(), { imageId }).getSingleResult();
-        });
-    }
-    create(_a) {
-        return __awaiter(this, void 0, void 0, function* () {
-            var { folderId } = _a, data = __rest(_a, ["folderId"]);
-            const folder = folderId ? yield this.foldersService.findOneById(folderId) : undefined;
-            return this.save(this.filesRepository.create(Object.assign(Object.assign({}, data), { license: Object.assign({}, data.license), folder: folder === null || folder === void 0 ? void 0 : folder.id, importSourceId: data.importSourceId, importSourceType: data.importSourceType })));
-        });
-    }
-    replace(fileToReplace, uploadedFile, assignData) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let result = undefined;
-            try {
-                if (uploadedFile.mimetype !== fileToReplace.mimetype) {
-                    throw new Error(`File cannot be replaced by a file with a different mimetype. Existing mimetype: ${fileToReplace.mimetype}, new mimetype: ${uploadedFile.mimetype}`);
-                }
-                const uploadedFileMetadata = yield this.getFileMetadataForUpload(uploadedFile);
-                const oldAndNewFileAreIdentical = fileToReplace.contentHash === uploadedFileMetadata.contentHash;
-                if (!oldAndNewFileAreIdentical) {
-                    // Don't upload the file if it is identical to the existing one
-                    yield this.blobStorageBackendService.upload(uploadedFile, uploadedFileMetadata.contentHash, this.config.filesDirectory);
-                    // Check if the current file is the only one using the contentHash before deleting from blob storage
-                    if ((yield withFilesSelect(this.filesRepository.createQueryBuilder("file"), { contentHash: fileToReplace.contentHash }).getResult())
-                        .length === 1) {
-                        yield this.blobStorageBackendService.removeFile(this.config.filesDirectory, (0, create_hashed_path_util_1.createHashedPath)(fileToReplace.contentHash));
-                    }
-                }
-                if (uploadedFileMetadata.image && uploadedFileMetadata.image.width && uploadedFileMetadata.image.height && fileToReplace.image) {
-                    fileToReplace.image.width = uploadedFileMetadata.image.width;
-                    fileToReplace.image.height = uploadedFileMetadata.image.height;
-                    fileToReplace.image.exif = uploadedFileMetadata.exifData;
+    async findAll({ folderId, includeArchived, filter, sortColumnName, sortDirection }, scope) {
+        const isSearching = filter?.searchText !== undefined && filter.searchText.length > 0;
+        return withFilesSelect(this.selectQueryBuilder(), {
+            archived: !includeArchived ? false : undefined,
+            folderId: !isSearching ? folderId || null : undefined,
+            mimetypes: filter?.mimetypes,
+            ids: filter?.ids,
+            query: filter?.searchText,
+            sortColumnName,
+            sortDirection,
+            scope,
+        }).getResult();
+    }
+    async findAndCount({ folderId, includeArchived, filter, sortColumnName, sortDirection, offset, limit }, scope) {
+        const isSearching = filter?.searchText !== undefined && filter.searchText.length > 0;
+        const files = await withFilesSelect(this.selectQueryBuilder(), {
+            archived: !includeArchived ? false : undefined,
+            folderId: !isSearching ? folderId || null : undefined,
+            mimetypes: filter?.mimetypes,
+            ids: filter?.ids,
+            query: filter?.searchText,
+            sortColumnName,
+            sortDirection,
+            offset,
+            limit,
+            scope,
+        }).getResult();
+        const totalCount = await withFilesSelect(this.selectQueryBuilder(), {
+            archived: !includeArchived ? false : undefined,
+            folderId: !isSearching ? folderId || null : undefined,
+            mimetypes: filter?.mimetypes,
+            ids: filter?.ids,
+            query: filter?.searchText,
+            sortColumnName,
+            sortDirection,
+            offset,
+            limit,
+            scope,
+        }).getCount();
+        return [files, totalCount];
+    }
+    async findAllByHash(contentHash, options) {
+        return withFilesSelect(this.selectQueryBuilder(), { contentHash, scope: options?.scope }).getResult();
+    }
+    async findMultipleByIds(ids) {
+        return withFilesSelect(this.selectQueryBuilder(), {})
+            .where({ id: { $in: ids } })
+            .getResult();
+    }
+    async findCopiesOfFileInScope(fileId, imageCropArea, scope) {
+        return withFilesSelect(this.selectQueryBuilder(), { copyOfId: fileId, imageCropArea, scope }).getResult();
+    }
+    async findOneById(id) {
+        return withFilesSelect(this.selectQueryBuilder(), { id }).getSingleResult();
+    }
+    async getDamPath(file) {
+        const folderNames = file.folder ? (await this.foldersService.findAncestorsByParentId(file.folder.id)).map((folder) => folder.name) : [];
+        return `/${folderNames.join("/")}`;
+    }
+    async findOneByHash(contentHash) {
+        return withFilesSelect(this.selectQueryBuilder(), { contentHash }).getSingleResult();
+    }
+    async calculateHashForFile(filePath) {
+        return hasha.fromFile(filePath, { algorithm: "md5" });
+    }
+    async findOneByFilenameAndFolder({ filename, folderId = null, }, scope) {
+        return withFilesSelect(this.selectQueryBuilder(), { folderId, filename, scope }).getSingleResult();
+    }
+    async findOneByImageId(imageId) {
+        return withFilesSelect(this.selectQueryBuilder(), { imageId }).getSingleResult();
+    }
+    async create({ folderId, ...data }) {
+        const folder = folderId ? await this.foldersService.findOneById(folderId) : undefined;
+        return this.save(this.filesRepository.create({
+            ...data,
+            license: { ...data.license },
+            folder: folder?.id,
+            importSourceId: data.importSourceId,
+            importSourceType: data.importSourceType,
+        }));
+    }
+    async replace(fileToReplace, uploadedFile, assignData) {
+        let result = undefined;
+        try {
+            if (uploadedFile.mimetype !== fileToReplace.mimetype) {
+                throw new Error(`File cannot be replaced by a file with a different mimetype. Existing mimetype: ${fileToReplace.mimetype}, new mimetype: ${uploadedFile.mimetype}`);
+            }
+            const uploadedFileMetadata = await this.getFileMetadataForUpload(uploadedFile);
+            const oldAndNewFileAreIdentical = fileToReplace.contentHash === uploadedFileMetadata.contentHash;
+            if (!oldAndNewFileAreIdentical) {
+                // Don't upload the file if it is identical to the existing one
+                await this.blobStorageBackendService.upload(uploadedFile, uploadedFileMetadata.contentHash, this.config.filesDirectory);
+                // Check if the current file is the only one using the contentHash before deleting from blob storage
+                if ((await withFilesSelect(this.filesRepository.createQueryBuilder("file"), { contentHash: fileToReplace.contentHash }).getResult())
+                    .length === 1) {
+                    await this.blobStorageBackendService.removeFile(this.config.filesDirectory, (0, create_hashed_path_util_1.createHashedPath)(fileToReplace.contentHash));
                 }
-                Object.assign(fileToReplace, Object.assign({ size: uploadedFile.size, mimetype: uploadedFile.mimetype, contentHash: uploadedFileMetadata.contentHash }, assignData));
-                result = yield this.save(fileToReplace);
-                rimraf.sync(uploadedFile.path);
             }
-            catch (e) {
-                rimraf.sync(uploadedFile.path);
-                throw e;
+            if (uploadedFileMetadata.image && uploadedFileMetadata.image.width && uploadedFileMetadata.image.height && fileToReplace.image) {
+                fileToReplace.image.width = uploadedFileMetadata.image.width;
+                fileToReplace.image.height = uploadedFileMetadata.image.height;
+                fileToReplace.image.exif = uploadedFileMetadata.exifData;
             }
-            return result;
-        });
+            Object.assign(fileToReplace, {
+                size: uploadedFile.size,
+                mimetype: uploadedFile.mimetype,
+                contentHash: uploadedFileMetadata.contentHash,
+                ...assignData,
+            });
+            result = await this.save(fileToReplace);
+            rimraf.sync(uploadedFile.path);
+        }
+        catch (e) {
+            rimraf.sync(uploadedFile.path);
+            throw e;
+        }
+        return result;
     }
-    updateById(id, data) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const file = yield this.findOneById(id);
-            if (!file)
-                throw new entity_not_found_exception_1.CometEntityNotFoundException();
-            return this.updateByEntity(file, data);
-        });
+    async updateById(id, data) {
+        const file = await this.findOneById(id);
+        if (!file) {
+            throw new entity_not_found_exception_1.CometEntityNotFoundException();
+        }
+        return this.updateByEntity(file, data);
     }
-    updateByEntity(entity, _a) {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _b;
-            var { image } = _a, input = __rest(_a, ["image"]);
-            const folderId = input.folderId !== undefined ? input.folderId : (_b = entity.folder) === null || _b === void 0 ? void 0 : _b.id;
-            const folder = folderId ? yield this.foldersService.findOneById(folderId) : null;
-            if (entity.image && (image === null || image === void 0 ? void 0 : image.cropArea)) {
-                entity.image.cropArea = image.cropArea;
-            }
-            if (input.name) {
-                const entityWithSameName = yield this.findOneByFilenameAndFolder({ filename: input.name, folderId }, entity.scope);
-                if (entityWithSameName !== null && entityWithSameName.id !== entity.id) {
-                    throw new Error(`Entity with name '${input.name}' already exists in ${folder ? `folder '${folder.name}'` : "root folder"}`);
-                }
+    async updateByEntity(entity, { image, ...input }) {
+        const folderId = input.folderId !== undefined ? input.folderId : entity.folder?.id;
+        const folder = folderId ? await this.foldersService.findOneById(folderId) : null;
+        if (entity.image && image?.cropArea) {
+            entity.image.cropArea = image.cropArea;
+        }
+        if (input.name) {
+            const entityWithSameName = await this.findOneByFilenameAndFolder({ filename: input.name, folderId }, entity.scope);
+            if (entityWithSameName !== null && entityWithSameName.id !== entity.id) {
+                throw new Error(`Entity with name '${input.name}' already exists in ${folder ? `folder '${folder.name}'` : "root folder"}`);
             }
-            const file = Object.assign(entity, Object.assign(Object.assign({}, input), { folder: folderId !== undefined ? folder : entity.folder }));
-            return this.save(file);
+        }
+        const file = Object.assign(entity, {
+            ...input,
+            folder: folderId !== undefined ? folder : entity.folder,
         });
-    }
-    moveBatch(files, targetFolder) {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            const updatedFiles = [];
-            for (const file of files) {
-                // Convert to JS object because deep-comparing classes and objects doesn't work
-                if ((targetFolder === null || targetFolder === void 0 ? void 0 : targetFolder.scope) !== undefined && !this.contentScopeService.scopesAreEqual(file.scope, targetFolder.scope)) {
-                    throw new Error("Target folder scope doesn't match file scope");
-                }
-                updatedFiles.push(yield this.updateByEntity(file, { folderId: (_a = targetFolder === null || targetFolder === void 0 ? void 0 : targetFolder.id) !== null && _a !== void 0 ? _a : null }));
+        return this.save(file);
+    }
+    async moveBatch(files, targetFolder) {
+        const updatedFiles = [];
+        for (const file of files) {
+            // Convert to JS object because deep-comparing classes and objects doesn't work
+            if (targetFolder?.scope !== undefined && !this.contentScopeService.scopesAreEqual(file.scope, targetFolder.scope)) {
+                throw new Error("Target folder scope doesn't match file scope");
             }
-            return updatedFiles;
-        });
+            updatedFiles.push(await this.updateByEntity(file, { folderId: targetFolder?.id ?? null }));
+        }
+        return updatedFiles;
     }
-    delete(id) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const file = yield this.findOneById(id);
-            if (!file)
-                throw new entity_not_found_exception_1.CometEntityNotFoundException();
-            const result = yield this.filesRepository.nativeDelete(id);
-            const deleted = result === 1;
-            if (deleted &&
-                (yield withFilesSelect(this.filesRepository.createQueryBuilder("file"), { contentHash: file.contentHash }).getResult()).length === 0) {
-                yield this.blobStorageBackendService.removeFile(this.config.filesDirectory, (0, create_hashed_path_util_1.createHashedPath)(file.contentHash));
+    async delete(id) {
+        const file = await this.findOneById(id);
+        if (!file) {
+            throw new entity_not_found_exception_1.CometEntityNotFoundException();
+        }
+        const result = await this.filesRepository.nativeDelete(id);
+        const deleted = result === 1;
+        if (deleted &&
+            (await withFilesSelect(this.filesRepository.createQueryBuilder("file"), { contentHash: file.contentHash }).getResult()).length === 0) {
+            await this.blobStorageBackendService.removeFile(this.config.filesDirectory, (0, create_hashed_path_util_1.createHashedPath)(file.contentHash));
+        }
+        return deleted;
+    }
+    async save(entity) {
+        await this.entityManager.persistAndFlush(entity);
+        return entity;
+    }
+    async upload(file, { folderId, scope, ...assignData }) {
+        let result = undefined;
+        try {
+            const { exifData, contentHash, image } = await this.getFileMetadataForUpload(file);
+            await this.blobStorageBackendService.upload(file, contentHash, this.config.filesDirectory);
+            const name = await this.findNextAvailableFilename({ filePath: file.originalname, folderId, scope });
+            result = await this.create({
+                name,
+                folderId: folderId,
+                size: file.size,
+                mimetype: file.mimetype,
+                image: image !== undefined
+                    ? {
+                        width: image.width,
+                        height: image.height,
+                        exif: exifData,
+                        cropArea: {
+                            focalPoint: focal_point_enum_1.FocalPoint.SMART,
+                        },
+                    }
+                    : undefined,
+                contentHash,
+                scope,
+                ...assignData,
+            });
+            if (result.image) {
+                // We do not want for our users to await the dominant color calculation. To prevent concurrency issues we must use a separate Unit of
+                // Work. This can be achieved by forking the EntityManager instance.
+                // See https://mikro-orm.io/docs/faq#you-cannot-call-emflush-from-inside-lifecycle-hook-handlers and
+                // https://mikro-orm.io/docs/unit-of-work for more information.
+                const entityManager = this.orm.em.fork();
+                const image = await entityManager.findOneOrFail(file_image_entity_1.DamFileImage, result.image.id);
+                this.calculateDominantColor(contentHash).then((dominantColor) => {
+                    image.dominantColor = dominantColor;
+                    return entityManager.flush();
+                });
             }
-            return deleted;
-        });
-    }
-    save(entity) {
-        return __awaiter(this, void 0, void 0, function* () {
-            yield this.entityManager.persistAndFlush(entity);
-            return entity;
-        });
+            rimraf.sync(file.path);
+        }
+        catch (e) {
+            rimraf.sync(file.path);
+            throw e;
+        }
+        return result;
     }
-    upload(file, _a) {
-        return __awaiter(this, void 0, void 0, function* () {
-            var { folderId, scope } = _a, assignData = __rest(_a, ["folderId", "scope"]);
-            let result = undefined;
-            try {
-                const { exifData, contentHash, image } = yield this.getFileMetadataForUpload(file);
-                yield this.blobStorageBackendService.upload(file, contentHash, this.config.filesDirectory);
-                const name = yield this.findNextAvailableFilename({ filePath: file.originalname, folderId, scope });
-                result = yield this.create(Object.assign({ name, folderId: folderId, size: file.size, mimetype: file.mimetype, image: image !== undefined
-                        ? {
-                            width: image.width,
-                            height: image.height,
-                            exif: exifData,
-                            cropArea: {
-                                focalPoint: focal_point_enum_1.FocalPoint.SMART,
-                            },
-                        }
-                        : undefined, contentHash,
-                    scope }, assignData));
-                if (result.image) {
-                    // We do not want for our users to await the dominant color calculation. To prevent concurrency issues we must use a separate Unit of
-                    // Work. This can be achieved by forking the EntityManager instance.
-                    // See https://mikro-orm.io/docs/faq#you-cannot-call-emflush-from-inside-lifecycle-hook-handlers and
-                    // https://mikro-orm.io/docs/unit-of-work for more information.
-                    const entityManager = this.orm.em.fork();
-                    const image = yield entityManager.findOneOrFail(file_image_entity_1.DamFileImage, result.image.id);
-                    this.calculateDominantColor(contentHash).then((dominantColor) => {
-                        image.dominantColor = dominantColor;
-                        return entityManager.flush();
-                    });
-                }
-                rimraf.sync(file.path);
-            }
-            catch (e) {
-                rimraf.sync(file.path);
-                throw e;
-            }
-            return result;
+    async getFilePosition(fileId, args, scope) {
+        const isSearching = args.filter?.searchText !== undefined && args.filter.searchText.length > 0;
+        const subQb = withFilesSelect(this.filesRepository
+            .createQueryBuilder("file")
+            .select(["file.id", (0, postgresql_1.raw)(`ROW_NUMBER() OVER( ORDER BY file."${args.sortColumnName}" ${args.sortDirection} ) AS row_number`)])
+            .leftJoinAndSelect("file.folder", "folder"), {
+            archived: !args.includeArchived ? false : undefined,
+            folderId: !isSearching ? args.folderId || null : undefined,
+            mimetypes: args.filter?.mimetypes,
+            query: args.filter?.searchText,
+            sortColumnName: args.sortColumnName,
+            sortDirection: args.sortDirection,
+            scope,
         });
-    }
-    getFilePosition(fileId, args, scope) {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b, _c;
-            const isSearching = ((_a = args.filter) === null || _a === void 0 ? void 0 : _a.searchText) !== undefined && args.filter.searchText.length > 0;
-            const subQb = withFilesSelect(this.filesRepository
-                .createQueryBuilder("file")
-                .select(["file.id", (0, postgresql_1.raw)(`ROW_NUMBER() OVER( ORDER BY file."${args.sortColumnName}" ${args.sortDirection} ) AS row_number`)])
-                .leftJoinAndSelect("file.folder", "folder"), {
-                archived: !args.includeArchived ? false : undefined,
-                folderId: !isSearching ? args.folderId || null : undefined,
-                mimetypes: (_b = args.filter) === null || _b === void 0 ? void 0 : _b.mimetypes,
-                query: (_c = args.filter) === null || _c === void 0 ? void 0 : _c.searchText,
-                sortColumnName: args.sortColumnName,
-                sortDirection: args.sortDirection,
-                scope,
-            });
-            const result = yield this.filesRepository.getKnex().raw(`select "file_with_row_number".row_number
+        const result = await this.filesRepository.getKnex().raw(`select "file_with_row_number".row_number
                 from "${file_entity_1.FILE_TABLE_NAME}" as "file"
                 join (${subQb.getFormattedQuery()}) as "file_with_row_number" ON file_with_row_number.id = file.id
                 where "file"."id" = ?
             `, [fileId]);
-            if (result.rows.length === 0) {
-                throw new Error("File ID does not exist.");
-            }
-            // make the positions start with 0
-            return Number(result.rows[0].row_number) - 1;
-        });
-    }
-    createCopyOfFile(file_1, _a) {
-        return __awaiter(this, arguments, void 0, function* (file, { inboxFolder }) {
-            let fileImageInput;
-            if (file.image) {
-                const _b = file.image, { id: ignoreId, file: ignoreFile } = _b, imageProps = __rest(_b, ["id", "file"]);
-                fileImageInput = Object.assign({}, postgresql_1.Utils.copy(imageProps));
-            }
-            const { id: ignoreId, createdAt: ignoreCreatedAt, updatedAt: ignoreUpdatedAt, folder: ignoreFolder, image: ignoreImage, scope: ignoreScope, copies: ignoreCopies, alternativesForThisFile: ignoreAlternativesForThisFile, thisFileIsAlternativeFor: ignoreThisFileIsAlternativeFor } = file, fileProps = __rest(file, ["id", "createdAt", "updatedAt", "folder", "image", "scope", "copies", "alternativesForThisFile", "thisFileIsAlternativeFor"]);
-            const fileInput = Object.assign(Object.assign({}, postgresql_1.Utils.copy(fileProps)), { image: fileImageInput, folderId: inboxFolder.id, copyOf: file, scope: inboxFolder.scope });
-            const copiedFile = yield this.create(fileInput);
-            // handled DAM alternatives
-            const copiedAlternatives = [];
-            if ((yield file.alternativesForThisFile.loadItems()).length > 0) {
-                for (const alternative of file.alternativesForThisFile) {
-                    const alternativeFile = yield alternative.alternative.load();
-                    if (alternativeFile === null) {
-                        continue;
-                    }
-                    const copiedAlternativeFile = yield this.createCopyOfFile(alternativeFile, { inboxFolder });
-                    const { id: ignoreId, for: ignoreFor, alternative: ignoreAlternative } = alternative, alternativeProps = __rest(alternative, ["id", "for", "alternative"]);
-                    const copiedDamMediaAlternative = this.damMediaAlternativesRepository.create(Object.assign(Object.assign({}, alternativeProps), { for: copiedFile, alternative: copiedAlternativeFile }));
-                    copiedAlternatives.push(copiedDamMediaAlternative);
+        if (result.rows.length === 0) {
+            throw new Error("File ID does not exist.");
+        }
+        // make the positions start with 0
+        return Number(result.rows[0].row_number) - 1;
+    }
+    async createCopyOfFile(file, { inboxFolder }) {
+        let fileImageInput;
+        if (file.image) {
+            const { id: ignoreId, file: ignoreFile, ...imageProps } = file.image;
+            fileImageInput = { ...postgresql_1.Utils.copy(imageProps) };
+        }
+        const { id: ignoreId, createdAt: ignoreCreatedAt, updatedAt: ignoreUpdatedAt, folder: ignoreFolder, image: ignoreImage, scope: ignoreScope, copies: ignoreCopies, alternativesForThisFile: ignoreAlternativesForThisFile, thisFileIsAlternativeFor: ignoreThisFileIsAlternativeFor, ...fileProps } = file;
+        const fileInput = {
+            ...postgresql_1.Utils.copy(fileProps),
+            image: fileImageInput,
+            folderId: inboxFolder.id,
+            copyOf: file,
+            scope: inboxFolder.scope,
+        };
+        const copiedFile = await this.create(fileInput);
+        // handled DAM alternatives
+        const copiedAlternatives = [];
+        if ((await file.alternativesForThisFile.loadItems()).length > 0) {
+            for (const alternative of file.alternativesForThisFile) {
+                const alternativeFile = await alternative.alternative.load();
+                if (alternativeFile === null) {
+                    continue;
                 }
+                const copiedAlternativeFile = await this.createCopyOfFile(alternativeFile, { inboxFolder });
+                const { id: ignoreId, for: ignoreFor, alternative: ignoreAlternative, ...alternativeProps } = alternative;
+                const copiedDamMediaAlternative = this.damMediaAlternativesRepository.create({
+                    ...alternativeProps,
+                    for: copiedFile,
+                    alternative: copiedAlternativeFile,
+                });
+                copiedAlternatives.push(copiedDamMediaAlternative);
             }
-            copiedFile.alternativesForThisFile.set(copiedAlternatives);
-            return copiedFile;
-        });
-    }
-    copyFilesToScope(_a) {
-        return __awaiter(this, arguments, void 0, function* ({ fileIds, inboxFolderId }) {
-            const inboxFolder = yield this.foldersService.findOneById(inboxFolderId);
-            if (!inboxFolder) {
-                throw new Error("Specified inbox folder doesn't exist.");
-            }
-            const files = yield this.findMultipleByIds(fileIds);
-            if (files.length === 0) {
-                throw new Error("No valid file ids provided");
-            }
-            const mappedFiles = [];
-            for (const file of files) {
-                const copiedFile = yield this.createCopyOfFile(file, { inboxFolder });
-                mappedFiles.push({ rootFile: file, copy: copiedFile });
-            }
-            return { mappedFiles };
-        });
-    }
-    findNextAvailableFilename(_a) {
-        return __awaiter(this, arguments, void 0, function* ({ filePath, folderId = null, scope, }) {
-            const extension = (0, path_1.extname)(filePath);
-            const filename = (0, path_1.basename)(filePath, extension);
-            let i = 1;
-            let name = (0, files_utils_1.slugifyFilename)(filename, extension);
-            while ((yield this.findOneByFilenameAndFolder({ filename: name, folderId }, scope)) !== null) {
-                name = (0, files_utils_1.slugifyFilename)(`${filename}-copy${i}`, extension);
-                i++;
-            }
-            return name;
-        });
+        }
+        copiedFile.alternativesForThisFile.set(copiedAlternatives);
+        return copiedFile;
     }
-    calculateDominantColor(contentHash) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const path = this.imgproxyService
-                .builder()
-                .resize(imgproxy_enum_1.ResizingType.AUTO, 1)
-                .format(imgproxy_enum_1.Extension.JPG)
-                .generateUrl(`${this.blobStorageBackendService.getBackendFilePathPrefix()}${this.config.filesDirectory}/${(0, create_hashed_path_util_1.createHashedPath)(contentHash)}`);
-            const imgUrl = this.imgproxyService.getSignedUrl(path);
-            try {
-                const imageResponse = yield fetch(imgUrl);
-                const arrayBuffer = yield imageResponse.arrayBuffer();
-                const imageBuffer = Buffer.from(arrayBuffer);
-                const data = yield (0, sharp_1.default)(imageBuffer).removeAlpha().raw().toBuffer();
-                // since we scale the image to 1px with imgproxy, data only contains the colors for this one pixel
-                const [r, g, b] = data;
-                return (0, images_util_1.rgbToHex)(r, g, b);
-            }
-            catch (e) {
-                // When imageproxy is not available it is ok.
-                console.error(e);
-                return undefined;
-            }
-        });
+    async copyFilesToScope({ fileIds, inboxFolderId }) {
+        const inboxFolder = await this.foldersService.findOneById(inboxFolderId);
+        if (!inboxFolder) {
+            throw new Error("Specified inbox folder doesn't exist.");
+        }
+        const files = await this.findMultipleByIds(fileIds);
+        if (files.length === 0) {
+            throw new Error("No valid file ids provided");
+        }
+        const mappedFiles = [];
+        for (const file of files) {
+            const copiedFile = await this.createCopyOfFile(file, { inboxFolder });
+            mappedFiles.push({ rootFile: file, copy: copiedFile });
+        }
+        return { mappedFiles };
+    }
+    async findNextAvailableFilename({ filePath, folderId = null, scope, }) {
+        const extension = (0, path_1.extname)(filePath);
+        const filename = (0, path_1.basename)(filePath, extension);
+        let i = 1;
+        let name = (0, files_utils_1.slugifyFilename)(filename, extension);
+        while ((await this.findOneByFilenameAndFolder({ filename: name, folderId }, scope)) !== null) {
+            name = (0, files_utils_1.slugifyFilename)(`${filename}-copy${i}`, extension);
+            i++;
+        }
+        return name;
+    }
+    async calculateDominantColor(contentHash) {
+        const path = this.imgproxyService
+            .builder()
+            .resize(imgproxy_enum_1.ResizingType.AUTO, 1)
+            .format(imgproxy_enum_1.Extension.PNG)
+            .generateUrl(`${this.blobStorageBackendService.getBackendFilePathPrefix()}${this.config.filesDirectory}/${(0, create_hashed_path_util_1.createHashedPath)(contentHash)}`);
+        const imgUrl = this.imgproxyService.getSignedUrl(path);
+        let imageResponse;
+        try {
+            imageResponse = await fetch(imgUrl);
+        }
+        catch (error) {
+            this.logger.error("Failed to calculate dominant color: imgproxy is not available", error);
+            return undefined;
+        }
+        if (!imageResponse.ok) {
+            this.logger.error(`Failed to calculate dominant color: imgproxy returned ${imageResponse.status} ${imageResponse.statusText}`);
+            return undefined;
+        }
+        try {
+            const arrayBuffer = await imageResponse.arrayBuffer();
+            const pngBuffer = Buffer.from(arrayBuffer);
+            // Parse the dominant color from the 1x1 PNG produced by imgproxy
+            return await this.parsePngPixelColor(pngBuffer);
+        }
+        catch (error) {
+            this.logger.error("Failed to calculate dominant color: could not parse imgproxy response", error);
+            return undefined;
+        }
     }
-    createFileUrl(file_1, _a) {
-        return __awaiter(this, arguments, void 0, function* (file, { previewDamUrls = false }) {
-            const filename = (0, path_1.parse)(file.name).name;
-            const baseUrl = [`/${this.config.basePath}/files`];
-            if (previewDamUrls) {
-                baseUrl.push("preview");
+    async parsePngPixelColor(pngBuffer) {
+        // PNG: 8-byte signature, then chunks (4-byte length + 4-byte type + data + 4-byte CRC)
+        let offset = 8;
+        let colorType = -1;
+        let palette;
+        while (offset < pngBuffer.length) {
+            const length = pngBuffer.readUInt32BE(offset);
+            const type = pngBuffer.toString("ascii", offset + 4, offset + 8);
+            const data = pngBuffer.subarray(offset + 8, offset + 8 + length);
+            if (type === "IHDR") {
+                colorType = data[9];
             }
-            else {
-                const hash = this.createHash({
-                    fileId: file.id,
-                    filename,
-                });
-                baseUrl.push(hash);
+            else if (type === "PLTE") {
+                palette = data;
             }
-            return [...baseUrl, file.contentHash, file.id, filename].join("/");
-        });
-    }
-    getFileAsBase64String(file) {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a, e_1, _b, _c;
-            const fileStream = yield this.blobStorageBackendService.getFile(this.config.filesDirectory, (0, create_hashed_path_util_1.createHashedPath)(file.contentHash));
-            const chunks = [];
-            try {
-                for (var _d = true, fileStream_1 = __asyncValues(fileStream), fileStream_1_1; fileStream_1_1 = yield fileStream_1.next(), _a = fileStream_1_1.done, !_a; _d = true) {
-                    _c = fileStream_1_1.value;
-                    _d = false;
-                    const chunk = _c;
-                    chunks.push(chunk);
+            else if (type === "IDAT") {
+                const decompressed = await inflate(data);
+                // Decompressed scanline: [filter_byte, pixel_data...]
+                let r, g, b;
+                if (colorType === 3 && palette) {
+                    // Indexed color: pixel value is a palette index
+                    const index = decompressed[1] * 3;
+                    [r, g, b] = [palette[index], palette[index + 1], palette[index + 2]];
                 }
-            }
-            catch (e_1_1) { e_1 = { error: e_1_1 }; }
-            finally {
-                try {
-                    if (!_d && !_a && (_b = fileStream_1.return)) yield _b.call(fileStream_1);
+                else if (colorType === 0) {
+                    // Grayscale
+                    const gray = decompressed[1];
+                    [r, g, b] = [gray, gray, gray];
                 }
-                finally { if (e_1) throw e_1.error; }
+                else {
+                    // RGB (type 2) or RGBA (type 6): R, G, B are at bytes 1-3
+                    [r, g, b] = [decompressed[1], decompressed[2], decompressed[3]];
+                }
+                return `#${[r, g, b].map((v) => v.toString(16).padStart(2, "0")).join("")}`;
             }
-            const base64String = Buffer.concat(chunks).toString("base64");
-            return `data:${file.mimetype};base64,${base64String}`;
-        });
+            offset += 12 + length;
+        }
+        this.logger.warn("Failed to calculate dominant color: no IDAT chunk found in PNG");
+        return undefined;
+    }
+    async createFileUrl(file, { previewDamUrls = false }) {
+        const filename = (0, path_1.parse)(file.name).name;
+        const baseUrl = [`/${this.config.basePath}/files`];
+        if (previewDamUrls) {
+            baseUrl.push("preview");
+        }
+        else {
+            const hash = this.createHash({
+                fileId: file.id,
+                filename,
+            });
+            baseUrl.push(hash);
+        }
+        return [...baseUrl, file.contentHash, file.id, filename].join("/");
     }
-    createFileDownloadUrl(file_1, _a) {
-        return __awaiter(this, arguments, void 0, function* (file, { previewDamUrls = false }) {
-            const filename = (0, path_1.parse)(file.name).name;
-            const baseUrl = [`/dam/files/download`];
-            if (previewDamUrls) {
-                baseUrl.push("preview");
-            }
-            else {
-                const hash = this.createHash({
-                    fileId: file.id,
-                    filename,
-                });
-                baseUrl.push(hash);
-            }
-            return [...baseUrl, file.contentHash, file.id, filename].join("/");
-        });
+    async getFileAsBase64String(file) {
+        const fileStream = await this.blobStorageBackendService.getFile(this.config.filesDirectory, (0, create_hashed_path_util_1.createHashedPath)(file.contentHash));
+        const chunks = [];
+        for await (const chunk of fileStream) {
+            chunks.push(chunk);
+        }
+        const base64String = Buffer.concat(chunks).toString("base64");
+        return `data:${file.mimetype};base64,${base64String}`;
+    }
+    async createFileDownloadUrl(file, { previewDamUrls = false }) {
+        const filename = (0, path_1.parse)(file.name).name;
+        const baseUrl = [`/dam/files/download`];
+        if (previewDamUrls) {
+            baseUrl.push("preview");
+        }
+        else {
+            const hash = this.createHash({
+                fileId: file.id,
+                filename,
+            });
+            baseUrl.push(hash);
+        }
+        return [...baseUrl, file.contentHash, file.id, filename].join("/");
     }
     createHash(params) {
         const fileHash = `file:${params.fileId}:${params.filename}`;
         return (0, crypto_1.createHmac)("sha1", this.config.secret).update(fileHash).digest("hex");
     }
-    getFileMetadataForUpload(file) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const contentHash = yield this.calculateHashForFile(file.path);
-            let image;
-            try {
-                image = yield (0, probe_image_size_1.default)((0, fs_1.createReadStream)(file.path));
-                if (image.type == "svg")
-                    image = undefined;
-                if (image !== undefined && image.orientation !== undefined && [6, 8].includes(image.orientation)) {
-                    image = Object.assign(Object.assign({}, image), { width: image.height, height: image.width });
-                }
+    async getFileMetadataForUpload(file) {
+        const contentHash = await this.calculateHashForFile(file.path);
+        let image;
+        try {
+            image = await (0, probe_image_size_1.default)((0, fs_1.createReadStream)(file.path));
+            if (image.type == "svg") {
+                image = undefined;
             }
-            catch (_a) {
-                // empty
+            if (image !== undefined && image.orientation !== undefined && [6, 8].includes(image.orientation)) {
+                image = {
+                    ...image,
+                    width: image.height,
+                    height: image.width,
+                };
             }
-            if (image !== undefined &&
-                image.width &&
-                image.height &&
-                Math.round(((image.width * image.height) / 1000000) * 10) / 10 >= this.config.maxSrcResolution) {
-                throw new image_resolution_exception_1.CometImageResolutionException(`Maximal image resolution exceeded`);
+        }
+        catch {
+            // empty
+        }
+        if (image !== undefined &&
+            image.width &&
+            image.height &&
+            Math.round(((image.width * image.height) / 1000000) * 10) / 10 >= this.config.maxSrcResolution) {
+            throw new image_resolution_exception_1.CometImageResolutionException(`Maximal image resolution exceeded`);
+        }
+        let exifData;
+        if (exifrSupportedMimetypes.includes(file.mimetype)) {
+            try {
+                exifData = await exifr_1.default.parse(file.path);
             }
-            let exifData;
-            if (exifrSupportedMimetypes.includes(file.mimetype)) {
-                try {
-                    exifData = yield exifr_1.default.parse(file.path);
-                }
-                catch (_b) {
-                    // empty
-                }
+            catch {
+                // empty
             }
-            return { exifData, contentHash, image };
-        });
+        }
+        return { exifData, contentHash, image };
     }
 };
 exports.FilesService = FilesService;