@webiny/api-file-manager 0.0.0-unstable.78f581c1d2 → 0.0.0-unstable.7f63ea0744
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/handlers/download/index.js +7 -26
- package/handlers/download/index.js.map +1 -1
- package/handlers/manage/index.js +0 -16
- package/handlers/manage/index.js.map +1 -1
- package/handlers/transform/index.js +6 -16
- package/handlers/transform/index.js.map +1 -1
- package/handlers/transform/loaders/imageLoader.js +0 -17
- package/handlers/transform/loaders/imageLoader.js.map +1 -1
- package/handlers/transform/loaders/index.js +0 -3
- package/handlers/transform/loaders/index.js.map +1 -1
- package/handlers/transform/loaders/sanitizeImageTransformations.js +0 -13
- package/handlers/transform/loaders/sanitizeImageTransformations.js.map +1 -1
- package/handlers/transform/managers/imageManager.js +6 -14
- package/handlers/transform/managers/imageManager.js.map +1 -1
- package/handlers/transform/managers/index.js +0 -3
- package/handlers/transform/managers/index.js.map +1 -1
- package/handlers/transform/optimizeImage.js +0 -6
- package/handlers/transform/optimizeImage.js.map +1 -1
- package/handlers/transform/transformImage.js +0 -5
- package/handlers/transform/transformImage.js.map +1 -1
- package/handlers/transform/utils.js +0 -10
- package/handlers/transform/utils.js.map +1 -1
- package/handlers/utils/getEnvironment.js +0 -2
- package/handlers/utils/getEnvironment.js.map +1 -1
- package/handlers/utils/getObjectParams.js +0 -4
- package/handlers/utils/getObjectParams.js.map +1 -1
- package/handlers/utils/index.js +0 -3
- package/handlers/utils/index.js.map +1 -1
- package/package.json +19 -19
- package/plugins/crud/files/validation.js +0 -6
- package/plugins/crud/files/validation.js.map +1 -1
- package/plugins/crud/files.crud.js +2 -61
- package/plugins/crud/files.crud.js.map +1 -1
- package/plugins/crud/settings.crud.js +1 -18
- package/plugins/crud/settings.crud.js.map +1 -1
- package/plugins/crud/system.crud.js +2 -32
- package/plugins/crud/system.crud.js.map +1 -1
- package/plugins/crud/utils/checkBasePermissions.js +0 -8
- package/plugins/crud/utils/checkBasePermissions.js.map +1 -1
- package/plugins/crud/utils/createFileModel.js +0 -12
- package/plugins/crud/utils/createFileModel.js.map +1 -1
- package/plugins/crud/utils/lifecycleEvents.js +4 -12
- package/plugins/crud/utils/lifecycleEvents.js.map +1 -1
- package/plugins/definitions/FilePhysicalStoragePlugin.js +0 -11
- package/plugins/definitions/FilePhysicalStoragePlugin.js.map +1 -1
- package/plugins/definitions/FilePlugin.js +0 -18
- package/plugins/definitions/FilePlugin.js.map +1 -1
- package/plugins/definitions/FileStorageTransformPlugin.js +1 -12
- package/plugins/definitions/FileStorageTransformPlugin.js.map +1 -1
- package/plugins/definitions/FilesStorageOperationsProviderPlugin.js +0 -5
- package/plugins/definitions/FilesStorageOperationsProviderPlugin.js.map +1 -1
- package/plugins/definitions/InstallationPlugin.js +0 -11
- package/plugins/definitions/InstallationPlugin.js.map +1 -1
- package/plugins/definitions/SettingsStorageOperationsProviderPlugin.js +0 -5
- package/plugins/definitions/SettingsStorageOperationsProviderPlugin.js.map +1 -1
- package/plugins/definitions/SystemStorageOperationsProviderPlugin.js +0 -5
- package/plugins/definitions/SystemStorageOperationsProviderPlugin.js.map +1 -1
- package/plugins/graphql.js +2 -22
- package/plugins/graphql.js.map +1 -1
- package/plugins/index.js +0 -9
- package/plugins/index.js.map +1 -1
- package/plugins/storage/FileStorage.js +14 -32
- package/plugins/storage/FileStorage.js.map +1 -1
- package/plugins/storage/index.js +0 -4
- package/plugins/storage/index.js.map +1 -1
- package/utils.js +0 -2
- package/utils.js.map +1 -1
|
@@ -1,34 +1,22 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
3
|
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
|
|
4
|
-
|
|
5
4
|
Object.defineProperty(exports, "__esModule", {
|
|
6
5
|
value: true
|
|
7
6
|
});
|
|
8
7
|
exports.createDownloadFilePlugins = void 0;
|
|
9
|
-
|
|
10
8
|
var _s = _interopRequireDefault(require("aws-sdk/clients/s3"));
|
|
11
|
-
|
|
12
9
|
var _sanitizeFilename = _interopRequireDefault(require("sanitize-filename"));
|
|
13
|
-
|
|
14
10
|
var _path = _interopRequireDefault(require("path"));
|
|
15
|
-
|
|
16
11
|
var _utils = require("../utils");
|
|
17
|
-
|
|
18
12
|
var _loaders = _interopRequireDefault(require("../transform/loaders"));
|
|
19
|
-
|
|
20
13
|
var _gateway = require("@webiny/handler-aws/gateway");
|
|
21
|
-
|
|
22
14
|
const MAX_RETURN_CONTENT_LENGTH = 5000000; // ~4.77MB
|
|
23
|
-
|
|
24
15
|
const DEFAULT_CACHE_MAX_AGE = 30758400; // 1 year
|
|
25
|
-
|
|
26
16
|
const PRESIGNED_URL_EXPIRATION = 900; // 15 minutes
|
|
27
|
-
|
|
28
17
|
/**
|
|
29
18
|
* Based on given path, extracts file key and additional options sent via query params.
|
|
30
19
|
*/
|
|
31
|
-
|
|
32
20
|
const extractFilenameOptions = request => {
|
|
33
21
|
const path = (0, _sanitizeFilename.default)(request.params.path);
|
|
34
22
|
return {
|
|
@@ -37,7 +25,6 @@ const extractFilenameOptions = request => {
|
|
|
37
25
|
extension: _path.default.extname(path)
|
|
38
26
|
};
|
|
39
27
|
};
|
|
40
|
-
|
|
41
28
|
const getS3Object = async (request, s3, context) => {
|
|
42
29
|
const {
|
|
43
30
|
options,
|
|
@@ -47,7 +34,6 @@ const getS3Object = async (request, s3, context) => {
|
|
|
47
34
|
const params = (0, _utils.getObjectParams)(filename);
|
|
48
35
|
const objectHead = await s3.headObject(params).promise();
|
|
49
36
|
const contentLength = objectHead.ContentLength ? objectHead.ContentLength : 0;
|
|
50
|
-
|
|
51
37
|
for (const loader of _loaders.default) {
|
|
52
38
|
const canProcess = loader.canProcess({
|
|
53
39
|
context,
|
|
@@ -59,11 +45,9 @@ const getS3Object = async (request, s3, context) => {
|
|
|
59
45
|
contentLength
|
|
60
46
|
}
|
|
61
47
|
});
|
|
62
|
-
|
|
63
48
|
if (!canProcess) {
|
|
64
49
|
continue;
|
|
65
50
|
}
|
|
66
|
-
|
|
67
51
|
return loader.process({
|
|
68
52
|
context,
|
|
69
53
|
s3,
|
|
@@ -74,21 +58,18 @@ const getS3Object = async (request, s3, context) => {
|
|
|
74
58
|
contentLength
|
|
75
59
|
}
|
|
76
60
|
});
|
|
77
|
-
}
|
|
78
|
-
|
|
61
|
+
}
|
|
79
62
|
|
|
63
|
+
// If no processors handled the file request, just return the S3 object taking its size into consideration.
|
|
80
64
|
let object;
|
|
81
|
-
|
|
82
65
|
if (contentLength < MAX_RETURN_CONTENT_LENGTH) {
|
|
83
66
|
object = await s3.getObject(params).promise();
|
|
84
67
|
}
|
|
85
|
-
|
|
86
68
|
return {
|
|
87
69
|
object,
|
|
88
70
|
params
|
|
89
71
|
};
|
|
90
72
|
};
|
|
91
|
-
|
|
92
73
|
const createDownloadFilePlugins = () => {
|
|
93
74
|
return [new _gateway.RoutePlugin(({
|
|
94
75
|
onGet,
|
|
@@ -104,8 +85,9 @@ const createDownloadFilePlugins = () => {
|
|
|
104
85
|
const {
|
|
105
86
|
params,
|
|
106
87
|
object
|
|
107
|
-
} = await getS3Object(request, s3, context);
|
|
88
|
+
} = await getS3Object(request, s3, context);
|
|
108
89
|
|
|
90
|
+
// If there's an "object", it means we can return its body directly.
|
|
109
91
|
if (object) {
|
|
110
92
|
return reply.headers({
|
|
111
93
|
"Content-Type": object.ContentType,
|
|
@@ -113,14 +95,14 @@ const createDownloadFilePlugins = () => {
|
|
|
113
95
|
"x-webiny-base64-encoded": true
|
|
114
96
|
}).send(object.Body || "");
|
|
115
97
|
}
|
|
116
|
-
|
|
117
98
|
const presignedUrl = s3.getSignedUrl("getObject", {
|
|
118
99
|
Bucket: params.Bucket,
|
|
119
100
|
Key: params.Key,
|
|
120
101
|
Expires: PRESIGNED_URL_EXPIRATION
|
|
121
|
-
});
|
|
122
|
-
// a 301 Redirect, redirecting the user to the public URL of the object in S3.
|
|
102
|
+
});
|
|
123
103
|
|
|
104
|
+
// Lambda can return max 6MB of content, so if our object's size is larger, we are sending
|
|
105
|
+
// a 301 Redirect, redirecting the user to the public URL of the object in S3.
|
|
124
106
|
return reply.code(301).headers({
|
|
125
107
|
Location: presignedUrl,
|
|
126
108
|
"Cache-Control": "public, max-age=" + PRESIGNED_URL_EXPIRATION
|
|
@@ -128,5 +110,4 @@ const createDownloadFilePlugins = () => {
|
|
|
128
110
|
});
|
|
129
111
|
})];
|
|
130
112
|
};
|
|
131
|
-
|
|
132
113
|
exports.createDownloadFilePlugins = createDownloadFilePlugins;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["MAX_RETURN_CONTENT_LENGTH","DEFAULT_CACHE_MAX_AGE","PRESIGNED_URL_EXPIRATION","extractFilenameOptions","request","path","sanitizeFilename","params","filename","decodeURI","options","query","extension","pathLib","extname","getS3Object","s3","context","getObjectParams","objectHead","headObject","promise","contentLength","ContentLength","loader","loaders","canProcess","file","name","process","object","getObject","createDownloadFilePlugins","RoutePlugin","onGet","reply","region","getEnvironment","S3","headers","ContentType","send","Body","presignedUrl","getSignedUrl","Bucket","Key","Expires","code","Location"],"sources":["index.ts"],"sourcesContent":["import S3 from \"aws-sdk/clients/s3\";\nimport sanitizeFilename from \"sanitize-filename\";\nimport pathLib from \"path\";\nimport { getEnvironment, getObjectParams } from \"../utils\";\nimport loaders from \"../transform/loaders\";\nimport { RoutePlugin } from \"@webiny/handler-aws/gateway\";\nimport { Context, Request } from \"@webiny/handler/types\";\nimport { ObjectParamsResponse } from \"~/handlers/utils/getObjectParams\";\n\nconst MAX_RETURN_CONTENT_LENGTH = 5000000; // ~4.77MB\nconst DEFAULT_CACHE_MAX_AGE = 30758400; // 1 year\nconst PRESIGNED_URL_EXPIRATION = 900; // 15 minutes\n/**\n * Based on given path, extracts file key and additional options sent via query params.\n */\nconst extractFilenameOptions = (request: Request) => {\n const path = sanitizeFilename((request.params as any).path);\n return {\n filename: decodeURI(path),\n options: request.query as any,\n extension: pathLib.extname(path)\n };\n};\n\ninterface S3Object {\n object?: S3.Types.GetObjectOutput;\n params: ObjectParamsResponse;\n}\n\nconst getS3Object = async (request: Request, s3: S3, context: Context): Promise<S3Object> => {\n const { options, filename, extension } = extractFilenameOptions(request);\n const params = getObjectParams(filename);\n const objectHead = await s3.headObject(params).promise();\n const contentLength = objectHead.ContentLength ? objectHead.ContentLength : 0;\n\n for (const loader of loaders) {\n const canProcess = loader.canProcess({\n context,\n s3,\n options,\n file: {\n name: filename,\n extension,\n contentLength\n }\n });\n\n if (!canProcess) {\n continue;\n }\n return loader.process({\n context,\n s3,\n options,\n file: {\n name: filename,\n extension,\n contentLength\n }\n });\n }\n\n // If no processors handled the file request, just return the S3 object taking its size into consideration.\n let object;\n if (contentLength < MAX_RETURN_CONTENT_LENGTH) {\n object = await s3.getObject(params).promise();\n }\n\n return { object, params };\n};\n\nexport const createDownloadFilePlugins = () => {\n return [\n new RoutePlugin(({ onGet, context }) => {\n onGet(\"/files/:path\", async (request, reply) => {\n const { region } = getEnvironment();\n const s3 = new S3({ region });\n\n const { params, object } = await getS3Object(request, 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":"
|
|
1
|
+
{"version":3,"names":["MAX_RETURN_CONTENT_LENGTH","DEFAULT_CACHE_MAX_AGE","PRESIGNED_URL_EXPIRATION","extractFilenameOptions","request","path","sanitizeFilename","params","filename","decodeURI","options","query","extension","pathLib","extname","getS3Object","s3","context","getObjectParams","objectHead","headObject","promise","contentLength","ContentLength","loader","loaders","canProcess","file","name","process","object","getObject","createDownloadFilePlugins","RoutePlugin","onGet","reply","region","getEnvironment","S3","headers","ContentType","send","Body","presignedUrl","getSignedUrl","Bucket","Key","Expires","code","Location"],"sources":["index.ts"],"sourcesContent":["import S3 from \"aws-sdk/clients/s3\";\nimport sanitizeFilename from \"sanitize-filename\";\nimport pathLib from \"path\";\nimport { getEnvironment, getObjectParams } from \"../utils\";\nimport loaders from \"../transform/loaders\";\nimport { RoutePlugin } from \"@webiny/handler-aws/gateway\";\nimport { Context, Request } from \"@webiny/handler/types\";\nimport { ObjectParamsResponse } from \"~/handlers/utils/getObjectParams\";\n\nconst MAX_RETURN_CONTENT_LENGTH = 5000000; // ~4.77MB\nconst DEFAULT_CACHE_MAX_AGE = 30758400; // 1 year\nconst PRESIGNED_URL_EXPIRATION = 900; // 15 minutes\n/**\n * Based on given path, extracts file key and additional options sent via query params.\n */\nconst extractFilenameOptions = (request: Request) => {\n const path = sanitizeFilename((request.params as any).path);\n return {\n filename: decodeURI(path),\n options: request.query as any,\n extension: pathLib.extname(path)\n };\n};\n\ninterface S3Object {\n object?: S3.Types.GetObjectOutput;\n params: ObjectParamsResponse;\n}\n\nconst getS3Object = async (request: Request, s3: S3, context: Context): Promise<S3Object> => {\n const { options, filename, extension } = extractFilenameOptions(request);\n const params = getObjectParams(filename);\n const objectHead = await s3.headObject(params).promise();\n const contentLength = objectHead.ContentLength ? objectHead.ContentLength : 0;\n\n for (const loader of loaders) {\n const canProcess = loader.canProcess({\n context,\n s3,\n options,\n file: {\n name: filename,\n extension,\n contentLength\n }\n });\n\n if (!canProcess) {\n continue;\n }\n return loader.process({\n context,\n s3,\n options,\n file: {\n name: filename,\n extension,\n contentLength\n }\n });\n }\n\n // If no processors handled the file request, just return the S3 object taking its size into consideration.\n let object;\n if (contentLength < MAX_RETURN_CONTENT_LENGTH) {\n object = await s3.getObject(params).promise();\n }\n\n return { object, params };\n};\n\nexport const createDownloadFilePlugins = () => {\n return [\n new RoutePlugin(({ onGet, context }) => {\n onGet(\"/files/:path\", async (request, reply) => {\n const { region } = getEnvironment();\n const s3 = new S3({ region });\n\n const { params, object } = await getS3Object(request, 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":"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"}
|
package/handlers/manage/index.js
CHANGED
|
@@ -1,22 +1,15 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
3
|
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
|
|
4
|
-
|
|
5
4
|
Object.defineProperty(exports, "__esModule", {
|
|
6
5
|
value: true
|
|
7
6
|
});
|
|
8
7
|
exports.createManageFilePlugins = void 0;
|
|
9
|
-
|
|
10
8
|
var _path = _interopRequireDefault(require("path"));
|
|
11
|
-
|
|
12
9
|
var _s = _interopRequireDefault(require("aws-sdk/clients/s3"));
|
|
13
|
-
|
|
14
10
|
var _utils = require("../utils");
|
|
15
|
-
|
|
16
11
|
var _managers = _interopRequireDefault(require("../transform/managers"));
|
|
17
|
-
|
|
18
12
|
var _handlerAws = require("@webiny/handler-aws");
|
|
19
|
-
|
|
20
13
|
/**
|
|
21
14
|
* This handler must be run through @webiny/handler-aws/s3
|
|
22
15
|
*/
|
|
@@ -25,39 +18,31 @@ const createManageFilePlugins = () => {
|
|
|
25
18
|
event
|
|
26
19
|
}) => {
|
|
27
20
|
const keys = [];
|
|
28
|
-
|
|
29
21
|
for (let i = 0; i < event.Records.length; i++) {
|
|
30
22
|
const record = event.Records[i];
|
|
31
|
-
|
|
32
23
|
if (typeof record.s3.object.key === "string") {
|
|
33
24
|
keys.push(record.s3.object.key);
|
|
34
25
|
}
|
|
35
26
|
}
|
|
36
|
-
|
|
37
27
|
if (keys.length === 0) {
|
|
38
28
|
return;
|
|
39
29
|
}
|
|
40
|
-
|
|
41
30
|
const {
|
|
42
31
|
region
|
|
43
32
|
} = (0, _utils.getEnvironment)();
|
|
44
33
|
const s3 = new _s.default({
|
|
45
34
|
region
|
|
46
35
|
});
|
|
47
|
-
|
|
48
36
|
for (const key of keys) {
|
|
49
37
|
const extension = _path.default.extname(key);
|
|
50
|
-
|
|
51
38
|
for (const manager of _managers.default) {
|
|
52
39
|
const canProcess = manager.canProcess({
|
|
53
40
|
key,
|
|
54
41
|
extension
|
|
55
42
|
});
|
|
56
|
-
|
|
57
43
|
if (!canProcess) {
|
|
58
44
|
continue;
|
|
59
45
|
}
|
|
60
|
-
|
|
61
46
|
await manager.process({
|
|
62
47
|
s3,
|
|
63
48
|
key,
|
|
@@ -67,5 +52,4 @@ const createManageFilePlugins = () => {
|
|
|
67
52
|
}
|
|
68
53
|
})];
|
|
69
54
|
};
|
|
70
|
-
|
|
71
55
|
exports.createManageFilePlugins = createManageFilePlugins;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["createManageFilePlugins","S3EventHandler","event","keys","i","Records","length","record","s3","object","key","push","region","getEnvironment","S3","extension","path","extname","manager","managers","canProcess","process"],"sources":["index.ts"],"sourcesContent":["import path from \"path\";\nimport S3 from \"aws-sdk/clients/s3\";\nimport { getEnvironment } from \"../utils\";\nimport managers from \"../transform/managers\";\nimport { S3EventHandler } from \"@webiny/handler-aws\";\n\n/**\n * This handler must be run through @webiny/handler-aws/s3\n */\nexport const createManageFilePlugins = () => {\n return [\n new S3EventHandler(async ({ event }) => {\n const keys: string[] = [];\n for (let i = 0; i < event.Records.length; i++) {\n const record = event.Records[i];\n if (typeof record.s3.object.key === \"string\") {\n keys.push(record.s3.object.key);\n }\n }\n\n if (keys.length === 0) {\n return;\n }\n\n const { region } = getEnvironment();\n const s3 = new S3({ region });\n\n for (const key of keys) {\n const extension = path.extname(key);\n\n for (const manager of managers) {\n const canProcess = manager.canProcess({\n key,\n extension\n });\n\n if (!canProcess) {\n continue;\n }\n await manager.process({\n s3,\n key,\n extension\n });\n }\n }\n })\n ];\n};\n"],"mappings":"
|
|
1
|
+
{"version":3,"names":["createManageFilePlugins","S3EventHandler","event","keys","i","Records","length","record","s3","object","key","push","region","getEnvironment","S3","extension","path","extname","manager","managers","canProcess","process"],"sources":["index.ts"],"sourcesContent":["import path from \"path\";\nimport S3 from \"aws-sdk/clients/s3\";\nimport { getEnvironment } from \"../utils\";\nimport managers from \"../transform/managers\";\nimport { S3EventHandler } from \"@webiny/handler-aws\";\n\n/**\n * This handler must be run through @webiny/handler-aws/s3\n */\nexport const createManageFilePlugins = () => {\n return [\n new S3EventHandler(async ({ event }) => {\n const keys: string[] = [];\n for (let i = 0; i < event.Records.length; i++) {\n const record = event.Records[i];\n if (typeof record.s3.object.key === \"string\") {\n keys.push(record.s3.object.key);\n }\n }\n\n if (keys.length === 0) {\n return;\n }\n\n const { region } = getEnvironment();\n const s3 = new S3({ region });\n\n for (const key of keys) {\n const extension = path.extname(key);\n\n for (const manager of managers) {\n const canProcess = manager.canProcess({\n key,\n extension\n });\n\n if (!canProcess) {\n continue;\n }\n await manager.process({\n s3,\n key,\n extension\n });\n }\n }\n })\n ];\n};\n"],"mappings":";;;;;;;AAAA;AACA;AACA;AACA;AACA;AAEA;AACA;AACA;AACO,MAAMA,uBAAuB,GAAG,MAAM;EACzC,OAAO,CACH,IAAIC,0BAAc,CAAC,OAAO;IAAEC;EAAM,CAAC,KAAK;IACpC,MAAMC,IAAc,GAAG,EAAE;IACzB,KAAK,IAAIC,CAAC,GAAG,CAAC,EAAEA,CAAC,GAAGF,KAAK,CAACG,OAAO,CAACC,MAAM,EAAEF,CAAC,EAAE,EAAE;MAC3C,MAAMG,MAAM,GAAGL,KAAK,CAACG,OAAO,CAACD,CAAC,CAAC;MAC/B,IAAI,OAAOG,MAAM,CAACC,EAAE,CAACC,MAAM,CAACC,GAAG,KAAK,QAAQ,EAAE;QAC1CP,IAAI,CAACQ,IAAI,CAACJ,MAAM,CAACC,EAAE,CAACC,MAAM,CAACC,GAAG,CAAC;MACnC;IACJ;IAEA,IAAIP,IAAI,CAACG,MAAM,KAAK,CAAC,EAAE;MACnB;IACJ;IAEA,MAAM;MAAEM;IAAO,CAAC,GAAG,IAAAC,qBAAc,GAAE;IACnC,MAAML,EAAE,GAAG,IAAIM,UAAE,CAAC;MAAEF;IAAO,CAAC,CAAC;IAE7B,KAAK,MAAMF,GAAG,IAAIP,IAAI,EAAE;MACpB,MAAMY,SAAS,GAAGC,aAAI,CAACC,OAAO,CAACP,GAAG,CAAC;MAEnC,KAAK,MAAMQ,OAAO,IAAIC,iBAAQ,EAAE;QAC5B,MAAMC,UAAU,GAAGF,OAAO,CAACE,UAAU,CAAC;UAClCV,GAAG;UACHK;QACJ,CAAC,CAAC;QAEF,IAAI,CAACK,UAAU,EAAE;UACb;QACJ;QACA,MAAMF,OAAO,CAACG,OAAO,CAAC;UAClBb,EAAE;UACFE,GAAG;UACHK;QACJ,CAAC,CAAC;MACN;IACJ;EACJ,CAAC,CAAC,CACL;AACL,CAAC;AAAC"}
|
|
@@ -1,26 +1,17 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
3
|
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
|
|
4
|
-
|
|
5
4
|
Object.defineProperty(exports, "__esModule", {
|
|
6
5
|
value: true
|
|
7
6
|
});
|
|
8
7
|
exports.createTransformFilePlugins = void 0;
|
|
9
|
-
|
|
10
8
|
var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
|
|
11
|
-
|
|
12
9
|
var _s = _interopRequireDefault(require("aws-sdk/clients/s3"));
|
|
13
|
-
|
|
14
10
|
var _transformImage = _interopRequireDefault(require("./transformImage"));
|
|
15
|
-
|
|
16
11
|
var _optimizeImage = _interopRequireDefault(require("./optimizeImage"));
|
|
17
|
-
|
|
18
12
|
var _utils = require("../utils");
|
|
19
|
-
|
|
20
13
|
var _utils2 = require("./utils");
|
|
21
|
-
|
|
22
14
|
var _handler = require("@webiny/handler");
|
|
23
|
-
|
|
24
15
|
const createTransformFilePlugins = () => {
|
|
25
16
|
return [(0, _handler.createEvent)(async ({
|
|
26
17
|
payload
|
|
@@ -32,7 +23,6 @@ const createTransformFilePlugins = () => {
|
|
|
32
23
|
key,
|
|
33
24
|
transformations
|
|
34
25
|
} = body;
|
|
35
|
-
|
|
36
26
|
try {
|
|
37
27
|
const env = (0, _utils.getEnvironment)();
|
|
38
28
|
const s3 = new _s.default({
|
|
@@ -48,8 +38,9 @@ const createTransformFilePlugins = () => {
|
|
|
48
38
|
key,
|
|
49
39
|
transformations
|
|
50
40
|
}))
|
|
51
|
-
};
|
|
41
|
+
};
|
|
52
42
|
|
|
43
|
+
// 1. Get optimized image.
|
|
53
44
|
try {
|
|
54
45
|
optimizedImageObject = await s3.getObject(params.optimized).promise();
|
|
55
46
|
} catch (e) {
|
|
@@ -60,17 +51,17 @@ const createTransformFilePlugins = () => {
|
|
|
60
51
|
Body: await (0, _optimizeImage.default)(optimizedImageObject.Body, optimizedImageObject.ContentType)
|
|
61
52
|
})).promise();
|
|
62
53
|
optimizedImageObject = await s3.getObject(params.optimized).promise();
|
|
63
|
-
}
|
|
64
|
-
|
|
54
|
+
}
|
|
65
55
|
|
|
56
|
+
// 2. If no transformations requested, just exit.
|
|
66
57
|
if (!transformations) {
|
|
67
58
|
return {
|
|
68
59
|
error: false,
|
|
69
60
|
message: ""
|
|
70
61
|
};
|
|
71
|
-
}
|
|
72
|
-
|
|
62
|
+
}
|
|
73
63
|
|
|
64
|
+
// 3. If transformations requested, apply them in save it into the bucket.
|
|
74
65
|
await s3.putObject((0, _objectSpread2.default)((0, _objectSpread2.default)({}, params.optimizedTransformed), {}, {
|
|
75
66
|
ContentType: optimizedImageObject.ContentType,
|
|
76
67
|
Body: await (0, _transformImage.default)(optimizedImageObject.Body, transformations)
|
|
@@ -87,5 +78,4 @@ const createTransformFilePlugins = () => {
|
|
|
87
78
|
}
|
|
88
79
|
})];
|
|
89
80
|
};
|
|
90
|
-
|
|
91
81
|
exports.createTransformFilePlugins = createTransformFilePlugins;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["createTransformFilePlugins","createEvent","payload","body","key","transformations","env","getEnvironment","s3","S3","region","optimizedImageObject","params","initial","getObjectParams","optimized","getImageKey","optimizedTransformed","getObject","promise","e","putObject","ContentType","Body","optimizeImage","error","message","transformImage"],"sources":["index.ts"],"sourcesContent":["import S3 from \"aws-sdk/clients/s3\";\nimport transformImage from \"./transformImage\";\nimport optimizeImage from \"./optimizeImage\";\nimport { getEnvironment, getObjectParams } from \"../utils\";\nimport { getImageKey } from \"./utils\";\nimport { TransformHandlerEventPayload } from \"~/handlers/types\";\nimport { createEvent } from \"@webiny/handler\";\n\nexport const createTransformFilePlugins = () => {\n return [\n createEvent<TransformHandlerEventPayload>(async ({ payload }) => {\n const { body } = payload;\n const { key, transformations } = body;\n try {\n const env = getEnvironment();\n const s3 = new S3({ region: env.region });\n\n let optimizedImageObject: S3.Types.GetObjectOutput;\n\n const params = {\n initial: getObjectParams(key),\n optimized: getObjectParams(getImageKey({ key })),\n optimizedTransformed: getObjectParams(getImageKey({ key, transformations }))\n };\n\n // 1. Get optimized image.\n try {\n optimizedImageObject = await s3.getObject(params.optimized).promise();\n } catch (e) {\n // If not found, try to create it by loading the initially uploaded image.\n optimizedImageObject = await s3.getObject(params.initial).promise();\n\n await s3\n .putObject({\n ...params.optimized,\n ContentType: optimizedImageObject.ContentType,\n Body: await optimizeImage(\n optimizedImageObject.Body as Buffer,\n optimizedImageObject.ContentType as string\n )\n })\n .promise();\n\n optimizedImageObject = await s3.getObject(params.optimized).promise();\n }\n\n // 2. If no transformations requested, just exit.\n if (!transformations) {\n return {\n error: false,\n message: \"\"\n };\n }\n\n // 3. If transformations requested, apply them in save it into the bucket.\n await s3\n .putObject({\n ...params.optimizedTransformed,\n ContentType: optimizedImageObject.ContentType,\n Body: await transformImage(\n optimizedImageObject.Body as Buffer,\n transformations\n )\n })\n .promise();\n\n return {\n error: false,\n message: \"\"\n };\n } catch (e) {\n return {\n error: true,\n message: e.message\n };\n }\n })\n ];\n};\n"],"mappings":"
|
|
1
|
+
{"version":3,"names":["createTransformFilePlugins","createEvent","payload","body","key","transformations","env","getEnvironment","s3","S3","region","optimizedImageObject","params","initial","getObjectParams","optimized","getImageKey","optimizedTransformed","getObject","promise","e","putObject","ContentType","Body","optimizeImage","error","message","transformImage"],"sources":["index.ts"],"sourcesContent":["import S3 from \"aws-sdk/clients/s3\";\nimport transformImage from \"./transformImage\";\nimport optimizeImage from \"./optimizeImage\";\nimport { getEnvironment, getObjectParams } from \"../utils\";\nimport { getImageKey } from \"./utils\";\nimport { TransformHandlerEventPayload } from \"~/handlers/types\";\nimport { createEvent } from \"@webiny/handler\";\n\nexport const createTransformFilePlugins = () => {\n return [\n createEvent<TransformHandlerEventPayload>(async ({ payload }) => {\n const { body } = payload;\n const { key, transformations } = body;\n try {\n const env = getEnvironment();\n const s3 = new S3({ region: env.region });\n\n let optimizedImageObject: S3.Types.GetObjectOutput;\n\n const params = {\n initial: getObjectParams(key),\n optimized: getObjectParams(getImageKey({ key })),\n optimizedTransformed: getObjectParams(getImageKey({ key, transformations }))\n };\n\n // 1. Get optimized image.\n try {\n optimizedImageObject = await s3.getObject(params.optimized).promise();\n } catch (e) {\n // If not found, try to create it by loading the initially uploaded image.\n optimizedImageObject = await s3.getObject(params.initial).promise();\n\n await s3\n .putObject({\n ...params.optimized,\n ContentType: optimizedImageObject.ContentType,\n Body: await optimizeImage(\n optimizedImageObject.Body as Buffer,\n optimizedImageObject.ContentType as string\n )\n })\n .promise();\n\n optimizedImageObject = await s3.getObject(params.optimized).promise();\n }\n\n // 2. If no transformations requested, just exit.\n if (!transformations) {\n return {\n error: false,\n message: \"\"\n };\n }\n\n // 3. If transformations requested, apply them in save it into the bucket.\n await s3\n .putObject({\n ...params.optimizedTransformed,\n ContentType: optimizedImageObject.ContentType,\n Body: await transformImage(\n optimizedImageObject.Body as Buffer,\n transformations\n )\n })\n .promise();\n\n return {\n error: false,\n message: \"\"\n };\n } catch (e) {\n return {\n error: true,\n message: e.message\n };\n }\n })\n ];\n};\n"],"mappings":";;;;;;;;AAAA;AACA;AACA;AACA;AACA;AAEA;AAEO,MAAMA,0BAA0B,GAAG,MAAM;EAC5C,OAAO,CACH,IAAAC,oBAAW,EAA+B,OAAO;IAAEC;EAAQ,CAAC,KAAK;IAC7D,MAAM;MAAEC;IAAK,CAAC,GAAGD,OAAO;IACxB,MAAM;MAAEE,GAAG;MAAEC;IAAgB,CAAC,GAAGF,IAAI;IACrC,IAAI;MACA,MAAMG,GAAG,GAAG,IAAAC,qBAAc,GAAE;MAC5B,MAAMC,EAAE,GAAG,IAAIC,UAAE,CAAC;QAAEC,MAAM,EAAEJ,GAAG,CAACI;MAAO,CAAC,CAAC;MAEzC,IAAIC,oBAA8C;MAElD,MAAMC,MAAM,GAAG;QACXC,OAAO,EAAE,IAAAC,sBAAe,EAACV,GAAG,CAAC;QAC7BW,SAAS,EAAE,IAAAD,sBAAe,EAAC,IAAAE,mBAAW,EAAC;UAAEZ;QAAI,CAAC,CAAC,CAAC;QAChDa,oBAAoB,EAAE,IAAAH,sBAAe,EAAC,IAAAE,mBAAW,EAAC;UAAEZ,GAAG;UAAEC;QAAgB,CAAC,CAAC;MAC/E,CAAC;;MAED;MACA,IAAI;QACAM,oBAAoB,GAAG,MAAMH,EAAE,CAACU,SAAS,CAACN,MAAM,CAACG,SAAS,CAAC,CAACI,OAAO,EAAE;MACzE,CAAC,CAAC,OAAOC,CAAC,EAAE;QACR;QACAT,oBAAoB,GAAG,MAAMH,EAAE,CAACU,SAAS,CAACN,MAAM,CAACC,OAAO,CAAC,CAACM,OAAO,EAAE;QAEnE,MAAMX,EAAE,CACHa,SAAS,6DACHT,MAAM,CAACG,SAAS;UACnBO,WAAW,EAAEX,oBAAoB,CAACW,WAAW;UAC7CC,IAAI,EAAE,MAAM,IAAAC,sBAAa,EACrBb,oBAAoB,CAACY,IAAI,EACzBZ,oBAAoB,CAACW,WAAW;QACnC,GACH,CACDH,OAAO,EAAE;QAEdR,oBAAoB,GAAG,MAAMH,EAAE,CAACU,SAAS,CAACN,MAAM,CAACG,SAAS,CAAC,CAACI,OAAO,EAAE;MACzE;;MAEA;MACA,IAAI,CAACd,eAAe,EAAE;QAClB,OAAO;UACHoB,KAAK,EAAE,KAAK;UACZC,OAAO,EAAE;QACb,CAAC;MACL;;MAEA;MACA,MAAMlB,EAAE,CACHa,SAAS,6DACHT,MAAM,CAACK,oBAAoB;QAC9BK,WAAW,EAAEX,oBAAoB,CAACW,WAAW;QAC7CC,IAAI,EAAE,MAAM,IAAAI,uBAAc,EACtBhB,oBAAoB,CAACY,IAAI,EACzBlB,eAAe;MAClB,GACH,CACDc,OAAO,EAAE;MAEd,OAAO;QACHM,KAAK,EAAE,KAAK;QACZC,OAAO,EAAE;MACb,CAAC;IACL,CAAC,CAAC,OAAON,CAAC,EAAE;MACR,OAAO;QACHK,KAAK,EAAE,IAAI;QACXC,OAAO,EAAEN,CAAC,CAACM;MACf,CAAC;IACL;EACJ,CAAC,CAAC,CACL;AACL,CAAC;AAAC"}
|
|
@@ -1,20 +1,14 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
3
|
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
|
|
4
|
-
|
|
5
4
|
Object.defineProperty(exports, "__esModule", {
|
|
6
5
|
value: true
|
|
7
6
|
});
|
|
8
7
|
exports.default = void 0;
|
|
9
|
-
|
|
10
8
|
var _sanitizeImageTransformations = _interopRequireDefault(require("./sanitizeImageTransformations"));
|
|
11
|
-
|
|
12
9
|
var _utils = require("../../utils");
|
|
13
|
-
|
|
14
10
|
var _utils2 = require("../utils");
|
|
15
|
-
|
|
16
11
|
const IMAGE_TRANSFORMER_FUNCTION = process.env.IMAGE_TRANSFORMER_FUNCTION;
|
|
17
|
-
|
|
18
12
|
const callImageTransformerLambda = async ({
|
|
19
13
|
key,
|
|
20
14
|
transformations,
|
|
@@ -30,12 +24,10 @@ const callImageTransformerLambda = async ({
|
|
|
30
24
|
}
|
|
31
25
|
});
|
|
32
26
|
};
|
|
33
|
-
|
|
34
27
|
var _default = {
|
|
35
28
|
canProcess: params => {
|
|
36
29
|
return _utils2.SUPPORTED_IMAGES.includes(params.file.extension);
|
|
37
30
|
},
|
|
38
|
-
|
|
39
31
|
async process({
|
|
40
32
|
s3,
|
|
41
33
|
file,
|
|
@@ -45,13 +37,11 @@ var _default = {
|
|
|
45
37
|
// Loaders must return {object, params} object.
|
|
46
38
|
let objectParams;
|
|
47
39
|
const transformations = (0, _sanitizeImageTransformations.default)(options);
|
|
48
|
-
|
|
49
40
|
if (transformations && _utils2.SUPPORTED_TRANSFORMABLE_IMAGES.includes(file.extension)) {
|
|
50
41
|
objectParams = (0, _utils.getObjectParams)((0, _utils2.getImageKey)({
|
|
51
42
|
key: file.name,
|
|
52
43
|
transformations
|
|
53
44
|
}));
|
|
54
|
-
|
|
55
45
|
try {
|
|
56
46
|
return {
|
|
57
47
|
object: await s3.getObject(objectParams).promise(),
|
|
@@ -63,22 +53,18 @@ var _default = {
|
|
|
63
53
|
transformations,
|
|
64
54
|
context
|
|
65
55
|
});
|
|
66
|
-
|
|
67
56
|
if (imageTransformerLambdaResponse.error) {
|
|
68
57
|
throw Error(imageTransformerLambdaResponse.message);
|
|
69
58
|
}
|
|
70
|
-
|
|
71
59
|
return {
|
|
72
60
|
object: await s3.getObject(objectParams).promise(),
|
|
73
61
|
params: objectParams
|
|
74
62
|
};
|
|
75
63
|
}
|
|
76
64
|
}
|
|
77
|
-
|
|
78
65
|
objectParams = (0, _utils.getObjectParams)((0, _utils2.getImageKey)({
|
|
79
66
|
key: file.name
|
|
80
67
|
}));
|
|
81
|
-
|
|
82
68
|
try {
|
|
83
69
|
return {
|
|
84
70
|
object: await s3.getObject(objectParams).promise(),
|
|
@@ -89,17 +75,14 @@ var _default = {
|
|
|
89
75
|
key: file.name,
|
|
90
76
|
context
|
|
91
77
|
});
|
|
92
|
-
|
|
93
78
|
if (imageTransformerLambdaResponse.error) {
|
|
94
79
|
throw Error(imageTransformerLambdaResponse.message);
|
|
95
80
|
}
|
|
96
|
-
|
|
97
81
|
return {
|
|
98
82
|
object: await s3.getObject(objectParams).promise(),
|
|
99
83
|
params: objectParams
|
|
100
84
|
};
|
|
101
85
|
}
|
|
102
86
|
}
|
|
103
|
-
|
|
104
87
|
};
|
|
105
88
|
exports.default = _default;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["IMAGE_TRANSFORMER_FUNCTION","process","env","callImageTransformerLambda","key","transformations","context","handlerClient","invoke","name","payload","body","canProcess","params","SUPPORTED_IMAGES","includes","file","extension","s3","options","objectParams","sanitizeImageTransformations","SUPPORTED_TRANSFORMABLE_IMAGES","getObjectParams","getImageKey","object","getObject","promise","e","imageTransformerLambdaResponse","error","Error","message"],"sources":["imageLoader.ts"],"sourcesContent":["import sanitizeImageTransformations from \"./sanitizeImageTransformations\";\nimport { getObjectParams } from \"../../utils\";\nimport { SUPPORTED_IMAGES, SUPPORTED_TRANSFORMABLE_IMAGES, getImageKey } from \"../utils\";\nimport { ClientContext } from \"@webiny/handler-client/types\";\nimport S3 from \"aws-sdk/clients/s3\";\n\nconst IMAGE_TRANSFORMER_FUNCTION = process.env.IMAGE_TRANSFORMER_FUNCTION as string;\n\ninterface TransformerParams {\n context: ClientContext;\n key: string;\n transformations?: {\n width?: number;\n };\n}\n\nconst callImageTransformerLambda = async ({ key, transformations, context }: TransformerParams) => {\n return await context.handlerClient.invoke({\n name: IMAGE_TRANSFORMER_FUNCTION,\n payload: {\n body: {\n key,\n transformations\n }\n }\n });\n};\ninterface File {\n extension: string;\n name: string;\n contentLength: number;\n}\ninterface Options {\n width?: string;\n}\nexport interface CanProcessParams {\n s3: S3;\n file: File;\n options?: Options;\n context: ClientContext;\n}\nexport interface ProcessParams {\n s3: S3;\n file: File;\n options?: Options;\n context: ClientContext;\n}\nexport default {\n canProcess: (params: CanProcessParams) => {\n return SUPPORTED_IMAGES.includes(params.file.extension);\n },\n async process({ s3, file, options, context }: ProcessParams) {\n // Loaders must return {object, params} object.\n let objectParams;\n\n const transformations = sanitizeImageTransformations(options);\n\n if (transformations && SUPPORTED_TRANSFORMABLE_IMAGES.includes(file.extension)) {\n objectParams = getObjectParams(getImageKey({ key: file.name, transformations }));\n try {\n return {\n object: await s3.getObject(objectParams).promise(),\n params: objectParams\n };\n } catch (e) {\n const imageTransformerLambdaResponse = await callImageTransformerLambda({\n key: file.name,\n transformations,\n context\n });\n\n if (imageTransformerLambdaResponse.error) {\n throw Error(imageTransformerLambdaResponse.message);\n }\n\n return {\n object: await s3.getObject(objectParams).promise(),\n params: objectParams\n };\n }\n }\n\n objectParams = getObjectParams(getImageKey({ key: file.name }));\n try {\n return {\n object: await s3.getObject(objectParams).promise(),\n params: objectParams\n };\n } catch (e) {\n const imageTransformerLambdaResponse = await callImageTransformerLambda({\n key: file.name,\n context\n });\n\n if (imageTransformerLambdaResponse.error) {\n throw Error(imageTransformerLambdaResponse.message);\n }\n\n return {\n object: await s3.getObject(objectParams).promise(),\n params: objectParams\n };\n }\n }\n};\n"],"mappings":"
|
|
1
|
+
{"version":3,"names":["IMAGE_TRANSFORMER_FUNCTION","process","env","callImageTransformerLambda","key","transformations","context","handlerClient","invoke","name","payload","body","canProcess","params","SUPPORTED_IMAGES","includes","file","extension","s3","options","objectParams","sanitizeImageTransformations","SUPPORTED_TRANSFORMABLE_IMAGES","getObjectParams","getImageKey","object","getObject","promise","e","imageTransformerLambdaResponse","error","Error","message"],"sources":["imageLoader.ts"],"sourcesContent":["import sanitizeImageTransformations from \"./sanitizeImageTransformations\";\nimport { getObjectParams } from \"../../utils\";\nimport { SUPPORTED_IMAGES, SUPPORTED_TRANSFORMABLE_IMAGES, getImageKey } from \"../utils\";\nimport { ClientContext } from \"@webiny/handler-client/types\";\nimport S3 from \"aws-sdk/clients/s3\";\n\nconst IMAGE_TRANSFORMER_FUNCTION = process.env.IMAGE_TRANSFORMER_FUNCTION as string;\n\ninterface TransformerParams {\n context: ClientContext;\n key: string;\n transformations?: {\n width?: number;\n };\n}\n\nconst callImageTransformerLambda = async ({ key, transformations, context }: TransformerParams) => {\n return await context.handlerClient.invoke({\n name: IMAGE_TRANSFORMER_FUNCTION,\n payload: {\n body: {\n key,\n transformations\n }\n }\n });\n};\ninterface File {\n extension: string;\n name: string;\n contentLength: number;\n}\ninterface Options {\n width?: string;\n}\nexport interface CanProcessParams {\n s3: S3;\n file: File;\n options?: Options;\n context: ClientContext;\n}\nexport interface ProcessParams {\n s3: S3;\n file: File;\n options?: Options;\n context: ClientContext;\n}\nexport default {\n canProcess: (params: CanProcessParams) => {\n return SUPPORTED_IMAGES.includes(params.file.extension);\n },\n async process({ s3, file, options, context }: ProcessParams) {\n // Loaders must return {object, params} object.\n let objectParams;\n\n const transformations = sanitizeImageTransformations(options);\n\n if (transformations && SUPPORTED_TRANSFORMABLE_IMAGES.includes(file.extension)) {\n objectParams = getObjectParams(getImageKey({ key: file.name, transformations }));\n try {\n return {\n object: await s3.getObject(objectParams).promise(),\n params: objectParams\n };\n } catch (e) {\n const imageTransformerLambdaResponse = await callImageTransformerLambda({\n key: file.name,\n transformations,\n context\n });\n\n if (imageTransformerLambdaResponse.error) {\n throw Error(imageTransformerLambdaResponse.message);\n }\n\n return {\n object: await s3.getObject(objectParams).promise(),\n params: objectParams\n };\n }\n }\n\n objectParams = getObjectParams(getImageKey({ key: file.name }));\n try {\n return {\n object: await s3.getObject(objectParams).promise(),\n params: objectParams\n };\n } catch (e) {\n const imageTransformerLambdaResponse = await callImageTransformerLambda({\n key: file.name,\n context\n });\n\n if (imageTransformerLambdaResponse.error) {\n throw Error(imageTransformerLambdaResponse.message);\n }\n\n return {\n object: await s3.getObject(objectParams).promise(),\n params: objectParams\n };\n }\n }\n};\n"],"mappings":";;;;;;;AAAA;AACA;AACA;AAIA,MAAMA,0BAA0B,GAAGC,OAAO,CAACC,GAAG,CAACF,0BAAoC;AAUnF,MAAMG,0BAA0B,GAAG,OAAO;EAAEC,GAAG;EAAEC,eAAe;EAAEC;AAA2B,CAAC,KAAK;EAC/F,OAAO,MAAMA,OAAO,CAACC,aAAa,CAACC,MAAM,CAAC;IACtCC,IAAI,EAAET,0BAA0B;IAChCU,OAAO,EAAE;MACLC,IAAI,EAAE;QACFP,GAAG;QACHC;MACJ;IACJ;EACJ,CAAC,CAAC;AACN,CAAC;AAAC,eAqBa;EACXO,UAAU,EAAGC,MAAwB,IAAK;IACtC,OAAOC,wBAAgB,CAACC,QAAQ,CAACF,MAAM,CAACG,IAAI,CAACC,SAAS,CAAC;EAC3D,CAAC;EACD,MAAMhB,OAAO,CAAC;IAAEiB,EAAE;IAAEF,IAAI;IAAEG,OAAO;IAAEb;EAAuB,CAAC,EAAE;IACzD;IACA,IAAIc,YAAY;IAEhB,MAAMf,eAAe,GAAG,IAAAgB,qCAA4B,EAACF,OAAO,CAAC;IAE7D,IAAId,eAAe,IAAIiB,sCAA8B,CAACP,QAAQ,CAACC,IAAI,CAACC,SAAS,CAAC,EAAE;MAC5EG,YAAY,GAAG,IAAAG,sBAAe,EAAC,IAAAC,mBAAW,EAAC;QAAEpB,GAAG,EAAEY,IAAI,CAACP,IAAI;QAAEJ;MAAgB,CAAC,CAAC,CAAC;MAChF,IAAI;QACA,OAAO;UACHoB,MAAM,EAAE,MAAMP,EAAE,CAACQ,SAAS,CAACN,YAAY,CAAC,CAACO,OAAO,EAAE;UAClDd,MAAM,EAAEO;QACZ,CAAC;MACL,CAAC,CAAC,OAAOQ,CAAC,EAAE;QACR,MAAMC,8BAA8B,GAAG,MAAM1B,0BAA0B,CAAC;UACpEC,GAAG,EAAEY,IAAI,CAACP,IAAI;UACdJ,eAAe;UACfC;QACJ,CAAC,CAAC;QAEF,IAAIuB,8BAA8B,CAACC,KAAK,EAAE;UACtC,MAAMC,KAAK,CAACF,8BAA8B,CAACG,OAAO,CAAC;QACvD;QAEA,OAAO;UACHP,MAAM,EAAE,MAAMP,EAAE,CAACQ,SAAS,CAACN,YAAY,CAAC,CAACO,OAAO,EAAE;UAClDd,MAAM,EAAEO;QACZ,CAAC;MACL;IACJ;IAEAA,YAAY,GAAG,IAAAG,sBAAe,EAAC,IAAAC,mBAAW,EAAC;MAAEpB,GAAG,EAAEY,IAAI,CAACP;IAAK,CAAC,CAAC,CAAC;IAC/D,IAAI;MACA,OAAO;QACHgB,MAAM,EAAE,MAAMP,EAAE,CAACQ,SAAS,CAACN,YAAY,CAAC,CAACO,OAAO,EAAE;QAClDd,MAAM,EAAEO;MACZ,CAAC;IACL,CAAC,CAAC,OAAOQ,CAAC,EAAE;MACR,MAAMC,8BAA8B,GAAG,MAAM1B,0BAA0B,CAAC;QACpEC,GAAG,EAAEY,IAAI,CAACP,IAAI;QACdH;MACJ,CAAC,CAAC;MAEF,IAAIuB,8BAA8B,CAACC,KAAK,EAAE;QACtC,MAAMC,KAAK,CAACF,8BAA8B,CAACG,OAAO,CAAC;MACvD;MAEA,OAAO;QACHP,MAAM,EAAE,MAAMP,EAAE,CAACQ,SAAS,CAACN,YAAY,CAAC,CAACO,OAAO,EAAE;QAClDd,MAAM,EAAEO;MACZ,CAAC;IACL;EACJ;AACJ,CAAC;AAAA"}
|
|
@@ -1,13 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
3
|
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
|
|
4
|
-
|
|
5
4
|
Object.defineProperty(exports, "__esModule", {
|
|
6
5
|
value: true
|
|
7
6
|
});
|
|
8
7
|
exports.default = void 0;
|
|
9
|
-
|
|
10
8
|
var _imageLoader = _interopRequireDefault(require("./imageLoader"));
|
|
11
|
-
|
|
12
9
|
var _default = [_imageLoader.default];
|
|
13
10
|
exports.default = _default;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["imageLoader"],"sources":["index.ts"],"sourcesContent":["import imageLoader from \"./imageLoader\";\n\nexport default [imageLoader];\n"],"mappings":"
|
|
1
|
+
{"version":3,"names":["imageLoader"],"sources":["index.ts"],"sourcesContent":["import imageLoader from \"./imageLoader\";\n\nexport default [imageLoader];\n"],"mappings":";;;;;;;AAAA;AAAwC,eAEzB,CAACA,oBAAW,CAAC;AAAA"}
|
|
@@ -5,54 +5,41 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
5
5
|
});
|
|
6
6
|
exports.default = void 0;
|
|
7
7
|
const SUPPORTED_IMAGE_RESIZE_WIDTHS = [100, 300, 500, 750, 1000, 1500, 2500];
|
|
8
|
-
|
|
9
8
|
/**
|
|
10
9
|
* Takes only allowed transformations into consideration, and discards the rest.
|
|
11
10
|
*/
|
|
12
11
|
var _default = args => {
|
|
13
12
|
const transformations = {};
|
|
14
|
-
|
|
15
13
|
if (!args || !args.width) {
|
|
16
14
|
return null;
|
|
17
15
|
}
|
|
18
|
-
|
|
19
16
|
const width = parseInt(args.width);
|
|
20
|
-
|
|
21
17
|
if (width <= 0) {
|
|
22
18
|
return null;
|
|
23
19
|
}
|
|
24
|
-
|
|
25
20
|
transformations.width = SUPPORTED_IMAGE_RESIZE_WIDTHS[0];
|
|
26
21
|
let i = SUPPORTED_IMAGE_RESIZE_WIDTHS.length;
|
|
27
|
-
|
|
28
22
|
while (i >= 0) {
|
|
29
23
|
if (width === SUPPORTED_IMAGE_RESIZE_WIDTHS[i]) {
|
|
30
24
|
transformations.width = SUPPORTED_IMAGE_RESIZE_WIDTHS[i];
|
|
31
25
|
break;
|
|
32
26
|
}
|
|
33
|
-
|
|
34
27
|
if (width > SUPPORTED_IMAGE_RESIZE_WIDTHS[i]) {
|
|
35
28
|
// Use next larger width. If there isn't any, use current.
|
|
36
29
|
transformations.width = SUPPORTED_IMAGE_RESIZE_WIDTHS[i + 1];
|
|
37
|
-
|
|
38
30
|
if (!transformations.width) {
|
|
39
31
|
transformations.width = SUPPORTED_IMAGE_RESIZE_WIDTHS[i];
|
|
40
32
|
}
|
|
41
|
-
|
|
42
33
|
break;
|
|
43
34
|
}
|
|
44
|
-
|
|
45
35
|
i--;
|
|
46
36
|
}
|
|
47
|
-
|
|
48
37
|
if (Object.keys(transformations).length > 0) {
|
|
49
38
|
/**
|
|
50
39
|
* It is safe to cast.
|
|
51
40
|
*/
|
|
52
41
|
return transformations;
|
|
53
42
|
}
|
|
54
|
-
|
|
55
43
|
return null;
|
|
56
44
|
};
|
|
57
|
-
|
|
58
45
|
exports.default = _default;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["SUPPORTED_IMAGE_RESIZE_WIDTHS","args","transformations","width","parseInt","i","length","Object","keys"],"sources":["sanitizeImageTransformations.ts"],"sourcesContent":["const SUPPORTED_IMAGE_RESIZE_WIDTHS: number[] = [100, 300, 500, 750, 1000, 1500, 2500];\n\nexport interface SanitizeImageArgs {\n width?: string;\n}\n\nexport interface SanitizeImageTransformations {\n width: number;\n}\n/**\n * Takes only allowed transformations into consideration, and discards the rest.\n */\nexport default (args?: SanitizeImageArgs): SanitizeImageTransformations | null => {\n const transformations: Partial<SanitizeImageTransformations> = {};\n\n if (!args || !args.width) {\n return null;\n }\n const width = parseInt(args.width);\n if (width <= 0) {\n return null;\n }\n transformations.width = SUPPORTED_IMAGE_RESIZE_WIDTHS[0];\n let i = SUPPORTED_IMAGE_RESIZE_WIDTHS.length;\n while (i >= 0) {\n if (width === SUPPORTED_IMAGE_RESIZE_WIDTHS[i]) {\n transformations.width = SUPPORTED_IMAGE_RESIZE_WIDTHS[i];\n break;\n }\n\n if (width > SUPPORTED_IMAGE_RESIZE_WIDTHS[i]) {\n // Use next larger width. If there isn't any, use current.\n transformations.width = SUPPORTED_IMAGE_RESIZE_WIDTHS[i + 1];\n if (!transformations.width) {\n transformations.width = SUPPORTED_IMAGE_RESIZE_WIDTHS[i];\n }\n break;\n }\n\n i--;\n }\n\n if (Object.keys(transformations).length > 0) {\n /**\n * It is safe to cast.\n */\n return transformations as SanitizeImageTransformations;\n }\n\n return null;\n};\n"],"mappings":";;;;;;AAAA,MAAMA,6BAAuC,GAAG,CAAC,
|
|
1
|
+
{"version":3,"names":["SUPPORTED_IMAGE_RESIZE_WIDTHS","args","transformations","width","parseInt","i","length","Object","keys"],"sources":["sanitizeImageTransformations.ts"],"sourcesContent":["const SUPPORTED_IMAGE_RESIZE_WIDTHS: number[] = [100, 300, 500, 750, 1000, 1500, 2500];\n\nexport interface SanitizeImageArgs {\n width?: string;\n}\n\nexport interface SanitizeImageTransformations {\n width: number;\n}\n/**\n * Takes only allowed transformations into consideration, and discards the rest.\n */\nexport default (args?: SanitizeImageArgs): SanitizeImageTransformations | null => {\n const transformations: Partial<SanitizeImageTransformations> = {};\n\n if (!args || !args.width) {\n return null;\n }\n const width = parseInt(args.width);\n if (width <= 0) {\n return null;\n }\n transformations.width = SUPPORTED_IMAGE_RESIZE_WIDTHS[0];\n let i = SUPPORTED_IMAGE_RESIZE_WIDTHS.length;\n while (i >= 0) {\n if (width === SUPPORTED_IMAGE_RESIZE_WIDTHS[i]) {\n transformations.width = SUPPORTED_IMAGE_RESIZE_WIDTHS[i];\n break;\n }\n\n if (width > SUPPORTED_IMAGE_RESIZE_WIDTHS[i]) {\n // Use next larger width. If there isn't any, use current.\n transformations.width = SUPPORTED_IMAGE_RESIZE_WIDTHS[i + 1];\n if (!transformations.width) {\n transformations.width = SUPPORTED_IMAGE_RESIZE_WIDTHS[i];\n }\n break;\n }\n\n i--;\n }\n\n if (Object.keys(transformations).length > 0) {\n /**\n * It is safe to cast.\n */\n return transformations as SanitizeImageTransformations;\n }\n\n return null;\n};\n"],"mappings":";;;;;;AAAA,MAAMA,6BAAuC,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC;AAStF;AACA;AACA;AAFA,eAGgBC,IAAwB,IAA0C;EAC9E,MAAMC,eAAsD,GAAG,CAAC,CAAC;EAEjE,IAAI,CAACD,IAAI,IAAI,CAACA,IAAI,CAACE,KAAK,EAAE;IACtB,OAAO,IAAI;EACf;EACA,MAAMA,KAAK,GAAGC,QAAQ,CAACH,IAAI,CAACE,KAAK,CAAC;EAClC,IAAIA,KAAK,IAAI,CAAC,EAAE;IACZ,OAAO,IAAI;EACf;EACAD,eAAe,CAACC,KAAK,GAAGH,6BAA6B,CAAC,CAAC,CAAC;EACxD,IAAIK,CAAC,GAAGL,6BAA6B,CAACM,MAAM;EAC5C,OAAOD,CAAC,IAAI,CAAC,EAAE;IACX,IAAIF,KAAK,KAAKH,6BAA6B,CAACK,CAAC,CAAC,EAAE;MAC5CH,eAAe,CAACC,KAAK,GAAGH,6BAA6B,CAACK,CAAC,CAAC;MACxD;IACJ;IAEA,IAAIF,KAAK,GAAGH,6BAA6B,CAACK,CAAC,CAAC,EAAE;MAC1C;MACAH,eAAe,CAACC,KAAK,GAAGH,6BAA6B,CAACK,CAAC,GAAG,CAAC,CAAC;MAC5D,IAAI,CAACH,eAAe,CAACC,KAAK,EAAE;QACxBD,eAAe,CAACC,KAAK,GAAGH,6BAA6B,CAACK,CAAC,CAAC;MAC5D;MACA;IACJ;IAEAA,CAAC,EAAE;EACP;EAEA,IAAIE,MAAM,CAACC,IAAI,CAACN,eAAe,CAAC,CAACI,MAAM,GAAG,CAAC,EAAE;IACzC;AACR;AACA;IACQ,OAAOJ,eAAe;EAC1B;EAEA,OAAO,IAAI;AACf,CAAC;AAAA"}
|
|
@@ -4,60 +4,52 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
6
|
exports.default = void 0;
|
|
7
|
-
|
|
8
7
|
var _utils = require("../../utils");
|
|
9
|
-
|
|
10
8
|
var _utils2 = require("../utils");
|
|
11
|
-
|
|
12
9
|
var _default = {
|
|
13
10
|
canProcess: params => {
|
|
14
11
|
const {
|
|
15
12
|
key,
|
|
16
13
|
extension
|
|
17
14
|
} = params;
|
|
18
|
-
|
|
19
15
|
if (_utils2.SUPPORTED_IMAGES.includes(extension) === false) {
|
|
20
16
|
return false;
|
|
21
|
-
}
|
|
17
|
+
}
|
|
18
|
+
|
|
19
|
+
// We only want to process original images, and delete all variations of it at once.
|
|
22
20
|
// We DO NOT want to process the event for the deletion of an optimized/transformed image.
|
|
23
21
|
// Unfortunately, there's no way to filter those events on the S3 bucket itself, so we have to do it this way.
|
|
24
|
-
|
|
25
|
-
|
|
26
22
|
return !(key.startsWith(_utils2.OPTIMIZED_IMAGE_PREFIX) || key.startsWith(_utils2.OPTIMIZED_TRANSFORMED_IMAGE_PREFIX));
|
|
27
23
|
},
|
|
28
|
-
|
|
29
24
|
async process({
|
|
30
25
|
s3,
|
|
31
26
|
key,
|
|
32
27
|
extension
|
|
33
28
|
}) {
|
|
34
29
|
// 1. Get optimized image's key.
|
|
30
|
+
|
|
35
31
|
await s3.deleteObject((0, _utils.getObjectParams)((0, _utils2.getImageKey)({
|
|
36
32
|
key
|
|
37
|
-
}))).promise();
|
|
33
|
+
}))).promise();
|
|
38
34
|
|
|
35
|
+
// 2. Search for all transformed images and delete those too.
|
|
39
36
|
if (_utils2.SUPPORTED_TRANSFORMABLE_IMAGES.includes(extension) === false) {
|
|
40
37
|
return;
|
|
41
38
|
}
|
|
42
|
-
|
|
43
39
|
const env = (0, _utils.getEnvironment)();
|
|
44
40
|
const imagesList = await s3.listObjects({
|
|
45
41
|
Bucket: env.bucket,
|
|
46
42
|
Prefix: (0, _utils2.getOptimizedTransformedImageKeyPrefix)(key)
|
|
47
43
|
}).promise();
|
|
48
|
-
|
|
49
44
|
if (!imagesList.Contents) {
|
|
50
45
|
return;
|
|
51
46
|
}
|
|
52
|
-
|
|
53
47
|
for (const imageObject of imagesList.Contents) {
|
|
54
48
|
if (!imageObject.Key) {
|
|
55
49
|
continue;
|
|
56
50
|
}
|
|
57
|
-
|
|
58
51
|
await s3.deleteObject((0, _utils.getObjectParams)(imageObject.Key)).promise();
|
|
59
52
|
}
|
|
60
53
|
}
|
|
61
|
-
|
|
62
54
|
};
|
|
63
55
|
exports.default = _default;
|