@webiny/api-file-manager 5.36.2 → 5.37.0-beta.1

package/graphql/index.js

@@ -4,285 +4,30 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createGraphQLSchemaPlugin = void 0;
-var _handlerGraphql = require("@webiny/handler-graphql");
-const emptyResolver = () => ({});
-
-/**
- * Use any because it really can be any.
- * TODO @ts-refactor maybe use generics at some point?
- */
-
-const resolve = async fn => {
-  try {
-    return new _handlerGraphql.Response(await fn());
-  } catch (e) {
-    return new _handlerGraphql.ErrorResponse(e);
-  }
-};
+var _baseSchema = require("./baseSchema");
+var _api = require("@webiny/api");
+var _createFieldTypePluginRecords = require("@webiny/api-headless-cms/graphql/schema/createFieldTypePluginRecords");
+var _filesSchema = require("./filesSchema");
+var _isInstallationPending = require("../cmsFileStorage/isInstallationPending");
 const createGraphQLSchemaPlugin = () => {
-  const fileManagerGraphQL = new _handlerGraphql.GraphQLSchemaPlugin({
-    typeDefs: /* GraphQL */`
-            type FmCreatedBy {
-                id: ID
-                displayName: String
-            }
-
-            input CreateFileInput {
-                id: ID!
-                key: String!
-                name: String!
-                size: Long!
-                type: String!
-                tags: [String!]
-                aliases: [String!]
-                meta: JSON
-            }
-
-            input UpdateFileInput {
-                key: String
-                name: String
-                size: Long
-                type: String
-                tags: [String!]
-                aliases: [String!]
-                meta: JSON
-            }
-
-            type UploadFileResponseDataFile {
-                id: ID!
-                name: String!
-                type: String!
-                size: Long!
-                key: String!
-            }
-
-            type UploadFileResponseData {
-                # Contains data that is necessary for initiating a file upload.
-                data: JSON
-                file: UploadFileResponseDataFile
-            }
-
-            type FileListMeta {
-                cursor: String
-                totalCount: Int
-                hasMoreItems: Boolean
-            }
-
-            type FileError {
-                code: String
-                message: String
-                data: JSON
-                stack: String
-            }
-
-            type FileListResponse {
-                data: [File]
-                meta: FileListMeta
-                error: FileError
-            }
-
-            type FileResponse {
-                data: File
-                error: FileError
-            }
-
-            type CreateFilesResponse {
-                data: [File!]
-                error: FileError
-            }
-
-            type File {
-                id: ID!
-                key: String!
-                name: String!
-                size: Long!
-                type: String!
-                src: String!
-                tags: [String!]
-                aliases: [String!]
-                meta: JSON
-                createdOn: DateTime
-                createdBy: FmCreatedBy
-            }
-
-            type FileManagerBooleanResponse {
-                data: Boolean
-                error: FileError
-            }
-
-            type FileManagerSettings {
-                uploadMinFileSize: Number
-                uploadMaxFileSize: Number
-                srcPrefix: String
-            }
-
-            input FileManagerSettingsInput {
-                uploadMinFileSize: Number
-                uploadMaxFileSize: Number
-                srcPrefix: String
-            }
-
-            type FileManagerSettingsResponse {
-                data: FileManagerSettings
-                error: FileError
-            }
-
-            input FileWhereInput {
-                search: String
-                type: String
-                type_in: [String!]
-                tag: String
-                tag_in: [String!]
-                tag_and_in: [String!]
-                tag_startsWith: String
-                tag_not_startsWith: String
-                id_in: [ID!]
-                id: ID
-                createdBy: ID
-            }
-
-            input TagWhereInput {
-                tag_startsWith: String
-                tag_not_startsWith: String
-            }
-
-            type ListTagResponseItem {
-                tag: String!
-                count: Number!
-            }
-
-            type ListTagsResponse {
-                data: [ListTagResponseItem!]
-                error: FileError
-            }
-
-            type FmQuery {
-                getFile(id: ID, where: JSON, sort: String): FileResponse
-
-                listFiles(
-                    limit: Int
-                    after: String
-                    types: [String]
-                    tags: [String]
-                    ids: [ID]
-                    search: String
-                    where: FileWhereInput
-                ): FileListResponse
-
-                listTags(where: TagWhereInput): ListTagsResponse!
-
-                # Get installed version
-                version: String
-
-                getSettings: FileManagerSettingsResponse
-            }
-
-            type FilesDeleteResponse {
-                data: Boolean
-                error: FileError
-            }
-
-            type FmMutation {
-                createFile(data: CreateFileInput!, meta: JSON): FileResponse
-                createFiles(data: [CreateFileInput]!, meta: JSON): CreateFilesResponse
-                updateFile(id: ID!, data: UpdateFileInput!): FileResponse
-                deleteFile(id: ID!): FilesDeleteResponse
-                install(srcPrefix: String): FileManagerBooleanResponse
-                updateSettings(data: FileManagerSettingsInput): FileManagerSettingsResponse
-            }
-
-            input FilesInstallInput {
-                srcPrefix: String!
-            }
-
-            extend type Query {
-                fileManager: FmQuery
-            }
-
-            extend type Mutation {
-                fileManager: FmMutation
-            }
-        `,
-    resolvers: {
-      File: {
-        async src(file, _, context) {
-          const settings = await context.fileManager.getSettings();
-          return ((settings === null || settings === void 0 ? void 0 : settings.srcPrefix) || "") + file.key;
-        }
-      },
-      Query: {
-        fileManager: emptyResolver
-      },
-      Mutation: {
-        fileManager: emptyResolver
-      },
-      FmQuery: {
-        getFile(_, args, context) {
-          return resolve(() => context.fileManager.getFile(args.id));
-        },
-        async listFiles(_, args, context) {
-          try {
-            const [data, meta] = await context.fileManager.listFiles(args);
-            return new _handlerGraphql.ListResponse(data, meta);
-          } catch (e) {
-            return new _handlerGraphql.ErrorResponse(e);
-          }
-        },
-        async listTags(_, args, context) {
-          try {
-            const tags = await context.fileManager.listTags(args || {});
-            return new _handlerGraphql.Response(tags);
-          } catch (error) {
-            return new _handlerGraphql.ErrorResponse(error);
-          }
-        },
-        async version(_, __, context) {
-          const {
-            i18n,
-            tenancy,
-            fileManager
-          } = context;
-          if (!tenancy.getCurrentTenant() || !i18n.getContentLocale()) {
-            return null;
-          }
-          return await fileManager.getVersion();
-        },
-        async getSettings(_, __, context) {
-          return resolve(() => context.fileManager.getSettings());
-        }
-      },
-      FmMutation: {
-        async createFile(_, args, context) {
-          return resolve(() => context.fileManager.createFile(args.data, args.meta));
-        },
-        async updateFile(_, args, context) {
-          return resolve(() => context.fileManager.updateFile(args.id, args.data));
-        },
-        async createFiles(_, args, context) {
-          return resolve(() => context.fileManager.createFilesInBatch(args.data, args.meta));
-        },
-        async deleteFile(_, args, context) {
-          return resolve(async () => {
-            // TODO: Ideally, this should work via a lifecycle hook; first we delete a record from DB, then from cloud storage.
-            const file = await context.fileManager.getFile(args.id);
-            return await context.fileManager.storage.delete({
-              id: file.id,
-              key: file.key
-            });
-          });
-        },
-        async install(_, args, context) {
-          return resolve(() => context.fileManager.install({
-            srcPrefix: args.srcPrefix
-          }));
-        },
-        async updateSettings(_, args, context) {
-          return resolve(() => context.fileManager.updateSettings(args.data));
-        }
-      }
+  return [(0, _baseSchema.createBaseSchema)(),
+  // Files schema is generated dynamically, based on a CMS model, so we need to
+  // register it from a ContextPlugin, to perform additional bootstrap.
+  new _api.ContextPlugin(async context => {
+    if ((0, _isInstallationPending.isInstallationPending)(context)) {
+      return;
     }
-  });
-  fileManagerGraphQL.name = "fm.graphql.schema";
-  return fileManagerGraphQL;
+    await context.security.withoutAuthorization(async () => {
+      const fileModel = await context.cms.getModel("fmFile");
+      const models = await context.cms.listModels();
+      const fieldPlugins = (0, _createFieldTypePluginRecords.createFieldTypePluginRecords)(context.plugins);
+      const graphQlPlugin = (0, _filesSchema.createFilesSchema)({
+        model: fileModel,
+        models,
+        plugins: fieldPlugins
+      });
+      context.plugins.register(graphQlPlugin);
+    });
+  })];
 };
 exports.createGraphQLSchemaPlugin = createGraphQLSchemaPlugin;

package/graphql/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["emptyResolver","resolve","fn","Response","e","ErrorResponse","createGraphQLSchemaPlugin","fileManagerGraphQL","GraphQLSchemaPlugin","typeDefs","resolvers","File","src","file","_","context","settings","fileManager","getSettings","srcPrefix","key","Query","Mutation","FmQuery","getFile","args","id","listFiles","data","meta","ListResponse","listTags","tags","error","version","__","i18n","tenancy","getCurrentTenant","getContentLocale","getVersion","FmMutation","createFile","updateFile","createFiles","createFilesInBatch","deleteFile","storage","delete","install","updateSettings","name"],"sources":["index.ts"],"sourcesContent":["import {\n    Response,\n    ErrorResponse,\n    ListResponse,\n    GraphQLSchemaPlugin\n} from \"@webiny/handler-graphql\";\nimport { FileManagerContext, FilesListOpts } from \"~/types\";\n\nconst emptyResolver = () => ({});\n\n/**\n * Use any because it really can be any.\n * TODO @ts-refactor maybe use generics at some point?\n */\ninterface ResolveCallable {\n    (): Promise<any>;\n}\n\nconst resolve = async (fn: ResolveCallable) => {\n    try {\n        return new Response(await fn());\n    } catch (e) {\n        return new ErrorResponse(e);\n    }\n};\n\nexport const createGraphQLSchemaPlugin = () => {\n    const fileManagerGraphQL = new GraphQLSchemaPlugin<FileManagerContext>({\n        typeDefs: /* GraphQL */ `\n            type FmCreatedBy {\n                id: ID\n                displayName: String\n            }\n\n            input CreateFileInput {\n                id: ID!\n                key: String!\n                name: String!\n                size: Long!\n                type: String!\n                tags: [String!]\n                aliases: [String!]\n                meta: JSON\n            }\n\n            input UpdateFileInput {\n                key: String\n                name: String\n                size: Long\n                type: String\n                tags: [String!]\n                aliases: [String!]\n                meta: JSON\n            }\n\n            type UploadFileResponseDataFile {\n                id: ID!\n                name: String!\n                type: String!\n                size: Long!\n                key: String!\n            }\n\n            type UploadFileResponseData {\n                # Contains data that is necessary for initiating a file upload.\n                data: JSON\n                file: UploadFileResponseDataFile\n            }\n\n            type FileListMeta {\n                cursor: String\n                totalCount: Int\n                hasMoreItems: Boolean\n            }\n\n            type FileError {\n                code: String\n                message: String\n                data: JSON\n                stack: String\n            }\n\n            type FileListResponse {\n                data: [File]\n                meta: FileListMeta\n                error: FileError\n            }\n\n            type FileResponse {\n                data: File\n                error: FileError\n            }\n\n            type CreateFilesResponse {\n                data: [File!]\n                error: FileError\n            }\n\n            type File {\n                id: ID!\n                key: String!\n                name: String!\n                size: Long!\n                type: String!\n                src: String!\n                tags: [String!]\n                aliases: [String!]\n                meta: JSON\n                createdOn: DateTime\n                createdBy: FmCreatedBy\n            }\n\n            type FileManagerBooleanResponse {\n                data: Boolean\n                error: FileError\n            }\n\n            type FileManagerSettings {\n                uploadMinFileSize: Number\n                uploadMaxFileSize: Number\n                srcPrefix: String\n            }\n\n            input FileManagerSettingsInput {\n                uploadMinFileSize: Number\n                uploadMaxFileSize: Number\n                srcPrefix: String\n            }\n\n            type FileManagerSettingsResponse {\n                data: FileManagerSettings\n                error: FileError\n            }\n\n            input FileWhereInput {\n                search: String\n                type: String\n                type_in: [String!]\n                tag: String\n                tag_in: [String!]\n                tag_and_in: [String!]\n                tag_startsWith: String\n                tag_not_startsWith: String\n                id_in: [ID!]\n                id: ID\n                createdBy: ID\n            }\n\n            input TagWhereInput {\n                tag_startsWith: String\n                tag_not_startsWith: String\n            }\n\n            type ListTagResponseItem {\n                tag: String!\n                count: Number!\n            }\n\n            type ListTagsResponse {\n                data: [ListTagResponseItem!]\n                error: FileError\n            }\n\n            type FmQuery {\n                getFile(id: ID, where: JSON, sort: String): FileResponse\n\n                listFiles(\n                    limit: Int\n                    after: String\n                    types: [String]\n                    tags: [String]\n                    ids: [ID]\n                    search: String\n                    where: FileWhereInput\n                ): FileListResponse\n\n                listTags(where: TagWhereInput): ListTagsResponse!\n\n                # Get installed version\n                version: String\n\n                getSettings: FileManagerSettingsResponse\n            }\n\n            type FilesDeleteResponse {\n                data: Boolean\n                error: FileError\n            }\n\n            type FmMutation {\n                createFile(data: CreateFileInput!, meta: JSON): FileResponse\n                createFiles(data: [CreateFileInput]!, meta: JSON): CreateFilesResponse\n                updateFile(id: ID!, data: UpdateFileInput!): FileResponse\n                deleteFile(id: ID!): FilesDeleteResponse\n                install(srcPrefix: String): FileManagerBooleanResponse\n                updateSettings(data: FileManagerSettingsInput): FileManagerSettingsResponse\n            }\n\n            input FilesInstallInput {\n                srcPrefix: String!\n            }\n\n            extend type Query {\n                fileManager: FmQuery\n            }\n\n            extend type Mutation {\n                fileManager: FmMutation\n            }\n        `,\n        resolvers: {\n            File: {\n                async src(file, _, context: FileManagerContext) {\n                    const settings = await context.fileManager.getSettings();\n                    return (settings?.srcPrefix || \"\") + file.key;\n                }\n            },\n            Query: {\n                fileManager: emptyResolver\n            },\n            Mutation: {\n                fileManager: emptyResolver\n            },\n            FmQuery: {\n                getFile(_, args: any, context) {\n                    return resolve(() => context.fileManager.getFile(args.id));\n                },\n                async listFiles(_, args: FilesListOpts, context) {\n                    try {\n                        const [data, meta] = await context.fileManager.listFiles(args);\n                        return new ListResponse(data, meta);\n                    } catch (e) {\n                        return new ErrorResponse(e);\n                    }\n                },\n                async listTags(_, args: any, context) {\n                    try {\n                        const tags = await context.fileManager.listTags(args || {});\n\n                        return new Response(tags);\n                    } catch (error) {\n                        return new ErrorResponse(error);\n                    }\n                },\n                async version(_, __, context) {\n                    const { i18n, tenancy, fileManager } = context;\n                    if (!tenancy.getCurrentTenant() || !i18n.getContentLocale()) {\n                        return null;\n                    }\n\n                    return await fileManager.getVersion();\n                },\n                async getSettings(_, __, context) {\n                    return resolve(() => context.fileManager.getSettings());\n                }\n            },\n            FmMutation: {\n                async createFile(_, args: any, context) {\n                    return resolve(() => context.fileManager.createFile(args.data, args.meta));\n                },\n                async updateFile(_, args: any, context) {\n                    return resolve(() => context.fileManager.updateFile(args.id, args.data));\n                },\n                async createFiles(_, args: any, context) {\n                    return resolve(() =>\n                        context.fileManager.createFilesInBatch(args.data, args.meta)\n                    );\n                },\n                async deleteFile(_, args: any, context) {\n                    return resolve(async () => {\n                        // TODO: Ideally, this should work via a lifecycle hook; first we delete a record from DB, then from cloud storage.\n                        const file = await context.fileManager.getFile(args.id);\n                        return await context.fileManager.storage.delete({\n                            id: file.id,\n                            key: file.key\n                        });\n                    });\n                },\n                async install(_, args: any, context) {\n                    return resolve(() =>\n                        context.fileManager.install({ srcPrefix: args.srcPrefix })\n                    );\n                },\n                async updateSettings(_, args: any, context) {\n                    return resolve(() => context.fileManager.updateSettings(args.data));\n                }\n            }\n        }\n    });\n    fileManagerGraphQL.name = \"fm.graphql.schema\";\n\n    return fileManagerGraphQL;\n};\n"],"mappings":";;;;;;AAAA;AAQA,MAAMA,aAAa,GAAG,OAAO,CAAC,CAAC,CAAC;;AAEhC;AACA;AACA;AACA;;AAKA,MAAMC,OAAO,GAAG,MAAOC,EAAmB,IAAK;EAC3C,IAAI;IACA,OAAO,IAAIC,wBAAQ,CAAC,MAAMD,EAAE,EAAE,CAAC;EACnC,CAAC,CAAC,OAAOE,CAAC,EAAE;IACR,OAAO,IAAIC,6BAAa,CAACD,CAAC,CAAC;EAC/B;AACJ,CAAC;AAEM,MAAME,yBAAyB,GAAG,MAAM;EAC3C,MAAMC,kBAAkB,GAAG,IAAIC,mCAAmB,CAAqB;IACnEC,QAAQ,EAAE,aAAe;AACjC;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;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;AAC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"}
+{"version":3,"names":["_baseSchema","require","_api","_createFieldTypePluginRecords","_filesSchema","_isInstallationPending","createGraphQLSchemaPlugin","createBaseSchema","ContextPlugin","context","isInstallationPending","security","withoutAuthorization","fileModel","cms","getModel","models","listModels","fieldPlugins","createFieldTypePluginRecords","plugins","graphQlPlugin","createFilesSchema","model","register","exports"],"sources":["index.ts"],"sourcesContent":["import { createBaseSchema } from \"~/graphql/baseSchema\";\nimport { ContextPlugin } from \"@webiny/api\";\nimport { FileManagerContext } from \"~/types\";\nimport { CmsModel } from \"@webiny/api-headless-cms/types\";\nimport { createFieldTypePluginRecords } from \"@webiny/api-headless-cms/graphql/schema/createFieldTypePluginRecords\";\nimport { createFilesSchema } from \"~/graphql/filesSchema\";\nimport { isInstallationPending } from \"~/cmsFileStorage/isInstallationPending\";\n\nexport const createGraphQLSchemaPlugin = () => {\n    return [\n        createBaseSchema(),\n        // Files schema is generated dynamically, based on a CMS model, so we need to\n        // register it from a ContextPlugin, to perform additional bootstrap.\n        new ContextPlugin<FileManagerContext>(async context => {\n            if (isInstallationPending(context)) {\n                return;\n            }\n\n            await context.security.withoutAuthorization(async () => {\n                const fileModel = (await context.cms.getModel(\"fmFile\")) as CmsModel;\n                const models = await context.cms.listModels();\n                const fieldPlugins = createFieldTypePluginRecords(context.plugins);\n\n                const graphQlPlugin = createFilesSchema({\n                    model: fileModel,\n                    models,\n                    plugins: fieldPlugins\n                });\n\n                context.plugins.register(graphQlPlugin);\n            });\n        })\n    ];\n};\n"],"mappings":";;;;;;AAAA,IAAAA,WAAA,GAAAC,OAAA;AACA,IAAAC,IAAA,GAAAD,OAAA;AAGA,IAAAE,6BAAA,GAAAF,OAAA;AACA,IAAAG,YAAA,GAAAH,OAAA;AACA,IAAAI,sBAAA,GAAAJ,OAAA;AAEO,MAAMK,yBAAyB,GAAGA,CAAA,KAAM;EAC3C,OAAO,CACH,IAAAC,4BAAgB,EAAC,CAAC;EAClB;EACA;EACA,IAAIC,kBAAa,CAAqB,MAAMC,OAAO,IAAI;IACnD,IAAI,IAAAC,4CAAqB,EAACD,OAAO,CAAC,EAAE;MAChC;IACJ;IAEA,MAAMA,OAAO,CAACE,QAAQ,CAACC,oBAAoB,CAAC,YAAY;MACpD,MAAMC,SAAS,GAAI,MAAMJ,OAAO,CAACK,GAAG,CAACC,QAAQ,CAAC,QAAQ,CAAc;MACpE,MAAMC,MAAM,GAAG,MAAMP,OAAO,CAACK,GAAG,CAACG,UAAU,CAAC,CAAC;MAC7C,MAAMC,YAAY,GAAG,IAAAC,0DAA4B,EAACV,OAAO,CAACW,OAAO,CAAC;MAElE,MAAMC,aAAa,GAAG,IAAAC,8BAAiB,EAAC;QACpCC,KAAK,EAAEV,SAAS;QAChBG,MAAM;QACNI,OAAO,EAAEF;MACb,CAAC,CAAC;MAEFT,OAAO,CAACW,OAAO,CAACI,QAAQ,CAACH,aAAa,CAAC;IAC3C,CAAC,CAAC;EACN,CAAC,CAAC,CACL;AACL,CAAC;AAACI,OAAA,CAAAnB,yBAAA,GAAAA,yBAAA"}

package/graphql/utils.d.ts

@@ -0,0 +1,11 @@
+import { Response, ErrorResponse } from "@webiny/handler-graphql";
+export declare const emptyResolver: () => {};
+/**
+ * Use any because it really can be any.
+ * TODO @ts-refactor maybe use generics at some point?
+ */
+interface ResolveCallable {
+    (): Promise<any>;
+}
+export declare const resolve: (fn: ResolveCallable) => Promise<ErrorResponse | Response<any>>;
+export {};

package/graphql/utils.js

@@ -0,0 +1,22 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.resolve = exports.emptyResolver = void 0;
+var _handlerGraphql = require("@webiny/handler-graphql");
+const emptyResolver = () => ({});
+
+/**
+ * Use any because it really can be any.
+ * TODO @ts-refactor maybe use generics at some point?
+ */
+exports.emptyResolver = emptyResolver;
+const resolve = async fn => {
+  try {
+    return new _handlerGraphql.Response(await fn());
+  } catch (e) {
+    return new _handlerGraphql.ErrorResponse(e);
+  }
+};
+exports.resolve = resolve;

package/graphql/utils.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["_handlerGraphql","require","emptyResolver","exports","resolve","fn","Response","e","ErrorResponse"],"sources":["utils.ts"],"sourcesContent":["import { Response, ErrorResponse } from \"@webiny/handler-graphql\";\n\nexport const emptyResolver = () => ({});\n\n/**\n * Use any because it really can be any.\n * TODO @ts-refactor maybe use generics at some point?\n */\ninterface ResolveCallable {\n    (): Promise<any>;\n}\n\nexport const resolve = async (fn: ResolveCallable) => {\n    try {\n        return new Response(await fn());\n    } catch (e) {\n        return new ErrorResponse(e);\n    }\n};\n"],"mappings":";;;;;;AAAA,IAAAA,eAAA,GAAAC,OAAA;AAEO,MAAMC,aAAa,GAAGA,CAAA,MAAO,CAAC,CAAC,CAAC;;AAEvC;AACA;AACA;AACA;AAHAC,OAAA,CAAAD,aAAA,GAAAA,aAAA;AAQO,MAAME,OAAO,GAAG,MAAOC,EAAmB,IAAK;EAClD,IAAI;IACA,OAAO,IAAIC,wBAAQ,CAAC,MAAMD,EAAE,CAAC,CAAC,CAAC;EACnC,CAAC,CAAC,OAAOE,CAAC,EAAE;IACR,OAAO,IAAIC,6BAAa,CAACD,CAAC,CAAC;EAC/B;AACJ,CAAC;AAACJ,OAAA,CAAAC,OAAA,GAAAA,OAAA"}

package/handlers/download/byAlias.js

@@ -14,6 +14,12 @@ var _getS3Object = require("./getS3Object");
 const DEFAULT_CACHE_MAX_AGE = 30758400; // 1 year
 const PRESIGNED_URL_EXPIRATION = 900; // 15 minutes
 
+const {
+  region
+} = (0, _utils.getEnvironment)();
+const s3 = new _s.default({
+  region
+});
 const createDownloadFileByAliasPlugins = ({
   documentClient
 }) => {
@@ -41,9 +47,6 @@ const createDownloadFileByAliasPlugins = ({
     context
   }) => {
     onGet("/*", async (request, reply) => {
-      const {
-        region
-      } = (0, _utils.getEnvironment)();
       const fileInfo = (0, _extractFileInformation.extractFileInformation)(request);
 
       // TODO: `root` tenant is hardcoded for now, to satisfy the basic use case.
@@ -53,24 +56,21 @@ const createDownloadFileByAliasPlugins = ({
       if (!realFilename) {
         return reply.code(404).type("text/html").send("Not Found");
       }
-      const s3 = new _s.default({
-        region
-      });
       const {
         params,
         object
       } = await (0, _getS3Object.getS3Object)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, fileInfo), {}, {
         filename: realFilename
       }), s3, context);
-
-      // If there's an "object", it means we can return its body directly.
-      if (object) {
+      if (object && (0, _getS3Object.isSmallObject)(object)) {
+        console.log("This is a small file; responding with object body.");
         return reply.headers({
           "Content-Type": object.ContentType,
           "Cache-Control": `public, max-age=${DEFAULT_CACHE_MAX_AGE}`,
           "x-webiny-base64-encoded": true
         }).send(object.Body || "");
       }
+      console.log("This is a large object; redirecting to a presigned URL.");
       const presignedUrl = s3.getSignedUrl("getObject", {
         Bucket: params.Bucket,
         Key: params.Key,

package/handlers/download/byAlias.js.map

@@ -1 +1 @@
-{"version":3,"names":["DEFAULT_CACHE_MAX_AGE","PRESIGNED_URL_EXPIRATION","createDownloadFileByAliasPlugins","documentClient","getFileByAlias","tenant","alias","Items","Count","query","TableName","String","process","env","DB_TABLE","IndexName","Limit","KeyConditionExpression","ExpressionAttributeValues","promise","data","key","RoutePlugin","onGet","context","request","reply","region","getEnvironment","fileInfo","extractFileInformation","realFilename","filename","code","type","send","s3","S3","params","object","getS3Object","headers","ContentType","Body","presignedUrl","getSignedUrl","Bucket","Key","Expires","Location"],"sources":["byAlias.ts"],"sourcesContent":["import S3 from \"aws-sdk/clients/s3\";\nimport { DocumentClient } from \"aws-sdk/clients/dynamodb\";\nimport { getEnvironment } from \"../utils\";\nimport { RoutePlugin } from \"@webiny/handler-aws/gateway\";\nimport { extractFileInformation } from \"./extractFileInformation\";\nimport { getS3Object } from \"./getS3Object\";\n\nconst DEFAULT_CACHE_MAX_AGE = 30758400; // 1 year\nconst PRESIGNED_URL_EXPIRATION = 900; // 15 minutes\n\nexport interface DownloadByFileAliasConfig {\n    documentClient: DocumentClient;\n}\n\nexport const createDownloadFileByAliasPlugins = ({ documentClient }: DownloadByFileAliasConfig) => {\n    async function getFileByAlias(tenant: string, alias: string): Promise<string | null> {\n        const { Items, Count } = await documentClient\n            .query({\n                TableName: String(process.env.DB_TABLE),\n                IndexName: \"GSI1\",\n                Limit: 1,\n                KeyConditionExpression: \"GSI1_PK = :GSI1_PK AND GSI1_SK = :GSI1_SK\",\n                ExpressionAttributeValues: {\n                    \":GSI1_PK\": `T#${tenant}#FM#FILE_ALIASES`,\n                    \":GSI1_SK\": `/${alias}`\n                }\n            })\n            .promise();\n\n        if (!Items || Count === 0) {\n            return null;\n        }\n\n        return Items[0].data.key ?? null;\n    }\n\n    return [\n        new RoutePlugin(({ onGet, context }) => {\n            onGet(\"/*\", async (request, reply) => {\n                const { region } = getEnvironment();\n                const fileInfo = extractFileInformation(request);\n\n                // TODO: `root` tenant is hardcoded for now, to satisfy the basic use case.\n                // We need to find a way to send tenant via `x-tenant` header, when images are being requested from\n                // the frontend (website, admin, etc.) by alias.\n                const realFilename = await getFileByAlias(\"root\", fileInfo.filename);\n\n                if (!realFilename) {\n                    return reply.code(404).type(\"text/html\").send(\"Not Found\");\n                }\n\n                const s3 = new S3({ region });\n                const { params, object } = await getS3Object(\n                    { ...fileInfo, filename: realFilename },\n                    s3,\n                    context\n                );\n\n                // If there's an \"object\", it means we can return its body directly.\n                if (object) {\n                    return reply\n                        .headers({\n                            \"Content-Type\": object.ContentType,\n                            \"Cache-Control\": `public, max-age=${DEFAULT_CACHE_MAX_AGE}`,\n                            \"x-webiny-base64-encoded\": true\n                        })\n                        .send(object.Body || \"\");\n                }\n\n                const presignedUrl = s3.getSignedUrl(\"getObject\", {\n                    Bucket: params.Bucket,\n                    Key: params.Key,\n                    Expires: PRESIGNED_URL_EXPIRATION\n                });\n\n                // Lambda can return max 6MB of content, so if our object's size is larger, we are sending\n                // a 301 Redirect, redirecting the user to the public URL of the object in S3.\n                return reply\n                    .code(301)\n                    .headers({\n                        Location: presignedUrl,\n                        \"Cache-Control\": \"public, max-age=\" + PRESIGNED_URL_EXPIRATION\n                    })\n                    .send(\"\");\n            });\n        })\n    ];\n};\n"],"mappings":";;;;;;;;AAAA;AAEA;AACA;AACA;AACA;AAEA,MAAMA,qBAAqB,GAAG,QAAQ,CAAC,CAAC;AACxC,MAAMC,wBAAwB,GAAG,GAAG,CAAC,CAAC;;AAM/B,MAAMC,gCAAgC,GAAG,CAAC;EAAEC;AAA0C,CAAC,KAAK;EAC/F,eAAeC,cAAc,CAACC,MAAc,EAAEC,KAAa,EAA0B;IACjF,MAAM;MAAEC,KAAK;MAAEC;IAAM,CAAC,GAAG,MAAML,cAAc,CACxCM,KAAK,CAAC;MACHC,SAAS,EAAEC,MAAM,CAACC,OAAO,CAACC,GAAG,CAACC,QAAQ,CAAC;MACvCC,SAAS,EAAE,MAAM;MACjBC,KAAK,EAAE,CAAC;MACRC,sBAAsB,EAAE,2CAA2C;MACnEC,yBAAyB,EAAE;QACvB,UAAU,EAAG,KAAIb,MAAO,kBAAiB;QACzC,UAAU,EAAG,IAAGC,KAAM;MAC1B;IACJ,CAAC,CAAC,CACDa,OAAO,EAAE;IAEd,IAAI,CAACZ,KAAK,IAAIC,KAAK,KAAK,CAAC,EAAE;MACvB,OAAO,IAAI;IACf;IAEA,OAAOD,KAAK,CAAC,CAAC,CAAC,CAACa,IAAI,CAACC,GAAG,IAAI,IAAI;EACpC;EAEA,OAAO,CACH,IAAIC,oBAAW,CAAC,CAAC;IAAEC,KAAK;IAAEC;EAAQ,CAAC,KAAK;IACpCD,KAAK,CAAC,IAAI,EAAE,OAAOE,OAAO,EAAEC,KAAK,KAAK;MAClC,MAAM;QAAEC;MAAO,CAAC,GAAG,IAAAC,qBAAc,GAAE;MACnC,MAAMC,QAAQ,GAAG,IAAAC,8CAAsB,EAACL,OAAO,CAAC;;MAEhD;MACA;MACA;MACA,MAAMM,YAAY,GAAG,MAAM3B,cAAc,CAAC,MAAM,EAAEyB,QAAQ,CAACG,QAAQ,CAAC;MAEpE,IAAI,CAACD,YAAY,EAAE;QACf,OAAOL,KAAK,CAACO,IAAI,CAAC,GAAG,CAAC,CAACC,IAAI,CAAC,WAAW,CAAC,CAACC,IAAI,CAAC,WAAW,CAAC;MAC9D;MAEA,MAAMC,EAAE,GAAG,IAAIC,UAAE,CAAC;QAAEV;MAAO,CAAC,CAAC;MAC7B,MAAM;QAAEW,MAAM;QAAEC;MAAO,CAAC,GAAG,MAAM,IAAAC,wBAAW,8DACnCX,QAAQ;QAAEG,QAAQ,EAAED;MAAY,IACrCK,EAAE,EACFZ,OAAO,CACV;;MAED;MACA,IAAIe,MAAM,EAAE;QACR,OAAOb,KAAK,CACPe,OAAO,CAAC;UACL,cAAc,EAAEF,MAAM,CAACG,WAAW;UAClC,eAAe,EAAG,mBAAkB1C,qBAAsB,EAAC;UAC3D,yBAAyB,EAAE;QAC/B,CAAC,CAAC,CACDmC,IAAI,CAACI,MAAM,CAACI,IAAI,IAAI,EAAE,CAAC;MAChC;MAEA,MAAMC,YAAY,GAAGR,EAAE,CAACS,YAAY,CAAC,WAAW,EAAE;QAC9CC,MAAM,EAAER,MAAM,CAACQ,MAAM;QACrBC,GAAG,EAAET,MAAM,CAACS,GAAG;QACfC,OAAO,EAAE/C;MACb,CAAC,CAAC;;MAEF;MACA;MACA,OAAOyB,KAAK,CACPO,IAAI,CAAC,GAAG,CAAC,CACTQ,OAAO,CAAC;QACLQ,QAAQ,EAAEL,YAAY;QACtB,eAAe,EAAE,kBAAkB,GAAG3C;MAC1C,CAAC,CAAC,CACDkC,IAAI,CAAC,EAAE,CAAC;IACjB,CAAC,CAAC;EACN,CAAC,CAAC,CACL;AACL,CAAC;AAAC"}
+{"version":3,"names":["_s","_interopRequireDefault","require","_utils","_gateway","_extractFileInformation","_getS3Object","DEFAULT_CACHE_MAX_AGE","PRESIGNED_URL_EXPIRATION","region","getEnvironment","s3","S3","createDownloadFileByAliasPlugins","documentClient","getFileByAlias","tenant","alias","Items","Count","query","TableName","String","process","env","DB_TABLE","IndexName","Limit","KeyConditionExpression","ExpressionAttributeValues","promise","data","key","RoutePlugin","onGet","context","request","reply","fileInfo","extractFileInformation","realFilename","filename","code","type","send","params","object","getS3Object","_objectSpread2","default","isSmallObject","console","log","headers","ContentType","Body","presignedUrl","getSignedUrl","Bucket","Key","Expires","Location","exports"],"sources":["byAlias.ts"],"sourcesContent":["import S3 from \"aws-sdk/clients/s3\";\nimport { DocumentClient } from \"aws-sdk/clients/dynamodb\";\nimport { getEnvironment } from \"../utils\";\nimport { RoutePlugin } from \"@webiny/handler-aws/gateway\";\nimport { extractFileInformation } from \"./extractFileInformation\";\nimport { getS3Object, isSmallObject } from \"./getS3Object\";\n\nconst DEFAULT_CACHE_MAX_AGE = 30758400; // 1 year\nconst PRESIGNED_URL_EXPIRATION = 900; // 15 minutes\n\nconst { region } = getEnvironment();\nconst s3 = new S3({ region });\n\nexport interface DownloadByFileAliasConfig {\n    documentClient: DocumentClient;\n}\n\nexport const createDownloadFileByAliasPlugins = ({ documentClient }: DownloadByFileAliasConfig) => {\n    async function getFileByAlias(tenant: string, alias: string): Promise<string | null> {\n        const { Items, Count } = await documentClient\n            .query({\n                TableName: String(process.env.DB_TABLE),\n                IndexName: \"GSI1\",\n                Limit: 1,\n                KeyConditionExpression: \"GSI1_PK = :GSI1_PK AND GSI1_SK = :GSI1_SK\",\n                ExpressionAttributeValues: {\n                    \":GSI1_PK\": `T#${tenant}#FM#FILE_ALIASES`,\n                    \":GSI1_SK\": `/${alias}`\n                }\n            })\n            .promise();\n\n        if (!Items || Count === 0) {\n            return null;\n        }\n\n        return Items[0].data.key ?? null;\n    }\n\n    return [\n        new RoutePlugin(({ onGet, context }) => {\n            onGet(\"/*\", async (request, reply) => {\n                const fileInfo = extractFileInformation(request);\n\n                // TODO: `root` tenant is hardcoded for now, to satisfy the basic use case.\n                // We need to find a way to send tenant via `x-tenant` header, when images are being requested from\n                // the frontend (website, admin, etc.) by alias.\n                const realFilename = await getFileByAlias(\"root\", fileInfo.filename);\n\n                if (!realFilename) {\n                    return reply.code(404).type(\"text/html\").send(\"Not Found\");\n                }\n\n                const { params, object } = await getS3Object(\n                    { ...fileInfo, filename: realFilename },\n                    s3,\n                    context\n                );\n\n                if (object && isSmallObject(object)) {\n                    console.log(\"This is a small file; responding with object body.\");\n\n                    return reply\n                        .headers({\n                            \"Content-Type\": object.ContentType,\n                            \"Cache-Control\": `public, max-age=${DEFAULT_CACHE_MAX_AGE}`,\n                            \"x-webiny-base64-encoded\": true\n                        })\n                        .send(object.Body || \"\");\n                }\n\n                console.log(\"This is a large object; redirecting to a presigned URL.\");\n\n                const presignedUrl = s3.getSignedUrl(\"getObject\", {\n                    Bucket: params.Bucket,\n                    Key: params.Key,\n                    Expires: PRESIGNED_URL_EXPIRATION\n                });\n\n                // Lambda can return max 6MB of content, so if our object's size is larger, we are sending\n                // a 301 Redirect, redirecting the user to the public URL of the object in S3.\n                return reply\n                    .code(301)\n                    .headers({\n                        Location: presignedUrl,\n                        \"Cache-Control\": \"public, max-age=\" + PRESIGNED_URL_EXPIRATION\n                    })\n                    .send(\"\");\n            });\n        })\n    ];\n};\n"],"mappings":"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"}

package/handlers/download/byExactKey.js

@@ -13,32 +13,32 @@ var _extractFileInformation = require("./extractFileInformation");
 const DEFAULT_CACHE_MAX_AGE = 30758400; // 1 year
 const PRESIGNED_URL_EXPIRATION = 900; // 15 minutes
 
+const {
+  region
+} = (0, _utils.getEnvironment)();
+const s3 = new _s.default({
+  region
+});
 const createDownloadFileByExactKeyPlugins = () => {
   return [new _gateway.RoutePlugin(({
     onGet,
     context
   }) => {
     onGet("/files/*", async (request, reply) => {
-      const {
-        region
-      } = (0, _utils.getEnvironment)();
       const fileInfo = (0, _extractFileInformation.extractFileInformation)(request);
-      const s3 = new _s.default({
-        region
-      });
       const {
         params,
         object
       } = await (0, _getS3Object.getS3Object)(fileInfo, s3, context);
-
-      // If there's an "object", it means we can return its body directly.
-      if (object) {
+      if (object && (0, _getS3Object.isSmallObject)(object)) {
+        console.log("This is a small file; responding with object body.");
         return reply.headers({
           "Content-Type": object.ContentType,
           "Cache-Control": `public, max-age=${DEFAULT_CACHE_MAX_AGE}`,
           "x-webiny-base64-encoded": true
         }).send(object.Body || "");
       }
+      console.log("This is a large object; redirecting to a presigned URL.");
       const presignedUrl = s3.getSignedUrl("getObject", {
         Bucket: params.Bucket,
         Key: params.Key,

package/handlers/download/byExactKey.js.map

@@ -1 +1 @@
-{"version":3,"names":["DEFAULT_CACHE_MAX_AGE","PRESIGNED_URL_EXPIRATION","createDownloadFileByExactKeyPlugins","RoutePlugin","onGet","context","request","reply","region","getEnvironment","fileInfo","extractFileInformation","s3","S3","params","object","getS3Object","headers","ContentType","send","Body","presignedUrl","getSignedUrl","Bucket","Key","Expires","code","Location"],"sources":["byExactKey.ts"],"sourcesContent":["import S3 from \"aws-sdk/clients/s3\";\nimport { getEnvironment } from \"../utils\";\nimport { RoutePlugin } from \"@webiny/handler-aws/gateway\";\nimport { getS3Object } from \"~/handlers/download/getS3Object\";\nimport { extractFileInformation } from \"~/handlers/download/extractFileInformation\";\n\nconst DEFAULT_CACHE_MAX_AGE = 30758400; // 1 year\nconst PRESIGNED_URL_EXPIRATION = 900; // 15 minutes\n\nexport const createDownloadFileByExactKeyPlugins = () => {\n    return [\n        new RoutePlugin(({ onGet, context }) => {\n            onGet(\"/files/*\", async (request, reply) => {\n                const { region } = getEnvironment();\n                const fileInfo = extractFileInformation(request);\n                const s3 = new S3({ region });\n\n                const { params, object } = await getS3Object(fileInfo, s3, context);\n\n                // If there's an \"object\", it means we can return its body directly.\n                if (object) {\n                    return reply\n                        .headers({\n                            \"Content-Type\": object.ContentType,\n                            \"Cache-Control\": `public, max-age=${DEFAULT_CACHE_MAX_AGE}`,\n                            \"x-webiny-base64-encoded\": true\n                        })\n                        .send(object.Body || \"\");\n                }\n\n                const presignedUrl = s3.getSignedUrl(\"getObject\", {\n                    Bucket: params.Bucket,\n                    Key: params.Key,\n                    Expires: PRESIGNED_URL_EXPIRATION\n                });\n\n                // Lambda can return max 6MB of content, so if our object's size is larger, we are sending\n                // a 301 Redirect, redirecting the user to the public URL of the object in S3.\n                return reply\n                    .code(301)\n                    .headers({\n                        Location: presignedUrl,\n                        \"Cache-Control\": \"public, max-age=\" + PRESIGNED_URL_EXPIRATION\n                    })\n                    .send(\"\");\n            });\n        })\n    ];\n};\n"],"mappings":";;;;;;;AAAA;AACA;AACA;AACA;AACA;AAEA,MAAMA,qBAAqB,GAAG,QAAQ,CAAC,CAAC;AACxC,MAAMC,wBAAwB,GAAG,GAAG,CAAC,CAAC;;AAE/B,MAAMC,mCAAmC,GAAG,MAAM;EACrD,OAAO,CACH,IAAIC,oBAAW,CAAC,CAAC;IAAEC,KAAK;IAAEC;EAAQ,CAAC,KAAK;IACpCD,KAAK,CAAC,UAAU,EAAE,OAAOE,OAAO,EAAEC,KAAK,KAAK;MACxC,MAAM;QAAEC;MAAO,CAAC,GAAG,IAAAC,qBAAc,GAAE;MACnC,MAAMC,QAAQ,GAAG,IAAAC,8CAAsB,EAACL,OAAO,CAAC;MAChD,MAAMM,EAAE,GAAG,IAAIC,UAAE,CAAC;QAAEL;MAAO,CAAC,CAAC;MAE7B,MAAM;QAAEM,MAAM;QAAEC;MAAO,CAAC,GAAG,MAAM,IAAAC,wBAAW,EAACN,QAAQ,EAAEE,EAAE,EAAEP,OAAO,CAAC;;MAEnE;MACA,IAAIU,MAAM,EAAE;QACR,OAAOR,KAAK,CACPU,OAAO,CAAC;UACL,cAAc,EAAEF,MAAM,CAACG,WAAW;UAClC,eAAe,EAAG,mBAAkBlB,qBAAsB,EAAC;UAC3D,yBAAyB,EAAE;QAC/B,CAAC,CAAC,CACDmB,IAAI,CAACJ,MAAM,CAACK,IAAI,IAAI,EAAE,CAAC;MAChC;MAEA,MAAMC,YAAY,GAAGT,EAAE,CAACU,YAAY,CAAC,WAAW,EAAE;QAC9CC,MAAM,EAAET,MAAM,CAACS,MAAM;QACrBC,GAAG,EAAEV,MAAM,CAACU,GAAG;QACfC,OAAO,EAAExB;MACb,CAAC,CAAC;;MAEF;MACA;MACA,OAAOM,KAAK,CACPmB,IAAI,CAAC,GAAG,CAAC,CACTT,OAAO,CAAC;QACLU,QAAQ,EAAEN,YAAY;QACtB,eAAe,EAAE,kBAAkB,GAAGpB;MAC1C,CAAC,CAAC,CACDkB,IAAI,CAAC,EAAE,CAAC;IACjB,CAAC,CAAC;EACN,CAAC,CAAC,CACL;AACL,CAAC;AAAC"}
+{"version":3,"names":["_s","_interopRequireDefault","require","_utils","_gateway","_getS3Object","_extractFileInformation","DEFAULT_CACHE_MAX_AGE","PRESIGNED_URL_EXPIRATION","region","getEnvironment","s3","S3","createDownloadFileByExactKeyPlugins","RoutePlugin","onGet","context","request","reply","fileInfo","extractFileInformation","params","object","getS3Object","isSmallObject","console","log","headers","ContentType","send","Body","presignedUrl","getSignedUrl","Bucket","Key","Expires","code","Location","exports"],"sources":["byExactKey.ts"],"sourcesContent":["import S3 from \"aws-sdk/clients/s3\";\nimport { getEnvironment } from \"../utils\";\nimport { RoutePlugin } from \"@webiny/handler-aws/gateway\";\nimport { getS3Object, isSmallObject } from \"~/handlers/download/getS3Object\";\nimport { extractFileInformation } from \"~/handlers/download/extractFileInformation\";\n\nconst DEFAULT_CACHE_MAX_AGE = 30758400; // 1 year\nconst PRESIGNED_URL_EXPIRATION = 900; // 15 minutes\n\nconst { region } = getEnvironment();\nconst s3 = new S3({ region });\n\nexport const createDownloadFileByExactKeyPlugins = () => {\n    return [\n        new RoutePlugin(({ onGet, context }) => {\n            onGet(\"/files/*\", async (request, reply) => {\n                const fileInfo = extractFileInformation(request);\n                const { params, object } = await getS3Object(fileInfo, s3, context);\n\n                if (object && isSmallObject(object)) {\n                    console.log(\"This is a small file; responding with object body.\");\n                    return reply\n                        .headers({\n                            \"Content-Type\": object.ContentType,\n                            \"Cache-Control\": `public, max-age=${DEFAULT_CACHE_MAX_AGE}`,\n                            \"x-webiny-base64-encoded\": true\n                        })\n                        .send(object.Body || \"\");\n                }\n\n                console.log(\"This is a large object; redirecting to a presigned URL.\");\n\n                const presignedUrl = s3.getSignedUrl(\"getObject\", {\n                    Bucket: params.Bucket,\n                    Key: params.Key,\n                    Expires: PRESIGNED_URL_EXPIRATION\n                });\n\n                // Lambda can return max 6MB of content, so if our object's size is larger, we are sending\n                // a 301 Redirect, redirecting the user to the public URL of the object in S3.\n                return reply\n                    .code(301)\n                    .headers({\n                        Location: presignedUrl,\n                        \"Cache-Control\": \"public, max-age=\" + PRESIGNED_URL_EXPIRATION\n                    })\n                    .send(\"\");\n            });\n        })\n    ];\n};\n"],"mappings":";;;;;;;AAAA,IAAAA,EAAA,GAAAC,sBAAA,CAAAC,OAAA;AACA,IAAAC,MAAA,GAAAD,OAAA;AACA,IAAAE,QAAA,GAAAF,OAAA;AACA,IAAAG,YAAA,GAAAH,OAAA;AACA,IAAAI,uBAAA,GAAAJ,OAAA;AAEA,MAAMK,qBAAqB,GAAG,QAAQ,CAAC,CAAC;AACxC,MAAMC,wBAAwB,GAAG,GAAG,CAAC,CAAC;;AAEtC,MAAM;EAAEC;AAAO,CAAC,GAAG,IAAAC,qBAAc,EAAC,CAAC;AACnC,MAAMC,EAAE,GAAG,IAAIC,UAAE,CAAC;EAAEH;AAAO,CAAC,CAAC;AAEtB,MAAMI,mCAAmC,GAAGA,CAAA,KAAM;EACrD,OAAO,CACH,IAAIC,oBAAW,CAAC,CAAC;IAAEC,KAAK;IAAEC;EAAQ,CAAC,KAAK;IACpCD,KAAK,CAAC,UAAU,EAAE,OAAOE,OAAO,EAAEC,KAAK,KAAK;MACxC,MAAMC,QAAQ,GAAG,IAAAC,8CAAsB,EAACH,OAAO,CAAC;MAChD,MAAM;QAAEI,MAAM;QAAEC;MAAO,CAAC,GAAG,MAAM,IAAAC,wBAAW,EAACJ,QAAQ,EAAER,EAAE,EAAEK,OAAO,CAAC;MAEnE,IAAIM,MAAM,IAAI,IAAAE,0BAAa,EAACF,MAAM,CAAC,EAAE;QACjCG,OAAO,CAACC,GAAG,CAAC,oDAAoD,CAAC;QACjE,OAAOR,KAAK,CACPS,OAAO,CAAC;UACL,cAAc,EAAEL,MAAM,CAACM,WAAW;UAClC,eAAe,EAAG,mBAAkBrB,qBAAsB,EAAC;UAC3D,yBAAyB,EAAE;QAC/B,CAAC,CAAC,CACDsB,IAAI,CAACP,MAAM,CAACQ,IAAI,IAAI,EAAE,CAAC;MAChC;MAEAL,OAAO,CAACC,GAAG,CAAC,yDAAyD,CAAC;MAEtE,MAAMK,YAAY,GAAGpB,EAAE,CAACqB,YAAY,CAAC,WAAW,EAAE;QAC9CC,MAAM,EAAEZ,MAAM,CAACY,MAAM;QACrBC,GAAG,EAAEb,MAAM,CAACa,GAAG;QACfC,OAAO,EAAE3B;MACb,CAAC,CAAC;;MAEF;MACA;MACA,OAAOU,KAAK,CACPkB,IAAI,CAAC,GAAG,CAAC,CACTT,OAAO,CAAC;QACLU,QAAQ,EAAEN,YAAY;QACtB,eAAe,EAAE,kBAAkB,GAAGvB;MAC1C,CAAC,CAAC,CACDqB,IAAI,CAAC,EAAE,CAAC;IACjB,CAAC,CAAC;EACN,CAAC,CAAC,CACL;AACL,CAAC;AAACS,OAAA,CAAAzB,mCAAA,GAAAA,mCAAA"}

package/handlers/download/extractFileInformation.js.map

@@ -1 +1 @@
-{"version":3,"names":["extractFileInformation","request","path","params","filename","decodeURI","options","query","extension","pathLib","extname"],"sources":["extractFileInformation.ts"],"sourcesContent":["import pathLib from \"path\";\nimport { Request } from \"@webiny/handler/types\";\n\n/**\n * Based on given request path, extracts file key and additional options sent via query params.\n */\nexport const extractFileInformation = (request: Request) => {\n    const path = (request.params as any)[\"*\"];\n    return {\n        filename: decodeURI(path),\n        options: request.query as any,\n        extension: pathLib.extname(path)\n    };\n};\n"],"mappings":";;;;;;;AAAA;AAGA;AACA;AACA;AACO,MAAMA,sBAAsB,GAAIC,OAAgB,IAAK;EACxD,MAAMC,IAAI,GAAID,OAAO,CAACE,MAAM,CAAS,GAAG,CAAC;EACzC,OAAO;IACHC,QAAQ,EAAEC,SAAS,CAACH,IAAI,CAAC;IACzBI,OAAO,EAAEL,OAAO,CAACM,KAAY;IAC7BC,SAAS,EAAEC,aAAO,CAACC,OAAO,CAACR,IAAI;EACnC,CAAC;AACL,CAAC;AAAC"}
+{"version":3,"names":["_path","_interopRequireDefault","require","extractFileInformation","request","path","params","filename","decodeURI","options","query","extension","pathLib","extname","exports"],"sources":["extractFileInformation.ts"],"sourcesContent":["import pathLib from \"path\";\nimport { Request } from \"@webiny/handler/types\";\n\n/**\n * Based on given request path, extracts file key and additional options sent via query params.\n */\nexport const extractFileInformation = (request: Request) => {\n    const path = (request.params as any)[\"*\"];\n    return {\n        filename: decodeURI(path),\n        options: request.query as any,\n        extension: pathLib.extname(path)\n    };\n};\n"],"mappings":";;;;;;;AAAA,IAAAA,KAAA,GAAAC,sBAAA,CAAAC,OAAA;AAGA;AACA;AACA;AACO,MAAMC,sBAAsB,GAAIC,OAAgB,IAAK;EACxD,MAAMC,IAAI,GAAID,OAAO,CAACE,MAAM,CAAS,GAAG,CAAC;EACzC,OAAO;IACHC,QAAQ,EAAEC,SAAS,CAACH,IAAI,CAAC;IACzBI,OAAO,EAAEL,OAAO,CAACM,KAAY;IAC7BC,SAAS,EAAEC,aAAO,CAACC,OAAO,CAACR,IAAI;EACnC,CAAC;AACL,CAAC;AAACS,OAAA,CAAAX,sBAAA,GAAAA,sBAAA"}

package/handlers/download/getS3Object.d.ts

@@ -2,9 +2,11 @@ import S3 from "aws-sdk/clients/s3";
 import { Context } from "@webiny/handler/types";
 import { ObjectParamsResponse } from "../utils/getObjectParams";
 import { extractFileInformation } from "./extractFileInformation";
+export declare function isSmallObject(object: S3.Types.GetObjectOutput): boolean;
 interface S3Object {
     object?: S3.Types.GetObjectOutput;
     params: ObjectParamsResponse;
 }
+export declare const MAX_RETURN_CONTENT_LENGTH = 5000000;
 export declare const getS3Object: (fileInfo: ReturnType<typeof extractFileInformation>, s3: S3, context: Context) => Promise<S3Object>;
 export {};

package/handlers/download/getS3Object.js

@@ -4,11 +4,15 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getS3Object = void 0;
+exports.getS3Object = exports.MAX_RETURN_CONTENT_LENGTH = void 0;
+exports.isSmallObject = isSmallObject;
 var _utils = require("../utils");
 var _loaders = _interopRequireDefault(require("../transform/loaders"));
+function isSmallObject(object) {
+  return (object.ContentLength ?? Number.MIN_SAFE_INTEGER) < MAX_RETURN_CONTENT_LENGTH;
+}
 const MAX_RETURN_CONTENT_LENGTH = 5000000; // ~4.77MB
-
+exports.MAX_RETURN_CONTENT_LENGTH = MAX_RETURN_CONTENT_LENGTH;
 const getS3Object = async (fileInfo, s3, context) => {
   const {
     filename,
@@ -18,30 +22,41 @@ const getS3Object = async (fileInfo, s3, context) => {
   const params = (0, _utils.getObjectParams)(filename);
   const objectHead = await s3.headObject(params).promise();
   const contentLength = objectHead.ContentLength ? objectHead.ContentLength : 0;
-  for (const loader of _loaders.default) {
-    const canProcess = loader.canProcess({
-      context,
-      s3,
-      options,
-      file: {
-        name: filename,
-        extension,
-        contentLength
+  const applyLoaders = options.original === undefined;
+  if (applyLoaders) {
+    console.log("Applying loaders...");
+    for (const loader of _loaders.default) {
+      try {
+        const canProcess = loader.canProcess({
+          context,
+          s3,
+          options,
+          file: {
+            name: filename,
+            extension,
+            contentLength
+          }
+        });
+        if (!canProcess) {
+          continue;
+        }
+        return loader.process({
+          context,
+          s3,
+          options,
+          file: {
+            name: filename,
+            extension,
+            contentLength
+          }
+        });
+      } catch (err) {
+        console.log("ERROR WHILE PROCESSING A LOADER");
+        console.log(err);
       }
-    });
-    if (!canProcess) {
-      continue;
     }
-    return loader.process({
-      context,
-      s3,
-      options,
-      file: {
-        name: filename,
-        extension,
-        contentLength
-      }
-    });
+  } else {
+    console.log("Skipping loaders.");
   }
 
   // If no processors handled the file request, just return the S3 object taking its size into consideration.