@solidxai/core 0.1.12-beta.2 → 0.1.12-beta.4

package/dist/services/media-download-url.service.d.ts

@@ -0,0 +1,21 @@
+import { ConfigService } from '@nestjs/config';
+import { JwtService } from '@nestjs/jwt';
+import { MediaStorageProviderMetadata } from '../entities/media-storage-provider-metadata.entity';
+import { S3FileService } from '../services/file';
+import { SettingService } from '../services/setting.service';
+export declare const MEDIA_DOWNLOAD_TOKEN_AUDIENCE = "media-download";
+export interface MediaDownloadTokenPayload {
+    mediaId: number;
+}
+export declare class MediaDownloadUrlService {
+    private readonly jwtService;
+    private readonly s3FileService;
+    private readonly settingService;
+    private readonly configService;
+    private readonly logger;
+    constructor(jwtService: JwtService, s3FileService: S3FileService, settingService: SettingService, configService: ConfigService);
+    resolveDownloadUrl(mediaId: number, relativeUri: string, storageProvider?: MediaStorageProviderMetadata): Promise<string>;
+    verifyDownloadToken(token: string): Promise<MediaDownloadTokenPayload>;
+    private mintDownloadToken;
+}
+//# sourceMappingURL=media-download-url.service.d.ts.map

package/dist/services/media-download-url.service.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"media-download-url.service.d.ts","sourceRoot":"","sources":["../../src/services/media-download-url.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAEzC,OAAO,EAAE,4BAA4B,EAAE,MAAM,qDAAqD,CAAC;AACnG,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAElD,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAG9D,eAAO,MAAM,6BAA6B,mBAAmB,CAAC;AAG9D,MAAM,WAAW,yBAAyB;IACxC,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,qBACa,uBAAuB;IAIhC,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,aAAa;IAC9B,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,OAAO,CAAC,QAAQ,CAAC,aAAa;IANhC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA4C;gBAGhD,UAAU,EAAE,UAAU,EACtB,aAAa,EAAE,aAAa,EAC5B,cAAc,EAAE,cAAc,EAC9B,aAAa,EAAE,aAAa;IAGzC,kBAAkB,CAAC,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,eAAe,CAAC,EAAE,4BAA4B,GAAG,OAAO,CAAC,MAAM,CAAC;IAuBzH,mBAAmB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,yBAAyB,CAAC;IAO5E,OAAO,CAAC,iBAAiB;CAQ1B"}

package/dist/services/media-download-url.service.js

@@ -0,0 +1,67 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+var MediaDownloadUrlService_1;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MediaDownloadUrlService = exports.MEDIA_DOWNLOAD_TOKEN_AUDIENCE = void 0;
+const common_1 = require("@nestjs/common");
+const config_1 = require("@nestjs/config");
+const jwt_1 = require("@nestjs/jwt");
+const create_media_storage_provider_metadata_dto_1 = require("../dtos/create-media-storage-provider-metadata.dto");
+const file_1 = require("./file");
+const media_storage_utils_1 = require("./media-storage.utils");
+const setting_service_1 = require("./setting.service");
+exports.MEDIA_DOWNLOAD_TOKEN_AUDIENCE = 'media-download';
+const DEFAULT_SIGNED_URL_EXPIRY_MINUTES = 60;
+let MediaDownloadUrlService = MediaDownloadUrlService_1 = class MediaDownloadUrlService {
+    constructor(jwtService, s3FileService, settingService, configService) {
+        this.jwtService = jwtService;
+        this.s3FileService = s3FileService;
+        this.settingService = settingService;
+        this.configService = configService;
+        this.logger = new common_1.Logger(MediaDownloadUrlService_1.name);
+    }
+    async resolveDownloadUrl(mediaId, relativeUri, storageProvider) {
+        const expiryMinutes = storageProvider?.signedUrlExpiry ?? DEFAULT_SIGNED_URL_EXPIRY_MINUTES;
+        if (storageProvider?.type === create_media_storage_provider_metadata_dto_1.MediaStorageProviderType.AwsS3) {
+            if (storageProvider?.bucketName) {
+                return this.s3FileService.getUrl(`${storageProvider.bucketName}:${relativeUri}`, { region: (0, media_storage_utils_1.getEffectiveS3Region)(this.configService, storageProvider.region), expiresIn: expiryMinutes * 60 });
+            }
+            this.logger.warn(`Media id ${mediaId}: AwsS3 provider missing bucketName; falling back to app-hosted token URL`);
+        }
+        const token = await this.mintDownloadToken(mediaId, expiryMinutes);
+        const downloadPath = `/api/media/${mediaId}/download?token=${token}`;
+        const baseUrl = this.settingService.getConfigValue('baseUrl');
+        return `${String(baseUrl).replace(/\/+$/, '')}${downloadPath}`;
+    }
+    async verifyDownloadToken(token) {
+        return this.jwtService.verifyAsync(token, {
+            secret: this.settingService.getConfigValue('secret'),
+            audience: exports.MEDIA_DOWNLOAD_TOKEN_AUDIENCE,
+        });
+    }
+    mintDownloadToken(mediaId, expiryMinutes) {
+        const payload = { mediaId };
+        return this.jwtService.signAsync(payload, {
+            secret: this.settingService.getConfigValue('secret'),
+            audience: exports.MEDIA_DOWNLOAD_TOKEN_AUDIENCE,
+            expiresIn: expiryMinutes * 60,
+        });
+    }
+};
+exports.MediaDownloadUrlService = MediaDownloadUrlService;
+exports.MediaDownloadUrlService = MediaDownloadUrlService = MediaDownloadUrlService_1 = __decorate([
+    (0, common_1.Injectable)(),
+    __metadata("design:paramtypes", [jwt_1.JwtService,
+        file_1.S3FileService,
+        setting_service_1.SettingService,
+        config_1.ConfigService])
+], MediaDownloadUrlService);
+//# sourceMappingURL=media-download-url.service.js.map

package/dist/services/media-download-url.service.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"media-download-url.service.js","sourceRoot":"","sources":["../../src/services/media-download-url.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,2CAAoD;AACpD,2CAA+C;AAC/C,qCAAyC;AACzC,mHAA+F;AAE/F,iCAAkD;AAClD,+DAAwE;AACxE,uDAA8D;AAGjD,QAAA,6BAA6B,GAAG,gBAAgB,CAAC;AAC9D,MAAM,iCAAiC,GAAG,EAAE,CAAC;AAOtC,IAAM,uBAAuB,+BAA7B,MAAM,uBAAuB;IAGlC,YACmB,UAAsB,EACtB,aAA4B,EAC5B,cAA8B,EAC9B,aAA4B;QAH5B,eAAU,GAAV,UAAU,CAAY;QACtB,kBAAa,GAAb,aAAa,CAAe;QAC5B,mBAAc,GAAd,cAAc,CAAgB;QAC9B,kBAAa,GAAb,aAAa,CAAe;QAN9B,WAAM,GAAG,IAAI,eAAM,CAAC,yBAAuB,CAAC,IAAI,CAAC,CAAC;IAO/D,CAAC;IAEL,KAAK,CAAC,kBAAkB,CAAC,OAAe,EAAE,WAAmB,EAAE,eAA8C;QAC3G,MAAM,aAAa,GAAG,eAAe,EAAE,eAAe,IAAI,iCAAiC,CAAC;QAE5F,IAAK,eAAe,EAAE,IAAiC,KAAK,qEAAwB,CAAC,KAAK,EAAE,CAAC;YAC3F,IAAI,eAAe,EAAE,UAAU,EAAE,CAAC;gBAChC,OAAO,IAAI,CAAC,aAAa,CAAC,MAAM,CAC9B,GAAG,eAAe,CAAC,UAAU,IAAI,WAAW,EAAE,EAC9C,EAAE,MAAM,EAAE,IAAA,0CAAoB,EAAC,IAAI,CAAC,aAAa,EAAE,eAAe,CAAC,MAAM,CAAC,EAAE,SAAS,EAAE,aAAa,GAAG,EAAE,EAAE,CAC5G,CAAC;YACJ,CAAC;YACD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,YAAY,OAAO,2EAA2E,CAAC,CAAC;QACnH,CAAC;QAMD,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;QACnE,MAAM,YAAY,GAAG,cAAc,OAAO,mBAAmB,KAAK,EAAE,CAAC;QACrE,MAAM,OAAO,GAAG,IAAI,CAAC,cAAc,CAAC,cAAc,CAAmB,SAAS,CAAC,CAAC;QAChF,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,GAAG,YAAY,EAAE,CAAC;IACjE,CAAC;IAED,KAAK,CAAC,mBAAmB,CAAC,KAAa;QACrC,OAAO,IAAI,CAAC,UAAU,CAAC,WAAW,CAA4B,KAAK,EAAE;YACnE,MAAM,EAAE,IAAI,CAAC,cAAc,CAAC,cAAc,CAAmB,QAAQ,CAAC;YACtE,QAAQ,EAAE,qCAA6B;SACxC,CAAC,CAAC;IACL,CAAC;IAEO,iBAAiB,CAAC,OAAe,EAAE,aAAqB;QAC9D,MAAM,OAAO,GAA8B,EAAE,OAAO,EAAE,CAAC;QACvD,OAAO,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,OAAO,EAAE;YACxC,MAAM,EAAE,IAAI,CAAC,cAAc,CAAC,cAAc,CAAmB,QAAQ,CAAC;YACtE,QAAQ,EAAE,qCAA6B;YACvC,SAAS,EAAE,aAAa,GAAG,EAAE;SAC9B,CAAC,CAAC;IACL,CAAC;CACF,CAAA;AAhDY,0DAAuB;kCAAvB,uBAAuB;IADnC,IAAA,mBAAU,GAAE;qCAKoB,gBAAU;QACP,oBAAa;QACZ,gCAAc;QACf,sBAAa;GAPpC,uBAAuB,CAgDnC","sourcesContent":["import { Injectable, Logger } from '@nestjs/common';\nimport { ConfigService } from '@nestjs/config';\nimport { JwtService } from '@nestjs/jwt';\nimport { MediaStorageProviderType } from 'src/dtos/create-media-storage-provider-metadata.dto';\nimport { MediaStorageProviderMetadata } from 'src/entities/media-storage-provider-metadata.entity';\nimport { S3FileService } from 'src/services/file';\nimport { getEffectiveS3Region } from 'src/services/media-storage.utils';\nimport { SettingService } from 'src/services/setting.service';\nimport type { SolidCoreSetting } from 'src/services/settings/default-settings-provider.service';\n\nexport const MEDIA_DOWNLOAD_TOKEN_AUDIENCE = 'media-download';\nconst DEFAULT_SIGNED_URL_EXPIRY_MINUTES = 60;\n\nexport interface MediaDownloadTokenPayload {\n  mediaId: number;\n}\n\n@Injectable()\nexport class MediaDownloadUrlService {\n  private readonly logger = new Logger(MediaDownloadUrlService.name);\n\n  constructor(\n    private readonly jwtService: JwtService,\n    private readonly s3FileService: S3FileService,\n    private readonly settingService: SettingService,\n    private readonly configService: ConfigService,\n  ) { }\n\n  async resolveDownloadUrl(mediaId: number, relativeUri: string, storageProvider?: MediaStorageProviderMetadata): Promise<string> {\n    const expiryMinutes = storageProvider?.signedUrlExpiry ?? DEFAULT_SIGNED_URL_EXPIRY_MINUTES;\n\n    if ((storageProvider?.type as MediaStorageProviderType) === MediaStorageProviderType.AwsS3) {\n      if (storageProvider?.bucketName) {\n        return this.s3FileService.getUrl(\n          `${storageProvider.bucketName}:${relativeUri}`,\n          { region: getEffectiveS3Region(this.configService, storageProvider.region), expiresIn: expiryMinutes * 60 },\n        );\n      }\n      this.logger.warn(`Media id ${mediaId}: AwsS3 provider missing bucketName; falling back to app-hosted token URL`);\n    }\n\n    // Filesystem (or misconfigured S3) has no native presigned-URL mechanism, so mint our\n    // own short-lived token and embed it in the download URL - the token alone authorizes\n    // the request (see MediaSignedUrlGuard), so it works in a plain <img src> with no\n    // Authorization header needed.\n    const token = await this.mintDownloadToken(mediaId, expiryMinutes);\n    const downloadPath = `/api/media/${mediaId}/download?token=${token}`;\n    const baseUrl = this.settingService.getConfigValue<SolidCoreSetting>('baseUrl');\n    return `${String(baseUrl).replace(/\\/+$/, '')}${downloadPath}`;\n  }\n\n  async verifyDownloadToken(token: string): Promise<MediaDownloadTokenPayload> {\n    return this.jwtService.verifyAsync<MediaDownloadTokenPayload>(token, {\n      secret: this.settingService.getConfigValue<SolidCoreSetting>('secret'),\n      audience: MEDIA_DOWNLOAD_TOKEN_AUDIENCE,\n    });\n  }\n\n  private mintDownloadToken(mediaId: number, expiryMinutes: number): Promise<string> {\n    const payload: MediaDownloadTokenPayload = { mediaId };\n    return this.jwtService.signAsync(payload, {\n      secret: this.settingService.getConfigValue<SolidCoreSetting>('secret'),\n      audience: MEDIA_DOWNLOAD_TOKEN_AUDIENCE,\n      expiresIn: expiryMinutes * 60,\n    });\n  }\n}\n"]}

package/dist/services/media-storage.utils.d.ts

@@ -0,0 +1,27 @@
+import { ConfigService } from '@nestjs/config';
+import { FieldMetadata } from '../entities/field-metadata.entity';
+import { MediaStorageProviderMetadata } from '../entities/media-storage-provider-metadata.entity';
+import { SettingService } from '../services/setting.service';
+export declare const DEFAULT_PRIVATE_MEDIA_STORAGE_DIR = "media-private-files-storage";
+export interface MediaRecordCreateInput {
+    entityId: number;
+    modelMetadataId: number;
+    mediaStorageProviderMetadataId: number;
+    fieldMetadataId: number;
+    relativeUri: string;
+    mimeType?: string;
+    fileSize?: number;
+    originalFileName?: string;
+    isPublic?: boolean;
+}
+export declare function buildStoredMediaFileName(file: Pick<Express.Multer.File, 'filename' | 'originalname'>): string;
+export declare function buildDiskMediaPath(fileName: string, settingService: Pick<SettingService, 'getConfigValue'>, storageProvider?: Pick<MediaStorageProviderMetadata, 'localPath' | 'isPublic'>): string;
+export declare function getEffectiveS3Region(configService: Pick<ConfigService, 'get'>, providerRegion?: string): string | undefined;
+export declare function resolveMediaIsPublic(storageProvider?: Pick<MediaStorageProviderMetadata, 'isPublic'>): boolean | undefined;
+export declare function resolveStoredMediaIsPublic(currentValue: boolean | undefined, storageProvider?: Pick<MediaStorageProviderMetadata, 'isPublic'>): boolean | undefined;
+export declare function buildMediaRecordCreateInput(entityId: number, mediaFieldMetadata: Pick<FieldMetadata, 'id' | 'model'> & {
+    model: {
+        id: number;
+    };
+}, storageProvider: Pick<MediaStorageProviderMetadata, 'id'>, overrides: Pick<MediaRecordCreateInput, 'relativeUri'> & Partial<Omit<MediaRecordCreateInput, 'entityId' | 'modelMetadataId' | 'mediaStorageProviderMetadataId' | 'fieldMetadataId' | 'relativeUri'>>): MediaRecordCreateInput;
+//# sourceMappingURL=media-storage.utils.d.ts.map

package/dist/services/media-storage.utils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"media-storage.utils.d.ts","sourceRoot":"","sources":["../../src/services/media-storage.utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAE/C,OAAO,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAC;AACnE,OAAO,EAAE,4BAA4B,EAAE,MAAM,qDAAqD,CAAC;AACnG,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAI9D,eAAO,MAAM,iCAAiC,gCAAgC,CAAC;AAE/E,MAAM,WAAW,sBAAsB;IACrC,QAAQ,EAAE,MAAM,CAAC;IACjB,eAAe,EAAE,MAAM,CAAC;IACxB,8BAA8B,EAAE,MAAM,CAAC;IACvC,eAAe,EAAE,MAAM,CAAC;IACxB,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAGD,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,UAAU,GAAG,cAAc,CAAC,GAAG,MAAM,CAE7G;AAGD,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,MAAM,EAAC,cAAc,EAAE,IAAI,CAAC,cAAc,EAAE,gBAAgB,CAAC,EAAC,eAAe,CAAC,EAAE,IAAI,CAAC,4BAA4B,EAAE,WAAW,GAAG,UAAU,CAAC,GAAI,MAAM,CAUlM;AAGD,wBAAgB,oBAAoB,CAAC,aAAa,EAAE,IAAI,CAAC,aAAa,EAAE,KAAK,CAAC,EAAC,cAAc,CAAC,EAAE,MAAM,GAAI,MAAM,GAAG,SAAS,CAE3H;AAGD,wBAAgB,oBAAoB,CAAC,eAAe,CAAC,EAAE,IAAI,CAAC,4BAA4B,EAAE,UAAU,CAAC,GAAI,OAAO,GAAG,SAAS,CAM3H;AAGD,wBAAgB,0BAA0B,CAAC,YAAY,EAAE,OAAO,GAAG,SAAS,EAAC,eAAe,CAAC,EAAC,IAAI,CAAC,4BAA4B,EAAE,UAAU,CAAC,GAAI,OAAO,GAAG,SAAS,CAMlK;AAGD,wBAAgB,2BAA2B,CACzC,QAAQ,EAAE,MAAM,EAChB,kBAAkB,EAAE,IAAI,CAAC,aAAa,EAAE,IAAI,GAAG,OAAO,CAAC,GAAG;IAAE,KAAK,EAAE;QAAE,EAAE,EAAE,MAAM,CAAA;KAAE,CAAA;CAAE,EACnF,eAAe,EAAE,IAAI,CAAC,4BAA4B,EAAE,IAAI,CAAC,EACzD,SAAS,EAAE,IAAI,CAAC,sBAAsB,EAAE,aAAa,CAAC,GAClD,OAAO,CAAC,IAAI,CAAC,sBAAsB,EAAE,UAAU,GAAG,iBAAiB,GAAG,gCAAgC,GAAG,iBAAiB,GAAG,aAAa,CAAC,CAAC,GAC/I,sBAAsB,CAQxB"}

package/dist/services/media-storage.utils.js

@@ -0,0 +1,82 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DEFAULT_PRIVATE_MEDIA_STORAGE_DIR = void 0;
+exports.buildStoredMediaFileName = buildStoredMediaFileName;
+exports.buildDiskMediaPath = buildDiskMediaPath;
+exports.getEffectiveS3Region = getEffectiveS3Region;
+exports.resolveMediaIsPublic = resolveMediaIsPublic;
+exports.resolveStoredMediaIsPublic = resolveStoredMediaIsPublic;
+exports.buildMediaRecordCreateInput = buildMediaRecordCreateInput;
+const path = __importStar(require("path"));
+const default_settings_provider_service_1 = require("./settings/default-settings-provider.service");
+exports.DEFAULT_PRIVATE_MEDIA_STORAGE_DIR = 'media-private-files-storage';
+function buildStoredMediaFileName(file) {
+    return `${file.filename}-${file.originalname}`;
+}
+function buildDiskMediaPath(fileName, settingService, storageProvider) {
+    const publicBase = settingService.getConfigValue('fileStorageDir') || default_settings_provider_service_1.DEFAULT_MEDIA_FILE_STORAGE_DIR;
+    const privateBase = exports.DEFAULT_PRIVATE_MEDIA_STORAGE_DIR;
+    const providerBase = storageProvider?.localPath || (storageProvider?.isPublic === false ? privateBase : publicBase);
+    if (path.isAbsolute(fileName) || fileName.startsWith(`${publicBase}/`) || fileName.startsWith(`${privateBase}/`) || (!!storageProvider?.localPath && fileName.startsWith(`${storageProvider.localPath}/`))) {
+        return fileName;
+    }
+    return `${providerBase}/${fileName}`;
+}
+function getEffectiveS3Region(configService, providerRegion) {
+    return providerRegion || configService.get('S3_AWS_REGION_NAME');
+}
+function resolveMediaIsPublic(storageProvider) {
+    if (!storageProvider) {
+        return undefined;
+    }
+    return storageProvider.isPublic !== false;
+}
+function resolveStoredMediaIsPublic(currentValue, storageProvider) {
+    if (typeof currentValue === 'boolean') {
+        return currentValue;
+    }
+    return resolveMediaIsPublic(storageProvider);
+}
+function buildMediaRecordCreateInput(entityId, mediaFieldMetadata, storageProvider, overrides) {
+    return {
+        entityId,
+        modelMetadataId: mediaFieldMetadata.model.id,
+        mediaStorageProviderMetadataId: storageProvider.id,
+        fieldMetadataId: mediaFieldMetadata.id,
+        ...overrides,
+    };
+}
+//# sourceMappingURL=media-storage.utils.js.map

package/dist/services/media-storage.utils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"media-storage.utils.js","sourceRoot":"","sources":["../../src/services/media-storage.utils.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAuBA,4DAEC;AAGD,gDAUC;AAGD,oDAEC;AAGD,oDAMC;AAGD,gEAMC;AAGD,kEAcC;AA7ED,2CAA6B;AAI7B,oGAAyG;AAG5F,QAAA,iCAAiC,GAAG,6BAA6B,CAAC;AAe/E,SAAgB,wBAAwB,CAAC,IAA4D;IACnG,OAAO,GAAG,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;AACjD,CAAC;AAGD,SAAgB,kBAAkB,CAAC,QAAgB,EAAC,cAAsD,EAAC,eAA8E;IACvL,MAAM,UAAU,GAAG,cAAc,CAAC,cAAc,CAAmB,gBAAgB,CAAC,IAAI,kEAA8B,CAAC;IACvH,MAAM,WAAW,GAAG,yCAAiC,CAAC;IACtD,MAAM,YAAY,GAAG,eAAe,EAAE,SAAS,IAAI,CAAC,eAAe,EAAE,QAAQ,KAAK,KAAK,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC;IAEpH,IAAK,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,QAAQ,CAAC,UAAU,CAAC,GAAG,UAAU,GAAG,CAAC,IAAI,QAAQ,CAAC,UAAU,CAAC,GAAG,WAAW,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,eAAe,EAAE,SAAS,IAAI,QAAQ,CAAC,UAAU,CAAC,GAAG,eAAe,CAAC,SAAS,GAAG,CAAC,CAAC,EAAE,CAAC;QAC5M,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,OAAO,GAAG,YAAY,IAAI,QAAQ,EAAE,CAAC;AACvC,CAAC;AAGD,SAAgB,oBAAoB,CAAC,aAAyC,EAAC,cAAuB;IACpG,OAAO,cAAc,IAAI,aAAa,CAAC,GAAG,CAAS,oBAAoB,CAAC,CAAC;AAC3E,CAAC;AAGD,SAAgB,oBAAoB,CAAC,eAAgE;IACnG,IAAI,CAAC,eAAe,EAAE,CAAC;QACrB,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,OAAO,eAAe,CAAC,QAAQ,KAAK,KAAK,CAAC;AAC5C,CAAC;AAGD,SAAgB,0BAA0B,CAAC,YAAiC,EAAC,eAA+D;IAC1I,IAAI,OAAO,YAAY,KAAK,SAAS,EAAE,CAAC;QACtC,OAAO,YAAY,CAAC;IACtB,CAAC;IAED,OAAO,oBAAoB,CAAC,eAAe,CAAC,CAAC;AAC/C,CAAC;AAGD,SAAgB,2BAA2B,CACzC,QAAgB,EAChB,kBAAmF,EACnF,eAAyD,EACzD,SACgJ;IAEhJ,OAAO;QACL,QAAQ;QACR,eAAe,EAAE,kBAAkB,CAAC,KAAK,CAAC,EAAE;QAC5C,8BAA8B,EAAE,eAAe,CAAC,EAAE;QAClD,eAAe,EAAE,kBAAkB,CAAC,EAAE;QACtC,GAAG,SAAS;KACb,CAAC;AACJ,CAAC","sourcesContent":["import { ConfigService } from '@nestjs/config';\nimport * as path from 'path';\nimport { FieldMetadata } from 'src/entities/field-metadata.entity';\nimport { MediaStorageProviderMetadata } from 'src/entities/media-storage-provider-metadata.entity';\nimport { SettingService } from 'src/services/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\nexport const DEFAULT_PRIVATE_MEDIA_STORAGE_DIR = 'media-private-files-storage';\n\nexport interface MediaRecordCreateInput {\n  entityId: number;\n  modelMetadataId: number;\n  mediaStorageProviderMetadataId: number;\n  fieldMetadataId: number;\n  relativeUri: string;\n  mimeType?: string;\n  fileSize?: number;\n  originalFileName?: string;\n  isPublic?: boolean;\n}\n\n// Builds the stored file name format shared by media storage implementations.\nexport function buildStoredMediaFileName(file: Pick<Express.Multer.File, 'filename' | 'originalname'>): string {\n  return `${file.filename}-${file.originalname}`;\n}\n\n// Resolves the on-disk path for a media file based on settings and provider visibility.\nexport function buildDiskMediaPath(fileName: string,settingService: Pick<SettingService, 'getConfigValue'>,storageProvider?: Pick<MediaStorageProviderMetadata, 'localPath' | 'isPublic'>,): string {\n  const publicBase = settingService.getConfigValue<SolidCoreSetting>('fileStorageDir') || DEFAULT_MEDIA_FILE_STORAGE_DIR;\n  const privateBase = DEFAULT_PRIVATE_MEDIA_STORAGE_DIR;\n  const providerBase = storageProvider?.localPath || (storageProvider?.isPublic === false ? privateBase : publicBase);\n\n  if ( path.isAbsolute(fileName) || fileName.startsWith(`${publicBase}/`) || fileName.startsWith(`${privateBase}/`) || (!!storageProvider?.localPath && fileName.startsWith(`${storageProvider.localPath}/`))) {\n    return fileName;\n  }\n\n  return `${providerBase}/${fileName}`;\n}\n\n// Returns the S3 region from the provider when present, otherwise falls back to app config.\nexport function getEffectiveS3Region(configService: Pick<ConfigService, 'get'>,providerRegion?: string,): string | undefined {\n  return providerRegion || configService.get<string>('S3_AWS_REGION_NAME');\n}\n\n// Resolves the effective public/private flag for a media storage provider.\nexport function resolveMediaIsPublic(storageProvider?: Pick<MediaStorageProviderMetadata, 'isPublic'>,): boolean | undefined {\n  if (!storageProvider) {\n    return undefined;\n  }\n\n  return storageProvider.isPublic !== false;\n}\n\n// Preserves an explicit media visibility value or derives it from the storage provider.\nexport function resolveStoredMediaIsPublic(currentValue: boolean | undefined,storageProvider?:Pick<MediaStorageProviderMetadata, 'isPublic'>,): boolean | undefined {\n  if (typeof currentValue === 'boolean') {\n    return currentValue;\n  }\n\n  return resolveMediaIsPublic(storageProvider);\n}\n\n// Builds the shared media record payload used before saving media metadata to the database.\nexport function buildMediaRecordCreateInput(\n  entityId: number,\n  mediaFieldMetadata: Pick<FieldMetadata, 'id' | 'model'> & { model: { id: number } },\n  storageProvider: Pick<MediaStorageProviderMetadata, 'id'>,\n  overrides: Pick<MediaRecordCreateInput, 'relativeUri'>\n    & Partial<Omit<MediaRecordCreateInput, 'entityId' | 'modelMetadataId' | 'mediaStorageProviderMetadataId' | 'fieldMetadataId' | 'relativeUri'>>,\n): MediaRecordCreateInput {\n  return {\n    entityId,\n    modelMetadataId: mediaFieldMetadata.model.id,\n    mediaStorageProviderMetadataId: storageProvider.id,\n    fieldMetadataId: mediaFieldMetadata.id,\n    ...overrides,\n  };\n}\n"]}

package/dist/services/media.service.d.ts

@@ -1,8 +1,10 @@
 import { ModuleRef } from "@nestjs/core";
 import { EntityManager } from 'typeorm';
+import { Readable } from 'stream';
 import { ConfigService } from '@nestjs/config';
 import { CRUDService } from '../services/crud.service';
 import { DiskFileService, S3FileService } from '../services/file';
+import { MediaDownloadUrlService } from '../services/media-download-url.service';
 import { BasicFilterDto } from '../dtos/basic-filters.dto';
 import { Media } from '../entities/media.entity';
 import { FieldMetadataRepository } from '../repository/field-metadata.repository';
@@ -13,17 +15,31 @@ export declare class MediaService extends CRUDService<Media> {
     readonly configService: ConfigService;
     readonly diskFileService: DiskFileService;
     readonly s3FileService: S3FileService;
+    private readonly mediaDownloadUrlService;
     readonly entityManager: EntityManager;
     readonly repo: MediaRepository;
     private readonly modelMetadataRepo;
     private readonly mediaStorageProviderMetadataRepo;
     private readonly fieldMetadataRepo;
     readonly moduleRef: ModuleRef;
-    constructor(configService: ConfigService, diskFileService: DiskFileService, s3FileService: S3FileService, entityManager: EntityManager, repo: MediaRepository, modelMetadataRepo: ModelMetadataRepository, mediaStorageProviderMetadataRepo: MediaStorageProviderMetadataRepository, fieldMetadataRepo: FieldMetadataRepository, moduleRef: ModuleRef);
+    private readonly logger;
+    constructor(configService: ConfigService, diskFileService: DiskFileService, s3FileService: S3FileService, mediaDownloadUrlService: MediaDownloadUrlService, entityManager: EntityManager, repo: MediaRepository, modelMetadataRepo: ModelMetadataRepository, mediaStorageProviderMetadataRepo: MediaStorageProviderMetadataRepository, fieldMetadataRepo: FieldMetadataRepository, moduleRef: ModuleRef);
     find(basicFilterDto: BasicFilterDto, solidRequestContext?: any): Promise<any>;
-    upload(createDto: any, files: Array<Express.Multer.File>): Promise<any[]>;
+    findOne(id: number, query?: any, solidRequestContext?: any): Promise<Media>;
+    upload(createDto: any, files: Array<Express.Multer.File>, _solidRequestContext?: any): Promise<any[]>;
     remove(id: number): Promise<Media>;
-    private getFullFilePathForDisk;
-    private getFileName;
+    fileDownloadStream(media: Media): Promise<{
+        stream: Readable | null;
+        fileName: string;
+        mimeType: string;
+        redirectUrl?: string;
+    }>;
+    delete(id: number, solidRequestContext?: any): Promise<Media>;
+    deleteMany(ids: number[], solidRequestContext?: any): Promise<any>;
+    private decorateMediaRecords;
+    private decorateMediaRecord;
+    private resolveMediaUrl;
+    private deletePhysicalFile;
+    private resolveMediaStorageProvider;
 }
 //# sourceMappingURL=media.service.d.ts.map

package/dist/services/media.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"media.service.d.ts","sourceRoot":"","sources":["../../src/services/media.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEzC,OAAO,EAAE,aAAa,EAAM,MAAM,SAAS,CAAC;AAK5C,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAInE,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAE5D,OAAO,EAAE,KAAK,EAAE,MAAM,2BAA2B,CAAC;AAClD,OAAO,EAAE,uBAAuB,EAAE,MAAM,0CAA0C,CAAC;AACnF,OAAO,EAAE,sCAAsC,EAAE,MAAM,2DAA2D,CAAC;AACnH,OAAO,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAClE,OAAO,EAAE,uBAAuB,EAAE,MAAM,0CAA0C,CAAC;AAInF,qBACa,YAAa,SAAQ,WAAW,CAAC,KAAK,CAAC;IAEhD,QAAQ,CAAC,aAAa,EAAE,aAAa;IACrC,QAAQ,CAAC,eAAe,EAAE,eAAe;IACzC,QAAQ,CAAC,aAAa,EAAE,aAAa;IAErC,QAAQ,CAAC,aAAa,EAAE,aAAa;IAGrC,QAAQ,CAAC,IAAI,EAAE,eAAe;IAQ9B,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,gCAAgC;IACjD,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,QAAQ,CAAC,SAAS,EAAE,SAAS;gBAlBpB,aAAa,EAAE,aAAa,EAC5B,eAAe,EAAE,eAAe,EAChC,aAAa,EAAE,aAAa,EAE5B,aAAa,EAAE,aAAa,EAG5B,IAAI,EAAE,eAAe,EAQb,iBAAiB,EAAE,uBAAuB,EAC1C,gCAAgC,EAAE,sCAAsC,EACxE,iBAAiB,EAAE,uBAAuB,EAClD,SAAS,EAAE,SAAS;IAKzB,IAAI,CAAC,cAAc,EAAE,cAAc,EAAE,mBAAmB,GAAE,GAAQ;IAgClE,MAAM,CAAC,SAAS,EAAE,GAAG,EAAE,KAAK,EAAE,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC;IAwDxD,MAAM,CAAC,EAAE,EAAE,MAAM;IAqBvB,OAAO,CAAC,sBAAsB;IAS9B,OAAO,CAAC,WAAW;CAIpB"}
+{"version":3,"file":"media.service.d.ts","sourceRoot":"","sources":["../../src/services/media.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEzC,OAAO,EAAE,aAAa,EAAM,MAAM,SAAS,CAAC;AAE5C,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAElC,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AACnE,OAAO,EAAE,uBAAuB,EAAE,MAAM,yCAAyC,CAAC;AAIlF,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAE5D,OAAO,EAAE,KAAK,EAAE,MAAM,2BAA2B,CAAC;AAElD,OAAO,EAAE,uBAAuB,EAAE,MAAM,0CAA0C,CAAC;AACnF,OAAO,EAAE,sCAAsC,EAAE,MAAM,2DAA2D,CAAC;AACnH,OAAO,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAClE,OAAO,EAAE,uBAAuB,EAAE,MAAM,0CAA0C,CAAC;AAInF,qBACa,YAAa,SAAQ,WAAW,CAAC,KAAK,CAAC;IAIhD,QAAQ,CAAC,aAAa,EAAE,aAAa;IACrC,QAAQ,CAAC,eAAe,EAAE,eAAe;IACzC,QAAQ,CAAC,aAAa,EAAE,aAAa;IACrC,OAAO,CAAC,QAAQ,CAAC,uBAAuB;IAExC,QAAQ,CAAC,aAAa,EAAE,aAAa;IAGrC,QAAQ,CAAC,IAAI,EAAE,eAAe;IAQ9B,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,gCAAgC;IACjD,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,QAAQ,CAAC,SAAS,EAAE,SAAS;IAtB/B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAiC;gBAG7C,aAAa,EAAE,aAAa,EAC5B,eAAe,EAAE,eAAe,EAChC,aAAa,EAAE,aAAa,EACpB,uBAAuB,EAAE,uBAAuB,EAExD,aAAa,EAAE,aAAa,EAG5B,IAAI,EAAE,eAAe,EAQb,iBAAiB,EAAE,uBAAuB,EAC1C,gCAAgC,EAAE,sCAAsC,EACxE,iBAAiB,EAAE,uBAAuB,EAClD,SAAS,EAAE,SAAS;IAKzB,IAAI,CAAC,cAAc,EAAE,cAAc,EAAE,mBAAmB,GAAE,GAAQ;IAalE,OAAO,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,GAAE,GAAQ,EAAE,mBAAmB,GAAE,GAAQ;IAQlE,MAAM,CAAC,SAAS,EAAE,GAAG,EAAE,KAAK,EAAE,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,oBAAoB,GAAE,GAAQ;IAmExF,MAAM,CAAC,EAAE,EAAE,MAAM;IAqBjB,kBAAkB,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC;QAAE,MAAM,EAAE,QAAQ,GAAG,IAAI,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAC;QAAC,WAAW,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IA2BhI,MAAM,CAAC,EAAE,EAAE,MAAM,EAAE,mBAAmB,GAAE,GAAQ;IAehD,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,mBAAmB,GAAE,GAAQ;YAiB/C,oBAAoB;YAMpB,mBAAmB;YAMnB,eAAe;YAsBf,kBAAkB;YA8BlB,2BAA2B;CAgB1C"}

package/dist/services/media.service.js

@@ -44,6 +44,7 @@ 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 MediaService_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MediaService = void 0;
 const common_1 = require("@nestjs/common");
@@ -51,99 +52,103 @@ const core_1 = require("@nestjs/core");
 const typeorm_1 = require("@nestjs/typeorm");
 const typeorm_2 = require("typeorm");
 const path = __importStar(require("path"));
-const default_settings_provider_service_1 = require("./settings/default-settings-provider.service");
 const config_1 = require("@nestjs/config");
 const crud_service_1 = require("./crud.service");
 const file_1 = require("./file");
+const media_download_url_service_1 = require("./media-download-url.service");
 const error_messages_1 = require("../constants/error-messages");
 const create_media_storage_provider_metadata_dto_1 = require("../dtos/create-media-storage-provider-metadata.dto");
 const field_metadata_repository_1 = require("../repository/field-metadata.repository");
 const media_storage_provider_metadata_repository_1 = require("../repository/media-storage-provider-metadata.repository");
 const media_repository_1 = require("../repository/media.repository");
 const model_metadata_repository_1 = require("../repository/model-metadata.repository");
+const media_storage_utils_1 = require("./media-storage.utils");
 const mediaStorageProviders_1 = require("./mediaStorageProviders");
-let MediaService = class MediaService extends crud_service_1.CRUDService {
-    constructor(configService, diskFileService, s3FileService, entityManager, repo, modelMetadataRepo, mediaStorageProviderMetadataRepo, fieldMetadataRepo, moduleRef) {
+let MediaService = MediaService_1 = class MediaService extends crud_service_1.CRUDService {
+    constructor(configService, diskFileService, s3FileService, mediaDownloadUrlService, entityManager, repo, modelMetadataRepo, mediaStorageProviderMetadataRepo, fieldMetadataRepo, moduleRef) {
         super(entityManager, repo, 'media', 'solid-core', moduleRef);
         this.configService = configService;
         this.diskFileService = diskFileService;
         this.s3FileService = s3FileService;
+        this.mediaDownloadUrlService = mediaDownloadUrlService;
         this.entityManager = entityManager;
         this.repo = repo;
         this.modelMetadataRepo = modelMetadataRepo;
         this.mediaStorageProviderMetadataRepo = mediaStorageProviderMetadataRepo;
         this.fieldMetadataRepo = fieldMetadataRepo;
         this.moduleRef = moduleRef;
+        this.logger = new common_1.Logger(MediaService_1.name);
     }
     async find(basicFilterDto, solidRequestContext = {}) {
         const data = await super.find(basicFilterDto, solidRequestContext);
         if (data.records) {
-            for (const media of data.records) {
-                const mediaStorageProvider = media.mediaStorageProviderMetadata;
-                if (mediaStorageProvider?.type === create_media_storage_provider_metadata_dto_1.MediaStorageProviderType.Filesystem) {
-                    media.relativeUri = await this.diskFileService.getUrl(this.getFullFilePathForDisk(media.relativeUri));
-                }
-                else if (mediaStorageProvider?.type === create_media_storage_provider_metadata_dto_1.MediaStorageProviderType.AwsS3) {
-                    media.relativeUri = await this.s3FileService.getUrl(`${mediaStorageProvider.bucketName}:${media.relativeUri}`, { region: mediaStorageProvider.region });
-                }
-            }
+            await this.decorateMediaRecords(data.records);
         }
         if (data.groupRecords) {
             for (const group of data.groupRecords) {
-                for (const media of group.groupData.records) {
-                    const mediaStorageProvider = media.mediaStorageProviderMetadata;
-                    if (mediaStorageProvider?.type === create_media_storage_provider_metadata_dto_1.MediaStorageProviderType.Filesystem) {
-                        media.relativeUri = await this.diskFileService.getUrl(this.getFullFilePathForDisk(media.relativeUri));
-                    }
-                    else if (mediaStorageProvider?.type === create_media_storage_provider_metadata_dto_1.MediaStorageProviderType.AwsS3) {
-                        media.relativeUri = await this.s3FileService.getUrl(`${mediaStorageProvider.bucketName}:${media.relativeUri}`, { region: mediaStorageProvider.region });
-                    }
-                }
+                await this.decorateMediaRecords(group.groupData.records);
             }
         }
         return data;
     }
-    async upload(createDto, files) {
-        if (!files) {
+    async findOne(id, query = {}, solidRequestContext = {}) {
+        const media = await super.findOne(id, query, solidRequestContext);
+        if (media) {
+            await this.decorateMediaRecord(media);
+        }
+        return media;
+    }
+    async upload(createDto, files, _solidRequestContext = {}) {
+        if (!files || files.length === 0) {
             throw new common_1.NotFoundException(error_messages_1.ERROR_MESSAGES.FILE_NOT_FOUND);
         }
+        createDto['fieldMetadata'] = await this.fieldMetadataRepo.findOne({
+            where: {
+                id: createDto['fieldMetadataId']
+            },
+            relations: ['mediaStorageProvider', 'model'],
+        });
+        createDto['modelMetadata'] = await this.modelMetadataRepo.findOne({
+            where: {
+                id: createDto['modelMetadataId']
+            },
+        });
+        createDto['mediaStorageProviderMetadata'] = await this.mediaStorageProviderMetadataRepo.findOne({
+            where: {
+                id: createDto['mediaStorageProviderMetadataId']
+            },
+        });
+        createDto['mediaStorageProviderMetadata'] = createDto['mediaStorageProviderMetadata'] || createDto['fieldMetadata']?.mediaStorageProvider;
+        createDto['modelMetadata'] = createDto['modelMetadata'] || createDto['fieldMetadata']?.model;
+        if (!createDto['mediaStorageProviderMetadata']) {
+            throw new common_1.NotFoundException('Media storage provider metadata not found');
+        }
         const savedMedias = [];
         for (let i = 0; i < files.length; i++) {
-            createDto['fieldMetadata'] = await this.fieldMetadataRepo.findOne({
-                where: {
-                    id: createDto['fieldMetadataId']
-                },
-            });
-            createDto['modelMetadata'] = await this.modelMetadataRepo.findOne({
-                where: {
-                    id: createDto['modelMetadataId']
-                },
-            });
-            createDto['mediaStorageProviderMetadata'] = await this.mediaStorageProviderMetadataRepo.findOne({
-                where: {
-                    id: createDto['mediaStorageProviderMetadataId']
-                },
-            });
             const file = files[i];
-            switch (createDto.mediaStorageProviderMetadata.type) {
+            const storageProvider = createDto.mediaStorageProviderMetadata;
+            const fileName = (0, media_storage_utils_1.buildStoredMediaFileName)(file);
+            switch (storageProvider.type) {
                 case create_media_storage_provider_metadata_dto_1.MediaStorageProviderType.Filesystem:
-                    const fileStoragePath = this.getFullFilePathForDisk(this.getFileName(file));
+                    const fileStoragePath = (0, media_storage_utils_1.buildDiskMediaPath)(fileName, this.settingService, storageProvider);
                     await this.diskFileService.copy(file.path, fileStoragePath);
-                    createDto['relativeUri'] = this.getFileName(file);
+                    createDto['relativeUri'] = fileName;
                     break;
                 case create_media_storage_provider_metadata_dto_1.MediaStorageProviderType.AwsS3:
-                    const fileName = this.getFileName(file);
-                    const bucketName = createDto.mediaStorageProviderMetadata.bucketName;
+                    const bucketName = storageProvider.bucketName;
+                    const region = (0, media_storage_utils_1.getEffectiveS3Region)(this.configService, storageProvider.region);
                     const fileData = await this.diskFileService.read(file.path);
-                    await this.s3FileService.write(`${bucketName}:${fileName}`, fileData, { contentType: file.mimetype });
+                    await this.s3FileService.write(`${bucketName}:${fileName}`, fileData, { contentType: file.mimetype, region });
                     createDto['relativeUri'] = fileName;
                     break;
                 default:
                     break;
             }
             await this.diskFileService.delete(file.path);
+            createDto['isPublic'] = (0, media_storage_utils_1.resolveStoredMediaIsPublic)(createDto['isPublic'], storageProvider);
             const media = this.repo.create(createDto);
             const savedMedia = await this.repo.save(media);
+            savedMedia.isPublic = (0, media_storage_utils_1.resolveStoredMediaIsPublic)(savedMedia.isPublic, storageProvider);
             savedMedias.push(savedMedia);
         }
         return savedMedias;
@@ -165,26 +170,123 @@ let MediaService = class MediaService extends crud_service_1.CRUDService {
         await storageProvider.delete(modelEntity, media.fieldMetadata);
         return this.repo.remove(media);
     }
-    getFullFilePathForDisk(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;
+    async fileDownloadStream(media) {
+        const loadedMedia = await this.repo.findOne({
+            where: { id: media.id },
+            relations: ['mediaStorageProviderMetadata'],
+        });
+        if (!loadedMedia || !loadedMedia.mediaStorageProviderMetadata) {
+            throw new common_1.NotFoundException(`Media with id ${media.id} not found`);
+        }
+        const fileName = loadedMedia.originalFileName || path.basename(loadedMedia.relativeUri || `${loadedMedia.id}`);
+        const mimeType = loadedMedia.mimeType || 'application/octet-stream';
+        switch (loadedMedia.mediaStorageProviderMetadata.type) {
+            case create_media_storage_provider_metadata_dto_1.MediaStorageProviderType.Filesystem:
+                return {
+                    stream: await this.diskFileService.readStream((0, media_storage_utils_1.buildDiskMediaPath)(loadedMedia.relativeUri, this.settingService, loadedMedia.mediaStorageProviderMetadata)),
+                    fileName,
+                    mimeType,
+                };
+            default:
+                throw new Error(`Unsupported media storage provider type ${loadedMedia.mediaStorageProviderMetadata.type}`);
+        }
+    }
+    async delete(id, solidRequestContext = {}) {
+        const media = await this.repo.findOne({
+            where: { id },
+            relations: ['mediaStorageProviderMetadata'],
+        });
+        const result = await super.delete(id, solidRequestContext);
+        if (media) {
+            await this.deletePhysicalFile(media);
+        }
+        return result;
+    }
+    async deleteMany(ids, solidRequestContext = {}) {
+        const mediaRecords = await this.repo.find({
+            where: {
+                id: (0, typeorm_2.In)(ids),
+            },
+            relations: ['mediaStorageProviderMetadata'],
+        });
+        const result = await super.deleteMany(ids, solidRequestContext);
+        for (const media of mediaRecords) {
+            await this.deletePhysicalFile(media);
+        }
+        return result;
+    }
+    async decorateMediaRecords(medias) {
+        for (const media of medias) {
+            await this.decorateMediaRecord(media);
         }
-        return `${base}/${fileName}`;
     }
-    getFileName(file) {
-        return `${file.filename}-${file.originalname}`;
+    async decorateMediaRecord(media) {
+        const mediaStorageProvider = await this.resolveMediaStorageProvider(media);
+        media.isPublic = (0, media_storage_utils_1.resolveStoredMediaIsPublic)(media.isPublic, mediaStorageProvider);
+        media.relativeUri = await this.resolveMediaUrl(media, mediaStorageProvider);
+    }
+    async resolveMediaUrl(media, mediaStorageProvider) {
+        const resolvedMediaStorageProvider = mediaStorageProvider || await this.resolveMediaStorageProvider(media);
+        const isPublic = (0, media_storage_utils_1.resolveStoredMediaIsPublic)(media.isPublic, resolvedMediaStorageProvider);
+        if (isPublic === false) {
+            return this.mediaDownloadUrlService.resolveDownloadUrl(media.id, media.relativeUri, resolvedMediaStorageProvider);
+        }
+        if (resolvedMediaStorageProvider?.type === create_media_storage_provider_metadata_dto_1.MediaStorageProviderType.Filesystem) {
+            return this.diskFileService.getUrl((0, media_storage_utils_1.buildDiskMediaPath)(media.relativeUri, this.settingService, resolvedMediaStorageProvider));
+        }
+        if (resolvedMediaStorageProvider?.type === create_media_storage_provider_metadata_dto_1.MediaStorageProviderType.AwsS3) {
+            return this.s3FileService.getUrl(`${resolvedMediaStorageProvider.bucketName}:${media.relativeUri}`, { region: (0, media_storage_utils_1.getEffectiveS3Region)(this.configService, resolvedMediaStorageProvider.region), expiresIn: 0 });
+        }
+        return media.relativeUri;
+    }
+    async deletePhysicalFile(media) {
+        if (!media?.relativeUri) {
+            return;
+        }
+        try {
+            const mediaStorageProvider = await this.resolveMediaStorageProvider(media);
+            if (!mediaStorageProvider) {
+                return;
+            }
+            switch (mediaStorageProvider.type) {
+                case create_media_storage_provider_metadata_dto_1.MediaStorageProviderType.Filesystem:
+                    await this.diskFileService.delete((0, media_storage_utils_1.buildDiskMediaPath)(media.relativeUri, this.settingService, mediaStorageProvider));
+                    return;
+                case create_media_storage_provider_metadata_dto_1.MediaStorageProviderType.AwsS3:
+                    await this.s3FileService.delete(`${mediaStorageProvider.bucketName}:${media.relativeUri}`, { region: (0, media_storage_utils_1.getEffectiveS3Region)(this.configService, mediaStorageProvider.region) });
+                    return;
+                default:
+                    this.logger.warn(`Skipping physical delete for unsupported media storage provider type ${mediaStorageProvider.type}`);
+            }
+        }
+        catch (error) {
+            const message = error?.message ?? String(error);
+            this.logger.warn(`Failed to delete physical media file for media id ${media.id}: ${message}`);
+        }
+    }
+    async resolveMediaStorageProvider(media) {
+        if (media.mediaStorageProviderMetadata) {
+            return media.mediaStorageProviderMetadata;
+        }
+        if (!media.id) {
+            return undefined;
+        }
+        const loadedMedia = await this.repo.findOne({
+            where: { id: media.id },
+            relations: ['mediaStorageProviderMetadata'],
+        });
+        return loadedMedia?.mediaStorageProviderMetadata;
     }
 };
 exports.MediaService = MediaService;
-exports.MediaService = MediaService = __decorate([
+exports.MediaService = MediaService = MediaService_1 = __decorate([
     (0, common_1.Injectable)(),
-    __param(3, (0, typeorm_1.InjectEntityManager)()),
-    __param(5, (0, common_1.Inject)((0, common_1.forwardRef)(() => model_metadata_repository_1.ModelMetadataRepository))),
+    __param(4, (0, typeorm_1.InjectEntityManager)()),
+    __param(6, (0, common_1.Inject)((0, common_1.forwardRef)(() => model_metadata_repository_1.ModelMetadataRepository))),
     __metadata("design:paramtypes", [config_1.ConfigService,
         file_1.DiskFileService,
         file_1.S3FileService,
+        media_download_url_service_1.MediaDownloadUrlService,
         typeorm_2.EntityManager,
         media_repository_1.MediaRepository,
         model_metadata_repository_1.ModelMetadataRepository,