@webiny/api-file-manager 5.23.1 → 5.25.0-beta.0

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.
Files changed (84) hide show
  1. package/handlers/download/index.d.ts +5 -1
  2. package/handlers/download/index.js +25 -19
  3. package/handlers/download/index.js.map +1 -0
  4. package/handlers/manage/index.d.ts +2 -1
  5. package/handlers/manage/index.js +17 -16
  6. package/handlers/manage/index.js.map +1 -0
  7. package/handlers/transform/index.d.ts +2 -1
  8. package/handlers/transform/index.js +7 -4
  9. package/handlers/transform/index.js.map +1 -0
  10. package/handlers/transform/loaders/imageLoader.d.ts +25 -9
  11. package/handlers/transform/loaders/imageLoader.js +2 -3
  12. package/handlers/transform/loaders/imageLoader.js.map +1 -0
  13. package/handlers/transform/loaders/index.d.ts +4 -9
  14. package/handlers/transform/loaders/index.js.map +1 -0
  15. package/handlers/transform/loaders/sanitizeImageTransformations.d.ts +7 -3
  16. package/handlers/transform/loaders/sanitizeImageTransformations.js +27 -20
  17. package/handlers/transform/loaders/sanitizeImageTransformations.js.map +1 -0
  18. package/handlers/transform/managers/imageManager.d.ts +12 -6
  19. package/handlers/transform/managers/imageManager.js +22 -17
  20. package/handlers/transform/managers/imageManager.js.map +1 -0
  21. package/handlers/transform/managers/index.d.ts +2 -6
  22. package/handlers/transform/managers/index.js.map +1 -0
  23. package/handlers/transform/optimizeImage.d.ts +2 -1
  24. package/handlers/transform/optimizeImage.js +3 -0
  25. package/handlers/transform/optimizeImage.js.map +1 -0
  26. package/handlers/transform/transformImage.d.ts +5 -4
  27. package/handlers/transform/transformImage.js +3 -3
  28. package/handlers/transform/transformImage.js.map +1 -0
  29. package/handlers/transform/utils.d.ts +2 -2
  30. package/handlers/transform/utils.js.map +1 -0
  31. package/handlers/types.d.ts +33 -0
  32. package/handlers/types.js +5 -0
  33. package/handlers/types.js.map +1 -0
  34. package/handlers/utils/createHandler.d.ts +16 -16
  35. package/handlers/utils/createHandler.js +43 -42
  36. package/handlers/utils/createHandler.js.map +1 -0
  37. package/handlers/utils/getEnvironment.js.map +1 -0
  38. package/handlers/utils/getObjectParams.d.ts +3 -4
  39. package/handlers/utils/getObjectParams.js +0 -2
  40. package/handlers/utils/getObjectParams.js.map +1 -0
  41. package/handlers/utils/index.d.ts +1 -1
  42. package/handlers/utils/index.js +17 -7
  43. package/handlers/utils/index.js.map +1 -0
  44. package/package.json +20 -20
  45. package/plugins/crud/files/validation.js.map +1 -0
  46. package/plugins/crud/files.crud.js +4 -7
  47. package/plugins/crud/files.crud.js.map +1 -0
  48. package/plugins/crud/settings.crud.js +1 -0
  49. package/plugins/crud/settings.crud.js.map +1 -0
  50. package/plugins/crud/system.crud.js.map +1 -0
  51. package/plugins/crud/utils/checkBasePermissions.js.map +1 -0
  52. package/plugins/crud/utils/createFileModel.d.ts +3 -0
  53. package/plugins/crud/utils/createFileModel.js +13 -0
  54. package/plugins/crud/utils/createFileModel.js.map +1 -0
  55. package/plugins/crud/utils/lifecycleEvents.d.ts +2 -2
  56. package/plugins/crud/utils/lifecycleEvents.js +5 -0
  57. package/plugins/crud/utils/lifecycleEvents.js.map +1 -0
  58. package/plugins/definitions/FilePhysicalStoragePlugin.d.ts +10 -11
  59. package/plugins/definitions/FilePhysicalStoragePlugin.js.map +1 -0
  60. package/plugins/definitions/FilePlugin.d.ts +6 -3
  61. package/plugins/definitions/FilePlugin.js +8 -2
  62. package/plugins/definitions/FilePlugin.js.map +1 -0
  63. package/plugins/definitions/FileStorageTransformPlugin.d.ts +9 -9
  64. package/plugins/definitions/FileStorageTransformPlugin.js.map +1 -0
  65. package/plugins/definitions/FilesStorageOperationsProviderPlugin.d.ts +3 -3
  66. package/plugins/definitions/FilesStorageOperationsProviderPlugin.js.map +1 -0
  67. package/plugins/definitions/InstallationPlugin.d.ts +9 -9
  68. package/plugins/definitions/InstallationPlugin.js +4 -2
  69. package/plugins/definitions/InstallationPlugin.js.map +1 -0
  70. package/plugins/definitions/SettingsStorageOperationsProviderPlugin.d.ts +3 -3
  71. package/plugins/definitions/SettingsStorageOperationsProviderPlugin.js.map +1 -0
  72. package/plugins/definitions/SystemStorageOperationsProviderPlugin.d.ts +3 -3
  73. package/plugins/definitions/SystemStorageOperationsProviderPlugin.js.map +1 -0
  74. package/plugins/graphql.js +9 -1
  75. package/plugins/graphql.js.map +1 -0
  76. package/plugins/index.js.map +1 -0
  77. package/plugins/storage/FileStorage.d.ts +23 -24
  78. package/plugins/storage/FileStorage.js +23 -13
  79. package/plugins/storage/FileStorage.js.map +1 -0
  80. package/plugins/storage/index.js +4 -0
  81. package/plugins/storage/index.js.map +1 -0
  82. package/types.d.ts +10 -9
  83. package/types.js.map +1 -0
  84. package/utils.js.map +1 -0
@@ -1,4 +1,8 @@
1
1
  import { HandlerPlugin } from "@webiny/handler/types";
2
2
  import { ArgsContext } from "@webiny/handler-args/types";
3
- declare const _default: () => HandlerPlugin<ArgsContext>;
3
+ import { DownloadHandlerEventArgs } from "../types";
4
+ import { ClientContext } from "@webiny/handler-client/types";
5
+ interface Context extends ClientContext, ArgsContext<DownloadHandlerEventArgs> {
6
+ }
7
+ declare const _default: () => HandlerPlugin<Context>;
4
8
  export default _default;
@@ -25,7 +25,6 @@ const DEFAULT_CACHE_MAX_AGE = 30758400; // 1 year
25
25
  * Based on given path, extracts file key and additional options sent via query params.
26
26
  * @param event
27
27
  */
28
-
29
28
  const extractFilenameOptions = event => {
30
29
  const path = (0, _sanitizeFilename.default)(event.pathParameters.path);
31
30
  return {
@@ -42,8 +41,7 @@ const getS3Object = async (event, s3, context) => {
42
41
  extension
43
42
  } = extractFilenameOptions(event);
44
43
 
45
- for (let i = 0; i < _loaders.default.length; i++) {
46
- const loader = _loaders.default[i];
44
+ for (const loader of _loaders.default) {
47
45
  const canProcess = loader.canProcess({
48
46
  context,
49
47
  s3,
@@ -54,17 +52,19 @@ const getS3Object = async (event, s3, context) => {
54
52
  }
55
53
  });
56
54
 
57
- if (canProcess) {
58
- return loader.process({
59
- context,
60
- s3,
61
- options,
62
- file: {
63
- name: filename,
64
- extension
65
- }
66
- });
55
+ if (!canProcess) {
56
+ continue;
67
57
  }
58
+
59
+ return loader.process({
60
+ context,
61
+ s3,
62
+ options,
63
+ file: {
64
+ name: filename,
65
+ extension
66
+ }
67
+ });
68
68
  } // If no processors handled the file request, just return the S3 object by default.
69
69
 
70
70
 
@@ -80,8 +80,7 @@ var _default = () => ({
80
80
  name: "handler-download-file",
81
81
 
82
82
  async handle(context) {
83
- const event = context.invocationArgs;
84
- const handler = (0, _utils.createHandler)(async event => {
83
+ const eventHandler = async event => {
85
84
  const {
86
85
  region
87
86
  } = (0, _utils.getEnvironment)();
@@ -92,10 +91,14 @@ var _default = () => ({
92
91
  params,
93
92
  object
94
93
  } = await getS3Object(event, s3, context);
94
+ const contentLength = object.ContentLength === undefined ? 0 : object.ContentLength;
95
95
 
96
- if (object.ContentLength < MAX_RETURN_CONTENT_LENGTH) {
96
+ if (contentLength < MAX_RETURN_CONTENT_LENGTH) {
97
97
  return {
98
- data: object.Body,
98
+ /**
99
+ * It is safe to cast as buffer or unknown
100
+ */
101
+ data: object.Body || null,
99
102
  headers: {
100
103
  "Content-Type": object.ContentType,
101
104
  "Cache-Control": "public, max-age=" + DEFAULT_CACHE_MAX_AGE
@@ -111,13 +114,16 @@ var _default = () => ({
111
114
  Key: params.Key
112
115
  }).promise();
113
116
  return {
117
+ data: null,
114
118
  statusCode: 301,
115
119
  headers: {
116
120
  Location: `https://${params.Bucket}.s3.amazonaws.com/${params.Key}`
117
121
  }
118
122
  };
119
- });
120
- return await handler(event);
123
+ };
124
+
125
+ const handler = (0, _utils.createHandler)(eventHandler);
126
+ return await handler(context.invocationArgs);
121
127
  }
122
128
 
123
129
  });
@@ -0,0 +1 @@
1
+ {"version":3,"sources":["index.ts"],"names":["MAX_RETURN_CONTENT_LENGTH","DEFAULT_CACHE_MAX_AGE","extractFilenameOptions","event","path","pathParameters","filename","decodeURI","options","queryStringParameters","extension","pathLib","extname","getS3Object","s3","context","loader","loaders","canProcess","file","name","process","params","object","getObject","promise","type","handle","eventHandler","region","S3","contentLength","ContentLength","undefined","data","Body","headers","ContentType","putObjectAcl","Bucket","ACL","Key","statusCode","Location","handler","invocationArgs"],"mappings":";;;;;;;;;AACA;;AACA;;AACA;;AACA;;AACA;;AAKA,MAAMA,yBAAyB,GAAG,OAAlC,C,CAA2C;;AAC3C,MAAMC,qBAAqB,GAAG,QAA9B,C,CAAwC;;AAGxC;AACA;AACA;AACA;AACA,MAAMC,sBAAsB,GAAIC,KAAD,IAAqC;AAChE,QAAMC,IAAI,GAAG,+BAAiBD,KAAK,CAACE,cAAN,CAAqBD,IAAtC,CAAb;AACA,SAAO;AACHE,IAAAA,QAAQ,EAAEC,SAAS,CAACH,IAAD,CADhB;AAEHI,IAAAA,OAAO,EAAEL,KAAK,CAACM,qBAFZ;AAGHC,IAAAA,SAAS,EAAEC,cAAQC,OAAR,CAAgBR,IAAhB;AAHR,GAAP;AAKH,CAPD;;AASA,MAAMS,WAAW,GAAG,OAAOV,KAAP,EAAwCW,EAAxC,EAAgDC,OAAhD,KAAqE;AACrF,QAAM;AAAEP,IAAAA,OAAF;AAAWF,IAAAA,QAAX;AAAqBI,IAAAA;AAArB,MAAmCR,sBAAsB,CAACC,KAAD,CAA/D;;AAEA,OAAK,MAAMa,MAAX,IAAqBC,gBAArB,EAA8B;AAC1B,UAAMC,UAAU,GAAGF,MAAM,CAACE,UAAP,CAAkB;AACjCH,MAAAA,OADiC;AAEjCD,MAAAA,EAFiC;AAGjCN,MAAAA,OAHiC;AAIjCW,MAAAA,IAAI,EAAE;AACFC,QAAAA,IAAI,EAAEd,QADJ;AAEFI,QAAAA;AAFE;AAJ2B,KAAlB,CAAnB;;AAUA,QAAI,CAACQ,UAAL,EAAiB;AACb;AACH;;AACD,WAAOF,MAAM,CAACK,OAAP,CAAe;AAClBN,MAAAA,OADkB;AAElBD,MAAAA,EAFkB;AAGlBN,MAAAA,OAHkB;AAIlBW,MAAAA,IAAI,EAAE;AACFC,QAAAA,IAAI,EAAEd,QADJ;AAEFI,QAAAA;AAFE;AAJY,KAAf,CAAP;AASH,GA1BoF,CA4BrF;;;AACA,QAAMY,MAAM,GAAG,4BAAgBhB,QAAhB,CAAf;AACA,SAAO;AACHiB,IAAAA,MAAM,EAAE,MAAMT,EAAE,CAACU,SAAH,CAAaF,MAAb,EAAqBG,OAArB,EADX;AAEHH,IAAAA,MAAM,EAAEA;AAFL,GAAP;AAIH,CAlCD;;eAoCe,OAA+B;AAC1CI,EAAAA,IAAI,EAAE,SADoC;AAE1CN,EAAAA,IAAI,EAAE,uBAFoC;;AAG1C,QAAMO,MAAN,CAAaZ,OAAb,EAAsB;AAClB,UAAMa,YAA4D,GAAG,MAAMzB,KAAN,IAAe;AAChF,YAAM;AAAE0B,QAAAA;AAAF,UAAa,4BAAnB;AACA,YAAMf,EAAE,GAAG,IAAIgB,UAAJ,CAAO;AAAED,QAAAA;AAAF,OAAP,CAAX;AAEA,YAAM;AAAEP,QAAAA,MAAF;AAAUC,QAAAA;AAAV,UAAqB,MAAMV,WAAW,CAACV,KAAD,EAAQW,EAAR,EAAYC,OAAZ,CAA5C;AAEA,YAAMgB,aAAa,GAAGR,MAAM,CAACS,aAAP,KAAyBC,SAAzB,GAAqC,CAArC,GAAyCV,MAAM,CAACS,aAAtE;;AACA,UAAID,aAAa,GAAG/B,yBAApB,EAA+C;AAC3C,eAAO;AACH;AACpB;AACA;AACoBkC,UAAAA,IAAI,EAAEX,MAAM,CAACY,IAAP,IAAe,IAJlB;AAKHC,UAAAA,OAAO,EAAE;AACL,4BAAgBb,MAAM,CAACc,WADlB;AAEL,6BAAiB,qBAAqBpC;AAFjC;AALN,SAAP;AAUH,OAlB+E,CAoBhF;AACA;;;AACA,YAAMa,EAAE,CACHwB,YADC,CACY;AACVC,QAAAA,MAAM,EAAEjB,MAAM,CAACiB,MADL;AAEVC,QAAAA,GAAG,EAAE,aAFK;AAGVC,QAAAA,GAAG,EAAEnB,MAAM,CAACmB;AAHF,OADZ,EAMDhB,OANC,EAAN;AAQA,aAAO;AACHS,QAAAA,IAAI,EAAE,IADH;AAEHQ,QAAAA,UAAU,EAAE,GAFT;AAGHN,QAAAA,OAAO,EAAE;AACLO,UAAAA,QAAQ,EAAG,WAAUrB,MAAM,CAACiB,MAAO,qBAAoBjB,MAAM,CAACmB,GAAI;AAD7D;AAHN,OAAP;AAOH,KArCD;;AAsCA,UAAMG,OAAO,GAAG,0BAAchB,YAAd,CAAhB;AAEA,WAAO,MAAMgB,OAAO,CAAC7B,OAAO,CAAC8B,cAAT,CAApB;AACH;;AA7CyC,CAA/B,C","sourcesContent":["import { HandlerPlugin } from \"@webiny/handler/types\";\nimport S3 from \"aws-sdk/clients/s3\";\nimport sanitizeFilename from \"sanitize-filename\";\nimport pathLib from \"path\";\nimport { createHandler, getEnvironment, getObjectParams, EventHandlerCallable } from \"../utils\";\nimport loaders from \"../transform/loaders\";\nimport { ArgsContext } from \"@webiny/handler-args/types\";\nimport { DownloadHandlerEventArgs } from \"~/handlers/types\";\nimport { ClientContext } from \"@webiny/handler-client/types\";\n\nconst MAX_RETURN_CONTENT_LENGTH = 5000000; // ~4.77MB\nconst DEFAULT_CACHE_MAX_AGE = 30758400; // 1 year\n\ninterface Context extends ClientContext, ArgsContext<DownloadHandlerEventArgs> {}\n/**\n * Based on given path, extracts file key and additional options sent via query params.\n * @param event\n */\nconst extractFilenameOptions = (event: DownloadHandlerEventArgs) => {\n const path = sanitizeFilename(event.pathParameters.path);\n return {\n filename: decodeURI(path),\n options: event.queryStringParameters,\n extension: pathLib.extname(path)\n };\n};\n\nconst getS3Object = async (event: DownloadHandlerEventArgs, s3: S3, context: Context) => {\n const { options, filename, extension } = extractFilenameOptions(event);\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 }\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 }\n });\n }\n\n // If no processors handled the file request, just return the S3 object by default.\n const params = getObjectParams(filename);\n return {\n object: await s3.getObject(params).promise(),\n params: params\n };\n};\n\nexport default (): HandlerPlugin<Context> => ({\n type: \"handler\",\n name: \"handler-download-file\",\n async handle(context) {\n const eventHandler: EventHandlerCallable<DownloadHandlerEventArgs> = async event => {\n const { region } = getEnvironment();\n const s3 = new S3({ region });\n\n const { params, object } = await getS3Object(event, s3, context);\n\n const contentLength = object.ContentLength === undefined ? 0 : object.ContentLength;\n if (contentLength < MAX_RETURN_CONTENT_LENGTH) {\n return {\n /**\n * It is safe to cast as buffer or unknown\n */\n data: object.Body || null,\n headers: {\n \"Content-Type\": object.ContentType,\n \"Cache-Control\": \"public, max-age=\" + DEFAULT_CACHE_MAX_AGE\n }\n };\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 await s3\n .putObjectAcl({\n Bucket: params.Bucket,\n ACL: \"public-read\",\n Key: params.Key\n })\n .promise();\n\n return {\n data: null,\n statusCode: 301,\n headers: {\n Location: `https://${params.Bucket}.s3.amazonaws.com/${params.Key}`\n }\n };\n };\n const handler = createHandler(eventHandler);\n\n return await handler(context.invocationArgs);\n }\n});\n"]}
@@ -1,4 +1,5 @@
1
1
  import { HandlerPlugin } from "@webiny/handler/types";
2
2
  import { ArgsContext } from "@webiny/handler-args/types";
3
- declare const _default: () => HandlerPlugin<ArgsContext>;
3
+ import { ManageHandlerEventArgs } from "../types";
4
+ declare const _default: () => HandlerPlugin<ArgsContext<ManageHandlerEventArgs>>;
4
5
  export default _default;
@@ -20,8 +20,9 @@ var _default = () => ({
20
20
  name: "handler-download-file",
21
21
 
22
22
  async handle(context) {
23
- const event = context.invocationArgs;
24
- const handler = (0, _utils.createHandler)(async event => {
23
+ // TODO @ts-refactor check in createHandler for returns types that eventHandler must return
24
+ // @ts-ignore
25
+ const eventHandler = async event => {
25
26
  const keys = [];
26
27
 
27
28
  for (let i = 0; i < event.Records.length; i++) {
@@ -39,30 +40,30 @@ var _default = () => ({
39
40
  region
40
41
  });
41
42
 
42
- for (let i = 0; i < keys.length; i++) {
43
- const key = keys[i];
44
-
43
+ for (const key of keys) {
45
44
  const extension = _path.default.extname(key);
46
45
 
47
- for (let j = 0; j < _managers.default.length; j++) {
48
- const manager = _managers.default[j];
46
+ for (const manager of _managers.default) {
49
47
  const canProcess = manager.canProcess({
50
- s3,
51
48
  key,
52
49
  extension
53
50
  });
54
51
 
55
- if (canProcess) {
56
- await manager.process({
57
- s3,
58
- key,
59
- extension
60
- });
52
+ if (!canProcess) {
53
+ continue;
61
54
  }
55
+
56
+ await manager.process({
57
+ s3,
58
+ key,
59
+ extension
60
+ });
62
61
  }
63
62
  }
64
- });
65
- return await handler(event);
63
+ };
64
+
65
+ const handler = (0, _utils.createHandler)(eventHandler);
66
+ return await handler(context.invocationArgs);
66
67
  }
67
68
 
68
69
  });
@@ -0,0 +1 @@
1
+ {"version":3,"sources":["index.ts"],"names":["type","name","handle","context","eventHandler","event","keys","i","Records","length","record","s3","object","key","push","region","S3","extension","path","extname","manager","managers","canProcess","process","handler","invocationArgs"],"mappings":";;;;;;;;;AAAA;;AACA;;AAEA;;AACA;;eAIe,OAA2D;AACtEA,EAAAA,IAAI,EAAE,SADgE;AAEtEC,EAAAA,IAAI,EAAE,uBAFgE;;AAGtE,QAAMC,MAAN,CAAaC,OAAb,EAAsB;AAClB;AACA;AACA,UAAMC,YAA0D,GAAG,MAAMC,KAAN,IAAe;AAC9E,YAAMC,IAAc,GAAG,EAAvB;;AACA,WAAK,IAAIC,CAAC,GAAG,CAAb,EAAgBA,CAAC,GAAGF,KAAK,CAACG,OAAN,CAAcC,MAAlC,EAA0CF,CAAC,EAA3C,EAA+C;AAC3C,cAAMG,MAAM,GAAGL,KAAK,CAACG,OAAN,CAAcD,CAAd,CAAf;;AACA,YAAI,OAAOG,MAAM,CAACC,EAAP,CAAUC,MAAV,CAAiBC,GAAxB,KAAgC,QAApC,EAA8C;AAC1CP,UAAAA,IAAI,CAACQ,IAAL,CAAUJ,MAAM,CAACC,EAAP,CAAUC,MAAV,CAAiBC,GAA3B;AACH;AACJ;;AAED,YAAM;AAAEE,QAAAA;AAAF,UAAa,4BAAnB;AACA,YAAMJ,EAAE,GAAG,IAAIK,UAAJ,CAAO;AAAED,QAAAA;AAAF,OAAP,CAAX;;AAEA,WAAK,MAAMF,GAAX,IAAkBP,IAAlB,EAAwB;AACpB,cAAMW,SAAS,GAAGC,cAAKC,OAAL,CAAaN,GAAb,CAAlB;;AAEA,aAAK,MAAMO,OAAX,IAAsBC,iBAAtB,EAAgC;AAC5B,gBAAMC,UAAU,GAAGF,OAAO,CAACE,UAAR,CAAmB;AAClCT,YAAAA,GADkC;AAElCI,YAAAA;AAFkC,WAAnB,CAAnB;;AAKA,cAAI,CAACK,UAAL,EAAiB;AACb;AACH;;AACD,gBAAMF,OAAO,CAACG,OAAR,CAAgB;AAClBZ,YAAAA,EADkB;AAElBE,YAAAA,GAFkB;AAGlBI,YAAAA;AAHkB,WAAhB,CAAN;AAKH;AACJ;AACJ,KA/BD;;AAiCA,UAAMO,OAAO,GAAG,0BAAcpB,YAAd,CAAhB;AAEA,WAAO,MAAMoB,OAAO,CAACrB,OAAO,CAACsB,cAAT,CAApB;AACH;;AA1CqE,CAA3D,C","sourcesContent":["import path from \"path\";\nimport S3 from \"aws-sdk/clients/s3\";\nimport { HandlerPlugin } from \"@webiny/handler/types\";\nimport { createHandler, getEnvironment, EventHandlerCallable } from \"../utils\";\nimport managers from \"../transform/managers\";\nimport { ArgsContext } from \"@webiny/handler-args/types\";\nimport { ManageHandlerEventArgs } from \"~/handlers/types\";\n\nexport default (): HandlerPlugin<ArgsContext<ManageHandlerEventArgs>> => ({\n type: \"handler\",\n name: \"handler-download-file\",\n async handle(context) {\n // TODO @ts-refactor check in createHandler for returns types that eventHandler must return\n // @ts-ignore\n const eventHandler: EventHandlerCallable<ManageHandlerEventArgs> = 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 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 const handler = createHandler(eventHandler);\n\n return await handler(context.invocationArgs);\n }\n});\n"]}
@@ -1,4 +1,5 @@
1
1
  import { HandlerPlugin } from "@webiny/handler/types";
2
2
  import { ArgsContext } from "@webiny/handler-args/types";
3
- declare const _default: () => HandlerPlugin<ArgsContext>;
3
+ import { TransformHandlerEventArgs } from "../types";
4
+ declare const _default: () => HandlerPlugin<ArgsContext<TransformHandlerEventArgs>>;
4
5
  export default _default;
@@ -28,8 +28,9 @@ var _default = () => ({
28
28
  name: "handler-download-file",
29
29
 
30
30
  async handle(context) {
31
- const event = context.invocationArgs;
32
- const handler = (0, _utils.createHandler)(async ({
31
+ // TODO @ts-refactor check in createHandler for returns types that eventHandler must return
32
+ // @ts-ignore
33
+ const eventHandler = async ({
33
34
  body: {
34
35
  transformations,
35
36
  key
@@ -87,8 +88,10 @@ var _default = () => ({
87
88
  message: e.message
88
89
  };
89
90
  }
90
- });
91
- return await handler(event);
91
+ };
92
+
93
+ const handler = (0, _utils.createHandler)(eventHandler);
94
+ return await handler(context.invocationArgs);
92
95
  }
93
96
 
94
97
  });
@@ -0,0 +1 @@
1
+ {"version":3,"sources":["index.ts"],"names":["type","name","handle","context","eventHandler","body","transformations","key","env","s3","S3","region","optimizedImageObject","params","initial","optimized","optimizedTransformed","getObject","promise","e","putObject","ContentType","Body","error","message","handler","invocationArgs"],"mappings":";;;;;;;;;;;AAAA;;AACA;;AACA;;AACA;;AACA;;;;;;eAKe,OAA8D;AACzEA,EAAAA,IAAI,EAAE,SADmE;AAEzEC,EAAAA,IAAI,EAAE,uBAFmE;;AAGzE,QAAMC,MAAN,CAAaC,OAAb,EAAsB;AAClB;AACA;AACA,UAAMC,YAA6D,GAAG,OAAO;AACzEC,MAAAA,IAAI,EAAE;AAAEC,QAAAA,eAAF;AAAmBC,QAAAA;AAAnB;AADmE,KAAP,KAEhE;AACF,UAAI;AACA,cAAMC,GAAG,GAAG,4BAAZ;AACA,cAAMC,EAAE,GAAG,IAAIC,UAAJ,CAAO;AAAEC,UAAAA,MAAM,EAAEH,GAAG,CAACG;AAAd,SAAP,CAAX;AAEA,YAAIC,oBAAJ;AAEA,cAAMC,MAAM,GAAG;AACXC,UAAAA,OAAO,EAAE,4BAAgBP,GAAhB,CADE;AAEXQ,UAAAA,SAAS,EAAE,4BAAgB,yBAAY;AAAER,YAAAA;AAAF,WAAZ,CAAhB,CAFA;AAGXS,UAAAA,oBAAoB,EAAE,4BAAgB,yBAAY;AAAET,YAAAA,GAAF;AAAOD,YAAAA;AAAP,WAAZ,CAAhB;AAHX,SAAf,CANA,CAYA;;AACA,YAAI;AACAM,UAAAA,oBAAoB,GAAG,MAAMH,EAAE,CAACQ,SAAH,CAAaJ,MAAM,CAACE,SAApB,EAA+BG,OAA/B,EAA7B;AACH,SAFD,CAEE,OAAOC,CAAP,EAAU;AACR;AACAP,UAAAA,oBAAoB,GAAG,MAAMH,EAAE,CAACQ,SAAH,CAAaJ,MAAM,CAACC,OAApB,EAA6BI,OAA7B,EAA7B;AAEA,gBAAMT,EAAE,CACHW,SADC,iCAEKP,MAAM,CAACE,SAFZ;AAGEM,YAAAA,WAAW,EAAET,oBAAoB,CAACS,WAHpC;AAIEC,YAAAA,IAAI,EAAE,MAAM,4BACRV,oBAAoB,CAACU,IADb,EAERV,oBAAoB,CAACS,WAFb;AAJd,cASDH,OATC,EAAN;AAWAN,UAAAA,oBAAoB,GAAG,MAAMH,EAAE,CAACQ,SAAH,CAAaJ,MAAM,CAACE,SAApB,EAA+BG,OAA/B,EAA7B;AACH,SA/BD,CAiCA;;;AACA,YAAI,CAACZ,eAAL,EAAsB;AAClB,iBAAO;AAAEiB,YAAAA,KAAK,EAAE,KAAT;AAAgBC,YAAAA,OAAO,EAAE;AAAzB,WAAP;AACH,SApCD,CAsCA;;;AACA,cAAMf,EAAE,CACHW,SADC,iCAEKP,MAAM,CAACG,oBAFZ;AAGEK,UAAAA,WAAW,EAAET,oBAAoB,CAACS,WAHpC;AAIEC,UAAAA,IAAI,EAAE,MAAM,6BACRV,oBAAoB,CAACU,IADb,EAERhB,eAFQ;AAJd,YASDY,OATC,EAAN;AAWA,eAAO;AAAEK,UAAAA,KAAK,EAAE,KAAT;AAAgBC,UAAAA,OAAO,EAAE;AAAzB,SAAP;AACH,OAnDD,CAmDE,OAAOL,CAAP,EAAU;AACR,eAAO;AAAEI,UAAAA,KAAK,EAAE,IAAT;AAAeC,UAAAA,OAAO,EAAEL,CAAC,CAACK;AAA1B,SAAP;AACH;AACJ,KAzDD;;AA0DA,UAAMC,OAAO,GAAG,0BAAcrB,YAAd,CAAhB;AAEA,WAAO,MAAMqB,OAAO,CAACtB,OAAO,CAACuB,cAAT,CAApB;AACH;;AAnEwE,CAA9D,C","sourcesContent":["import S3 from \"aws-sdk/clients/s3\";\nimport transformImage from \"./transformImage\";\nimport optimizeImage from \"./optimizeImage\";\nimport { createHandler, EventHandlerCallable, getEnvironment, getObjectParams } from \"../utils\";\nimport { getImageKey } from \"./utils\";\nimport { HandlerPlugin } from \"@webiny/handler/types\";\nimport { ArgsContext } from \"@webiny/handler-args/types\";\nimport { TransformHandlerEventArgs } from \"~/handlers/types\";\n\nexport default (): HandlerPlugin<ArgsContext<TransformHandlerEventArgs>> => ({\n type: \"handler\",\n name: \"handler-download-file\",\n async handle(context) {\n // TODO @ts-refactor check in createHandler for returns types that eventHandler must return\n // @ts-ignore\n const eventHandler: EventHandlerCallable<TransformHandlerEventArgs> = async ({\n body: { transformations, key }\n }) => {\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 { error: false, message: \"\" };\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 { error: false, message: \"\" };\n } catch (e) {\n return { error: true, message: e.message };\n }\n };\n const handler = createHandler(eventHandler);\n\n return await handler(context.invocationArgs);\n }\n});\n"]}
@@ -1,13 +1,29 @@
1
+ import { ClientContext } from "@webiny/handler-client/types";
2
+ import S3 from "aws-sdk/clients/s3";
3
+ interface File {
4
+ extension: string;
5
+ name: string;
6
+ }
7
+ interface Options {
8
+ width?: string;
9
+ }
10
+ export interface CanProcessParams {
11
+ s3: S3;
12
+ file: File;
13
+ options?: Options;
14
+ context: ClientContext;
15
+ }
16
+ export interface ProcessParams {
17
+ s3: S3;
18
+ file: File;
19
+ options?: Options;
20
+ context: ClientContext;
21
+ }
1
22
  declare const _default: {
2
- canProcess: (opts: any) => boolean;
3
- process({ s3, file, options, context }: {
4
- s3: any;
5
- file: any;
6
- options: any;
7
- context: any;
8
- }): Promise<{
9
- object: any;
10
- params: any;
23
+ canProcess: (params: CanProcessParams) => boolean;
24
+ process({ s3, file, options, context }: ProcessParams): Promise<{
25
+ object: import("aws-sdk/lib/request").PromiseResult<S3.GetObjectOutput, import("aws-sdk/lib/error").AWSError>;
26
+ params: import("../../utils/getObjectParams").ObjectParamsResponse;
11
27
  }>;
12
28
  };
13
29
  export default _default;
@@ -13,7 +13,6 @@ var _utils = require("../../utils");
13
13
 
14
14
  var _utils2 = require("../utils");
15
15
 
16
- // @ts-ignore
17
16
  const IMAGE_TRANSFORMER_FUNCTION = process.env.IMAGE_TRANSFORMER_FUNCTION;
18
17
 
19
18
  const callImageTransformerLambda = async ({
@@ -33,8 +32,8 @@ const callImageTransformerLambda = async ({
33
32
  };
34
33
 
35
34
  var _default = {
36
- canProcess: opts => {
37
- return _utils2.SUPPORTED_IMAGES.includes(opts.file.extension);
35
+ canProcess: params => {
36
+ return _utils2.SUPPORTED_IMAGES.includes(params.file.extension);
38
37
  },
39
38
 
40
39
  async process({
@@ -0,0 +1 @@
1
+ {"version":3,"sources":["imageLoader.ts"],"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","SUPPORTED_TRANSFORMABLE_IMAGES","object","getObject","promise","e","imageTransformerLambdaResponse","error","Error","message"],"mappings":";;;;;;;;;AAAA;;AACA;;AACA;;AAIA,MAAMA,0BAA0B,GAAGC,OAAO,CAACC,GAAR,CAAYF,0BAA/C;;AAQA,MAAMG,0BAA0B,GAAG,OAAO;AAAEC,EAAAA,GAAF;AAAOC,EAAAA,eAAP;AAAwBC,EAAAA;AAAxB,CAAP,KAAgE;AAC/F,SAAO,MAAMA,OAAO,CAACC,aAAR,CAAsBC,MAAtB,CAA6B;AACtCC,IAAAA,IAAI,EAAET,0BADgC;AAEtCU,IAAAA,OAAO,EAAE;AACLC,MAAAA,IAAI,EAAE;AACFP,QAAAA,GADE;AAEFC,QAAAA;AAFE;AADD;AAF6B,GAA7B,CAAb;AASH,CAVD;;eA8Be;AACXO,EAAAA,UAAU,EAAGC,MAAD,IAA8B;AACtC,WAAOC,yBAAiBC,QAAjB,CAA0BF,MAAM,CAACG,IAAP,CAAYC,SAAtC,CAAP;AACH,GAHU;;AAIX,QAAMhB,OAAN,CAAc;AAAEiB,IAAAA,EAAF;AAAMF,IAAAA,IAAN;AAAYG,IAAAA,OAAZ;AAAqBb,IAAAA;AAArB,GAAd,EAA6D;AACzD;AACA,QAAIc,YAAJ;AAEA,UAAMf,eAAe,GAAG,2CAA6Bc,OAA7B,CAAxB;;AAEA,QAAId,eAAe,IAAIgB,uCAA+BN,QAA/B,CAAwCC,IAAI,CAACC,SAA7C,CAAvB,EAAgF;AAC5EG,MAAAA,YAAY,GAAG,4BAAgB,yBAAY;AAAEhB,QAAAA,GAAG,EAAEY,IAAI,CAACP,IAAZ;AAAkBJ,QAAAA;AAAlB,OAAZ,CAAhB,CAAf;;AACA,UAAI;AACA,eAAO;AACHiB,UAAAA,MAAM,EAAE,MAAMJ,EAAE,CAACK,SAAH,CAAaH,YAAb,EAA2BI,OAA3B,EADX;AAEHX,UAAAA,MAAM,EAAEO;AAFL,SAAP;AAIH,OALD,CAKE,OAAOK,CAAP,EAAU;AACR,cAAMC,8BAA8B,GAAG,MAAMvB,0BAA0B,CAAC;AACpEC,UAAAA,GAAG,EAAEY,IAAI,CAACP,IAD0D;AAEpEJ,UAAAA,eAFoE;AAGpEC,UAAAA;AAHoE,SAAD,CAAvE;;AAMA,YAAIoB,8BAA8B,CAACC,KAAnC,EAA0C;AACtC,gBAAMC,KAAK,CAACF,8BAA8B,CAACG,OAAhC,CAAX;AACH;;AAED,eAAO;AACHP,UAAAA,MAAM,EAAE,MAAMJ,EAAE,CAACK,SAAH,CAAaH,YAAb,EAA2BI,OAA3B,EADX;AAEHX,UAAAA,MAAM,EAAEO;AAFL,SAAP;AAIH;AACJ;;AAEDA,IAAAA,YAAY,GAAG,4BAAgB,yBAAY;AAAEhB,MAAAA,GAAG,EAAEY,IAAI,CAACP;AAAZ,KAAZ,CAAhB,CAAf;;AACA,QAAI;AACA,aAAO;AACHa,QAAAA,MAAM,EAAE,MAAMJ,EAAE,CAACK,SAAH,CAAaH,YAAb,EAA2BI,OAA3B,EADX;AAEHX,QAAAA,MAAM,EAAEO;AAFL,OAAP;AAIH,KALD,CAKE,OAAOK,CAAP,EAAU;AACR,YAAMC,8BAA8B,GAAG,MAAMvB,0BAA0B,CAAC;AACpEC,QAAAA,GAAG,EAAEY,IAAI,CAACP,IAD0D;AAEpEH,QAAAA;AAFoE,OAAD,CAAvE;;AAKA,UAAIoB,8BAA8B,CAACC,KAAnC,EAA0C;AACtC,cAAMC,KAAK,CAACF,8BAA8B,CAACG,OAAhC,CAAX;AACH;;AAED,aAAO;AACHP,QAAAA,MAAM,EAAE,MAAMJ,EAAE,CAACK,SAAH,CAAaH,YAAb,EAA2BI,OAA3B,EADX;AAEHX,QAAAA,MAAM,EAAEO;AAFL,OAAP;AAIH;AACJ;;AAxDU,C","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?: any;\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}\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"]}
@@ -1,13 +1,8 @@
1
1
  declare const _default: {
2
- canProcess: (opts: any) => boolean;
3
- process({ s3, file, options, context }: {
4
- s3: any;
5
- file: any;
6
- options: any;
7
- context: any;
8
- }): Promise<{
9
- object: any;
10
- params: any;
2
+ canProcess: (params: import("./imageLoader").CanProcessParams) => boolean;
3
+ process({ s3, file, options, context }: import("./imageLoader").ProcessParams): Promise<{
4
+ object: import("aws-sdk/lib/request").PromiseResult<import("aws-sdk/clients/s3").GetObjectOutput, import("aws-sdk/lib/error").AWSError>;
5
+ params: import("../../utils/getObjectParams").ObjectParamsResponse;
11
6
  }>;
12
7
  }[];
13
8
  export default _default;
@@ -0,0 +1 @@
1
+ {"version":3,"sources":["index.ts"],"names":["imageLoader"],"mappings":";;;;;;;;;AAAA;;eAEe,CAACA,oBAAD,C","sourcesContent":["import imageLoader from \"./imageLoader\";\n\nexport default [imageLoader];\n"]}
@@ -1,6 +1,10 @@
1
- declare const _default: (args: any) => {
2
- [key: string]: any;
3
- };
1
+ export interface SanitizeImageArgs {
2
+ width?: string;
3
+ }
4
+ export interface SanitizeImageTransformations {
5
+ width: number;
6
+ }
7
+ declare const _default: (args?: SanitizeImageArgs | undefined) => SanitizeImageTransformations | null;
4
8
  /**
5
9
  * Takes only allowed transformations into consideration, and discards the rest.
6
10
  */
@@ -5,43 +5,50 @@ 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
+
8
9
  /**
9
10
  * Takes only allowed transformations into consideration, and discards the rest.
10
11
  */
11
-
12
12
  var _default = args => {
13
13
  const transformations = {};
14
14
 
15
- if (args) {
16
- const width = parseInt(args.width);
15
+ if (!args || !args.width) {
16
+ return null;
17
+ }
17
18
 
18
- if (width > 0) {
19
- transformations.width = SUPPORTED_IMAGE_RESIZE_WIDTHS[0];
20
- let i = SUPPORTED_IMAGE_RESIZE_WIDTHS.length;
19
+ const width = parseInt(args.width);
21
20
 
22
- while (i >= 0) {
23
- if (width === SUPPORTED_IMAGE_RESIZE_WIDTHS[i]) {
24
- transformations.width = SUPPORTED_IMAGE_RESIZE_WIDTHS[i];
25
- break;
26
- }
21
+ if (width <= 0) {
22
+ return null;
23
+ }
27
24
 
28
- if (width > SUPPORTED_IMAGE_RESIZE_WIDTHS[i]) {
29
- // Use next larger width. If there isn't any, use current.
30
- transformations.width = SUPPORTED_IMAGE_RESIZE_WIDTHS[i + 1];
25
+ transformations.width = SUPPORTED_IMAGE_RESIZE_WIDTHS[0];
26
+ let i = SUPPORTED_IMAGE_RESIZE_WIDTHS.length;
31
27
 
32
- if (!transformations.width) {
33
- transformations.width = SUPPORTED_IMAGE_RESIZE_WIDTHS[i];
34
- }
28
+ while (i >= 0) {
29
+ if (width === SUPPORTED_IMAGE_RESIZE_WIDTHS[i]) {
30
+ transformations.width = SUPPORTED_IMAGE_RESIZE_WIDTHS[i];
31
+ break;
32
+ }
35
33
 
36
- break;
37
- }
34
+ if (width > SUPPORTED_IMAGE_RESIZE_WIDTHS[i]) {
35
+ // Use next larger width. If there isn't any, use current.
36
+ transformations.width = SUPPORTED_IMAGE_RESIZE_WIDTHS[i + 1];
38
37
 
39
- i--;
38
+ if (!transformations.width) {
39
+ transformations.width = SUPPORTED_IMAGE_RESIZE_WIDTHS[i];
40
40
  }
41
+
42
+ break;
41
43
  }
44
+
45
+ i--;
42
46
  }
43
47
 
44
48
  if (Object.keys(transformations).length > 0) {
49
+ /**
50
+ * It is safe to cast.
51
+ */
45
52
  return transformations;
46
53
  }
47
54
 
@@ -0,0 +1 @@
1
+ {"version":3,"sources":["sanitizeImageTransformations.ts"],"names":["SUPPORTED_IMAGE_RESIZE_WIDTHS","args","transformations","width","parseInt","i","length","Object","keys"],"mappings":";;;;;;AAAA,MAAMA,6BAAuC,GAAG,CAAC,GAAD,EAAM,GAAN,EAAW,GAAX,EAAgB,GAAhB,EAAqB,IAArB,EAA2B,IAA3B,EAAiC,IAAjC,CAAhD;;AASA;AACA;AACA;eACgBC,IAAD,IAAmE;AAC9E,QAAMC,eAAsD,GAAG,EAA/D;;AAEA,MAAI,CAACD,IAAD,IAAS,CAACA,IAAI,CAACE,KAAnB,EAA0B;AACtB,WAAO,IAAP;AACH;;AACD,QAAMA,KAAK,GAAGC,QAAQ,CAACH,IAAI,CAACE,KAAN,CAAtB;;AACA,MAAIA,KAAK,IAAI,CAAb,EAAgB;AACZ,WAAO,IAAP;AACH;;AACDD,EAAAA,eAAe,CAACC,KAAhB,GAAwBH,6BAA6B,CAAC,CAAD,CAArD;AACA,MAAIK,CAAC,GAAGL,6BAA6B,CAACM,MAAtC;;AACA,SAAOD,CAAC,IAAI,CAAZ,EAAe;AACX,QAAIF,KAAK,KAAKH,6BAA6B,CAACK,CAAD,CAA3C,EAAgD;AAC5CH,MAAAA,eAAe,CAACC,KAAhB,GAAwBH,6BAA6B,CAACK,CAAD,CAArD;AACA;AACH;;AAED,QAAIF,KAAK,GAAGH,6BAA6B,CAACK,CAAD,CAAzC,EAA8C;AAC1C;AACAH,MAAAA,eAAe,CAACC,KAAhB,GAAwBH,6BAA6B,CAACK,CAAC,GAAG,CAAL,CAArD;;AACA,UAAI,CAACH,eAAe,CAACC,KAArB,EAA4B;AACxBD,QAAAA,eAAe,CAACC,KAAhB,GAAwBH,6BAA6B,CAACK,CAAD,CAArD;AACH;;AACD;AACH;;AAEDA,IAAAA,CAAC;AACJ;;AAED,MAAIE,MAAM,CAACC,IAAP,CAAYN,eAAZ,EAA6BI,MAA7B,GAAsC,CAA1C,EAA6C;AACzC;AACR;AACA;AACQ,WAAOJ,eAAP;AACH;;AAED,SAAO,IAAP;AACH,C","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"]}
@@ -1,9 +1,15 @@
1
+ import S3 from "aws-sdk/clients/s3";
2
+ export interface ImageManagerCanProcessParams {
3
+ key: string;
4
+ extension: string;
5
+ }
6
+ export interface ImageManagerProcessParams {
7
+ s3: S3;
8
+ key: string;
9
+ extension: string;
10
+ }
1
11
  declare const _default: {
2
- canProcess: (opts: any) => boolean;
3
- process({ s3, key, extension }: {
4
- s3: any;
5
- key: any;
6
- extension: any;
7
- }): Promise<void>;
12
+ canProcess: (params: ImageManagerCanProcessParams) => boolean;
13
+ process({ s3, key, extension }: ImageManagerProcessParams): Promise<void>;
8
14
  };
9
15
  export default _default;
@@ -10,21 +10,17 @@ var _utils = require("../../utils");
10
10
  var _utils2 = require("../utils");
11
11
 
12
12
  var _default = {
13
- canProcess: opts => {
13
+ canProcess: params => {
14
14
  const {
15
15
  key,
16
16
  extension
17
- } = opts;
17
+ } = params;
18
18
 
19
- if (!_utils2.SUPPORTED_IMAGES.includes(extension)) {
19
+ if (_utils2.SUPPORTED_IMAGES.includes(extension) === false) {
20
20
  return false;
21
21
  }
22
22
 
23
- if (key.startsWith(_utils2.OPTIMIZED_IMAGE_PREFIX || key.startsWith(_utils2.OPTIMIZED_TRANSFORMED_IMAGE_PREFIX))) {
24
- return false;
25
- }
26
-
27
- return true;
23
+ return key.startsWith(_utils2.OPTIMIZED_IMAGE_PREFIX) || key.startsWith(_utils2.OPTIMIZED_TRANSFORMED_IMAGE_PREFIX);
28
24
  },
29
25
 
30
26
  async process({
@@ -37,17 +33,26 @@ var _default = {
37
33
  key
38
34
  }))).promise(); // 2. Search for all transformed images and delete those too.
39
35
 
40
- if (_utils2.SUPPORTED_TRANSFORMABLE_IMAGES.includes(extension)) {
41
- const env = (0, _utils.getEnvironment)();
42
- const imagesList = await s3.listObjects({
43
- Bucket: env.bucket,
44
- Prefix: (0, _utils2.getOptimizedTransformedImageKeyPrefix)(key)
45
- }).promise();
36
+ if (_utils2.SUPPORTED_TRANSFORMABLE_IMAGES.includes(extension) === false) {
37
+ return;
38
+ }
39
+
40
+ const env = (0, _utils.getEnvironment)();
41
+ const imagesList = await s3.listObjects({
42
+ Bucket: env.bucket,
43
+ Prefix: (0, _utils2.getOptimizedTransformedImageKeyPrefix)(key)
44
+ }).promise();
45
+
46
+ if (!imagesList.Contents) {
47
+ return;
48
+ }
46
49
 
47
- for (let i = 0; i < imagesList.Contents.length; i++) {
48
- const imageObject = imagesList.Contents[i];
49
- await s3.deleteObject((0, _utils.getObjectParams)(imageObject.Key)).promise();
50
+ for (const imageObject of imagesList.Contents) {
51
+ if (!imageObject.Key) {
52
+ continue;
50
53
  }
54
+
55
+ await s3.deleteObject((0, _utils.getObjectParams)(imageObject.Key)).promise();
51
56
  }
52
57
  }
53
58
 
@@ -0,0 +1 @@
1
+ {"version":3,"sources":["imageManager.ts"],"names":["canProcess","params","key","extension","SUPPORTED_IMAGES","includes","startsWith","OPTIMIZED_IMAGE_PREFIX","OPTIMIZED_TRANSFORMED_IMAGE_PREFIX","process","s3","deleteObject","promise","SUPPORTED_TRANSFORMABLE_IMAGES","env","imagesList","listObjects","Bucket","bucket","Prefix","Contents","imageObject","Key"],"mappings":";;;;;;;AACA;;AACA;;eAkBe;AACXA,EAAAA,UAAU,EAAGC,MAAD,IAA0C;AAClD,UAAM;AAAEC,MAAAA,GAAF;AAAOC,MAAAA;AAAP,QAAqBF,MAA3B;;AACA,QAAIG,yBAAiBC,QAAjB,CAA0BF,SAA1B,MAAyC,KAA7C,EAAoD;AAChD,aAAO,KAAP;AACH;;AAED,WACID,GAAG,CAACI,UAAJ,CAAeC,8BAAf,KACAL,GAAG,CAACI,UAAJ,CAAeE,0CAAf,CAFJ;AAIH,GAXU;;AAYX,QAAMC,OAAN,CAAc;AAAEC,IAAAA,EAAF;AAAMR,IAAAA,GAAN;AAAWC,IAAAA;AAAX,GAAd,EAAiE;AAC7D;AAEA,UAAMO,EAAE,CAACC,YAAH,CAAgB,4BAAgB,yBAAY;AAAET,MAAAA;AAAF,KAAZ,CAAhB,CAAhB,EAAuDU,OAAvD,EAAN,CAH6D,CAK7D;;AACA,QAAIC,uCAA+BR,QAA/B,CAAwCF,SAAxC,MAAuD,KAA3D,EAAkE;AAC9D;AACH;;AACD,UAAMW,GAAG,GAAG,4BAAZ;AACA,UAAMC,UAAU,GAAG,MAAML,EAAE,CACtBM,WADoB,CACR;AACTC,MAAAA,MAAM,EAAEH,GAAG,CAACI,MADH;AAETC,MAAAA,MAAM,EAAE,mDAAsCjB,GAAtC;AAFC,KADQ,EAKpBU,OALoB,EAAzB;;AAOA,QAAI,CAACG,UAAU,CAACK,QAAhB,EAA0B;AACtB;AACH;;AAED,SAAK,MAAMC,WAAX,IAA0BN,UAAU,CAACK,QAArC,EAA+C;AAC3C,UAAI,CAACC,WAAW,CAACC,GAAjB,EAAsB;AAClB;AACH;;AACD,YAAMZ,EAAE,CAACC,YAAH,CAAgB,4BAAgBU,WAAW,CAACC,GAA5B,CAAhB,EAAkDV,OAAlD,EAAN;AACH;AACJ;;AAvCU,C","sourcesContent":["import S3 from \"aws-sdk/clients/s3\";\nimport { getObjectParams, getEnvironment } from \"~/handlers/utils\";\nimport {\n SUPPORTED_IMAGES,\n SUPPORTED_TRANSFORMABLE_IMAGES,\n OPTIMIZED_IMAGE_PREFIX,\n OPTIMIZED_TRANSFORMED_IMAGE_PREFIX,\n getImageKey,\n getOptimizedTransformedImageKeyPrefix\n} from \"../utils\";\n\nexport interface ImageManagerCanProcessParams {\n key: string;\n extension: string;\n}\nexport interface ImageManagerProcessParams {\n s3: S3;\n key: string;\n extension: string;\n}\nexport default {\n canProcess: (params: ImageManagerCanProcessParams) => {\n const { key, extension } = params;\n if (SUPPORTED_IMAGES.includes(extension) === false) {\n return false;\n }\n\n return (\n key.startsWith(OPTIMIZED_IMAGE_PREFIX) ||\n key.startsWith(OPTIMIZED_TRANSFORMED_IMAGE_PREFIX)\n );\n },\n async process({ s3, key, extension }: ImageManagerProcessParams) {\n // 1. Get optimized image's key.\n\n await s3.deleteObject(getObjectParams(getImageKey({ key }))).promise();\n\n // 2. Search for all transformed images and delete those too.\n if (SUPPORTED_TRANSFORMABLE_IMAGES.includes(extension) === false) {\n return;\n }\n const env = getEnvironment();\n const imagesList = await s3\n .listObjects({\n Bucket: env.bucket,\n Prefix: getOptimizedTransformedImageKeyPrefix(key)\n })\n .promise();\n\n if (!imagesList.Contents) {\n return;\n }\n\n for (const imageObject of imagesList.Contents) {\n if (!imageObject.Key) {\n continue;\n }\n await s3.deleteObject(getObjectParams(imageObject.Key)).promise();\n }\n }\n};\n"]}
@@ -1,9 +1,5 @@
1
1
  declare const _default: {
2
- canProcess: (opts: any) => boolean;
3
- process({ s3, key, extension }: {
4
- s3: any;
5
- key: any;
6
- extension: any;
7
- }): Promise<void>;
2
+ canProcess: (params: import("./imageManager").ImageManagerCanProcessParams) => boolean;
3
+ process({ s3, key, extension }: import("./imageManager").ImageManagerProcessParams): Promise<void>;
8
4
  }[];
9
5
  export default _default;
@@ -0,0 +1 @@
1
+ {"version":3,"sources":["index.ts"],"names":["imageManager"],"mappings":";;;;;;;;;AAAA;;eAEe,CAACA,qBAAD,C","sourcesContent":["import imageManager from \"./imageManager\";\n\nexport default [imageManager];\n"]}
@@ -1,2 +1,3 @@
1
- declare const _default: (buffer: any, type: any) => Promise<any>;
1
+ import { Body } from "aws-sdk/clients/s3";
2
+ declare const _default: (buffer: Body, type: string) => Promise<Body>;
2
3
  export default _default;
@@ -9,6 +9,9 @@ exports.default = void 0;
9
9
 
10
10
  var _sharp = _interopRequireDefault(require("sharp"));
11
11
 
12
+ /**
13
+ * Sharp is included in the AWS Lambda layer
14
+ */
12
15
  // @ts-ignore
13
16
  var _default = async (buffer, type) => {
14
17
  switch (type) {
@@ -0,0 +1 @@
1
+ {"version":3,"sources":["optimizeImage.ts"],"names":["buffer","type","resize","width","withoutEnlargement","fit","png","compressionLevel","adaptiveFiltering","force","withMetadata","toBuffer","toFormat","quality"],"mappings":";;;;;;;;;AAIA;;AAJA;AACA;AACA;AACA;eAIe,OAAOA,MAAP,EAAqBC,IAArB,KAAqD;AAChE,UAAQA,IAAR;AACI,SAAK,WAAL;AAAkB;AACd,eAAO,MAAM,oBAAMD,MAAN,EACRE,MADQ,CACD;AAAEC,UAAAA,KAAK,EAAE,IAAT;AAAeC,UAAAA,kBAAkB,EAAE,IAAnC;AAAyCC,UAAAA,GAAG,EAAE;AAA9C,SADC,EAERC,GAFQ,CAEJ;AAAEC,UAAAA,gBAAgB,EAAE,CAApB;AAAuBC,UAAAA,iBAAiB,EAAE,IAA1C;AAAgDC,UAAAA,KAAK,EAAE;AAAvD,SAFI,EAGRC,YAHQ,GAIRC,QAJQ,EAAb;AAKH;;AACD,SAAK,YAAL;AACA,SAAK,WAAL;AAAkB;AACd,eAAO,MAAM,oBAAMX,MAAN,EACRE,MADQ,CACD;AAAEC,UAAAA,KAAK,EAAE,IAAT;AAAeC,UAAAA,kBAAkB,EAAE,IAAnC;AAAyCC,UAAAA,GAAG,EAAE;AAA9C,SADC,EAERO,QAFQ,CAEC,MAFD,EAES;AAAEC,UAAAA,OAAO,EAAE;AAAX,SAFT,EAGRF,QAHQ,EAAb;AAIH;;AACD;AACI,aAAOX,MAAP;AAhBR;AAkBH,C","sourcesContent":["/**\n * Sharp is included in the AWS Lambda layer\n */\n// @ts-ignore\nimport sharp from \"sharp\";\nimport { Body } from \"aws-sdk/clients/s3\";\n\nexport default async (buffer: Body, type: string): Promise<Body> => {\n switch (type) {\n case \"image/png\": {\n return await sharp(buffer)\n .resize({ width: 2560, withoutEnlargement: true, fit: \"inside\" })\n .png({ compressionLevel: 9, adaptiveFiltering: true, force: true })\n .withMetadata()\n .toBuffer();\n }\n case \"image/jpeg\":\n case \"image/jpg\": {\n return await sharp(buffer)\n .resize({ width: 2560, withoutEnlargement: true, fit: \"inside\" })\n .toFormat(\"jpeg\", { quality: 90 })\n .toBuffer();\n }\n default:\n return buffer;\n }\n};\n"]}
@@ -1,9 +1,10 @@
1
- declare const _default: (buffer: any, transformations: any) => Promise<any>;
1
+ import { Body } from "aws-sdk/clients/s3";
2
+ interface Transformation {
3
+ width: string;
4
+ }
5
+ declare const _default: (buffer: Body, transformations: Transformation) => Promise<Body>;
2
6
  /**
3
7
  * Only processing "width" at the moment.
4
8
  * Check "sanitizeImageTransformations.js" to allow additional image processing transformations.
5
- * @param buffer
6
- * @param transformations
7
- * @returns {Promise<Buffer>}
8
9
  */
9
10
  export default _default;
@@ -9,14 +9,14 @@ exports.default = void 0;
9
9
 
10
10
  var _sharp = _interopRequireDefault(require("sharp"));
11
11
 
12
+ /**
13
+ * Sharp is included in the AWS Lambda layer
14
+ */
12
15
  // @ts-ignore
13
16
 
14
17
  /**
15
18
  * Only processing "width" at the moment.
16
19
  * Check "sanitizeImageTransformations.js" to allow additional image processing transformations.
17
- * @param buffer
18
- * @param transformations
19
- * @returns {Promise<Buffer>}
20
20
  */
21
21
  var _default = async (buffer, transformations) => {
22
22
  const {
@@ -0,0 +1 @@
1
+ {"version":3,"sources":["transformImage.ts"],"names":["buffer","transformations","width","resize","toBuffer"],"mappings":";;;;;;;;;AAIA;;AAJA;AACA;AACA;AACA;;AAOA;AACA;AACA;AACA;eACe,OAAOA,MAAP,EAAqBC,eAArB,KAAwE;AACnF,QAAM;AAAEC,IAAAA;AAAF,MAAYD,eAAlB;AACA,SAAO,MAAM,oBAAMD,MAAN,EAAcG,MAAd,CAAqB;AAAED,IAAAA;AAAF,GAArB,EAAgCE,QAAhC,EAAb;AACH,C","sourcesContent":["/**\n * Sharp is included in the AWS Lambda layer\n */\n// @ts-ignore\nimport sharp from \"sharp\";\nimport { Body } from \"aws-sdk/clients/s3\";\n\ninterface Transformation {\n width: string;\n}\n/**\n * Only processing \"width\" at the moment.\n * Check \"sanitizeImageTransformations.js\" to allow additional image processing transformations.\n */\nexport default async (buffer: Body, transformations: Transformation): Promise<Body> => {\n const { width } = transformations;\n return await sharp(buffer).resize({ width }).toBuffer();\n};\n"]}
@@ -2,8 +2,8 @@ declare const SUPPORTED_IMAGES: string[];
2
2
  declare const SUPPORTED_TRANSFORMABLE_IMAGES: string[];
3
3
  declare const OPTIMIZED_TRANSFORMED_IMAGE_PREFIX = "img-o-t-";
4
4
  declare const OPTIMIZED_IMAGE_PREFIX = "img-o-";
5
- declare const getOptimizedImageKeyPrefix: (key: any) => string;
6
- declare const getOptimizedTransformedImageKeyPrefix: (key: any) => string;
5
+ declare const getOptimizedImageKeyPrefix: (key: string) => string;
6
+ declare const getOptimizedTransformedImageKeyPrefix: (key: string) => string;
7
7
  interface GetImageKeyParams {
8
8
  key: string;
9
9
  transformations?: any;
@@ -0,0 +1 @@
1
+ {"version":3,"sources":["utils.ts"],"names":["SUPPORTED_IMAGES","SUPPORTED_TRANSFORMABLE_IMAGES","OPTIMIZED_TRANSFORMED_IMAGE_PREFIX","OPTIMIZED_IMAGE_PREFIX","getOptimizedImageKeyPrefix","key","getOptimizedTransformedImageKeyPrefix","getImageKey","transformations","prefix"],"mappings":";;;;;;;;;AAAA;;AAEA,MAAMA,gBAAgB,GAAG,CAAC,MAAD,EAAS,OAAT,EAAkB,MAAlB,EAA0B,MAA1B,EAAkC,MAAlC,CAAzB;;AACA,MAAMC,8BAA8B,GAAG,CAAC,MAAD,EAAS,OAAT,EAAkB,MAAlB,CAAvC;;AAEA,MAAMC,kCAAkC,GAAG,UAA3C;;AACA,MAAMC,sBAAsB,GAAG,QAA/B;;;AAEA,MAAMC,0BAA0B,GAAIC,GAAD,IAAyB;AACxD,SAAQ,GAAEF,sBAAuB,GAAE,yBAAWE,GAAX,CAAgB,GAAnD;AACH,CAFD;;;;AAIA,MAAMC,qCAAqC,GAAID,GAAD,IAAyB;AACnE,SAAQ,GAAEH,kCAAmC,GAAE,yBAAWG,GAAX,CAAgB,GAA/D;AACH,CAFD;;;;AASA,MAAME,WAAW,GAAG,CAAC;AAAEF,EAAAA,GAAF;AAAOG,EAAAA;AAAP,CAAD,KAAyD;AACzE,MAAI,CAACA,eAAL,EAAsB;AAClB,UAAMC,MAAM,GAAGL,0BAA0B,CAACC,GAAD,CAAzC;AACA,WAAOI,MAAM,GAAGJ,GAAhB;AACH;;AAED,QAAMI,MAAM,GAAGH,qCAAqC,CAACD,GAAD,CAApD;AACA,SAAQ,GAAEI,MAAO,GAAE,yBAAWD,eAAX,CAA4B,IAAGH,GAAI,EAAtD;AACH,CARD","sourcesContent":["import objectHash from \"object-hash\";\n\nconst SUPPORTED_IMAGES = [\".jpg\", \".jpeg\", \".png\", \".svg\", \".gif\"];\nconst SUPPORTED_TRANSFORMABLE_IMAGES = [\".jpg\", \".jpeg\", \".png\"];\n\nconst OPTIMIZED_TRANSFORMED_IMAGE_PREFIX = \"img-o-t-\";\nconst OPTIMIZED_IMAGE_PREFIX = \"img-o-\";\n\nconst getOptimizedImageKeyPrefix = (key: string): string => {\n return `${OPTIMIZED_IMAGE_PREFIX}${objectHash(key)}-`;\n};\n\nconst getOptimizedTransformedImageKeyPrefix = (key: string): string => {\n return `${OPTIMIZED_TRANSFORMED_IMAGE_PREFIX}${objectHash(key)}-`;\n};\n\ninterface GetImageKeyParams {\n key: string;\n transformations?: any;\n}\n\nconst getImageKey = ({ key, transformations }: GetImageKeyParams): string => {\n if (!transformations) {\n const prefix = getOptimizedImageKeyPrefix(key);\n return prefix + key;\n }\n\n const prefix = getOptimizedTransformedImageKeyPrefix(key);\n return `${prefix}${objectHash(transformations)}-${key}`;\n};\n\nexport {\n SUPPORTED_IMAGES,\n SUPPORTED_TRANSFORMABLE_IMAGES,\n OPTIMIZED_TRANSFORMED_IMAGE_PREFIX,\n OPTIMIZED_IMAGE_PREFIX,\n getImageKey,\n getOptimizedImageKeyPrefix,\n getOptimizedTransformedImageKeyPrefix\n};\n"]}