@solidxai/core 0.1.12-beta.0 → 0.1.12-beta.10

package/dist/services/mediaStorageProviders/file-s3-storage-provider.d.ts

@@ -5,20 +5,20 @@ import { MediaStorageProvider } from "../../interfaces";
 import { DiskFileService, S3FileService } from "../../services/file";
 import { Readable } from "stream";
 import { MediaRepository } from "../../repository/media.repository";
+import { MediaDownloadUrlService } from "../../services/media-download-url.service";
 export declare class FileS3StorageProvider<T> implements MediaStorageProvider<T> {
     private readonly configService;
     readonly diskFileService: DiskFileService;
     readonly s3FileService: S3FileService;
     readonly mediaRepository: MediaRepository;
+    private readonly mediaDownloadUrlService;
     private logger;
-    constructor(configService: ConfigService, diskFileService: DiskFileService, s3FileService: S3FileService, mediaRepository: MediaRepository);
+    constructor(configService: ConfigService, diskFileService: DiskFileService, s3FileService: S3FileService, mediaRepository: MediaRepository, mediaDownloadUrlService: MediaDownloadUrlService);
     storeStreams(streamPairs: [Readable, string][], entity: T, mediaFieldMetadata: FieldMetadata): Promise<Media[]>;
     retrieve(entity: T, mediaFieldMetadata: FieldMetadata): Promise<Media[]>;
     store(files: Express.Multer.File[], entity: T, mediaFieldMetadata: FieldMetadata): Promise<Media[]>;
     delete(entity: T, mediaFieldMetadata: FieldMetadata): Promise<void>;
     deleteByMediaRecord(media: Media): Promise<void>;
-    private getEffectiveRegion;
-    private getFullFilePath;
-    private getFileName;
+    private getSupportedEntityId;
 }
 //# sourceMappingURL=file-s3-storage-provider.d.ts.map

package/dist/services/mediaStorageProviders/file-s3-storage-provider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"file-s3-storage-provider.d.ts","sourceRoot":"","sources":["../../../src/services/mediaStorageProviders/file-s3-storage-provider.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAE/C,OAAO,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAC;AAGnE,OAAO,EAAE,KAAK,EAAE,MAAM,2BAA2B,CAAC;AAClD,OAAO,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AACtD,OAAO,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AACnE,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAClC,OAAO,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAElE,qBACa,qBAAqB,CAAC,CAAC,CAAE,YAAW,oBAAoB,CAAC,CAAC,CAAC;IAIhE,OAAO,CAAC,QAAQ,CAAC,aAAa;IAC9B,QAAQ,CAAC,eAAe,EAAE,eAAe;IACzC,QAAQ,CAAC,aAAa,EAAE,aAAa;IACrC,QAAQ,CAAC,eAAe,EAAE,eAAe;IAN7C,OAAO,CAAC,MAAM,CAA0C;gBAGnC,aAAa,EAAE,aAAa,EACpC,eAAe,EAAE,eAAe,EAChC,aAAa,EAAE,aAAa,EAC5B,eAAe,EAAE,eAAe;IAGvC,YAAY,CAAC,WAAW,EAAE,CAAC,QAAQ,EAAE,MAAM,CAAC,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE,kBAAkB,EAAE,aAAa,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;IAuC/G,QAAQ,CAAC,MAAM,EAAE,CAAC,EAAE,kBAAkB,EAAE,aAAa,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;IAiCxE,KAAK,CAAC,KAAK,EAAE,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE,kBAAkB,EAAE,aAAa,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;IA0CnG,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,kBAAkB,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAoBnE,mBAAmB,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;IAgBtD,OAAO,CAAC,kBAAkB;IAI1B,OAAO,CAAC,eAAe;IAOvB,OAAO,CAAC,WAAW;CAGtB"}
+{"version":3,"file":"file-s3-storage-provider.d.ts","sourceRoot":"","sources":["../../../src/services/mediaStorageProviders/file-s3-storage-provider.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAE/C,OAAO,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAC;AAGnE,OAAO,EAAE,KAAK,EAAE,MAAM,2BAA2B,CAAC;AAClD,OAAO,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AACtD,OAAO,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AACnE,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAClC,OAAO,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAClE,OAAO,EAAE,uBAAuB,EAAE,MAAM,yCAAyC,CAAC;AAQlF,qBACa,qBAAqB,CAAC,CAAC,CAAE,YAAW,oBAAoB,CAAC,CAAC,CAAC;IAIhE,OAAO,CAAC,QAAQ,CAAC,aAAa;IAC9B,QAAQ,CAAC,eAAe,EAAE,eAAe;IACzC,QAAQ,CAAC,aAAa,EAAE,aAAa;IACrC,QAAQ,CAAC,eAAe,EAAE,eAAe;IACzC,OAAO,CAAC,QAAQ,CAAC,uBAAuB;IAP5C,OAAO,CAAC,MAAM,CAA0C;gBAGnC,aAAa,EAAE,aAAa,EACpC,eAAe,EAAE,eAAe,EAChC,aAAa,EAAE,aAAa,EAC5B,eAAe,EAAE,eAAe,EACxB,uBAAuB,EAAE,uBAAuB;IAG/D,YAAY,CAAC,WAAW,EAAE,CAAC,QAAQ,EAAE,MAAM,CAAC,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE,kBAAkB,EAAE,aAAa,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;IA+B/G,QAAQ,CAAC,MAAM,EAAE,CAAC,EAAE,kBAAkB,EAAE,aAAa,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;IA0BxE,KAAK,CAAC,KAAK,EAAE,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE,kBAAkB,EAAE,aAAa,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;IAkCnG,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,kBAAkB,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAenE,mBAAmB,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;IAYtD,OAAO,CAAC,oBAAoB;CAW/B"}

package/dist/services/mediaStorageProviders/file-s3-storage-provider.js

@@ -18,24 +18,22 @@ const legacy_common_entity_with_existing_id_entity_1 = require("../../entities/l
 const legacy_common_with_generated_id_entity_1 = require("../../entities/legacy-common-with-generated-id.entity");
 const file_1 = require("../file");
 const media_repository_1 = require("../../repository/media.repository");
+const media_download_url_service_1 = require("../media-download-url.service");
+const media_storage_utils_1 = require("../media-storage.utils");
 let FileS3StorageProvider = FileS3StorageProvider_1 = class FileS3StorageProvider {
-    constructor(configService, diskFileService, s3FileService, mediaRepository) {
+    constructor(configService, diskFileService, s3FileService, mediaRepository, mediaDownloadUrlService) {
         this.configService = configService;
         this.diskFileService = diskFileService;
         this.s3FileService = s3FileService;
         this.mediaRepository = mediaRepository;
+        this.mediaDownloadUrlService = mediaDownloadUrlService;
         this.logger = new common_1.Logger(FileS3StorageProvider_1.name);
     }
     async storeStreams(streamPairs, entity, mediaFieldMetadata) {
-        const isSupportedEntity = entity instanceof common_entity_1.CommonEntity
-            || entity instanceof legacy_common_entity_with_existing_id_entity_1.LegacyCommonEntityWithExistingId
-            || entity instanceof legacy_common_with_generated_id_entity_1.LegacyCommonEntityWithGeneratedId;
-        if (!isSupportedEntity) {
-            throw new Error("Entity must be an instance of CommonEntity, LegacyCommonEntityWithExistingId or LegacyCommonEntityWithGeneratedId");
-        }
+        const entityId = this.getSupportedEntityId(entity);
         const result = [];
         const storageProvider = mediaFieldMetadata.mediaStorageProvider;
-        const region = this.getEffectiveRegion(storageProvider.region);
+        const region = (0, media_storage_utils_1.getEffectiveS3Region)(this.configService, storageProvider.region);
         for (const [stream, fileName] of streamPairs) {
             const bucketName = storageProvider.bucketName;
             const chunks = [];
@@ -45,67 +43,45 @@ let FileS3StorageProvider = FileS3StorageProvider_1 = class FileS3StorageProvide
             const fileData = Buffer.concat(chunks);
             const fileSize = fileData.length;
             await this.s3FileService.write(`${bucketName}:${fileName}`, fileData, { region });
-            const mediaEntity = await this.mediaRepository.createMedia({
-                entityId: entity.id,
-                modelMetadataId: mediaFieldMetadata.model.id,
+            const mediaEntity = await this.mediaRepository.createMedia((0, media_storage_utils_1.buildMediaRecordCreateInput)(entityId, mediaFieldMetadata, storageProvider, {
                 relativeUri: fileName,
                 fileSize,
-                mediaStorageProviderMetadataId: mediaFieldMetadata.mediaStorageProvider.id,
-                fieldMetadataId: mediaFieldMetadata.id
-            });
+            }));
             result.push(mediaEntity);
             this.logger.debug(`Stored media with`, mediaEntity);
         }
         return result;
     }
     async retrieve(entity, mediaFieldMetadata) {
-        const isSupportedEntity = entity instanceof common_entity_1.CommonEntity
-            || entity instanceof legacy_common_entity_with_existing_id_entity_1.LegacyCommonEntityWithExistingId
-            || entity instanceof legacy_common_with_generated_id_entity_1.LegacyCommonEntityWithGeneratedId;
-        if (!isSupportedEntity) {
-            throw new Error("Entity must be an instance of CommonEntity, LegacyCommonEntityWithExistingId or LegacyCommonEntityWithGeneratedId");
-        }
-        const media = await this.mediaRepository.findByEntityIdAndFieldIdAndModelMetadataId(entity.id, mediaFieldMetadata.id, mediaFieldMetadata.model.id, ['mediaStorageProviderMetadata']);
+        const entityId = this.getSupportedEntityId(entity);
+        const media = await this.mediaRepository.findByEntityIdAndFieldIdAndModelMetadataId(entityId, mediaFieldMetadata.id, mediaFieldMetadata.model.id, ['mediaStorageProviderMetadata']);
         for (const m of media) {
             const storageMeta = m.mediaStorageProviderMetadata;
-            const region = this.getEffectiveRegion(storageMeta.region);
-            if (storageMeta.isPublic === false) {
-                const expiryInSeconds = (storageMeta.signedUrlExpiry ?? 60) * 60;
-                m['_full_url'] = await this.s3FileService.getUrl(`${storageMeta?.bucketName}:${m.relativeUri}`, { expiresIn: expiryInSeconds, region });
-            }
-            else {
-                m['_full_url'] = this.getFullFilePath(m);
-            }
+            const isPublic = (0, media_storage_utils_1.resolveMediaIsPublic)(storageMeta);
+            m['_full_url'] = isPublic === false
+                ? await this.mediaDownloadUrlService.getPrivateUrl(m.id, m.relativeUri, storageMeta)
+                : await this.s3FileService.getUrl(`${storageMeta.bucketName}:${m.relativeUri}`, { region: (0, media_storage_utils_1.getEffectiveS3Region)(this.configService, storageMeta.region), expiresIn: 0 });
         }
         return media;
     }
     async store(files, entity, mediaFieldMetadata) {
-        const isSupportedEntity = entity instanceof common_entity_1.CommonEntity
-            || entity instanceof legacy_common_entity_with_existing_id_entity_1.LegacyCommonEntityWithExistingId
-            || entity instanceof legacy_common_with_generated_id_entity_1.LegacyCommonEntityWithGeneratedId;
-        if (!isSupportedEntity) {
-            throw new Error("Entity must be an instance of CommonEntity, LegacyCommonEntityWithExistingId or LegacyCommonEntityWithGeneratedId");
-        }
+        const entityId = this.getSupportedEntityId(entity);
         const result = [];
         const storageProvider = mediaFieldMetadata.mediaStorageProvider;
-        const region = this.getEffectiveRegion(storageProvider.region);
+        const region = (0, media_storage_utils_1.getEffectiveS3Region)(this.configService, storageProvider.region);
         for (const file of files) {
-            const fileName = this.getFileName(file);
+            const fileName = (0, media_storage_utils_1.buildStoredMediaFileName)(file);
             const bucketName = storageProvider.bucketName;
             const fileData = await this.diskFileService.read(file.path);
             await this.s3FileService.write(`${bucketName}:${fileName}`, fileData, { contentType: file.mimetype, region });
             await this.diskFileService.delete(file.path);
             const awsFileUrl = fileName;
-            const mediaEntity = await this.mediaRepository.createMedia({
-                entityId: entity.id,
-                modelMetadataId: mediaFieldMetadata.model.id,
+            const mediaEntity = await this.mediaRepository.createMedia((0, media_storage_utils_1.buildMediaRecordCreateInput)(entityId, mediaFieldMetadata, storageProvider, {
                 relativeUri: awsFileUrl,
                 mimeType: file.mimetype,
                 fileSize: file.size,
                 originalFileName: file.originalname,
-                mediaStorageProviderMetadataId: mediaFieldMetadata.mediaStorageProvider.id,
-                fieldMetadataId: mediaFieldMetadata.id
-            });
+            }));
             result.push(mediaEntity);
             this.logger.debug(`Stored media with`, mediaEntity);
         }
@@ -113,16 +89,11 @@ let FileS3StorageProvider = FileS3StorageProvider_1 = class FileS3StorageProvide
         return result;
     }
     async delete(entity, mediaFieldMetadata) {
-        const isSupportedEntity = entity instanceof common_entity_1.CommonEntity
-            || entity instanceof legacy_common_entity_with_existing_id_entity_1.LegacyCommonEntityWithExistingId
-            || entity instanceof legacy_common_with_generated_id_entity_1.LegacyCommonEntityWithGeneratedId;
-        if (!isSupportedEntity) {
-            throw new Error("Entity must be an instance of CommonEntity, LegacyCommonEntityWithExistingId or LegacyCommonEntityWithGeneratedId");
-        }
+        const entityId = this.getSupportedEntityId(entity);
         const storageProvider = mediaFieldMetadata.mediaStorageProvider;
-        const region = this.getEffectiveRegion(storageProvider.region);
-        const existingMedia = await this.mediaRepository.findByEntityIdAndFieldIdAndModelMetadataId(entity.id, mediaFieldMetadata.id, mediaFieldMetadata.model.id, ['mediaStorageProviderMetadata']);
-        this.mediaRepository.deleteByEntityIdAndFieldIdAndModelMetadataId(entity.id, mediaFieldMetadata.id, mediaFieldMetadata.model.id);
+        const region = (0, media_storage_utils_1.getEffectiveS3Region)(this.configService, storageProvider.region);
+        const existingMedia = await this.mediaRepository.findByEntityIdAndFieldIdAndModelMetadataId(entityId, mediaFieldMetadata.id, mediaFieldMetadata.model.id, ['mediaStorageProviderMetadata']);
+        this.mediaRepository.deleteByEntityIdAndFieldIdAndModelMetadataId(entityId, mediaFieldMetadata.id, mediaFieldMetadata.model.id);
         for (const media of existingMedia) {
             const bucketName = storageProvider.bucketName;
             await this.s3FileService.delete(`${bucketName}:${media.relativeUri}`, { region });
@@ -136,18 +107,17 @@ let FileS3StorageProvider = FileS3StorageProvider_1 = class FileS3StorageProvide
         if (!storageProvider?.bucketName || !media?.relativeUri) {
             return;
         }
-        const region = this.getEffectiveRegion(storageProvider.region);
+        const region = (0, media_storage_utils_1.getEffectiveS3Region)(this.configService, storageProvider.region);
         await this.s3FileService.delete(`${storageProvider.bucketName}:${media.relativeUri}`, { region });
     }
-    getEffectiveRegion(providerRegion) {
-        return providerRegion || this.configService.get('S3_AWS_REGION_NAME');
-    }
-    getFullFilePath(media) {
-        const region = this.getEffectiveRegion(media.mediaStorageProviderMetadata.region);
-        return `https://${media.mediaStorageProviderMetadata.bucketName}.s3.${region}.amazonaws.com/${media.relativeUri}`;
-    }
-    getFileName(file) {
-        return `${file.filename}-${file.originalname}`;
+    getSupportedEntityId(entity) {
+        const isSupportedEntity = entity instanceof common_entity_1.CommonEntity
+            || entity instanceof legacy_common_entity_with_existing_id_entity_1.LegacyCommonEntityWithExistingId
+            || entity instanceof legacy_common_with_generated_id_entity_1.LegacyCommonEntityWithGeneratedId;
+        if (!isSupportedEntity) {
+            throw new Error("Entity must be an instance of CommonEntity, LegacyCommonEntityWithExistingId or LegacyCommonEntityWithGeneratedId");
+        }
+        return entity.id;
     }
 };
 exports.FileS3StorageProvider = FileS3StorageProvider;
@@ -156,6 +126,7 @@ exports.FileS3StorageProvider = FileS3StorageProvider = FileS3StorageProvider_1
     __metadata("design:paramtypes", [config_1.ConfigService,
         file_1.DiskFileService,
         file_1.S3FileService,
-        media_repository_1.MediaRepository])
+        media_repository_1.MediaRepository,
+        media_download_url_service_1.MediaDownloadUrlService])
 ], FileS3StorageProvider);
 //# sourceMappingURL=file-s3-storage-provider.js.map

package/dist/services/mediaStorageProviders/file-s3-storage-provider.js.map

@@ -1 +1 @@
-{"version":3,"file":"file-s3-storage-provider.js","sourceRoot":"","sources":["../../../src/services/mediaStorageProviders/file-s3-storage-provider.ts"],"names":[],"mappings":"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","sourcesContent":["import { Injectable, Logger } from \"@nestjs/common\";\nimport { ConfigService } from \"@nestjs/config\";\nimport { CommonEntity } from \"src/entities/common.entity\";\nimport { FieldMetadata } from \"src/entities/field-metadata.entity\";\nimport { LegacyCommonEntityWithExistingId } from \"src/entities/legacy-common.entity-with-existing-id.entity\";\nimport { LegacyCommonEntityWithGeneratedId } from \"src/entities/legacy-common-with-generated-id.entity\";\nimport { Media } from \"src/entities/media.entity\";\nimport { MediaStorageProvider } from \"src/interfaces\";\nimport { DiskFileService, S3FileService } from \"src/services/file\";\nimport { Readable } from \"stream\";\nimport { MediaRepository } from \"src/repository/media.repository\";\n\n@Injectable()\nexport class FileS3StorageProvider<T> implements MediaStorageProvider<T> {\n    private logger = new Logger(FileS3StorageProvider.name);\n\n    constructor(\n        private readonly configService: ConfigService,\n        readonly diskFileService: DiskFileService,\n        readonly s3FileService: S3FileService,\n        readonly mediaRepository: MediaRepository,\n    ) { }\n\n    async storeStreams(streamPairs: [Readable, string][], entity: T, mediaFieldMetadata: FieldMetadata): Promise<Media[]> {\n        const isSupportedEntity = entity instanceof CommonEntity\n            || entity instanceof LegacyCommonEntityWithExistingId\n            || entity instanceof LegacyCommonEntityWithGeneratedId;\n        if (!isSupportedEntity) {\n            throw new Error(\"Entity must be an instance of CommonEntity, LegacyCommonEntityWithExistingId or LegacyCommonEntityWithGeneratedId\");\n        }\n        const result: Media[] = [];\n        const storageProvider = mediaFieldMetadata.mediaStorageProvider;\n        const region = this.getEffectiveRegion(storageProvider.region);\n\n        for (const [stream, fileName] of streamPairs) {\n            const bucketName = storageProvider.bucketName;\n\n            // Buffer the stream so we can get the byte count and upload in one pass\n            const chunks: Buffer[] = [];\n            for await (const chunk of stream) {\n                chunks.push(Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk));\n            }\n            const fileData = Buffer.concat(chunks);\n            const fileSize = fileData.length;\n\n            await this.s3FileService.write(`${bucketName}:${fileName}`, fileData, { region });\n\n            const mediaEntity = await this.mediaRepository.createMedia({\n                // @ts-ignore\n                entityId: entity.id,\n                modelMetadataId: mediaFieldMetadata.model.id,\n                relativeUri: fileName,\n                fileSize,\n                mediaStorageProviderMetadataId: mediaFieldMetadata.mediaStorageProvider.id,\n                fieldMetadataId: mediaFieldMetadata.id\n            }) as unknown as Media;\n            result.push(mediaEntity);\n            this.logger.debug(`Stored media with`, mediaEntity);\n        }\n        return result;\n    }\n\n    async retrieve(entity: T, mediaFieldMetadata: FieldMetadata): Promise<Media[]> {\n        const isSupportedEntity = entity instanceof CommonEntity\n            || entity instanceof LegacyCommonEntityWithExistingId\n            || entity instanceof LegacyCommonEntityWithGeneratedId;\n        if (!isSupportedEntity) {\n            throw new Error(\"Entity must be an instance of CommonEntity, LegacyCommonEntityWithExistingId or LegacyCommonEntityWithGeneratedId\"); // FIXME This needs to be handled through generics. e.g T extends CommonEntity\n        }\n        // @ts-ignore\n        const media = await this.mediaRepository.findByEntityIdAndFieldIdAndModelMetadataId(entity.id, mediaFieldMetadata.id, mediaFieldMetadata.model.id, ['mediaStorageProviderMetadata']);\n\n        // TODO: Check if the mediaStorageProvider (s3 in this case) is configured with a public bucket or not.\n        // If private bucket then we need to return a \"signed-url\", the timeout for the signed url can be configured in the media storage provider entity and modified using the CRUD interface.\n        // Add the full URL to the media\n        for (const m of media) {\n            const storageMeta = m.mediaStorageProviderMetadata;\n            const region = this.getEffectiveRegion(storageMeta.region);\n            if (storageMeta.isPublic === false) {\n                // Generate signed URL\n                const expiryInSeconds = (storageMeta.signedUrlExpiry ?? 60) * 60;\n                m['_full_url'] = await this.s3FileService.getUrl(`${storageMeta?.bucketName}:${m.relativeUri}`, { expiresIn: expiryInSeconds, region });\n            } else {\n                // Public S3 or local filesystem: use normal URL\n                m['_full_url'] = this.getFullFilePath(m);\n            }\n        }\n\n        return media;\n        // media.forEach(m => {\n        //     m['_full_url'] = this.getFullFilePath(m);\n        // });\n        // return media;\n    }\n\n    async store(files: Express.Multer.File[], entity: T, mediaFieldMetadata: FieldMetadata): Promise<Media[]> {\n        const isSupportedEntity = entity instanceof CommonEntity\n            || entity instanceof LegacyCommonEntityWithExistingId\n            || entity instanceof LegacyCommonEntityWithGeneratedId;\n        if (!isSupportedEntity) {\n            throw new Error(\"Entity must be an instance of CommonEntity, LegacyCommonEntityWithExistingId or LegacyCommonEntityWithGeneratedId\"); // FIXME This needs to be handled through generics. e.g T extends CommonEntity\n        }\n        const result: Media[] = [];\n        const storageProvider = mediaFieldMetadata.mediaStorageProvider;\n        const region = this.getEffectiveRegion(storageProvider.region);\n\n        for (const file of files) {\n            const fileName = this.getFileName(file);\n            const bucketName = storageProvider.bucketName;\n\n            // Read file from disk and upload to S3\n            const fileData = await this.diskFileService.read(file.path);\n            await this.s3FileService.write(`${bucketName}:${fileName}`, fileData, { contentType: file.mimetype, region });\n\n            // Delete temp file from disk\n            await this.diskFileService.delete(file.path);\n\n            const awsFileUrl = fileName;\n\n            // Create an entry in the media table\n            const mediaEntity = await this.mediaRepository.createMedia({\n                // @ts-ignore\n                entityId: entity.id,\n                modelMetadataId: mediaFieldMetadata.model.id,\n                relativeUri: awsFileUrl,\n                mimeType: file.mimetype,\n                fileSize: file.size,\n                originalFileName: file.originalname,\n                mediaStorageProviderMetadataId: mediaFieldMetadata.mediaStorageProvider.id,\n                fieldMetadataId: mediaFieldMetadata.id\n            }) as unknown as Media;\n            result.push(mediaEntity);\n            this.logger.debug(`Stored media with`, mediaEntity);\n        };\n        return result;\n    }\n\n    async delete(entity: T, mediaFieldMetadata: FieldMetadata): Promise<void> {\n        const isSupportedEntity = entity instanceof CommonEntity\n            || entity instanceof LegacyCommonEntityWithExistingId\n            || entity instanceof LegacyCommonEntityWithGeneratedId;\n        if (!isSupportedEntity) {\n            throw new Error(\"Entity must be an instance of CommonEntity, LegacyCommonEntityWithExistingId or LegacyCommonEntityWithGeneratedId\"); // FIXME This needs to be handled through generics. e.g T extends CommonEntity\n        }\n        const storageProvider = mediaFieldMetadata.mediaStorageProvider;\n        const region = this.getEffectiveRegion(storageProvider.region);\n\n        // @ts-ignore\n        const existingMedia = await this.mediaRepository.findByEntityIdAndFieldIdAndModelMetadataId(entity.id, mediaFieldMetadata.id, mediaFieldMetadata.model.id, ['mediaStorageProviderMetadata']);\n        // @ts-ignore\n        this.mediaRepository.deleteByEntityIdAndFieldIdAndModelMetadataId(entity.id, mediaFieldMetadata.id, mediaFieldMetadata.model.id);\n        for (const media of existingMedia) {\n            const bucketName = storageProvider.bucketName;\n            await this.s3FileService.delete(`${bucketName}:${media.relativeUri}`, { region });\n        }\n    }\n\n    async deleteByMediaRecord(media: Media): Promise<void> {\n        const storageProvider = media?.mediaStorageProviderMetadata;\n        if (!storageProvider) {\n            throw new Error(`mediaStorageProviderMetadata is not populated for media id ${media?.id ?? 'unknown'}`);\n        }\n        if (!storageProvider?.bucketName || !media?.relativeUri) {\n            return;\n        }\n        const region = this.getEffectiveRegion(storageProvider.region);\n        await this.s3FileService.delete(`${storageProvider.bucketName}:${media.relativeUri}`, { region });\n    }\n\n    /**\n     * Get the effective region to use for S3 operations.\n     * Uses the provider-specific region if configured, otherwise falls back to env variable.\n     */\n    private getEffectiveRegion(providerRegion?: string): string | undefined {\n        return providerRegion || this.configService.get('S3_AWS_REGION_NAME');\n    }\n\n    private getFullFilePath(media: Media): string {\n        // Use provider region if available, fallback to env variable\n        const region = this.getEffectiveRegion(media.mediaStorageProviderMetadata.region);\n        // https://lunarismedia.s3.ap-south-1.amazonaws.com/LUNARIS_CP_REGISTRATION_CREATIVE.jpg\n        return `https://${media.mediaStorageProviderMetadata.bucketName}.s3.${region}.amazonaws.com/${media.relativeUri}`;\n    }\n\n    private getFileName(file: Express.Multer.File): string {\n        return `${file.filename}-${file.originalname}`;\n    }\n}\n"]}
+{"version":3,"file":"file-s3-storage-provider.js","sourceRoot":"","sources":["../../../src/services/mediaStorageProviders/file-s3-storage-provider.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,2CAAoD;AACpD,2CAA+C;AAC/C,gEAA0D;AAE1D,8HAA6G;AAC7G,kHAAwG;AAGxG,kCAAmE;AAEnE,wEAAkE;AAClE,8EAAkF;AAClF,gEAK0C;AAGnC,IAAM,qBAAqB,6BAA3B,MAAM,qBAAqB;IAG9B,YACqB,aAA4B,EACpC,eAAgC,EAChC,aAA4B,EAC5B,eAAgC,EACxB,uBAAgD;QAJhD,kBAAa,GAAb,aAAa,CAAe;QACpC,oBAAe,GAAf,eAAe,CAAiB;QAChC,kBAAa,GAAb,aAAa,CAAe;QAC5B,oBAAe,GAAf,eAAe,CAAiB;QACxB,4BAAuB,GAAvB,uBAAuB,CAAyB;QAP7D,WAAM,GAAG,IAAI,eAAM,CAAC,uBAAqB,CAAC,IAAI,CAAC,CAAC;IAQpD,CAAC;IAEL,KAAK,CAAC,YAAY,CAAC,WAAiC,EAAE,MAAS,EAAE,kBAAiC;QAC9F,MAAM,QAAQ,GAAG,IAAI,CAAC,oBAAoB,CAAC,MAAM,CAAC,CAAC;QACnD,MAAM,MAAM,GAAY,EAAE,CAAC;QAC3B,MAAM,eAAe,GAAG,kBAAkB,CAAC,oBAAoB,CAAC;QAChE,MAAM,MAAM,GAAG,IAAA,0CAAoB,EAAC,IAAI,CAAC,aAAa,EAAE,eAAe,CAAC,MAAM,CAAC,CAAC;QAEhF,KAAK,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,IAAI,WAAW,EAAE,CAAC;YAC3C,MAAM,UAAU,GAAG,eAAe,CAAC,UAAU,CAAC;YAG9C,MAAM,MAAM,GAAa,EAAE,CAAC;YAC5B,IAAI,KAAK,EAAE,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;gBAC/B,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;YACrE,CAAC;YACD,MAAM,QAAQ,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;YACvC,MAAM,QAAQ,GAAG,QAAQ,CAAC,MAAM,CAAC;YAEjC,MAAM,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,GAAG,UAAU,IAAI,QAAQ,EAAE,EAAE,QAAQ,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;YAElF,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,WAAW,CACtD,IAAA,iDAA2B,EAAC,QAAQ,EAAE,kBAAkB,EAAE,eAAe,EAAE;gBACvE,WAAW,EAAE,QAAQ;gBACrB,QAAQ;aACX,CAAC,CACe,CAAC;YACtB,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;YACzB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,mBAAmB,EAAE,WAAW,CAAC,CAAC;QACxD,CAAC;QACD,OAAO,MAAM,CAAC;IAClB,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,MAAS,EAAE,kBAAiC;QACvD,MAAM,QAAQ,GAAG,IAAI,CAAC,oBAAoB,CAAC,MAAM,CAAC,CAAC;QAEnD,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,0CAA0C,CAAC,QAAQ,EAAE,kBAAkB,CAAC,EAAE,EAAE,kBAAkB,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC,8BAA8B,CAAC,CAAC,CAAC;QAKpL,KAAK,MAAM,CAAC,IAAI,KAAK,EAAE,CAAC;YACpB,MAAM,WAAW,GAAG,CAAC,CAAC,4BAA4B,CAAC;YACnD,MAAM,QAAQ,GAAG,IAAA,0CAAoB,EAAC,WAAW,CAAC,CAAC;YACnD,CAAC,CAAC,WAAW,CAAC,GAAG,QAAQ,KAAK,KAAK;gBAC/B,CAAC,CAAC,MAAM,IAAI,CAAC,uBAAuB,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,WAAW,EAAE,WAAW,CAAC;gBACpF,CAAC,CAAC,MAAM,IAAI,CAAC,aAAa,CAAC,MAAM,CAC7B,GAAG,WAAW,CAAC,UAAU,IAAI,CAAC,CAAC,WAAW,EAAE,EAC5C,EAAE,MAAM,EAAE,IAAA,0CAAoB,EAAC,IAAI,CAAC,aAAa,EAAE,WAAW,CAAC,MAAM,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,CACzF,CAAC;QACV,CAAC;QAED,OAAO,KAAK,CAAC;IAKjB,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,KAA4B,EAAE,MAAS,EAAE,kBAAiC;QAClF,MAAM,QAAQ,GAAG,IAAI,CAAC,oBAAoB,CAAC,MAAM,CAAC,CAAC;QACnD,MAAM,MAAM,GAAY,EAAE,CAAC;QAC3B,MAAM,eAAe,GAAG,kBAAkB,CAAC,oBAAoB,CAAC;QAChE,MAAM,MAAM,GAAG,IAAA,0CAAoB,EAAC,IAAI,CAAC,aAAa,EAAE,eAAe,CAAC,MAAM,CAAC,CAAC;QAEhF,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;YACvB,MAAM,QAAQ,GAAG,IAAA,8CAAwB,EAAC,IAAI,CAAC,CAAC;YAChD,MAAM,UAAU,GAAG,eAAe,CAAC,UAAU,CAAC;YAG9C,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAC5D,MAAM,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,GAAG,UAAU,IAAI,QAAQ,EAAE,EAAE,QAAQ,EAAE,EAAE,WAAW,EAAE,IAAI,CAAC,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC;YAG9G,MAAM,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAE7C,MAAM,UAAU,GAAG,QAAQ,CAAC;YAG5B,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,WAAW,CACtD,IAAA,iDAA2B,EAAC,QAAQ,EAAE,kBAAkB,EAAE,eAAe,EAAE;gBACvE,WAAW,EAAE,UAAU;gBACvB,QAAQ,EAAE,IAAI,CAAC,QAAQ;gBACvB,QAAQ,EAAE,IAAI,CAAC,IAAI;gBACnB,gBAAgB,EAAE,IAAI,CAAC,YAAY;aACtC,CAAC,CACe,CAAC;YACtB,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;YACzB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,mBAAmB,EAAE,WAAW,CAAC,CAAC;QACxD,CAAC;QAAA,CAAC;QACF,OAAO,MAAM,CAAC;IAClB,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,MAAS,EAAE,kBAAiC;QACrD,MAAM,QAAQ,GAAG,IAAI,CAAC,oBAAoB,CAAC,MAAM,CAAC,CAAC;QACnD,MAAM,eAAe,GAAG,kBAAkB,CAAC,oBAAoB,CAAC;QAChE,MAAM,MAAM,GAAG,IAAA,0CAAoB,EAAC,IAAI,CAAC,aAAa,EAAE,eAAe,CAAC,MAAM,CAAC,CAAC;QAGhF,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,0CAA0C,CAAC,QAAQ,EAAE,kBAAkB,CAAC,EAAE,EAAE,kBAAkB,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC,8BAA8B,CAAC,CAAC,CAAC;QAE5L,IAAI,CAAC,eAAe,CAAC,4CAA4C,CAAC,QAAQ,EAAE,kBAAkB,CAAC,EAAE,EAAE,kBAAkB,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QAChI,KAAK,MAAM,KAAK,IAAI,aAAa,EAAE,CAAC;YAChC,MAAM,UAAU,GAAG,eAAe,CAAC,UAAU,CAAC;YAC9C,MAAM,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,GAAG,UAAU,IAAI,KAAK,CAAC,WAAW,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;QACtF,CAAC;IACL,CAAC;IAED,KAAK,CAAC,mBAAmB,CAAC,KAAY;QAClC,MAAM,eAAe,GAAG,KAAK,EAAE,4BAA4B,CAAC;QAC5D,IAAI,CAAC,eAAe,EAAE,CAAC;YACnB,MAAM,IAAI,KAAK,CAAC,8DAA8D,KAAK,EAAE,EAAE,IAAI,SAAS,EAAE,CAAC,CAAC;QAC5G,CAAC;QACD,IAAI,CAAC,eAAe,EAAE,UAAU,IAAI,CAAC,KAAK,EAAE,WAAW,EAAE,CAAC;YACtD,OAAO;QACX,CAAC;QACD,MAAM,MAAM,GAAG,IAAA,0CAAoB,EAAC,IAAI,CAAC,aAAa,EAAE,eAAe,CAAC,MAAM,CAAC,CAAC;QAChF,MAAM,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,GAAG,eAAe,CAAC,UAAU,IAAI,KAAK,CAAC,WAAW,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;IACtG,CAAC;IAEO,oBAAoB,CAAC,MAAS;QAClC,MAAM,iBAAiB,GAAG,MAAM,YAAY,4BAAY;eACjD,MAAM,YAAY,+EAAgC;eAClD,MAAM,YAAY,0EAAiC,CAAC;QAE3D,IAAI,CAAC,iBAAiB,EAAE,CAAC;YACrB,MAAM,IAAI,KAAK,CAAC,mHAAmH,CAAC,CAAC;QACzI,CAAC;QAED,OAAQ,MAAc,CAAC,EAAE,CAAC;IAC9B,CAAC;CACJ,CAAA;AA5IY,sDAAqB;gCAArB,qBAAqB;IADjC,IAAA,mBAAU,GAAE;qCAK2B,sBAAa;QACnB,sBAAe;QACjB,oBAAa;QACX,kCAAe;QACC,oDAAuB;GAR5D,qBAAqB,CA4IjC","sourcesContent":["import { Injectable, Logger } from \"@nestjs/common\";\nimport { ConfigService } from \"@nestjs/config\";\nimport { CommonEntity } from \"src/entities/common.entity\";\nimport { FieldMetadata } from \"src/entities/field-metadata.entity\";\nimport { LegacyCommonEntityWithExistingId } from \"src/entities/legacy-common.entity-with-existing-id.entity\";\nimport { LegacyCommonEntityWithGeneratedId } from \"src/entities/legacy-common-with-generated-id.entity\";\nimport { Media } from \"src/entities/media.entity\";\nimport { MediaStorageProvider } from \"src/interfaces\";\nimport { DiskFileService, S3FileService } from \"src/services/file\";\nimport { Readable } from \"stream\";\nimport { MediaRepository } from \"src/repository/media.repository\";\nimport { MediaDownloadUrlService } from \"src/services/media-download-url.service\";\nimport {\nbuildMediaRecordCreateInput,\nbuildStoredMediaFileName,\ngetEffectiveS3Region,\nresolveMediaIsPublic,\n} from \"src/services/media-storage.utils\";\n\n@Injectable()\nexport class FileS3StorageProvider<T> implements MediaStorageProvider<T> {\n    private logger = new Logger(FileS3StorageProvider.name);\n\n    constructor(\n        private readonly configService: ConfigService,\n        readonly diskFileService: DiskFileService,\n        readonly s3FileService: S3FileService,\n        readonly mediaRepository: MediaRepository,\n        private readonly mediaDownloadUrlService: MediaDownloadUrlService,\n    ) { }\n\n    async storeStreams(streamPairs: [Readable, string][], entity: T, mediaFieldMetadata: FieldMetadata): Promise<Media[]> {\n        const entityId = this.getSupportedEntityId(entity);\n        const result: Media[] = [];\n        const storageProvider = mediaFieldMetadata.mediaStorageProvider;\n        const region = getEffectiveS3Region(this.configService, storageProvider.region);\n\n        for (const [stream, fileName] of streamPairs) {\n            const bucketName = storageProvider.bucketName;\n\n            // Buffer the stream so we can get the byte count and upload in one pass\n            const chunks: Buffer[] = [];\n            for await (const chunk of stream) {\n                chunks.push(Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk));\n            }\n            const fileData = Buffer.concat(chunks);\n            const fileSize = fileData.length;\n\n            await this.s3FileService.write(`${bucketName}:${fileName}`, fileData, { region });\n\n            const mediaEntity = await this.mediaRepository.createMedia(\n                buildMediaRecordCreateInput(entityId, mediaFieldMetadata, storageProvider, {\n                    relativeUri: fileName,\n                    fileSize,\n                })\n            ) as unknown as Media;\n            result.push(mediaEntity);\n            this.logger.debug(`Stored media with`, mediaEntity);\n        }\n        return result;\n    }\n\n    async retrieve(entity: T, mediaFieldMetadata: FieldMetadata): Promise<Media[]> {\n        const entityId = this.getSupportedEntityId(entity);\n        // @ts-ignore\n        const media = await this.mediaRepository.findByEntityIdAndFieldIdAndModelMetadataId(entityId, mediaFieldMetadata.id, mediaFieldMetadata.model.id, ['mediaStorageProviderMetadata']);\n\n        // TODO: Check if the mediaStorageProvider (s3 in this case) is configured with a public bucket or not.\n        // If private bucket then we need to return a \"signed-url\", the timeout for the signed url can be configured in the media storage provider entity and modified using the CRUD interface.\n        // Add the full URL to the media\n        for (const m of media) {\n            const storageMeta = m.mediaStorageProviderMetadata;\n            const isPublic = resolveMediaIsPublic(storageMeta);\n            m['_full_url'] = isPublic === false\n                ? await this.mediaDownloadUrlService.getPrivateUrl(m.id, m.relativeUri, storageMeta)\n                : await this.s3FileService.getUrl(\n                    `${storageMeta.bucketName}:${m.relativeUri}`,\n                    { region: getEffectiveS3Region(this.configService, storageMeta.region), expiresIn: 0 },\n                );\n        }\n\n        return media;\n        // media.forEach(m => {\n        //     m['_full_url'] = this.getFullFilePath(m);\n        // });\n        // return media;\n    }\n\n    async store(files: Express.Multer.File[], entity: T, mediaFieldMetadata: FieldMetadata): Promise<Media[]> {\n        const entityId = this.getSupportedEntityId(entity);\n        const result: Media[] = [];\n        const storageProvider = mediaFieldMetadata.mediaStorageProvider;\n        const region = getEffectiveS3Region(this.configService, storageProvider.region);\n\n        for (const file of files) {\n            const fileName = buildStoredMediaFileName(file);\n            const bucketName = storageProvider.bucketName;\n\n            // Read file from disk and upload to S3\n            const fileData = await this.diskFileService.read(file.path);\n            await this.s3FileService.write(`${bucketName}:${fileName}`, fileData, { contentType: file.mimetype, region });\n\n            // Delete temp file from disk\n            await this.diskFileService.delete(file.path);\n\n            const awsFileUrl = fileName;\n\n            // Create an entry in the media table\n            const mediaEntity = await this.mediaRepository.createMedia(\n                buildMediaRecordCreateInput(entityId, mediaFieldMetadata, storageProvider, {\n                    relativeUri: awsFileUrl,\n                    mimeType: file.mimetype,\n                    fileSize: file.size,\n                    originalFileName: file.originalname,\n                })\n            ) as unknown as Media;\n            result.push(mediaEntity);\n            this.logger.debug(`Stored media with`, mediaEntity);\n        };\n        return result;\n    }\n\n    async delete(entity: T, mediaFieldMetadata: FieldMetadata): Promise<void> {\n        const entityId = this.getSupportedEntityId(entity);\n        const storageProvider = mediaFieldMetadata.mediaStorageProvider;\n        const region = getEffectiveS3Region(this.configService, storageProvider.region);\n\n        // @ts-ignore\n        const existingMedia = await this.mediaRepository.findByEntityIdAndFieldIdAndModelMetadataId(entityId, mediaFieldMetadata.id, mediaFieldMetadata.model.id, ['mediaStorageProviderMetadata']);\n        // @ts-ignore\n        this.mediaRepository.deleteByEntityIdAndFieldIdAndModelMetadataId(entityId, mediaFieldMetadata.id, mediaFieldMetadata.model.id);\n        for (const media of existingMedia) {\n            const bucketName = storageProvider.bucketName;\n            await this.s3FileService.delete(`${bucketName}:${media.relativeUri}`, { region });\n        }\n    }\n\n    async deleteByMediaRecord(media: Media): Promise<void> {\n        const storageProvider = media?.mediaStorageProviderMetadata;\n        if (!storageProvider) {\n            throw new Error(`mediaStorageProviderMetadata is not populated for media id ${media?.id ?? 'unknown'}`);\n        }\n        if (!storageProvider?.bucketName || !media?.relativeUri) {\n            return;\n        }\n        const region = getEffectiveS3Region(this.configService, storageProvider.region);\n        await this.s3FileService.delete(`${storageProvider.bucketName}:${media.relativeUri}`, { region });\n    }\n\n    private getSupportedEntityId(entity: T): number {\n        const isSupportedEntity = entity instanceof CommonEntity\n            || entity instanceof LegacyCommonEntityWithExistingId\n            || entity instanceof LegacyCommonEntityWithGeneratedId;\n\n        if (!isSupportedEntity) {\n            throw new Error(\"Entity must be an instance of CommonEntity, LegacyCommonEntityWithExistingId or LegacyCommonEntityWithGeneratedId\");\n        }\n\n        return (entity as any).id;\n    }\n}\n"]}

package/dist/services/mediaStorageProviders/file-storage-provider.d.ts

@@ -1,4 +1,3 @@
-import { ConfigService } from "@nestjs/config";
 import { FieldMetadata } from "../../entities/field-metadata.entity";
 import { Media } from "../../entities/media.entity";
 import { MediaStorageProvider } from "../../interfaces";
@@ -6,19 +5,20 @@ import { MediaRepository } from "../../repository/media.repository";
 import { DiskFileService } from "../../services/file";
 import { Readable } from "stream";
 import { SettingService } from "../setting.service";
+import { MediaDownloadUrlService } from "../../services/media-download-url.service";
 export declare class FileStorageProvider<T> implements MediaStorageProvider<T> {
-    private readonly configService;
     readonly fileService: DiskFileService;
     readonly mediaRepository: MediaRepository;
     private readonly settingService;
+    private readonly mediaDownloadUrlService;
     private logger;
-    constructor(configService: ConfigService, fileService: DiskFileService, mediaRepository: MediaRepository, settingService: SettingService);
+    constructor(fileService: DiskFileService, mediaRepository: MediaRepository, settingService: SettingService, mediaDownloadUrlService: MediaDownloadUrlService);
     retrieve(entity: T, mediaFieldMetadata: FieldMetadata): Promise<Media[]>;
     store(files: Express.Multer.File[], entity: T, mediaFieldMetadata: FieldMetadata): Promise<Media[]>;
     storeStreams(streamPairs: [Readable, string][], entity: T, mediaFieldMetadata: FieldMetadata): Promise<Media[]>;
     delete(entity: T, mediaFieldMetadata: FieldMetadata): Promise<void>;
     deleteByMediaRecord(media: Media): Promise<void>;
-    private getFullFilePath;
-    private getFileName;
+    private resolveMediaStorageProvider;
+    private getEntityId;
 }
 //# sourceMappingURL=file-storage-provider.d.ts.map

package/dist/services/mediaStorageProviders/file-storage-provider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"file-storage-provider.d.ts","sourceRoot":"","sources":["../../../src/services/mediaStorageProviders/file-storage-provider.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAE/C,OAAO,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAC;AACnE,OAAO,EAAE,KAAK,EAAE,MAAM,2BAA2B,CAAC;AAClD,OAAO,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AACtD,OAAO,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAClE,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAGlC,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAIpD,qBACa,mBAAmB,CAAC,CAAC,CAAE,YAAW,oBAAoB,CAAC,CAAC,CAAC;IAM9D,OAAO,CAAC,QAAQ,CAAC,aAAa;IAC9B,QAAQ,CAAC,WAAW,EAAE,eAAe;IACrC,QAAQ,CAAC,eAAe,EAAE,eAAe;IACzC,OAAO,CAAC,QAAQ,CAAC,cAAc;IARnC,OAAO,CAAC,MAAM,CAAwC;gBAKjC,aAAa,EAAE,aAAa,EACpC,WAAW,EAAE,eAAe,EAC5B,eAAe,EAAE,eAAe,EACxB,cAAc,EAAE,cAAc;IAI7C,QAAQ,CAAC,MAAM,EAAE,CAAC,EAAE,kBAAkB,EAAE,aAAa,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;IAiBxE,KAAK,CAAC,KAAK,EAAE,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE,kBAAkB,EAAE,aAAa,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;IA6BnG,YAAY,CAAC,WAAW,EAAE,CAAC,QAAQ,EAAE,MAAM,CAAC,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE,kBAAkB,EAAE,aAAa,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;IAyB/G,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,kBAAkB,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAgBnE,mBAAmB,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;IAOtD,OAAO,CAAC,eAAe;IASvB,OAAO,CAAC,WAAW;CAGtB"}
+{"version":3,"file":"file-storage-provider.d.ts","sourceRoot":"","sources":["../../../src/services/mediaStorageProviders/file-storage-provider.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAC;AACnE,OAAO,EAAE,KAAK,EAAE,MAAM,2BAA2B,CAAC;AAElD,OAAO,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AACtD,OAAO,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAClE,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAElC,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAE,uBAAuB,EAAE,MAAM,yCAAyC,CAAC;AAGlF,qBACa,mBAAmB,CAAC,CAAC,CAAE,YAAW,oBAAoB,CAAC,CAAC,CAAC;IAI9D,QAAQ,CAAC,WAAW,EAAE,eAAe;IACrC,QAAQ,CAAC,eAAe,EAAE,eAAe;IACzC,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,OAAO,CAAC,QAAQ,CAAC,uBAAuB;IAN5C,OAAO,CAAC,MAAM,CAAwC;gBAGzC,WAAW,EAAE,eAAe,EAC5B,eAAe,EAAE,eAAe,EACxB,cAAc,EAAE,cAAc,EAC9B,uBAAuB,EAAE,uBAAuB;IAI/D,QAAQ,CAAC,MAAM,EAAE,CAAC,EAAE,kBAAkB,EAAE,aAAa,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;IAqBxE,KAAK,CAAC,KAAK,EAAE,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE,kBAAkB,EAAE,aAAa,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;IA4BnG,YAAY,CAAC,WAAW,EAAE,CAAC,QAAQ,EAAE,MAAM,CAAC,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE,kBAAkB,EAAE,aAAa,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;IAwB/G,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,kBAAkB,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAgBnE,mBAAmB,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;IAOtD,OAAO,CAAC,2BAA2B;IAInC,OAAO,CAAC,WAAW;CAGtB"}

package/dist/services/mediaStorageProviders/file-storage-provider.js

@@ -45,44 +45,45 @@ var FileStorageProvider_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FileStorageProvider = void 0;
 const common_1 = require("@nestjs/common");
-const config_1 = require("@nestjs/config");
 const media_repository_1 = require("../../repository/media.repository");
 const file_1 = require("../file");
-const path = __importStar(require("path"));
 const fs = __importStar(require("fs"));
 const setting_service_1 = require("../setting.service");
-const default_settings_provider_service_1 = require("../settings/default-settings-provider.service");
+const media_download_url_service_1 = require("../media-download-url.service");
+const media_storage_utils_1 = require("../media-storage.utils");
 let FileStorageProvider = FileStorageProvider_1 = class FileStorageProvider {
-    constructor(configService, fileService, mediaRepository, settingService) {
-        this.configService = configService;
+    constructor(fileService, mediaRepository, settingService, mediaDownloadUrlService) {
         this.fileService = fileService;
         this.mediaRepository = mediaRepository;
         this.settingService = settingService;
+        this.mediaDownloadUrlService = mediaDownloadUrlService;
         this.logger = new common_1.Logger(FileStorageProvider_1.name);
     }
     async retrieve(entity, mediaFieldMetadata) {
-        const media = await this.mediaRepository.findByEntityIdAndFieldIdAndModelMetadataId(entity.id, mediaFieldMetadata.id, mediaFieldMetadata.model.id, ['mediaStorageProviderMetadata']);
+        const media = await this.mediaRepository.findByEntityIdAndFieldIdAndModelMetadataId(this.getEntityId(entity), mediaFieldMetadata.id, mediaFieldMetadata.model.id, ['mediaStorageProviderMetadata']);
         for (const m of media) {
-            m['_full_url'] = `${this.settingService.getConfigValue("baseUrl")}/${this.getFullFilePath(m.relativeUri)}`;
+            const storageProvider = this.resolveMediaStorageProvider(m, mediaFieldMetadata);
+            const isPublic = (0, media_storage_utils_1.resolveMediaIsPublic)(storageProvider);
+            m['_full_url'] = isPublic === false
+                ? await this.mediaDownloadUrlService.getPrivateUrl(m.id, m.relativeUri, storageProvider)
+                : await this.fileService.getUrl((0, media_storage_utils_1.buildDiskMediaPath)(m.relativeUri, this.settingService, storageProvider));
         }
         return media;
     }
     async store(files, entity, mediaFieldMetadata) {
         const result = [];
+        const storageProvider = mediaFieldMetadata.mediaStorageProvider;
         for (const file of files) {
-            const fileStoragePath = this.getFullFilePath(this.getFileName(file));
+            const fileName = (0, media_storage_utils_1.buildStoredMediaFileName)(file);
+            const fileStoragePath = (0, media_storage_utils_1.buildDiskMediaPath)(fileName, this.settingService, storageProvider);
             await this.fileService.copy(file.path, fileStoragePath);
             await this.fileService.delete(file.path);
-            const mediaEntity = await this.mediaRepository.createMedia({
-                entityId: entity.id,
-                modelMetadataId: mediaFieldMetadata.model.id,
-                relativeUri: this.getFileName(file),
+            const mediaEntity = await this.mediaRepository.createMedia((0, media_storage_utils_1.buildMediaRecordCreateInput)(this.getEntityId(entity), mediaFieldMetadata, storageProvider, {
+                relativeUri: fileName,
                 mimeType: file.mimetype,
                 fileSize: file.size,
                 originalFileName: file.originalname,
-                mediaStorageProviderMetadataId: mediaFieldMetadata.mediaStorageProvider.id,
-                fieldMetadataId: mediaFieldMetadata.id
-            });
+            }));
             result.push(mediaEntity);
             this.logger.debug(`Stored media with`, mediaEntity);
         }
@@ -91,56 +92,51 @@ let FileStorageProvider = FileStorageProvider_1 = class FileStorageProvider {
     }
     async storeStreams(streamPairs, entity, mediaFieldMetadata) {
         const result = [];
+        const storageProvider = mediaFieldMetadata.mediaStorageProvider;
         for (const pair of streamPairs) {
             const stream = pair[0];
             const fileName = pair[1];
-            const fullPath = this.getFullFilePath(fileName);
+            const fullPath = (0, media_storage_utils_1.buildDiskMediaPath)(fileName, this.settingService, storageProvider);
             await this.fileService.writeStream(fullPath, stream);
             const { size: fileSize } = await fs.promises.stat(fullPath);
-            const mediaEntity = await this.mediaRepository.createMedia({
-                entityId: entity.id,
-                modelMetadataId: mediaFieldMetadata.model.id,
+            const mediaEntity = await this.mediaRepository.createMedia((0, media_storage_utils_1.buildMediaRecordCreateInput)(this.getEntityId(entity), mediaFieldMetadata, storageProvider, {
                 relativeUri: fileName,
                 fileSize,
-                mediaStorageProviderMetadataId: mediaFieldMetadata.mediaStorageProvider.id,
-                fieldMetadataId: mediaFieldMetadata.id
-            });
+            }));
+            result.push(mediaEntity);
             this.logger.debug(`Stored media with`, mediaEntity);
         }
         ;
         return result;
     }
     async delete(entity, mediaFieldMetadata) {
-        const existingMedia = await this.mediaRepository.findByEntityIdAndFieldIdAndModelMetadataId(entity.id, mediaFieldMetadata.id, mediaFieldMetadata.model.id, ['mediaStorageProviderMetadata']);
-        this.mediaRepository.deleteByEntityIdAndFieldIdAndModelMetadataId(entity.id, mediaFieldMetadata.id, mediaFieldMetadata.model.id);
+        const entityId = this.getEntityId(entity);
+        const existingMedia = await this.mediaRepository.findByEntityIdAndFieldIdAndModelMetadataId(entityId, mediaFieldMetadata.id, mediaFieldMetadata.model.id, ['mediaStorageProviderMetadata']);
+        await this.mediaRepository.deleteByEntityIdAndFieldIdAndModelMetadataId(entityId, mediaFieldMetadata.id, mediaFieldMetadata.model.id);
         for (const media of existingMedia) {
-            await this.fileService.delete(this.getFullFilePath(media.relativeUri));
+            const storageProvider = this.resolveMediaStorageProvider(media, mediaFieldMetadata);
+            await this.fileService.delete((0, media_storage_utils_1.buildDiskMediaPath)(media.relativeUri, this.settingService, storageProvider));
         }
     }
     async deleteByMediaRecord(media) {
         if (!media?.relativeUri) {
             return;
         }
-        await this.fileService.delete(this.getFullFilePath(media.relativeUri));
+        await this.fileService.delete((0, media_storage_utils_1.buildDiskMediaPath)(media.relativeUri, this.settingService, media.mediaStorageProviderMetadata));
     }
-    getFullFilePath(fileName) {
-        const base = this.settingService.getConfigValue("fileStorageDir")
-            || default_settings_provider_service_1.DEFAULT_MEDIA_FILE_STORAGE_DIR;
-        if (path.isAbsolute(fileName) || fileName.startsWith(`${base}/`)) {
-            return fileName;
-        }
-        return `${base}/${fileName}`;
+    resolveMediaStorageProvider(media, mediaFieldMetadata) {
+        return media.mediaStorageProviderMetadata || mediaFieldMetadata?.mediaStorageProvider;
     }
-    getFileName(file) {
-        return `${file.filename}-${file.originalname}`;
+    getEntityId(entity) {
+        return entity.id;
     }
 };
 exports.FileStorageProvider = FileStorageProvider;
 exports.FileStorageProvider = FileStorageProvider = FileStorageProvider_1 = __decorate([
     (0, common_1.Injectable)(),
-    __metadata("design:paramtypes", [config_1.ConfigService,
-        file_1.DiskFileService,
+    __metadata("design:paramtypes", [file_1.DiskFileService,
         media_repository_1.MediaRepository,
-        setting_service_1.SettingService])
+        setting_service_1.SettingService,
+        media_download_url_service_1.MediaDownloadUrlService])
 ], FileStorageProvider);
 //# sourceMappingURL=file-storage-provider.js.map

package/dist/services/mediaStorageProviders/file-storage-provider.js.map

@@ -1 +1 @@
-{"version":3,"file":"file-storage-provider.js","sourceRoot":"","sources":["../../../src/services/mediaStorageProviders/file-storage-provider.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2CAAoD;AACpD,2CAA+C;AAK/C,wEAAkE;AAClE,kCAAoD;AAEpD,2CAA6B;AAC7B,uCAAyB;AACzB,wDAAoD;AACpD,qGAAyG;AAIlG,IAAM,mBAAmB,2BAAzB,MAAM,mBAAmB;IAG5B,YAGqB,aAA4B,EACpC,WAA4B,EAC5B,eAAgC,EACxB,cAA8B;QAH9B,kBAAa,GAAb,aAAa,CAAe;QACpC,gBAAW,GAAX,WAAW,CAAiB;QAC5B,oBAAe,GAAf,eAAe,CAAiB;QACxB,mBAAc,GAAd,cAAc,CAAgB;QAR3C,WAAM,GAAG,IAAI,eAAM,CAAC,qBAAmB,CAAC,IAAI,CAAC,CAAC;IAUlD,CAAC;IAEL,KAAK,CAAC,QAAQ,CAAC,MAAS,EAAE,kBAAiC;QAKvD,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,0CAA0C,CAAC,MAAM,CAAC,EAAE,EAAE,kBAAkB,CAAC,EAAE,EAAE,kBAAkB,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC,8BAA8B,CAAC,CAAC,CAAC;QAIrL,KAAK,MAAM,CAAC,IAAI,KAAK,EAAE,CAAC;YACpB,CAAC,CAAC,WAAW,CAAC,GAAG,GAAG,IAAI,CAAC,cAAc,CAAC,cAAc,CAAmB,SAAS,CAAC,IAAI,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,WAAW,CAAC,EAAE,CAAC;QACjI,CAAC;QAGD,OAAO,KAAK,CAAC;IACjB,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,KAA4B,EAAE,MAAS,EAAE,kBAAiC;QAIlF,MAAM,MAAM,GAAY,EAAE,CAAC;QAC3B,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;YAEvB,MAAM,eAAe,GAAG,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC;YACrE,MAAM,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC;YACxD,MAAM,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAGzC,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,WAAW,CAAC;gBAEvD,QAAQ,EAAE,MAAM,CAAC,EAAE;gBACnB,eAAe,EAAE,kBAAkB,CAAC,KAAK,CAAC,EAAE;gBAC5C,WAAW,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC;gBACnC,QAAQ,EAAE,IAAI,CAAC,QAAQ;gBACvB,QAAQ,EAAE,IAAI,CAAC,IAAI;gBACnB,gBAAgB,EAAE,IAAI,CAAC,YAAY;gBACnC,8BAA8B,EAAE,kBAAkB,CAAC,oBAAoB,CAAC,EAAE;gBAC1E,eAAe,EAAE,kBAAkB,CAAC,EAAE;aACzC,CAAqB,CAAC;YACvB,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;YACzB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,mBAAmB,EAAE,WAAW,CAAC,CAAC;QACxD,CAAC;QAAA,CAAC;QACF,OAAO,MAAM,CAAC;IAClB,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,WAAiC,EAAE,MAAS,EAAE,kBAAiC;QAI9F,MAAM,MAAM,GAAY,EAAE,CAAC;QAC3B,KAAK,MAAM,IAAI,IAAI,WAAW,EAAE,CAAC;YAC7B,MAAM,MAAM,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;YACvB,MAAM,QAAQ,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;YACzB,MAAM,QAAQ,GAAG,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC;YAChD,MAAM,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;YACrD,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YAC5D,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,WAAW,CAAC;gBAEvD,QAAQ,EAAE,MAAM,CAAC,EAAE;gBACnB,eAAe,EAAE,kBAAkB,CAAC,KAAK,CAAC,EAAE;gBAC5C,WAAW,EAAE,QAAQ;gBACrB,QAAQ;gBACR,8BAA8B,EAAE,kBAAkB,CAAC,oBAAoB,CAAC,EAAE;gBAC1E,eAAe,EAAE,kBAAkB,CAAC,EAAE;aACzC,CAAqB,CAAC;YACvB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,mBAAmB,EAAE,WAAW,CAAC,CAAC;QACxD,CAAC;QAAA,CAAC;QACF,OAAO,MAAM,CAAC;IAClB,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,MAAS,EAAE,kBAAiC;QAKrD,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,0CAA0C,CAAC,MAAM,CAAC,EAAE,EAAE,kBAAkB,CAAC,EAAE,EAAE,kBAAkB,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC,8BAA8B,CAAC,CAAC,CAAC;QAE7L,IAAI,CAAC,eAAe,CAAC,4CAA4C,CAAC,MAAM,CAAC,EAAE,EAAE,kBAAkB,CAAC,EAAE,EAAE,kBAAkB,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QAEjI,KAAK,MAAM,KAAK,IAAI,aAAa,EAAE,CAAC;YAChC,MAAM,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC;QAC3E,CAAC;IAGL,CAAC;IAED,KAAK,CAAC,mBAAmB,CAAC,KAAY;QAClC,IAAI,CAAC,KAAK,EAAE,WAAW,EAAE,CAAC;YACtB,OAAO;QACX,CAAC;QACD,MAAM,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC;IAC3E,CAAC;IAEO,eAAe,CAAC,QAAgB;QACpC,MAAM,IAAI,GAAG,IAAI,CAAC,cAAc,CAAC,cAAc,CAAmB,gBAAgB,CAAC;eAC5E,kEAA8B,CAAC;QACtC,IAAI,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,QAAQ,CAAC,UAAU,CAAC,GAAG,IAAI,GAAG,CAAC,EAAE,CAAC;YAC/D,OAAO,QAAQ,CAAC;QACpB,CAAC;QACD,OAAO,GAAG,IAAI,IAAI,QAAQ,EAAE,CAAC;IACjC,CAAC;IAEO,WAAW,CAAC,IAAyB;QACzC,OAAO,GAAG,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;IACnD,CAAC;CACJ,CAAA;AAvHY,kDAAmB;8BAAnB,mBAAmB;IAD/B,IAAA,mBAAU,GAAE;qCAO2B,sBAAa;QACvB,sBAAe;QACX,kCAAe;QACR,gCAAc;GAT1C,mBAAmB,CAuH/B","sourcesContent":["import { Injectable, Logger } from \"@nestjs/common\";\nimport { ConfigService } from \"@nestjs/config\";\nimport { CommonEntity } from \"src/entities/common.entity\";\nimport { FieldMetadata } from \"src/entities/field-metadata.entity\";\nimport { Media } from \"src/entities/media.entity\";\nimport { MediaStorageProvider } from \"src/interfaces\";\nimport { MediaRepository } from \"src/repository/media.repository\";\nimport { DiskFileService } from \"src/services/file\";\nimport { Readable } from \"stream\";\nimport * as path from \"path\";\nimport * as fs from \"fs\";\nimport { SettingService } from \"../setting.service\";\nimport { DEFAULT_MEDIA_FILE_STORAGE_DIR } from \"src/services/settings/default-settings-provider.service\";\nimport type { SolidCoreSetting } from \"src/services/settings/default-settings-provider.service\";\n\n@Injectable()\nexport class FileStorageProvider<T> implements MediaStorageProvider<T> {\n    private logger = new Logger(FileStorageProvider.name);\n\n    constructor(\n        // @Inject(appBuilderConfig.KEY)\n        // private readonly appBuilderConfiguration: ConfigType<typeof appBuilderConfig>,\n        private readonly configService: ConfigService,\n        readonly fileService: DiskFileService,\n        readonly mediaRepository: MediaRepository,\n        private readonly settingService: SettingService\n\n    ) { }\n\n    async retrieve(entity: T, mediaFieldMetadata: FieldMetadata): Promise<Media[]> {\n        // if (!(entity instanceof CommonEntity)) {\n        //     throw new Error(\"Entity must be an instance of CommonEntity\"); //FIXME This needs to be handled through generics. e.g T extends CommonEntity\n        // }\n        //@ts-ignore\n        const media = await this.mediaRepository.findByEntityIdAndFieldIdAndModelMetadataId(entity.id, mediaFieldMetadata.id, mediaFieldMetadata.model.id, ['mediaStorageProviderMetadata']);\n        // Add the full URL to the media\n        // media.forEach(m => {\n        // });\n        for (const m of media) {\n            m['_full_url'] = `${this.settingService.getConfigValue<SolidCoreSetting>(\"baseUrl\")}/${this.getFullFilePath(m.relativeUri)}`;\n        }\n\n\n        return media;\n    }\n\n    async store(files: Express.Multer.File[], entity: T, mediaFieldMetadata: FieldMetadata): Promise<Media[]> {\n        // if (!(entity instanceof CommonEntity)) {\n        //     throw new Error(\"Entity must be an instance of CommonEntity\"); //FIXME This needs to be handled through generics. e.g T extends CommonEntity\n        // }\n        const result: Media[] = [];\n        for (const file of files) {\n            // Store the file in the configured file storage directory\n            const fileStoragePath = this.getFullFilePath(this.getFileName(file));\n            await this.fileService.copy(file.path, fileStoragePath);\n            await this.fileService.delete(file.path);\n\n            // Create an entry in the media table\n            const mediaEntity = await this.mediaRepository.createMedia({\n                //@ts-ignore\n                entityId: entity.id,\n                modelMetadataId: mediaFieldMetadata.model.id,\n                relativeUri: this.getFileName(file),\n                mimeType: file.mimetype,\n                fileSize: file.size,\n                originalFileName: file.originalname,\n                mediaStorageProviderMetadataId: mediaFieldMetadata.mediaStorageProvider.id,\n                fieldMetadataId: mediaFieldMetadata.id\n            }) as unknown as Media;\n            result.push(mediaEntity);\n            this.logger.debug(`Stored media with`, mediaEntity);\n        };\n        return result;\n    }\n\n    async storeStreams(streamPairs: [Readable, string][], entity: T, mediaFieldMetadata: FieldMetadata): Promise<Media[]> {\n        // if (!(entity instanceof CommonEntity)) {\n        //     throw new Error(\"Entity must be an instance of CommonEntity\"); //FIXME This needs to be handled through generics. e.g T extends CommonEntity\n        // }\n        const result: Media[] = [];\n        for (const pair of streamPairs) {\n            const stream = pair[0];\n            const fileName = pair[1];\n            const fullPath = this.getFullFilePath(fileName);\n            await this.fileService.writeStream(fullPath, stream);\n            const { size: fileSize } = await fs.promises.stat(fullPath);\n            const mediaEntity = await this.mediaRepository.createMedia({\n                //@ts-ignore\n                entityId: entity.id,\n                modelMetadataId: mediaFieldMetadata.model.id,\n                relativeUri: fileName,\n                fileSize,\n                mediaStorageProviderMetadataId: mediaFieldMetadata.mediaStorageProvider.id,\n                fieldMetadataId: mediaFieldMetadata.id\n            }) as unknown as Media;\n            this.logger.debug(`Stored media with`, mediaEntity);\n        };\n        return result;\n    }\n\n    async delete(entity: T, mediaFieldMetadata: FieldMetadata): Promise<void> {\n        // if (!(entity instanceof CommonEntity)) {\n        //     throw new Error(\"Entity must be an instance of CommonEntity\"); //FIXME This needs to be handled through generics. e.g T extends CommonEntity\n        // }\n        //@ts-ignore\n        const existingMedia = await this.mediaRepository.findByEntityIdAndFieldIdAndModelMetadataId(entity.id, mediaFieldMetadata.id, mediaFieldMetadata.model.id, ['mediaStorageProviderMetadata']);\n        //@ts-ignore\n        this.mediaRepository.deleteByEntityIdAndFieldIdAndModelMetadataId(entity.id, mediaFieldMetadata.id, mediaFieldMetadata.model.id);\n\n        for (const media of existingMedia) {\n            await this.fileService.delete(this.getFullFilePath(media.relativeUri));\n        }\n        // existingMedia.forEach(media => {\n        // });\n    }\n\n    async deleteByMediaRecord(media: Media): Promise<void> {\n        if (!media?.relativeUri) {\n            return;\n        }\n        await this.fileService.delete(this.getFullFilePath(media.relativeUri));\n    }\n\n    private getFullFilePath(fileName: string): string {\n        const base = this.settingService.getConfigValue<SolidCoreSetting>(\"fileStorageDir\")\n            || DEFAULT_MEDIA_FILE_STORAGE_DIR;\n        if (path.isAbsolute(fileName) || fileName.startsWith(`${base}/`)) {\n            return fileName;\n        }\n        return `${base}/${fileName}`;\n    }\n\n    private getFileName(file: Express.Multer.File): string {\n        return `${file.filename}-${file.originalname}`;\n    }\n}\n"]}
+{"version":3,"file":"file-storage-provider.js","sourceRoot":"","sources":["../../../src/services/mediaStorageProviders/file-storage-provider.ts"],"names":[],"mappings":"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","sourcesContent":["import { Injectable, Logger } from \"@nestjs/common\";\nimport { FieldMetadata } from \"src/entities/field-metadata.entity\";\nimport { Media } from \"src/entities/media.entity\";\nimport { MediaStorageProviderMetadata } from \"src/entities/media-storage-provider-metadata.entity\";\nimport { MediaStorageProvider } from \"src/interfaces\";\nimport { MediaRepository } from \"src/repository/media.repository\";\nimport { DiskFileService } from \"src/services/file\";\nimport { Readable } from \"stream\";\nimport * as fs from \"fs\";\nimport { SettingService } from \"../setting.service\";\nimport { MediaDownloadUrlService } from \"src/services/media-download-url.service\";\nimport {buildDiskMediaPath,buildMediaRecordCreateInput,buildStoredMediaFileName,resolveMediaIsPublic,} from \"src/services/media-storage.utils\";\n\n@Injectable()\nexport class FileStorageProvider<T> implements MediaStorageProvider<T> {\n    private logger = new Logger(FileStorageProvider.name);\n\n    constructor(\n        readonly fileService: DiskFileService,\n        readonly mediaRepository: MediaRepository,\n        private readonly settingService: SettingService,\n        private readonly mediaDownloadUrlService: MediaDownloadUrlService,\n\n    ) { }\n\n    async retrieve(entity: T, mediaFieldMetadata: FieldMetadata): Promise<Media[]> {\n        // if (!(entity instanceof CommonEntity)) {\n        //     throw new Error(\"Entity must be an instance of CommonEntity\"); //FIXME This needs to be handled through generics. e.g T extends CommonEntity\n        // }\n        //@ts-ignore\n        const media = await this.mediaRepository.findByEntityIdAndFieldIdAndModelMetadataId(this.getEntityId(entity), mediaFieldMetadata.id, mediaFieldMetadata.model.id, ['mediaStorageProviderMetadata']);\n        // Add the full URL to the media\n        // media.forEach(m => {\n        // });\n        for (const m of media) {\n            const storageProvider = this.resolveMediaStorageProvider(m, mediaFieldMetadata);\n            const isPublic = resolveMediaIsPublic(storageProvider);\n            m['_full_url'] = isPublic === false\n                ? await this.mediaDownloadUrlService.getPrivateUrl(m.id, m.relativeUri, storageProvider)\n                : await this.fileService.getUrl(buildDiskMediaPath(m.relativeUri, this.settingService, storageProvider));\n        }\n\n\n        return media;\n    }\n\n    async store(files: Express.Multer.File[], entity: T, mediaFieldMetadata: FieldMetadata): Promise<Media[]> {\n        // if (!(entity instanceof CommonEntity)) {\n        //     throw new Error(\"Entity must be an instance of CommonEntity\"); //FIXME This needs to be handled through generics. e.g T extends CommonEntity\n        // }\n        const result: Media[] = [];\n        const storageProvider = mediaFieldMetadata.mediaStorageProvider;\n        for (const file of files) {\n            // Store the file in the configured file storage directory\n            const fileName = buildStoredMediaFileName(file);\n            const fileStoragePath = buildDiskMediaPath(fileName, this.settingService, storageProvider);\n            await this.fileService.copy(file.path, fileStoragePath);\n            await this.fileService.delete(file.path);\n\n            // Create an entry in the media table\n            const mediaEntity = await this.mediaRepository.createMedia(\n                buildMediaRecordCreateInput(this.getEntityId(entity), mediaFieldMetadata, storageProvider, {\n                    relativeUri: fileName,\n                    mimeType: file.mimetype,\n                    fileSize: file.size,\n                    originalFileName: file.originalname,\n                })\n            ) as unknown as Media;\n            result.push(mediaEntity);\n            this.logger.debug(`Stored media with`, mediaEntity);\n        };\n        return result;\n    }\n\n    async storeStreams(streamPairs: [Readable, string][], entity: T, mediaFieldMetadata: FieldMetadata): Promise<Media[]> {\n        // if (!(entity instanceof CommonEntity)) {\n        //     throw new Error(\"Entity must be an instance of CommonEntity\"); //FIXME This needs to be handled through generics. e.g T extends CommonEntity\n        // }\n        const result: Media[] = [];\n        const storageProvider = mediaFieldMetadata.mediaStorageProvider;\n        for (const pair of streamPairs) {\n            const stream = pair[0];\n            const fileName = pair[1];\n            const fullPath = buildDiskMediaPath(fileName, this.settingService, storageProvider);\n            await this.fileService.writeStream(fullPath, stream);\n            const { size: fileSize } = await fs.promises.stat(fullPath);\n            const mediaEntity = await this.mediaRepository.createMedia(\n                buildMediaRecordCreateInput(this.getEntityId(entity), mediaFieldMetadata, storageProvider, {\n                    relativeUri: fileName,\n                    fileSize,\n                })\n            ) as unknown as Media;\n            result.push(mediaEntity);\n            this.logger.debug(`Stored media with`, mediaEntity);\n        };\n        return result;\n    }\n\n    async delete(entity: T, mediaFieldMetadata: FieldMetadata): Promise<void> {\n        // if (!(entity instanceof CommonEntity)) {\n        //     throw new Error(\"Entity must be an instance of CommonEntity\"); //FIXME This needs to be handled through generics. e.g T extends CommonEntity\n        // }\n        const entityId = this.getEntityId(entity);\n        const existingMedia = await this.mediaRepository.findByEntityIdAndFieldIdAndModelMetadataId(entityId, mediaFieldMetadata.id, mediaFieldMetadata.model.id, ['mediaStorageProviderMetadata']);\n        await this.mediaRepository.deleteByEntityIdAndFieldIdAndModelMetadataId(entityId, mediaFieldMetadata.id, mediaFieldMetadata.model.id);\n\n        for (const media of existingMedia) {\n            const storageProvider = this.resolveMediaStorageProvider(media, mediaFieldMetadata);\n            await this.fileService.delete(buildDiskMediaPath(media.relativeUri, this.settingService, storageProvider));\n        }\n        // existingMedia.forEach(media => {\n        // });\n    }\n\n    async deleteByMediaRecord(media: Media): Promise<void> {\n        if (!media?.relativeUri) {\n            return;\n        }\n        await this.fileService.delete(buildDiskMediaPath(media.relativeUri, this.settingService, media.mediaStorageProviderMetadata));\n    }\n\n    private resolveMediaStorageProvider(media: Media, mediaFieldMetadata?: FieldMetadata): MediaStorageProviderMetadata | undefined {\n        return media.mediaStorageProviderMetadata || mediaFieldMetadata?.mediaStorageProvider;\n    }\n\n    private getEntityId(entity: T): number {\n        return (entity as any).id;\n    }\n}\n"]}

package/dist/services/role-metadata.service.d.ts

@@ -18,6 +18,7 @@ export declare class RoleMetadataService extends CRUDService<RoleMetadata> {
     createRolesIfNotExists(roles: CreateRoleMetadataDto[]): Promise<void>;
     private resolveRoleModule;
     addAllPermissionsToRole(roleName: string): Promise<RoleMetadata>;
+    addAllPermissionsToRoleExceptPrefixes(roleName: string, excludedPermissionPrefixes: string[]): Promise<RoleMetadata>;
     addPermissionsToRole(roleName: string, permissionNames: string[]): Promise<RoleMetadata>;
     addPermissionToRole(roleName: string, permissionName: string[]): Promise<RoleMetadata>;
     private _addPermissionsToRole;

package/dist/services/role-metadata.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"role-metadata.service.d.ts","sourceRoot":"","sources":["../../src/services/role-metadata.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEzC,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AACxD,OAAO,EAAE,aAAa,EAAM,MAAM,SAAS,CAAC;AAG5C,OAAO,EAAE,4BAA4B,EAAE,MAAM,+CAA+C,CAAC;AAC7F,OAAO,EAAE,sBAAsB,EAAE,MAAM,yCAAyC,CAAC;AACjF,OAAO,EAAE,qBAAqB,EAAE,MAAM,kCAAkC,CAAC;AAGzE,OAAO,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAC;AAEhE,qBACa,mBAAoB,SAAQ,WAAW,CAAC,YAAY,CAAC;IAM9D,QAAQ,CAAC,aAAa,EAAE,aAAa;IAGrC,QAAQ,CAAC,IAAI,EAAE,sBAAsB;IAGrC,QAAQ,CAAC,oBAAoB,EAAE,4BAA4B;IAC3D,QAAQ,CAAC,SAAS,EAAE,SAAS;IAZ/B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAwC;IAC/D,OAAO,CAAC,QAAQ,CAAC,6BAA6B,CAAO;gBAI1C,aAAa,EAAE,aAAa,EAG5B,IAAI,EAAE,sBAAsB,EAG5B,oBAAoB,EAAE,4BAA4B,EAClD,SAAS,EAAE,SAAS;IAMzB,cAAc,CAAC,QAAQ,EAAE,MAAM;IAe/B,sBAAsB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAevD,sBAAsB,CAAC,KAAK,EAAE,qBAAqB,EAAE;YA0D7C,iBAAiB;IAgBzB,uBAAuB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC;IAIhE,oBAAoB,CAAC,QAAQ,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,YAAY,CAAC;IAIxF,mBAAmB,CAAC,QAAQ,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,EAAE;YAItD,qBAAqB;IA8C7B,yBAAyB,CAAC,QAAQ,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,YAAY,CAAC;YAsBrF,uBAAuB;YAUvB,qBAAqB;IAiBnC,OAAO,CAAC,yBAAyB;YAmBnB,4BAA4B;CAsB3C"}
+{"version":3,"file":"role-metadata.service.d.ts","sourceRoot":"","sources":["../../src/services/role-metadata.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEzC,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AACxD,OAAO,EAAE,aAAa,EAAM,MAAM,SAAS,CAAC;AAG5C,OAAO,EAAE,4BAA4B,EAAE,MAAM,+CAA+C,CAAC;AAC7F,OAAO,EAAE,sBAAsB,EAAE,MAAM,yCAAyC,CAAC;AACjF,OAAO,EAAE,qBAAqB,EAAE,MAAM,kCAAkC,CAAC;AAGzE,OAAO,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAC;AAEhE,qBACa,mBAAoB,SAAQ,WAAW,CAAC,YAAY,CAAC;IAM9D,QAAQ,CAAC,aAAa,EAAE,aAAa;IAGrC,QAAQ,CAAC,IAAI,EAAE,sBAAsB;IAGrC,QAAQ,CAAC,oBAAoB,EAAE,4BAA4B;IAC3D,QAAQ,CAAC,SAAS,EAAE,SAAS;IAZ/B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAwC;IAC/D,OAAO,CAAC,QAAQ,CAAC,6BAA6B,CAAO;gBAI1C,aAAa,EAAE,aAAa,EAG5B,IAAI,EAAE,sBAAsB,EAG5B,oBAAoB,EAAE,4BAA4B,EAClD,SAAS,EAAE,SAAS;IAMzB,cAAc,CAAC,QAAQ,EAAE,MAAM;IAe/B,sBAAsB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAevD,sBAAsB,CAAC,KAAK,EAAE,qBAAqB,EAAE;YA0D7C,iBAAiB;IAgBzB,uBAAuB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC;IAIhE,qCAAqC,CAAC,QAAQ,EAAE,MAAM,EAAE,0BAA0B,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,YAAY,CAAC;IAIpH,oBAAoB,CAAC,QAAQ,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,YAAY,CAAC;IAIxF,mBAAmB,CAAC,QAAQ,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,EAAE;YAItD,qBAAqB;IAkD7B,yBAAyB,CAAC,QAAQ,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,YAAY,CAAC;YAsBrF,uBAAuB;YAUvB,qBAAqB;IAqBnC,OAAO,CAAC,yBAAyB;YAmBnB,4BAA4B;CAsB3C"}

package/dist/services/role-metadata.service.js

@@ -110,13 +110,16 @@ let RoleMetadataService = RoleMetadataService_1 = class RoleMetadataService exte
     async addAllPermissionsToRole(roleName) {
         return await this._addPermissionsToRole(roleName, null);
     }
+    async addAllPermissionsToRoleExceptPrefixes(roleName, excludedPermissionPrefixes) {
+        return await this._addPermissionsToRole(roleName, null, excludedPermissionPrefixes);
+    }
     async addPermissionsToRole(roleName, permissionNames) {
         return await this._addPermissionsToRole(roleName, permissionNames);
     }
     async addPermissionToRole(roleName, permissionName) {
         return await this._addPermissionsToRole(roleName, permissionName);
     }
-    async _addPermissionsToRole(roleName, permissionNames) {
+    async _addPermissionsToRole(roleName, permissionNames, excludedPermissionPrefixes = []) {
         const role = await this.repo.findOne({
             where: { name: roleName },
             select: {
@@ -128,7 +131,7 @@ let RoleMetadataService = RoleMetadataService_1 = class RoleMetadataService exte
             throw new Error(`Role '${roleName}' not found.`);
         }
         const joinInfo = this.getRolePermissionJoinInfo();
-        const targetPermissions = await this.loadTargetPermissions(permissionNames);
+        const targetPermissions = await this.loadTargetPermissions(permissionNames, excludedPermissionPrefixes);
         if (!permissionNames || permissionNames.length === 0) {
             await this.entityManager
                 .createQueryBuilder()
@@ -179,20 +182,20 @@ let RoleMetadataService = RoleMetadataService_1 = class RoleMetadataService exte
         }
         return existingPermission;
     }
-    async loadTargetPermissions(permissionNames) {
+    async loadTargetPermissions(permissionNames, excludedPermissionPrefixes = []) {
         if (permissionNames && permissionNames.length !== 0) {
             const uniquePermissionNames = [...new Set(permissionNames)];
             const permissions = await this.permissionRepository.find({ where: { name: (0, typeorm_2.In)(uniquePermissionNames) } });
             if (permissions.length !== uniquePermissionNames.length) {
                 throw new Error(`One or more permissions not found.`);
             }
-            return permissions;
+            return permissions.filter((permission) => !excludedPermissionPrefixes.some((prefix) => permission.name.startsWith(prefix)));
         }
         const permissions = await this.permissionRepository.find();
         if (permissions.length === 0) {
             throw new Error(`No permissions configured in the system. Did you forget to run the PermissionSeederService?`);
         }
-        return permissions;
+        return permissions.filter((permission) => !excludedPermissionPrefixes.some((prefix) => permission.name.startsWith(prefix)));
     }
     getRolePermissionJoinInfo() {
         const relation = this.repo.metadata.relations.find((candidate) => candidate.propertyName === 'permissions');