@webiny/api-file-manager-s3 6.0.0-beta.0 → 6.0.0-rc.0

package/{plugins/graphqlFileStorageS3.js → graphql/schema.js}

@@ -1,23 +1,17 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-var _clientS = require("@webiny/aws-sdk/client-s3");
-var _pMap = _interopRequireDefault(require("p-map"));
-var _responses = require("@webiny/handler-graphql/responses");
-var _getPresignedPostPayload = require("../utils/getPresignedPostPayload");
-var _error = _interopRequireDefault(require("@webiny/error"));
-var _checkPermissions = require("./checkPermissions");
-var _CreateMultiPartUploadUseCase = require("../multiPartUpload/CreateMultiPartUploadUseCase");
-var _CompleteMultiPartUploadUseCase = require("../multiPartUpload/CompleteMultiPartUploadUseCase");
-var _createFileNormalizerFromContext = require("../utils/createFileNormalizerFromContext");
-const plugin = {
-  type: "graphql-schema",
-  name: "graphql-schema-api-file-manager-s3",
-  schema: {
+import pMap from "p-map";
+import { createGraphQLSchemaPlugin } from "@webiny/handler-graphql";
+import { IdentityContext } from "@webiny/api-core/features/IdentityContext";
+import { S3 } from "@webiny/aws-sdk/client-s3/index.js";
+import { ErrorResponse, Response } from "@webiny/handler-graphql/responses.js";
+import { getPresignedPostPayload } from "../utils/getPresignedPostPayload.js";
+import { checkPermissions } from "./checkPermissions.js";
+import { CreateMultiPartUploadUseCase } from "../multiPartUpload/CreateMultiPartUploadUseCase.js";
+import { CompleteMultiPartUploadUseCase } from "../multiPartUpload/CompleteMultiPartUploadUseCase.js";
+import { createFileNormalizerFromContext } from "../utils/createFileNormalizerFromContext.js";
+import { GetSettingsUseCase } from "@webiny/api-file-manager/features/settings/GetSettings/abstractions.js";
+import { TenantContext } from "@webiny/api-core/features/tenancy/TenantContext/index.js";
+export const createS3GraphQLSchema = () => {
+  return createGraphQLSchemaPlugin({
     typeDefs: /* GraphQL */`
             type UploadFileResponseDataFile {
                 id: ID!
@@ -28,6 +22,7 @@ const plugin = {
             }
 
             input PreSignedPostPayloadInput {
+                id: ID
                 name: String!
                 type: String!
                 size: Long!
@@ -109,22 +104,20 @@ const plugin = {
     resolvers: {
       FmQuery: {
         getPreSignedPostPayload: async (_, args, context) => {
+          const identityContext = context.container.resolve(IdentityContext);
+          const getSettings = context.container.resolve(GetSettingsUseCase);
           try {
-            await (0, _checkPermissions.checkPermissions)(context, {
+            await checkPermissions(identityContext, {
               rwd: "w"
             });
             const data = args.data;
-            const settings = await context.fileManager.getSettings();
-            if (!settings) {
-              throw new _error.default("Missing File Manager Settings.", "FILE_MANAGER_SETTINGS_ERROR", {
-                file: data
-              });
-            }
-            const normalizer = (0, _createFileNormalizerFromContext.createFileNormalizerFromContext)(context);
-            const presignedPayload = await (0, _getPresignedPostPayload.getPresignedPostPayload)(await normalizer.normalizeFile(data), settings);
-            return new _responses.Response(presignedPayload);
+            const settingsResult = await getSettings.execute();
+            const settings = settingsResult.value;
+            const normalizer = createFileNormalizerFromContext(context);
+            const presignedPayload = await getPresignedPostPayload(await normalizer.normalizeFile(data), settings, context.container.resolve(TenantContext));
+            return new Response(presignedPayload);
           } catch (e) {
-            return new _responses.ErrorResponse({
+            return new ErrorResponse({
               message: e.message,
               code: e.code,
               data: e.data
@@ -132,24 +125,22 @@ const plugin = {
           }
         },
         getPreSignedPostPayloads: async (_, args, context) => {
-          await (0, _checkPermissions.checkPermissions)(context, {
+          const identityContext = context.container.resolve(IdentityContext);
+          const getSettings = context.container.resolve(GetSettingsUseCase);
+          await checkPermissions(identityContext, {
             rwd: "w"
           });
           const files = args.data;
           try {
-            const settings = await context.fileManager.getSettings();
-            if (!settings) {
-              throw new _error.default("Missing File Manager Settings.", "FILE_MANAGER_SETTINGS_ERROR", {
-                files
-              });
-            }
-            const normalizer = (0, _createFileNormalizerFromContext.createFileNormalizerFromContext)(context);
-            const presignedPayloads = await (0, _pMap.default)(files, async data => {
-              return (0, _getPresignedPostPayload.getPresignedPostPayload)(await normalizer.normalizeFile(data), settings);
+            const settingsResult = await getSettings.execute();
+            const settings = settingsResult.value;
+            const normalizer = createFileNormalizerFromContext(context);
+            const presignedPayloads = await pMap(files, async data => {
+              return getPresignedPostPayload(await normalizer.normalizeFile(data), settings, context.container.resolve(TenantContext));
             });
-            return new _responses.Response(presignedPayloads);
+            return new Response(presignedPayloads);
           } catch (e) {
-            return new _responses.ErrorResponse({
+            return new ErrorResponse({
               message: e.message,
               code: e.code,
               data: e.data
@@ -159,22 +150,23 @@ const plugin = {
       },
       FmMutation: {
         createMultiPartUpload: async (_, args, context) => {
-          await (0, _checkPermissions.checkPermissions)(context, {
+          const identityContext = context.container.resolve(IdentityContext);
+          await checkPermissions(identityContext, {
             rwd: "w"
           });
-          const s3Client = new _clientS.S3({
+          const s3Client = new S3({
             region: process.env.AWS_REGION
           });
           try {
-            const useCase = new _CreateMultiPartUploadUseCase.CreateMultiPartUploadUseCase(String(process.env.S3_BUCKET), s3Client);
-            const normalizer = (0, _createFileNormalizerFromContext.createFileNormalizerFromContext)(context);
+            const useCase = new CreateMultiPartUploadUseCase(String(process.env.S3_BUCKET), s3Client);
+            const normalizer = createFileNormalizerFromContext(context);
             const multiPartUpload = await useCase.execute({
               file: await normalizer.normalizeFile(args.data),
               numberOfParts: args.numberOfParts
             });
-            return new _responses.Response(multiPartUpload);
+            return new Response(multiPartUpload);
           } catch (e) {
-            return new _responses.ErrorResponse({
+            return new ErrorResponse({
               message: e.message,
               code: e.code,
               data: e.data
@@ -182,21 +174,22 @@ const plugin = {
           }
         },
         completeMultiPartUpload: async (_, args, context) => {
-          await (0, _checkPermissions.checkPermissions)(context, {
+          const identityContext = context.container.resolve(IdentityContext);
+          await checkPermissions(identityContext, {
             rwd: "w"
           });
-          const s3Client = new _clientS.S3({
+          const s3Client = new S3({
             region: process.env.AWS_REGION
           });
           try {
-            const useCase = new _CompleteMultiPartUploadUseCase.CompleteMultiPartUploadUseCase(String(process.env.S3_BUCKET), s3Client);
+            const useCase = new CompleteMultiPartUploadUseCase(String(process.env.S3_BUCKET), s3Client);
             await useCase.execute({
               fileKey: args.fileKey,
               uploadId: args.uploadId
             });
-            return new _responses.Response(true);
+            return new Response(true);
           } catch (e) {
-            return new _responses.ErrorResponse({
+            return new ErrorResponse({
               message: e.message,
               code: e.code,
               data: e.data
@@ -205,8 +198,7 @@ const plugin = {
         }
       }
     }
-  }
+  });
 };
-var _default = exports.default = plugin;
 
-//# sourceMappingURL=graphqlFileStorageS3.js.map
+//# sourceMappingURL=schema.js.map

package/graphql/schema.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["pMap","createGraphQLSchemaPlugin","IdentityContext","S3","ErrorResponse","Response","getPresignedPostPayload","checkPermissions","CreateMultiPartUploadUseCase","CompleteMultiPartUploadUseCase","createFileNormalizerFromContext","GetSettingsUseCase","TenantContext","createS3GraphQLSchema","typeDefs","resolvers","FmQuery","getPreSignedPostPayload","_","args","context","identityContext","container","resolve","getSettings","rwd","data","settingsResult","execute","settings","value","normalizer","presignedPayload","normalizeFile","e","message","code","getPreSignedPostPayloads","files","presignedPayloads","FmMutation","createMultiPartUpload","s3Client","region","process","env","AWS_REGION","useCase","String","S3_BUCKET","multiPartUpload","file","numberOfParts","completeMultiPartUpload","fileKey","uploadId"],"sources":["schema.ts"],"sourcesContent":["import pMap from \"p-map\";\nimport { createGraphQLSchemaPlugin } from \"@webiny/handler-graphql\";\nimport { IdentityContext } from \"@webiny/api-core/features/IdentityContext\";\nimport { S3 } from \"@webiny/aws-sdk/client-s3/index.js\";\nimport { ErrorResponse, Response } from \"@webiny/handler-graphql/responses.js\";\nimport { getPresignedPostPayload } from \"~/utils/getPresignedPostPayload.js\";\nimport { checkPermissions } from \"./checkPermissions.js\";\nimport type { PresignedPostPayloadData } from \"~/types.js\";\nimport { CreateMultiPartUploadUseCase } from \"~/multiPartUpload/CreateMultiPartUploadUseCase.js\";\nimport { CompleteMultiPartUploadUseCase } from \"~/multiPartUpload/CompleteMultiPartUploadUseCase.js\";\nimport { createFileNormalizerFromContext } from \"~/utils/createFileNormalizerFromContext.js\";\nimport { GetSettingsUseCase } from \"@webiny/api-file-manager/features/settings/GetSettings/abstractions.js\";\nimport { TenantContext } from \"@webiny/api-core/features/tenancy/TenantContext/index.js\";\n\nexport const createS3GraphQLSchema = () => {\n    return createGraphQLSchemaPlugin({\n        typeDefs: /* GraphQL */ `\n            type UploadFileResponseDataFile {\n                id: ID!\n                name: String!\n                type: String!\n                size: Long!\n                key: String!\n            }\n\n            input PreSignedPostPayloadInput {\n                id: ID\n                name: String!\n                type: String!\n                size: Long!\n                key: String\n                keyPrefix: String\n            }\n\n            type GetPreSignedPostPayloadResponseDataFile {\n                id: ID!\n                name: String!\n                type: String!\n                size: Long!\n                key: String!\n            }\n\n            type GetPreSignedPostPayloadResponseData {\n                # Contains data that is necessary for initiating a file upload.\n                data: JSON!\n                file: UploadFileResponseDataFile!\n            }\n\n            type GetPreSignedPostPayloadResponse {\n                error: FmError\n                data: GetPreSignedPostPayloadResponseData\n            }\n\n            type MultiPartUploadFilePart {\n                partNumber: Int!\n                url: String!\n            }\n\n            type CreateMultiPartUploadResponseData {\n                file: GetPreSignedPostPayloadResponseDataFile!\n                uploadId: String!\n                parts: [MultiPartUploadFilePart!]!\n            }\n\n            type CompleteMultiPartUploadResponse {\n                data: Boolean\n                error: FmError\n            }\n\n            type GetPreSignedPostPayloadsResponse {\n                error: FmError\n                data: [GetPreSignedPostPayloadResponseData!]!\n            }\n\n            extend type FmQuery {\n                getPreSignedPostPayload(\n                    data: PreSignedPostPayloadInput!\n                ): GetPreSignedPostPayloadResponse\n                getPreSignedPostPayloads(\n                    data: [PreSignedPostPayloadInput]!\n                ): GetPreSignedPostPayloadsResponse\n            }\n\n            type CreateMultiPartUploadResponse {\n                data: CreateMultiPartUploadResponseData\n                error: FmError\n            }\n\n            input MultiPartUploadFilePartInput {\n                partNumber: Int!\n                etag: String!\n            }\n\n            extend type FmMutation {\n                createMultiPartUpload(\n                    data: PreSignedPostPayloadInput!\n                    numberOfParts: Number!\n                ): CreateMultiPartUploadResponse\n\n                completeMultiPartUpload(\n                    fileKey: String!\n                    uploadId: String!\n                ): CompleteMultiPartUploadResponse\n            }\n        `,\n        resolvers: {\n            FmQuery: {\n                getPreSignedPostPayload: async (_, args: any, context) => {\n                    const identityContext = context.container.resolve(IdentityContext);\n                    const getSettings = context.container.resolve(GetSettingsUseCase);\n\n                    try {\n                        await checkPermissions(identityContext, { rwd: \"w\" });\n\n                        const data = args.data as PresignedPostPayloadData;\n\n                        const settingsResult = await getSettings.execute();\n                        const settings = settingsResult.value;\n\n                        const normalizer = createFileNormalizerFromContext(context);\n                        const presignedPayload = await getPresignedPostPayload(\n                            await normalizer.normalizeFile(data),\n                            settings,\n                            context.container.resolve(TenantContext)\n                        );\n\n                        return new Response(presignedPayload);\n                    } catch (e) {\n                        return new ErrorResponse({\n                            message: e.message,\n                            code: e.code,\n                            data: e.data\n                        });\n                    }\n                },\n                getPreSignedPostPayloads: async (_, args, context) => {\n                    const identityContext = context.container.resolve(IdentityContext);\n                    const getSettings = context.container.resolve(GetSettingsUseCase);\n                    await checkPermissions(identityContext, { rwd: \"w\" });\n\n                    const files = args.data as PresignedPostPayloadData[];\n\n                    try {\n                        const settingsResult = await getSettings.execute();\n                        const settings = settingsResult.value;\n\n                        const normalizer = createFileNormalizerFromContext(context);\n\n                        const presignedPayloads = await pMap(files, async data => {\n                            return getPresignedPostPayload(\n                                await normalizer.normalizeFile(data),\n                                settings,\n                                context.container.resolve(TenantContext)\n                            );\n                        });\n\n                        return new Response(presignedPayloads);\n                    } catch (e) {\n                        return new ErrorResponse({\n                            message: e.message,\n                            code: e.code,\n                            data: e.data\n                        });\n                    }\n                }\n            },\n            FmMutation: {\n                createMultiPartUpload: async (_, args, context) => {\n                    const identityContext = context.container.resolve(IdentityContext);\n                    await checkPermissions(identityContext, { rwd: \"w\" });\n\n                    const s3Client = new S3({\n                        region: process.env.AWS_REGION\n                    });\n\n                    try {\n                        const useCase = new CreateMultiPartUploadUseCase(\n                            String(process.env.S3_BUCKET),\n                            s3Client\n                        );\n\n                        const normalizer = createFileNormalizerFromContext(context);\n\n                        const multiPartUpload = await useCase.execute({\n                            file: await normalizer.normalizeFile(args.data),\n                            numberOfParts: args.numberOfParts\n                        });\n\n                        return new Response(multiPartUpload);\n                    } catch (e) {\n                        return new ErrorResponse({\n                            message: e.message,\n                            code: e.code,\n                            data: e.data\n                        });\n                    }\n                },\n                completeMultiPartUpload: async (_, args, context) => {\n                    const identityContext = context.container.resolve(IdentityContext);\n                    await checkPermissions(identityContext, { rwd: \"w\" });\n\n                    const s3Client = new S3({\n                        region: process.env.AWS_REGION\n                    });\n\n                    try {\n                        const useCase = new CompleteMultiPartUploadUseCase(\n                            String(process.env.S3_BUCKET),\n                            s3Client\n                        );\n\n                        await useCase.execute({\n                            fileKey: args.fileKey,\n                            uploadId: args.uploadId\n                        });\n\n                        return new Response(true);\n                    } catch (e) {\n                        return new ErrorResponse({\n                            message: e.message,\n                            code: e.code,\n                            data: e.data\n                        });\n                    }\n                }\n            }\n        }\n    });\n};\n"],"mappings":"AAAA,OAAOA,IAAI,MAAM,OAAO;AACxB,SAASC,yBAAyB,QAAQ,yBAAyB;AACnE,SAASC,eAAe,QAAQ,2CAA2C;AAC3E,SAASC,EAAE,QAAQ,oCAAoC;AACvD,SAASC,aAAa,EAAEC,QAAQ,QAAQ,sCAAsC;AAC9E,SAASC,uBAAuB;AAChC,SAASC,gBAAgB;AAEzB,SAASC,4BAA4B;AACrC,SAASC,8BAA8B;AACvC,SAASC,+BAA+B;AACxC,SAASC,kBAAkB,QAAQ,wEAAwE;AAC3G,SAASC,aAAa,QAAQ,0DAA0D;AAExF,OAAO,MAAMC,qBAAqB,GAAGA,CAAA,KAAM;EACvC,OAAOZ,yBAAyB,CAAC;IAC7Ba,QAAQ,EAAE,aAAc;AAChC;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;IACDC,SAAS,EAAE;MACPC,OAAO,EAAE;QACLC,uBAAuB,EAAE,MAAAA,CAAOC,CAAC,EAAEC,IAAS,EAAEC,OAAO,KAAK;UACtD,MAAMC,eAAe,GAAGD,OAAO,CAACE,SAAS,CAACC,OAAO,CAACrB,eAAe,CAAC;UAClE,MAAMsB,WAAW,GAAGJ,OAAO,CAACE,SAAS,CAACC,OAAO,CAACZ,kBAAkB,CAAC;UAEjE,IAAI;YACA,MAAMJ,gBAAgB,CAACc,eAAe,EAAE;cAAEI,GAAG,EAAE;YAAI,CAAC,CAAC;YAErD,MAAMC,IAAI,GAAGP,IAAI,CAACO,IAAgC;YAElD,MAAMC,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","ignoreList":[]}

package/index.d.ts

@@ -1,5 +1,4 @@
-export { createFileUploadModifier } from "./utils/FileUploadModifier";
-export { createAssetDelivery } from "./assetDelivery/createAssetDelivery";
-export { createCustomAssetDelivery } from "./assetDelivery/createCustomAssetDelivery";
-declare const _default: () => (import("@webiny/handler-graphql/types").GraphQLSchemaPlugin<import("@webiny/api-file-manager/types").FileManagerContext> | import("@webiny/api").ContextPlugin<import("@webiny/api/types").Context> | (import("@webiny/api").ContextPlugin<import("@webiny/api-file-manager/types").FileManagerContext> | import("@webiny/tasks").TaskDefinitionPlugin<import("@webiny/api-file-manager/types").FileManagerContext, any, import("@webiny/tasks").ITaskResponseDoneResultOutput>)[])[];
-export default _default;
+import { ContextPlugin } from "@webiny/api";
+export { createFileUploadModifier } from "./utils/FileUploadModifier.js";
+export { createAssetDelivery } from "./assetDelivery/createAssetDelivery.js";
+export declare const createFileManagerS3: () => (import("@webiny/handler-graphql/index.js").GraphQLSchemaPlugin<import("@webiny/api/types.js").Context> | ContextPlugin<import("@webiny/api/types.js").Context>)[];

package/index.js

@@ -1,36 +1,25 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-Object.defineProperty(exports, "createAssetDelivery", {
-  enumerable: true,
-  get: function () {
-    return _createAssetDelivery.createAssetDelivery;
-  }
-});
-Object.defineProperty(exports, "createCustomAssetDelivery", {
-  enumerable: true,
-  get: function () {
-    return _createCustomAssetDelivery.createCustomAssetDelivery;
-  }
-});
-Object.defineProperty(exports, "createFileUploadModifier", {
-  enumerable: true,
-  get: function () {
-    return _FileUploadModifier.createFileUploadModifier;
+import { ContextPlugin } from "@webiny/api";
+import { WcpContext } from "@webiny/api-core/features/wcp/WcpContext/index.js";
+import { createS3GraphQLSchema } from "./graphql/schema.js";
+import { DeleteFileFromBucketFeature } from "./features/DeleteFileFromBucket/feature.js";
+import { WriteFileMetadataFeature } from "./features/WriteFileMetadata/feature.js";
+import { ApplyThreatScanningFeature } from "./enterprise/ApplyThreatScanning/feature.js";
+import { FlushCacheFeature } from "./features/FlushCache/feature.js";
+import { ExtractMetadataFeature } from "./features/ExtractMetadata/feature.js";
+export { createFileUploadModifier } from "./utils/FileUploadModifier.js";
+export { createAssetDelivery } from "./assetDelivery/createAssetDelivery.js";
+const contextPlugin = new ContextPlugin(context => {
+  const container = context.container;
+  FlushCacheFeature.register(container);
+  DeleteFileFromBucketFeature.register(container);
+  ExtractMetadataFeature.register(container);
+  WriteFileMetadataFeature.register(container);
+  const wcp = container.resolve(WcpContext);
+  if (wcp.canUseFileManagerThreatDetection()) {
+    ApplyThreatScanningFeature.register(container);
   }
 });
-exports.default = void 0;
-var _graphqlFileStorageS = _interopRequireDefault(require("./plugins/graphqlFileStorageS3"));
-var _fileStorageS = _interopRequireDefault(require("./plugins/fileStorageS3"));
-var _addFileMetadata = require("./plugins/addFileMetadata");
-var _flushCdnCache = require("./flushCdnCache");
-var _FileUploadModifier = require("./utils/FileUploadModifier");
-var _createAssetDelivery = require("./assetDelivery/createAssetDelivery");
-var _createCustomAssetDelivery = require("./assetDelivery/createCustomAssetDelivery");
-var _default = () => [(0, _fileStorageS.default)(), _graphqlFileStorageS.default, (0, _addFileMetadata.addFileMetadata)(), (0, _flushCdnCache.flushCdnCache)()];
-exports.default = _default;
+contextPlugin.name = `fileManagerS3.context`;
+export const createFileManagerS3 = () => [contextPlugin, createS3GraphQLSchema()];
 
 //# sourceMappingURL=index.js.map

package/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["_graphqlFileStorageS","_interopRequireDefault","require","_fileStorageS","_addFileMetadata","_flushCdnCache","_FileUploadModifier","_createAssetDelivery","_createCustomAssetDelivery","_default","fileStorageS3","graphqlFileStorageS3","addFileMetadata","flushCdnCache","exports","default"],"sources":["index.ts"],"sourcesContent":["import graphqlFileStorageS3 from \"./plugins/graphqlFileStorageS3\";\nimport fileStorageS3 from \"./plugins/fileStorageS3\";\nimport { addFileMetadata } from \"./plugins/addFileMetadata\";\nimport { flushCdnCache } from \"~/flushCdnCache\";\n\nexport { createFileUploadModifier } from \"./utils/FileUploadModifier\";\nexport { createAssetDelivery } from \"./assetDelivery/createAssetDelivery\";\nexport { createCustomAssetDelivery } from \"./assetDelivery/createCustomAssetDelivery\";\n\nexport default () => [fileStorageS3(), graphqlFileStorageS3, addFileMetadata(), flushCdnCache()];\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,IAAAA,oBAAA,GAAAC,sBAAA,CAAAC,OAAA;AACA,IAAAC,aAAA,GAAAF,sBAAA,CAAAC,OAAA;AACA,IAAAE,gBAAA,GAAAF,OAAA;AACA,IAAAG,cAAA,GAAAH,OAAA;AAEA,IAAAI,mBAAA,GAAAJ,OAAA;AACA,IAAAK,oBAAA,GAAAL,OAAA;AACA,IAAAM,0BAAA,GAAAN,OAAA;AAAsF,IAAAO,QAAA,GAEvEA,CAAA,KAAM,CAAC,IAAAC,qBAAa,EAAC,CAAC,EAAEC,4BAAoB,EAAE,IAAAC,gCAAe,EAAC,CAAC,EAAE,IAAAC,4BAAa,EAAC,CAAC,CAAC;AAAAC,OAAA,CAAAC,OAAA,GAAAN,QAAA","ignoreList":[]}
+{"version":3,"names":["ContextPlugin","WcpContext","createS3GraphQLSchema","DeleteFileFromBucketFeature","WriteFileMetadataFeature","ApplyThreatScanningFeature","FlushCacheFeature","ExtractMetadataFeature","createFileUploadModifier","createAssetDelivery","contextPlugin","context","container","register","wcp","resolve","canUseFileManagerThreatDetection","name","createFileManagerS3"],"sources":["index.ts"],"sourcesContent":["import { ContextPlugin } from \"@webiny/api\";\nimport { WcpContext } from \"@webiny/api-core/features/wcp/WcpContext/index.js\";\nimport { createS3GraphQLSchema } from \"./graphql/schema.js\";\nimport { DeleteFileFromBucketFeature } from \"~/features/DeleteFileFromBucket/feature.js\";\nimport { WriteFileMetadataFeature } from \"~/features/WriteFileMetadata/feature.js\";\nimport { ApplyThreatScanningFeature } from \"~/enterprise/ApplyThreatScanning/feature.js\";\nimport { FlushCacheFeature } from \"~/features/FlushCache/feature.js\";\nimport { ExtractMetadataFeature } from \"~/features/ExtractMetadata/feature.js\";\nexport { createFileUploadModifier } from \"./utils/FileUploadModifier.js\";\nexport { createAssetDelivery } from \"./assetDelivery/createAssetDelivery.js\";\n\nconst contextPlugin = new ContextPlugin(context => {\n    const container = context.container;\n\n    FlushCacheFeature.register(container);\n    DeleteFileFromBucketFeature.register(container);\n    ExtractMetadataFeature.register(container);\n    WriteFileMetadataFeature.register(container);\n\n    const wcp = container.resolve(WcpContext);\n    if (wcp.canUseFileManagerThreatDetection()) {\n        ApplyThreatScanningFeature.register(container);\n    }\n});\n\ncontextPlugin.name = `fileManagerS3.context`;\n\nexport const createFileManagerS3 = () => [contextPlugin, createS3GraphQLSchema()];\n"],"mappings":"AAAA,SAASA,aAAa,QAAQ,aAAa;AAC3C,SAASC,UAAU,QAAQ,mDAAmD;AAC9E,SAASC,qBAAqB;AAC9B,SAASC,2BAA2B;AACpC,SAASC,wBAAwB;AACjC,SAASC,0BAA0B;AACnC,SAASC,iBAAiB;AAC1B,SAASC,sBAAsB;AAC/B,SAASC,wBAAwB;AACjC,SAASC,mBAAmB;AAE5B,MAAMC,aAAa,GAAG,IAAIV,aAAa,CAACW,OAAO,IAAI;EAC/C,MAAMC,SAAS,GAAGD,OAAO,CAACC,SAAS;EAEnCN,iBAAiB,CAACO,QAAQ,CAACD,SAAS,CAAC;EACrCT,2BAA2B,CAACU,QAAQ,CAACD,SAAS,CAAC;EAC/CL,sBAAsB,CAACM,QAAQ,CAACD,SAAS,CAAC;EAC1CR,wBAAwB,CAACS,QAAQ,CAACD,SAAS,CAAC;EAE5C,MAAME,GAAG,GAAGF,SAAS,CAACG,OAAO,CAACd,UAAU,CAAC;EACzC,IAAIa,GAAG,CAACE,gCAAgC,CAAC,CAAC,EAAE;IACxCX,0BAA0B,CAACQ,QAAQ,CAACD,SAAS,CAAC;EAClD;AACJ,CAAC,CAAC;AAEFF,aAAa,CAACO,IAAI,GAAG,uBAAuB;AAE5C,OAAO,MAAMC,mBAAmB,GAAGA,CAAA,KAAM,CAACR,aAAa,EAAER,qBAAqB,CAAC,CAAC,CAAC","ignoreList":[]}

package/multiPartUpload/CompleteMultiPartUploadUseCase.d.ts

@@ -1,4 +1,4 @@
-import { S3 } from "@webiny/aws-sdk/client-s3";
+import type { S3 } from "@webiny/aws-sdk/client-s3/index.js";
 interface CompleteMultiPartUploadParams {
     fileKey: string;
     uploadId: string;

package/multiPartUpload/CompleteMultiPartUploadUseCase.js

@@ -1,11 +1,5 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.CompleteMultiPartUploadUseCase = void 0;
-var _clientS = require("@webiny/aws-sdk/client-s3");
-class CompleteMultiPartUploadUseCase {
+import { ListPartsCommand, CompleteMultipartUploadCommand } from "@webiny/aws-sdk/client-s3/index.js";
+export class CompleteMultiPartUploadUseCase {
   emptyMarkerValues = [undefined, "0"];
   constructor(bucket, s3Client) {
     this.bucket = bucket;
@@ -25,7 +19,7 @@ class CompleteMultiPartUploadUseCase {
       }
     };
     try {
-      const command = new _clientS.CompleteMultipartUploadCommand(s3Params);
+      const command = new CompleteMultipartUploadCommand(s3Params);
       await this.s3.send(command);
     } catch (err) {
       console.error(err);
@@ -39,7 +33,7 @@ class CompleteMultiPartUploadUseCase {
       const {
         Parts,
         PartNumberMarker
-      } = await this.s3.send(new _clientS.ListPartsCommand({
+      } = await this.s3.send(new ListPartsCommand({
         ...params,
         PartNumberMarker: marker
       }));
@@ -60,6 +54,5 @@ class CompleteMultiPartUploadUseCase {
     return this.emptyMarkerValues.includes(marker);
   }
 }
-exports.CompleteMultiPartUploadUseCase = CompleteMultiPartUploadUseCase;
 
 //# sourceMappingURL=CompleteMultiPartUploadUseCase.js.map

package/multiPartUpload/CompleteMultiPartUploadUseCase.js.map

@@ -1 +1 @@
-{"version":3,"names":["_clientS","require","CompleteMultiPartUploadUseCase","emptyMarkerValues","undefined","constructor","bucket","s3Client","s3","execute","params","uploadParams","Bucket","Key","fileKey","UploadId","uploadId","allParts","getAllUploadParts","s3Params","MultipartUpload","Parts","command","CompleteMultipartUploadCommand","send","err","console","error","parts","marker","PartNumberMarker","ListPartsCommand","forEach","part","push","isMarkerEmpty","map","ETag","PartNumber","includes","exports"],"sources":["CompleteMultiPartUploadUseCase.ts"],"sourcesContent":["import {\n    S3,\n    Part,\n    ListPartsOutput,\n    ListPartsCommand,\n    CompleteMultipartUploadCommand\n} from \"@webiny/aws-sdk/client-s3\";\n\ninterface CompleteMultiPartUploadParams {\n    fileKey: string;\n    uploadId: string;\n}\n\ninterface GetAllUploadPartsParams {\n    Bucket: string;\n    Key: string;\n    UploadId: string;\n}\n\nexport class CompleteMultiPartUploadUseCase {\n    private readonly s3: S3;\n    private readonly bucket: string;\n    private readonly emptyMarkerValues = [undefined, \"0\"];\n\n    constructor(bucket: string, s3Client: S3) {\n        this.bucket = bucket;\n        this.s3 = s3Client;\n    }\n\n    async execute(params: CompleteMultiPartUploadParams) {\n        const uploadParams = {\n            Bucket: this.bucket,\n            Key: params.fileKey,\n            UploadId: params.uploadId\n        };\n\n        const allParts = await this.getAllUploadParts(uploadParams);\n\n        const s3Params = {\n            ...uploadParams,\n            MultipartUpload: {\n                Parts: allParts\n            }\n        };\n\n        try {\n            const command = new CompleteMultipartUploadCommand(s3Params);\n            await this.s3.send(command);\n        } catch (err) {\n            console.error(err);\n            throw err;\n        }\n    }\n\n    private async getAllUploadParts(params: GetAllUploadPartsParams) {\n        const parts: Part[] = [];\n\n        let marker: string | undefined = undefined;\n        while (true) {\n            const { Parts, PartNumberMarker }: ListPartsOutput = await this.s3.send(\n                new ListPartsCommand({\n                    ...params,\n                    PartNumberMarker: marker\n                })\n            );\n\n            if (Parts) {\n                Parts.forEach(part => parts.push(part));\n            }\n\n            marker = PartNumberMarker || undefined;\n            if (this.isMarkerEmpty(marker)) {\n                break;\n            }\n        }\n\n        return parts.map(part => ({\n            ETag: part.ETag as string,\n            PartNumber: part.PartNumber as number\n        }));\n    }\n\n    private isMarkerEmpty(marker: string | undefined) {\n        return this.emptyMarkerValues.includes(marker);\n    }\n}\n"],"mappings":";;;;;;AAAA,IAAAA,QAAA,GAAAC,OAAA;AAmBO,MAAMC,8BAA8B,CAAC;EAGvBC,iBAAiB,GAAG,CAACC,SAAS,EAAE,GAAG,CAAC;EAErDC,WAAWA,CAACC,MAAc,EAAEC,QAAY,EAAE;IACtC,IAAI,CAACD,MAAM,GAAGA,MAAM;IACpB,IAAI,CAACE,EAAE,GAAGD,QAAQ;EACtB;EAEA,MAAME,OAAOA,CAACC,MAAqC,EAAE;IACjD,MAAMC,YAAY,GAAG;MACjBC,MAAM,EAAE,IAAI,CAACN,MAAM;MACnBO,GAAG,EAAEH,MAAM,CAACI,OAAO;MACnBC,QAAQ,EAAEL,MAAM,CAACM;IACrB,CAAC;IAED,MAAMC,QAAQ,GAAG,MAAM,IAAI,CAACC,iBAAiB,CAACP,YAAY,CAAC;IAE3D,MAAMQ,QAAQ,GAAG;MACb,GAAGR,YAAY;MACfS,eAAe,EAAE;QACbC,KAAK,EAAEJ;MACX;IACJ,CAAC;IAED,IAAI;MACA,MAAMK,OAAO,GAAG,IAAIC,uCAA8B,CAACJ,QAAQ,CAAC;MAC5D,MAAM,IAAI,CAACX,EAAE,CAACgB,IAAI,CAACF,OAAO,CAAC;IAC/B,CAAC,CAAC,OAAOG,GAAG,EAAE;MACVC,OAAO,CAACC,KAAK,CAACF,GAAG,CAAC;MAClB,MAAMA,GAAG;IACb;EACJ;EAEA,MAAcP,iBAAiBA,CAACR,MAA+B,EAAE;IAC7D,MAAMkB,KAAa,GAAG,EAAE;IAExB,IAAIC,MAA0B,GAAGzB,SAAS;IAC1C,OAAO,IAAI,EAAE;MACT,MAAM;QAAEiB,KAAK;QAAES;MAAkC,CAAC,GAAG,MAAM,IAAI,CAACtB,EAAE,CAACgB,IAAI,CACnE,IAAIO,yBAAgB,CAAC;QACjB,GAAGrB,MAAM;QACToB,gBAAgB,EAAED;MACtB,CAAC,CACL,CAAC;MAED,IAAIR,KAAK,EAAE;QACPA,KAAK,CAACW,OAAO,CAACC,IAAI,IAAIL,KAAK,CAACM,IAAI,CAACD,IAAI,CAAC,CAAC;MAC3C;MAEAJ,MAAM,GAAGC,gBAAgB,IAAI1B,SAAS;MACtC,IAAI,IAAI,CAAC+B,aAAa,CAACN,MAAM,CAAC,EAAE;QAC5B;MACJ;IACJ;IAEA,OAAOD,KAAK,CAACQ,GAAG,CAACH,IAAI,KAAK;MACtBI,IAAI,EAAEJ,IAAI,CAACI,IAAc;MACzBC,UAAU,EAAEL,IAAI,CAACK;IACrB,CAAC,CAAC,CAAC;EACP;EAEQH,aAAaA,CAACN,MAA0B,EAAE;IAC9C,OAAO,IAAI,CAAC1B,iBAAiB,CAACoC,QAAQ,CAACV,MAAM,CAAC;EAClD;AACJ;AAACW,OAAA,CAAAtC,8BAAA,GAAAA,8BAAA","ignoreList":[]}
+{"version":3,"names":["ListPartsCommand","CompleteMultipartUploadCommand","CompleteMultiPartUploadUseCase","emptyMarkerValues","undefined","constructor","bucket","s3Client","s3","execute","params","uploadParams","Bucket","Key","fileKey","UploadId","uploadId","allParts","getAllUploadParts","s3Params","MultipartUpload","Parts","command","send","err","console","error","parts","marker","PartNumberMarker","forEach","part","push","isMarkerEmpty","map","ETag","PartNumber","includes"],"sources":["CompleteMultiPartUploadUseCase.ts"],"sourcesContent":["import type { S3, Part, ListPartsOutput } from \"@webiny/aws-sdk/client-s3/index.js\";\nimport {\n    ListPartsCommand,\n    CompleteMultipartUploadCommand\n} from \"@webiny/aws-sdk/client-s3/index.js\";\n\ninterface CompleteMultiPartUploadParams {\n    fileKey: string;\n    uploadId: string;\n}\n\ninterface GetAllUploadPartsParams {\n    Bucket: string;\n    Key: string;\n    UploadId: string;\n}\n\nexport class CompleteMultiPartUploadUseCase {\n    private readonly s3: S3;\n    private readonly bucket: string;\n    private readonly emptyMarkerValues = [undefined, \"0\"];\n\n    constructor(bucket: string, s3Client: S3) {\n        this.bucket = bucket;\n        this.s3 = s3Client;\n    }\n\n    async execute(params: CompleteMultiPartUploadParams) {\n        const uploadParams = {\n            Bucket: this.bucket,\n            Key: params.fileKey,\n            UploadId: params.uploadId\n        };\n\n        const allParts = await this.getAllUploadParts(uploadParams);\n\n        const s3Params = {\n            ...uploadParams,\n            MultipartUpload: {\n                Parts: allParts\n            }\n        };\n\n        try {\n            const command = new CompleteMultipartUploadCommand(s3Params);\n            await this.s3.send(command);\n        } catch (err) {\n            console.error(err);\n            throw err;\n        }\n    }\n\n    private async getAllUploadParts(params: GetAllUploadPartsParams) {\n        const parts: Part[] = [];\n\n        let marker: string | undefined = undefined;\n        while (true) {\n            const { Parts, PartNumberMarker }: ListPartsOutput = await this.s3.send(\n                new ListPartsCommand({\n                    ...params,\n                    PartNumberMarker: marker\n                })\n            );\n\n            if (Parts) {\n                Parts.forEach(part => parts.push(part));\n            }\n\n            marker = PartNumberMarker || undefined;\n            if (this.isMarkerEmpty(marker)) {\n                break;\n            }\n        }\n\n        return parts.map(part => ({\n            ETag: part.ETag as string,\n            PartNumber: part.PartNumber as number\n        }));\n    }\n\n    private isMarkerEmpty(marker: string | undefined) {\n        return this.emptyMarkerValues.includes(marker);\n    }\n}\n"],"mappings":"AACA,SACIA,gBAAgB,EAChBC,8BAA8B,QAC3B,oCAAoC;AAa3C,OAAO,MAAMC,8BAA8B,CAAC;EAGvBC,iBAAiB,GAAG,CAACC,SAAS,EAAE,GAAG,CAAC;EAErDC,WAAWA,CAACC,MAAc,EAAEC,QAAY,EAAE;IACtC,IAAI,CAACD,MAAM,GAAGA,MAAM;IACpB,IAAI,CAACE,EAAE,GAAGD,QAAQ;EACtB;EAEA,MAAME,OAAOA,CAACC,MAAqC,EAAE;IACjD,MAAMC,YAAY,GAAG;MACjBC,MAAM,EAAE,IAAI,CAACN,MAAM;MACnBO,GAAG,EAAEH,MAAM,CAACI,OAAO;MACnBC,QAAQ,EAAEL,MAAM,CAACM;IACrB,CAAC;IAED,MAAMC,QAAQ,GAAG,MAAM,IAAI,CAACC,iBAAiB,CAACP,YAAY,CAAC;IAE3D,MAAMQ,QAAQ,GAAG;MACb,GAAGR,YAAY;MACfS,eAAe,EAAE;QACbC,KAAK,EAAEJ;MACX;IACJ,CAAC;IAED,IAAI;MACA,MAAMK,OAAO,GAAG,IAAIrB,8BAA8B,CAACkB,QAAQ,CAAC;MAC5D,MAAM,IAAI,CAACX,EAAE,CAACe,IAAI,CAACD,OAAO,CAAC;IAC/B,CAAC,CAAC,OAAOE,GAAG,EAAE;MACVC,OAAO,CAACC,KAAK,CAACF,GAAG,CAAC;MAClB,MAAMA,GAAG;IACb;EACJ;EAEA,MAAcN,iBAAiBA,CAACR,MAA+B,EAAE;IAC7D,MAAMiB,KAAa,GAAG,EAAE;IAExB,IAAIC,MAA0B,GAAGxB,SAAS;IAC1C,OAAO,IAAI,EAAE;MACT,MAAM;QAAEiB,KAAK;QAAEQ;MAAkC,CAAC,GAAG,MAAM,IAAI,CAACrB,EAAE,CAACe,IAAI,CACnE,IAAIvB,gBAAgB,CAAC;QACjB,GAAGU,MAAM;QACTmB,gBAAgB,EAAED;MACtB,CAAC,CACL,CAAC;MAED,IAAIP,KAAK,EAAE;QACPA,KAAK,CAACS,OAAO,CAACC,IAAI,IAAIJ,KAAK,CAACK,IAAI,CAACD,IAAI,CAAC,CAAC;MAC3C;MAEAH,MAAM,GAAGC,gBAAgB,IAAIzB,SAAS;MACtC,IAAI,IAAI,CAAC6B,aAAa,CAACL,MAAM,CAAC,EAAE;QAC5B;MACJ;IACJ;IAEA,OAAOD,KAAK,CAACO,GAAG,CAACH,IAAI,KAAK;MACtBI,IAAI,EAAEJ,IAAI,CAACI,IAAc;MACzBC,UAAU,EAAEL,IAAI,CAACK;IACrB,CAAC,CAAC,CAAC;EACP;EAEQH,aAAaA,CAACL,MAA0B,EAAE;IAC9C,OAAO,IAAI,CAACzB,iBAAiB,CAACkC,QAAQ,CAACT,MAAM,CAAC;EAClD;AACJ","ignoreList":[]}

package/multiPartUpload/CreateMultiPartUploadUseCase.d.ts

@@ -1,5 +1,5 @@
-import { S3 } from "@webiny/aws-sdk/client-s3";
-import { FileData } from "../types";
+import type { S3 } from "@webiny/aws-sdk/client-s3/index.js";
+import type { FileData } from "../types.js";
 interface CreateMultiPartUploadParams {
     file: FileData;
     numberOfParts: number;

package/multiPartUpload/CreateMultiPartUploadUseCase.js

@@ -1,11 +1,5 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.CreateMultiPartUploadUseCase = void 0;
-var _clientS = require("@webiny/aws-sdk/client-s3");
-class CreateMultiPartUploadUseCase {
+import { getSignedUrl, UploadPartCommand } from "@webiny/aws-sdk/client-s3/index.js";
+export class CreateMultiPartUploadUseCase {
   constructor(bucket, s3Client) {
     this.bucket = bucket;
     this.s3 = s3Client;
@@ -24,7 +18,7 @@ class CreateMultiPartUploadUseCase {
     const parts = await Promise.all(Array.from({
       length: numberOfParts
     }).map((_, index) => {
-      return (0, _clientS.getSignedUrl)(this.s3, new _clientS.UploadPartCommand({
+      return getSignedUrl(this.s3, new UploadPartCommand({
         ...s3Params,
         UploadId,
         PartNumber: index + 1
@@ -43,6 +37,5 @@ class CreateMultiPartUploadUseCase {
     };
   }
 }
-exports.CreateMultiPartUploadUseCase = CreateMultiPartUploadUseCase;
 
 //# sourceMappingURL=CreateMultiPartUploadUseCase.js.map

package/multiPartUpload/CreateMultiPartUploadUseCase.js.map

@@ -1 +1 @@
-{"version":3,"names":["_clientS","require","CreateMultiPartUploadUseCase","constructor","bucket","s3Client","s3","execute","file","numberOfParts","s3Params","Bucket","Key","key","UploadId","createMultipartUpload","parts","Promise","all","Array","from","length","map","_","index","getSignedUrl","UploadPartCommand","PartNumber","expiresIn","then","url","partNumber","uploadId","exports"],"sources":["CreateMultiPartUploadUseCase.ts"],"sourcesContent":["import { S3, getSignedUrl, UploadPartCommand } from \"@webiny/aws-sdk/client-s3\";\nimport { FileData } from \"~/types\";\n\ninterface CreateMultiPartUploadParams {\n    file: FileData;\n    numberOfParts: number;\n}\n\nexport class CreateMultiPartUploadUseCase {\n    private readonly s3: S3;\n    private readonly bucket: string;\n\n    constructor(bucket: string, s3Client: S3) {\n        this.bucket = bucket;\n        this.s3 = s3Client;\n    }\n\n    async execute({ file, numberOfParts }: CreateMultiPartUploadParams) {\n        const s3Params = { Bucket: this.bucket, Key: file.key };\n\n        const { UploadId } = await this.s3.createMultipartUpload(s3Params);\n\n        const parts = await Promise.all(\n            Array.from({ length: numberOfParts }).map((_, index) => {\n                return getSignedUrl(\n                    this.s3,\n                    new UploadPartCommand({ ...s3Params, UploadId, PartNumber: index + 1 }),\n                    {\n                        // URL expires after 24 hours.\n                        expiresIn: 86400\n                    }\n                ).then(url => ({\n                    url,\n                    partNumber: index + 1\n                }));\n            })\n        );\n\n        return {\n            file,\n            uploadId: UploadId,\n            parts\n        };\n    }\n}\n"],"mappings":";;;;;;AAAA,IAAAA,QAAA,GAAAC,OAAA;AAQO,MAAMC,4BAA4B,CAAC;EAItCC,WAAWA,CAACC,MAAc,EAAEC,QAAY,EAAE;IACtC,IAAI,CAACD,MAAM,GAAGA,MAAM;IACpB,IAAI,CAACE,EAAE,GAAGD,QAAQ;EACtB;EAEA,MAAME,OAAOA,CAAC;IAAEC,IAAI;IAAEC;EAA2C,CAAC,EAAE;IAChE,MAAMC,QAAQ,GAAG;MAAEC,MAAM,EAAE,IAAI,CAACP,MAAM;MAAEQ,GAAG,EAAEJ,IAAI,CAACK;IAAI,CAAC;IAEvD,MAAM;MAAEC;IAAS,CAAC,GAAG,MAAM,IAAI,CAACR,EAAE,CAACS,qBAAqB,CAACL,QAAQ,CAAC;IAElE,MAAMM,KAAK,GAAG,MAAMC,OAAO,CAACC,GAAG,CAC3BC,KAAK,CAACC,IAAI,CAAC;MAAEC,MAAM,EAAEZ;IAAc,CAAC,CAAC,CAACa,GAAG,CAAC,CAACC,CAAC,EAAEC,KAAK,KAAK;MACpD,OAAO,IAAAC,qBAAY,EACf,IAAI,CAACnB,EAAE,EACP,IAAIoB,0BAAiB,CAAC;QAAE,GAAGhB,QAAQ;QAAEI,QAAQ;QAAEa,UAAU,EAAEH,KAAK,GAAG;MAAE,CAAC,CAAC,EACvE;QACI;QACAI,SAAS,EAAE;MACf,CACJ,CAAC,CAACC,IAAI,CAACC,GAAG,KAAK;QACXA,GAAG;QACHC,UAAU,EAAEP,KAAK,GAAG;MACxB,CAAC,CAAC,CAAC;IACP,CAAC,CACL,CAAC;IAED,OAAO;MACHhB,IAAI;MACJwB,QAAQ,EAAElB,QAAQ;MAClBE;IACJ,CAAC;EACL;AACJ;AAACiB,OAAA,CAAA/B,4BAAA,GAAAA,4BAAA","ignoreList":[]}
+{"version":3,"names":["getSignedUrl","UploadPartCommand","CreateMultiPartUploadUseCase","constructor","bucket","s3Client","s3","execute","file","numberOfParts","s3Params","Bucket","Key","key","UploadId","createMultipartUpload","parts","Promise","all","Array","from","length","map","_","index","PartNumber","expiresIn","then","url","partNumber","uploadId"],"sources":["CreateMultiPartUploadUseCase.ts"],"sourcesContent":["import type { S3 } from \"@webiny/aws-sdk/client-s3/index.js\";\nimport { getSignedUrl, UploadPartCommand } from \"@webiny/aws-sdk/client-s3/index.js\";\nimport type { FileData } from \"~/types.js\";\n\ninterface CreateMultiPartUploadParams {\n    file: FileData;\n    numberOfParts: number;\n}\n\nexport class CreateMultiPartUploadUseCase {\n    private readonly s3: S3;\n    private readonly bucket: string;\n\n    constructor(bucket: string, s3Client: S3) {\n        this.bucket = bucket;\n        this.s3 = s3Client;\n    }\n\n    async execute({ file, numberOfParts }: CreateMultiPartUploadParams) {\n        const s3Params = { Bucket: this.bucket, Key: file.key };\n\n        const { UploadId } = await this.s3.createMultipartUpload(s3Params);\n\n        const parts = await Promise.all(\n            Array.from({ length: numberOfParts }).map((_, index) => {\n                return getSignedUrl(\n                    this.s3,\n                    new UploadPartCommand({ ...s3Params, UploadId, PartNumber: index + 1 }),\n                    {\n                        // URL expires after 24 hours.\n                        expiresIn: 86400\n                    }\n                ).then(url => ({\n                    url,\n                    partNumber: index + 1\n                }));\n            })\n        );\n\n        return {\n            file,\n            uploadId: UploadId,\n            parts\n        };\n    }\n}\n"],"mappings":"AACA,SAASA,YAAY,EAAEC,iBAAiB,QAAQ,oCAAoC;AAQpF,OAAO,MAAMC,4BAA4B,CAAC;EAItCC,WAAWA,CAACC,MAAc,EAAEC,QAAY,EAAE;IACtC,IAAI,CAACD,MAAM,GAAGA,MAAM;IACpB,IAAI,CAACE,EAAE,GAAGD,QAAQ;EACtB;EAEA,MAAME,OAAOA,CAAC;IAAEC,IAAI;IAAEC;EAA2C,CAAC,EAAE;IAChE,MAAMC,QAAQ,GAAG;MAAEC,MAAM,EAAE,IAAI,CAACP,MAAM;MAAEQ,GAAG,EAAEJ,IAAI,CAACK;IAAI,CAAC;IAEvD,MAAM;MAAEC;IAAS,CAAC,GAAG,MAAM,IAAI,CAACR,EAAE,CAACS,qBAAqB,CAACL,QAAQ,CAAC;IAElE,MAAMM,KAAK,GAAG,MAAMC,OAAO,CAACC,GAAG,CAC3BC,KAAK,CAACC,IAAI,CAAC;MAAEC,MAAM,EAAEZ;IAAc,CAAC,CAAC,CAACa,GAAG,CAAC,CAACC,CAAC,EAAEC,KAAK,KAAK;MACpD,OAAOxB,YAAY,CACf,IAAI,CAACM,EAAE,EACP,IAAIL,iBAAiB,CAAC;QAAE,GAAGS,QAAQ;QAAEI,QAAQ;QAAEW,UAAU,EAAED,KAAK,GAAG;MAAE,CAAC,CAAC,EACvE;QACI;QACAE,SAAS,EAAE;MACf,CACJ,CAAC,CAACC,IAAI,CAACC,GAAG,KAAK;QACXA,GAAG;QACHC,UAAU,EAAEL,KAAK,GAAG;MACxB,CAAC,CAAC,CAAC;IACP,CAAC,CACL,CAAC;IAED,OAAO;MACHhB,IAAI;MACJsB,QAAQ,EAAEhB,QAAQ;MAClBE;IACJ,CAAC;EACL;AACJ","ignoreList":[]}

package/package.json

@@ -1,6 +1,7 @@
 {
 	"name": "@webiny/api-file-manager-s3",
-	"version": "6.0.0-beta.0",
+	"version": "6.0.0-rc.0",
+	"type": "module",
 	"main": "index.js",
 	"repository": {
 		"type": "git",
@@ -10,42 +11,35 @@
 	"author": "Webiny Ltd",
 	"license": "MIT",
 	"dependencies": {
-		"@webiny/api": "6.0.0-beta.0",
-		"@webiny/api-file-manager": "6.0.0-beta.0",
-		"@webiny/api-security": "6.0.0-beta.0",
-		"@webiny/aws-sdk": "6.0.0-beta.0",
-		"@webiny/error": "6.0.0-beta.0",
-		"@webiny/handler": "6.0.0-beta.0",
-		"@webiny/handler-graphql": "6.0.0-beta.0",
-		"@webiny/plugins": "6.0.0-beta.0",
-		"@webiny/tasks": "6.0.0-beta.0",
-		"@webiny/utils": "6.0.0-beta.0",
-		"@webiny/validation": "6.0.0-beta.0",
-		"form-data": "4.0.0",
+		"@webiny/api": "6.0.0-rc.0",
+		"@webiny/api-core": "6.0.0-rc.0",
+		"@webiny/api-file-manager": "6.0.0-rc.0",
+		"@webiny/api-websockets": "6.0.0-rc.0",
+		"@webiny/aws-sdk": "6.0.0-rc.0",
+		"@webiny/feature": "6.0.0-rc.0",
+		"@webiny/handler": "6.0.0-rc.0",
+		"@webiny/handler-aws": "6.0.0-rc.0",
+		"@webiny/handler-graphql": "6.0.0-rc.0",
+		"@webiny/plugins": "6.0.0-rc.0",
+		"@webiny/utils": "6.0.0-rc.0",
+		"@webiny/validation": "6.0.0-rc.0",
+		"exifreader": "4.36.2",
 		"mime": "3.0.0",
-		"node-fetch": "2.7.0",
 		"object-hash": "3.0.0",
-		"p-map": "4.0.0",
-		"p-reduce": "2.1.0",
+		"p-map": "7.0.4",
+		"p-reduce": "3.0.0",
 		"sanitize-filename": "1.6.3",
-		"sharp": "0.32.6"
+		"sharp": "0.34.5"
 	},
 	"devDependencies": {
-		"@babel/cli": "7.24.1",
-		"@babel/core": "7.24.3",
-		"@types/node-fetch": "2.6.2",
-		"@webiny/cli": "6.0.0-beta.0",
-		"@webiny/project-utils": "6.0.0-beta.0",
-		"rimraf": "5.0.5",
-		"typescript": "4.7.4"
+		"@webiny/build-tools": "6.0.0-rc.0",
+		"rimraf": "6.1.3",
+		"typescript": "5.9.3",
+		"vitest": "4.0.18"
 	},
 	"publishConfig": {
 		"access": "public",
 		"directory": "dist"
 	},
-	"scripts": {
-		"build": "yarn webiny run build",
-		"watch": "yarn webiny run watch"
-	},
-	"gitHead": "aa8dbfbbd5ad13ec271adba6f2431e02991a300f"
+	"gitHead": "0f2aa699f4642e550ab62c96fcd050e8d02345c9"
 }

package/types.d.ts

@@ -1,4 +1,4 @@
-import { PresignedPost } from "@webiny/aws-sdk/client-s3";
+import type { PresignedPost } from "@webiny/aws-sdk/client-s3/index.js";
 export interface PresignedPostPayloadData {
     name: string;
     type: string;

package/types.js

@@ -1,7 +1,3 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
+export {};
 
 //# sourceMappingURL=types.js.map

package/types.js.map

@@ -1 +1 @@
-{"version":3,"names":[],"sources":["types.ts"],"sourcesContent":["import { PresignedPost } from \"@webiny/aws-sdk/client-s3\";\n\nexport interface PresignedPostPayloadData {\n    name: string;\n    type: string;\n    size: number;\n    id?: string;\n    key?: string;\n    keyPrefix?: string;\n}\n\nexport interface FileData {\n    id: string;\n    key: string;\n    name: string;\n    size: number;\n    type: string;\n}\n\nexport interface PresignedPostPayloadDataResponse {\n    data: PresignedPost;\n    file: FileData;\n}\n"],"mappings":"","ignoreList":[]}
+{"version":3,"names":[],"sources":["types.ts"],"sourcesContent":["import type { PresignedPost } from \"@webiny/aws-sdk/client-s3/index.js\";\n\nexport interface PresignedPostPayloadData {\n    name: string;\n    type: string;\n    size: number;\n    id?: string;\n    key?: string;\n    keyPrefix?: string;\n}\n\nexport interface FileData {\n    id: string;\n    key: string;\n    name: string;\n    size: number;\n    type: string;\n}\n\nexport interface PresignedPostPayloadDataResponse {\n    data: PresignedPost;\n    file: FileData;\n}\n"],"mappings":"","ignoreList":[]}

package/utils/CdnPathsGenerator.d.ts

@@ -0,0 +1,3 @@
+export declare class CdnPathsGenerator {
+    generate(fileId: string): string[];
+}

package/utils/CdnPathsGenerator.js

@@ -0,0 +1,7 @@
+export class CdnPathsGenerator {
+  generate(fileId) {
+    return [`/files/${fileId}/*`, `/private/${fileId}/*`];
+  }
+}
+
+//# sourceMappingURL=CdnPathsGenerator.js.map

package/utils/CdnPathsGenerator.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["CdnPathsGenerator","generate","fileId"],"sources":["CdnPathsGenerator.ts"],"sourcesContent":["export class CdnPathsGenerator {\n    generate(fileId: string): string[] {\n        return [`/files/${fileId}/*`, `/private/${fileId}/*`];\n    }\n}\n"],"mappings":"AAAA,OAAO,MAAMA,iBAAiB,CAAC;EAC3BC,QAAQA,CAACC,MAAc,EAAY;IAC/B,OAAO,CAAC,UAAUA,MAAM,IAAI,EAAE,YAAYA,MAAM,IAAI,CAAC;EACzD;AACJ","ignoreList":[]}

package/utils/FileExtension.d.ts

@@ -1,4 +1,4 @@
-import { PresignedPostPayloadData } from "../types";
+import type { PresignedPostPayloadData } from "../types.js";
 export declare class FileExtension {
     private data;
     constructor(data: PresignedPostPayloadData);

package/utils/FileExtension.js

@@ -1,24 +1,17 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.FileExtension = void 0;
-var _mimeTypes = require("./mimeTypes");
-class FileExtension {
+import { mimeTypes } from "./mimeTypes.js";
+export class FileExtension {
   constructor(data) {
     this.data = data;
   }
   getValue() {
     const name = (this.data.key || this.data.name).toLowerCase();
     const maybeExt = name.split(".").pop();
-    const extensions = _mimeTypes.mimeTypes[this.data.type];
+    const extensions = mimeTypes[this.data.type];
     if (extensions && !extensions.includes(maybeExt)) {
       return extensions[0];
     }
     return "";
   }
 }
-exports.FileExtension = FileExtension;
 
 //# sourceMappingURL=FileExtension.js.map

package/utils/FileExtension.js.map

@@ -1 +1 @@
-{"version":3,"names":["_mimeTypes","require","FileExtension","constructor","data","getValue","name","key","toLowerCase","maybeExt","split","pop","extensions","mimeTypes","type","includes","exports"],"sources":["FileExtension.ts"],"sourcesContent":["import { mimeTypes } from \"~/utils/mimeTypes\";\nimport { PresignedPostPayloadData } from \"~/types\";\n\nexport class FileExtension {\n    private data: PresignedPostPayloadData;\n\n    constructor(data: PresignedPostPayloadData) {\n        this.data = data;\n    }\n\n    getValue() {\n        const name = (this.data.key || this.data.name).toLowerCase();\n\n        const maybeExt = name.split(\".\").pop() as string;\n        const extensions = mimeTypes[this.data.type];\n        if (extensions && !extensions.includes(maybeExt)) {\n            return extensions[0];\n        }\n\n        return \"\";\n    }\n}\n"],"mappings":";;;;;;AAAA,IAAAA,UAAA,GAAAC,OAAA;AAGO,MAAMC,aAAa,CAAC;EAGvBC,WAAWA,CAACC,IAA8B,EAAE;IACxC,IAAI,CAACA,IAAI,GAAGA,IAAI;EACpB;EAEAC,QAAQA,CAAA,EAAG;IACP,MAAMC,IAAI,GAAG,CAAC,IAAI,CAACF,IAAI,CAACG,GAAG,IAAI,IAAI,CAACH,IAAI,CAACE,IAAI,EAAEE,WAAW,CAAC,CAAC;IAE5D,MAAMC,QAAQ,GAAGH,IAAI,CAACI,KAAK,CAAC,GAAG,CAAC,CAACC,GAAG,CAAC,CAAW;IAChD,MAAMC,UAAU,GAAGC,oBAAS,CAAC,IAAI,CAACT,IAAI,CAACU,IAAI,CAAC;IAC5C,IAAIF,UAAU,IAAI,CAACA,UAAU,CAACG,QAAQ,CAACN,QAAQ,CAAC,EAAE;MAC9C,OAAOG,UAAU,CAAC,CAAC,CAAC;IACxB;IAEA,OAAO,EAAE;EACb;AACJ;AAACI,OAAA,CAAAd,aAAA,GAAAA,aAAA","ignoreList":[]}
+{"version":3,"names":["mimeTypes","FileExtension","constructor","data","getValue","name","key","toLowerCase","maybeExt","split","pop","extensions","type","includes"],"sources":["FileExtension.ts"],"sourcesContent":["import { mimeTypes } from \"~/utils/mimeTypes.js\";\nimport type { PresignedPostPayloadData } from \"~/types.js\";\n\nexport class FileExtension {\n    private data: PresignedPostPayloadData;\n\n    constructor(data: PresignedPostPayloadData) {\n        this.data = data;\n    }\n\n    getValue() {\n        const name = (this.data.key || this.data.name).toLowerCase();\n\n        const maybeExt = name.split(\".\").pop() as string;\n        const extensions = mimeTypes[this.data.type];\n        if (extensions && !extensions.includes(maybeExt)) {\n            return extensions[0];\n        }\n\n        return \"\";\n    }\n}\n"],"mappings":"AAAA,SAASA,SAAS;AAGlB,OAAO,MAAMC,aAAa,CAAC;EAGvBC,WAAWA,CAACC,IAA8B,EAAE;IACxC,IAAI,CAACA,IAAI,GAAGA,IAAI;EACpB;EAEAC,QAAQA,CAAA,EAAG;IACP,MAAMC,IAAI,GAAG,CAAC,IAAI,CAACF,IAAI,CAACG,GAAG,IAAI,IAAI,CAACH,IAAI,CAACE,IAAI,EAAEE,WAAW,CAAC,CAAC;IAE5D,MAAMC,QAAQ,GAAGH,IAAI,CAACI,KAAK,CAAC,GAAG,CAAC,CAACC,GAAG,CAAC,CAAW;IAChD,MAAMC,UAAU,GAAGX,SAAS,CAAC,IAAI,CAACG,IAAI,CAACS,IAAI,CAAC;IAC5C,IAAID,UAAU,IAAI,CAACA,UAAU,CAACE,QAAQ,CAACL,QAAQ,CAAC,EAAE;MAC9C,OAAOG,UAAU,CAAC,CAAC,CAAC;IACxB;IAEA,OAAO,EAAE;EACb;AACJ","ignoreList":[]}

package/utils/FileKey.d.ts

@@ -1,4 +1,4 @@
-import { PresignedPostPayloadData } from "../types";
+import type { PresignedPostPayloadData } from "../types.js";
 export declare class FileKey {
     private data;
     private extension;