@webiny/api-file-manager-s3 6.3.0 → 6.4.0-beta.1
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/assetDelivery/assetDeliveryConfig.js +32 -39
- package/assetDelivery/assetDeliveryConfig.js.map +1 -1
- package/assetDelivery/createAssetDelivery.js +5 -19
- package/assetDelivery/createAssetDelivery.js.map +1 -1
- package/assetDelivery/index.js +0 -2
- package/assetDelivery/s3/S3AssetResolver.js +21 -22
- package/assetDelivery/s3/S3AssetResolver.js.map +1 -1
- package/assetDelivery/s3/S3ContentsReader.js +13 -16
- package/assetDelivery/s3/S3ContentsReader.js.map +1 -1
- package/assetDelivery/s3/S3ErrorAssetReply.js +10 -9
- package/assetDelivery/s3/S3ErrorAssetReply.js.map +1 -1
- package/assetDelivery/s3/S3OutputStrategy.js +23 -27
- package/assetDelivery/s3/S3OutputStrategy.js.map +1 -1
- package/assetDelivery/s3/S3RedirectAssetReply.js +12 -11
- package/assetDelivery/s3/S3RedirectAssetReply.js.map +1 -1
- package/assetDelivery/s3/S3StreamAssetReply.js +12 -11
- package/assetDelivery/s3/S3StreamAssetReply.js.map +1 -1
- package/assetDelivery/s3/SharpTransform.js +139 -169
- package/assetDelivery/s3/SharpTransform.js.map +1 -1
- package/assetDelivery/s3/transformation/AssetKeyGenerator.js +18 -17
- package/assetDelivery/s3/transformation/AssetKeyGenerator.js.map +1 -1
- package/assetDelivery/s3/transformation/CallableContentsReader.js +8 -7
- package/assetDelivery/s3/transformation/CallableContentsReader.js.map +1 -1
- package/assetDelivery/s3/transformation/WidthCollection.js +15 -16
- package/assetDelivery/s3/transformation/WidthCollection.js.map +1 -1
- package/assetDelivery/s3/transformation/utils.js +24 -30
- package/assetDelivery/s3/transformation/utils.js.map +1 -1
- package/assetDelivery/threatDetection/ObjectKey.js +15 -14
- package/assetDelivery/threatDetection/ObjectKey.js.map +1 -1
- package/assetDelivery/threatDetection/createThreatDetectionEventHandler.js +28 -42
- package/assetDelivery/threatDetection/createThreatDetectionEventHandler.js.map +1 -1
- package/assetDelivery/threatDetection/createThreatDetectionPluginLoader.js +2 -3
- package/assetDelivery/threatDetection/createThreatDetectionPluginLoader.js.map +1 -1
- package/assetDelivery/threatDetection/index.js +0 -2
- package/assetDelivery/threatDetection/processThreatScanResult.js +48 -54
- package/assetDelivery/threatDetection/processThreatScanResult.js.map +1 -1
- package/assetDelivery/threatDetection/types.js +0 -3
- package/assetDelivery/types.js +0 -3
- package/enterprise/ApplyThreatScanning/CreateFileWithThreatScanDecorator.js +17 -13
- package/enterprise/ApplyThreatScanning/CreateFileWithThreatScanDecorator.js.map +1 -1
- package/enterprise/ApplyThreatScanning/feature.js +6 -5
- package/enterprise/ApplyThreatScanning/feature.js.map +1 -1
- package/features/DeleteFileFromBucket/DeleteFileFromBucketHandler.js +26 -27
- package/features/DeleteFileFromBucket/DeleteFileFromBucketHandler.js.map +1 -1
- package/features/DeleteFileFromBucket/DeleteS3FolderTask.js +40 -51
- package/features/DeleteFileFromBucket/DeleteS3FolderTask.js.map +1 -1
- package/features/DeleteFileFromBucket/feature.js +7 -6
- package/features/DeleteFileFromBucket/feature.js.map +1 -1
- package/features/ExtractMetadata/ExtractMetadataHandler.js +18 -19
- package/features/ExtractMetadata/ExtractMetadataHandler.js.map +1 -1
- package/features/ExtractMetadata/ExtractMetadataTask.js +75 -114
- package/features/ExtractMetadata/ExtractMetadataTask.js.map +1 -1
- package/features/ExtractMetadata/feature.js +7 -6
- package/features/ExtractMetadata/feature.js.map +1 -1
- package/features/FlushCache/FlushCacheOnFileDeleteHandler.js +20 -19
- package/features/FlushCache/FlushCacheOnFileDeleteHandler.js.map +1 -1
- package/features/FlushCache/FlushCacheOnFileUpdateHandler.js +22 -26
- package/features/FlushCache/FlushCacheOnFileUpdateHandler.js.map +1 -1
- package/features/FlushCache/InvalidateCacheTask.js +63 -75
- package/features/FlushCache/InvalidateCacheTask.js.map +1 -1
- package/features/FlushCache/feature.js +8 -7
- package/features/FlushCache/feature.js.map +1 -1
- package/features/GetFileContentsById/GetFileContentsByIdUseCase.d.ts +13 -0
- package/features/GetFileContentsById/GetFileContentsByIdUseCase.js +40 -0
- package/features/GetFileContentsById/GetFileContentsByIdUseCase.js.map +1 -0
- package/features/GetFileContentsById/feature.d.ts +4 -0
- package/features/GetFileContentsById/feature.js +11 -0
- package/features/GetFileContentsById/feature.js.map +1 -0
- package/features/GetFileContentsByKey/GetFileContentsByKeyUseCase.d.ts +13 -0
- package/features/GetFileContentsByKey/GetFileContentsByKeyUseCase.js +40 -0
- package/features/GetFileContentsByKey/GetFileContentsByKeyUseCase.js.map +1 -0
- package/features/GetFileContentsByKey/feature.d.ts +4 -0
- package/features/GetFileContentsByKey/feature.js +11 -0
- package/features/GetFileContentsByKey/feature.js.map +1 -0
- package/features/WriteFileMetadata/MetadataReader.js +9 -10
- package/features/WriteFileMetadata/MetadataReader.js.map +1 -1
- package/features/WriteFileMetadata/MetadataWriter.js +23 -25
- package/features/WriteFileMetadata/MetadataWriter.js.map +1 -1
- package/features/WriteFileMetadata/WriteMetadataAfterBatchCreateHandler.js +14 -12
- package/features/WriteFileMetadata/WriteMetadataAfterBatchCreateHandler.js.map +1 -1
- package/features/WriteFileMetadata/WriteMetadataAfterCreateHandler.js +16 -12
- package/features/WriteFileMetadata/WriteMetadataAfterCreateHandler.js.map +1 -1
- package/features/WriteFileMetadata/feature.js +7 -6
- package/features/WriteFileMetadata/feature.js.map +1 -1
- package/graphql/checkPermissions.js +17 -32
- package/graphql/checkPermissions.js.map +1 -1
- package/graphql/schema.js +99 -102
- package/graphql/schema.js.map +1 -1
- package/index.js +19 -13
- package/index.js.map +1 -1
- package/multiPartUpload/CompleteMultiPartUploadUseCase.js +50 -53
- package/multiPartUpload/CompleteMultiPartUploadUseCase.js.map +1 -1
- package/multiPartUpload/CreateMultiPartUploadUseCase.js +31 -38
- package/multiPartUpload/CreateMultiPartUploadUseCase.js.map +1 -1
- package/package.json +18 -18
- package/types.js +0 -2
- package/utils/CdnPathsGenerator.js +8 -4
- package/utils/CdnPathsGenerator.js.map +1 -1
- package/utils/FileExtension.js +12 -13
- package/utils/FileExtension.js.map +1 -1
- package/utils/FileKey.js +29 -21
- package/utils/FileKey.js.map +1 -1
- package/utils/FileKey.test.js +49 -49
- package/utils/FileKey.test.js.map +1 -1
- package/utils/FileNormalizer.js +34 -35
- package/utils/FileNormalizer.js.map +1 -1
- package/utils/FileUploadModifier.js +32 -32
- package/utils/FileUploadModifier.js.map +1 -1
- package/utils/createFileNormalizerFromContext.js +5 -4
- package/utils/createFileNormalizerFromContext.js.map +1 -1
- package/utils/getPresignedPostPayload.js +36 -33
- package/utils/getPresignedPostPayload.js.map +1 -1
- package/utils/mimeTypes.js +6 -10
- package/utils/mimeTypes.js.map +1 -1
- package/utils/uploadFileToS3.js +11 -10
- package/utils/uploadFileToS3.js.map +1 -1
- package/assetDelivery/index.js.map +0 -1
- package/assetDelivery/threatDetection/index.js.map +0 -1
- package/assetDelivery/threatDetection/types.js.map +0 -1
- package/assetDelivery/types.js.map +0 -1
- package/types.js.map +0 -1
|
@@ -1,47 +1,40 @@
|
|
|
1
|
-
import { createAssetDelivery
|
|
1
|
+
import { createAssetDelivery, createAssetDeliveryConfig } from "@webiny/api-file-manager";
|
|
2
2
|
import { S3 } from "@webiny/aws-sdk/client-s3/index.js";
|
|
3
3
|
import { S3AssetResolver } from "./s3/S3AssetResolver.js";
|
|
4
4
|
import { S3OutputStrategy } from "./s3/S3OutputStrategy.js";
|
|
5
5
|
import { SharpTransform } from "./s3/SharpTransform.js";
|
|
6
6
|
import { GlobalKeyValueStore } from "@webiny/api-core/features/keyValueStore/index.js";
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
config.decorateAssetTransformationStrategy(() => {
|
|
38
|
-
return new SharpTransform({
|
|
39
|
-
s3,
|
|
40
|
-
bucket,
|
|
41
|
-
imageResizeWidths
|
|
42
|
-
});
|
|
43
|
-
});
|
|
44
|
-
})];
|
|
7
|
+
const assetDeliveryConfig = (params)=>{
|
|
8
|
+
const bucket = process.env.S3_BUCKET;
|
|
9
|
+
const region = process.env.AWS_REGION;
|
|
10
|
+
const { presignedUrlTtl = 3600, imageResizeWidths = [
|
|
11
|
+
128,
|
|
12
|
+
384,
|
|
13
|
+
640,
|
|
14
|
+
750,
|
|
15
|
+
828,
|
|
16
|
+
1080,
|
|
17
|
+
1200,
|
|
18
|
+
1920,
|
|
19
|
+
2048,
|
|
20
|
+
3840
|
|
21
|
+
], assetStreamingMaxSize = 4718592 } = params;
|
|
22
|
+
return [
|
|
23
|
+
createAssetDelivery(),
|
|
24
|
+
createAssetDeliveryConfig((config)=>{
|
|
25
|
+
const s3 = new S3({
|
|
26
|
+
region
|
|
27
|
+
});
|
|
28
|
+
config.decorateAssetResolver(({ container })=>new S3AssetResolver(container.resolve(GlobalKeyValueStore), s3, bucket));
|
|
29
|
+
config.decorateAssetOutputStrategy(()=>new S3OutputStrategy(s3, bucket, presignedUrlTtl, assetStreamingMaxSize));
|
|
30
|
+
config.decorateAssetTransformationStrategy(()=>new SharpTransform({
|
|
31
|
+
s3,
|
|
32
|
+
bucket,
|
|
33
|
+
imageResizeWidths
|
|
34
|
+
}));
|
|
35
|
+
})
|
|
36
|
+
];
|
|
45
37
|
};
|
|
38
|
+
export { assetDeliveryConfig };
|
|
46
39
|
|
|
47
40
|
//# sourceMappingURL=assetDeliveryConfig.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"
|
|
1
|
+
{"version":3,"file":"assetDelivery/assetDeliveryConfig.js","sources":["../../src/assetDelivery/assetDeliveryConfig.ts"],"sourcesContent":["import {\n createAssetDelivery as createBaseAssetDelivery,\n createAssetDeliveryConfig\n} from \"@webiny/api-file-manager\";\nimport { S3 } from \"@webiny/aws-sdk/client-s3/index.js\";\nimport { S3AssetResolver } from \"~/assetDelivery/s3/S3AssetResolver.js\";\nimport { S3OutputStrategy } from \"~/assetDelivery/s3/S3OutputStrategy.js\";\nimport { SharpTransform } from \"~/assetDelivery/s3/SharpTransform.js\";\nimport type { AssetDeliveryParams } from \"~/assetDelivery/types.js\";\nimport { GlobalKeyValueStore } from \"@webiny/api-core/features/keyValueStore/index.js\";\n\nexport const assetDeliveryConfig = (params: AssetDeliveryParams) => {\n const bucket = process.env.S3_BUCKET as string;\n const region = process.env.AWS_REGION as string;\n\n const {\n // Presigned URLs last 1 hour\n presignedUrlTtl = 3600,\n imageResizeWidths = [128, 384, 640, 750, 828, 1080, 1200, 1920, 2048, 3840],\n /**\n * Even though Lambda's response payload limit is 6,291,556 bytes, we leave some room for the response envelope.\n * We had situations where a 4.7MB file would cause the payload to go over the limit, so let's be on the safe side.\n */\n assetStreamingMaxSize = 4718592\n } = params;\n\n return [\n // Base asset delivery\n createBaseAssetDelivery(),\n // S3 plugins\n createAssetDeliveryConfig(config => {\n const s3 = new S3({ region });\n\n config.decorateAssetResolver(({ container }) => {\n // This resolver loads file information from the `.metadata` file.\n return new S3AssetResolver(container.resolve(GlobalKeyValueStore), s3, bucket);\n });\n\n config.decorateAssetOutputStrategy(() => {\n return new S3OutputStrategy(s3, bucket, presignedUrlTtl, assetStreamingMaxSize);\n });\n\n config.decorateAssetTransformationStrategy(() => {\n return new SharpTransform({ s3, bucket, imageResizeWidths });\n });\n })\n ];\n};\n"],"names":["assetDeliveryConfig","params","bucket","process","region","presignedUrlTtl","imageResizeWidths","assetStreamingMaxSize","createBaseAssetDelivery","createAssetDeliveryConfig","config","s3","S3","container","S3AssetResolver","GlobalKeyValueStore","S3OutputStrategy","SharpTransform"],"mappings":";;;;;;AAWO,MAAMA,sBAAsB,CAACC;IAChC,MAAMC,SAASC,QAAQ,GAAG,CAAC,SAAS;IACpC,MAAMC,SAASD,QAAQ,GAAG,CAAC,UAAU;IAErC,MAAM,EAEFE,kBAAkB,IAAI,EACtBC,oBAAoB;QAAC;QAAK;QAAK;QAAK;QAAK;QAAK;QAAM;QAAM;QAAM;QAAM;KAAK,EAK3EC,wBAAwB,OAAO,EAClC,GAAGN;IAEJ,OAAO;QAEHO;QAEAC,0BAA0BC,CAAAA;YACtB,MAAMC,KAAK,IAAIC,GAAG;gBAAER;YAAO;YAE3BM,OAAO,qBAAqB,CAAC,CAAC,EAAEG,SAAS,EAAE,GAEhC,IAAIC,gBAAgBD,UAAU,OAAO,CAACE,sBAAsBJ,IAAIT;YAG3EQ,OAAO,2BAA2B,CAAC,IACxB,IAAIM,iBAAiBL,IAAIT,QAAQG,iBAAiBE;YAG7DG,OAAO,mCAAmC,CAAC,IAChC,IAAIO,eAAe;oBAAEN;oBAAIT;oBAAQI;gBAAkB;QAElE;KACH;AACL"}
|
|
@@ -1,23 +1,9 @@
|
|
|
1
1
|
import { createAssetDeliveryPluginLoader } from "@webiny/api-file-manager";
|
|
2
2
|
import { createThreatDetectionPluginLoader } from "./threatDetection/index.js";
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
createAssetDeliveryPluginLoader(() => {
|
|
9
|
-
return import(/* webpackChunkName: "s3AssetDelivery" */"./assetDeliveryConfig.js").then(({
|
|
10
|
-
assetDeliveryConfig
|
|
11
|
-
}) => assetDeliveryConfig(params));
|
|
12
|
-
}),
|
|
13
|
-
/**
|
|
14
|
-
* We only want to load this plugin in the context of the Threat Detection Lambda function.
|
|
15
|
-
*/
|
|
16
|
-
createThreatDetectionPluginLoader(() => {
|
|
17
|
-
return import(/* webpackChunkName: "threatDetectionEventHandler" */"./threatDetection/createThreatDetectionEventHandler.js").then(({
|
|
18
|
-
createThreatDetectionEventHandler
|
|
19
|
-
}) => createThreatDetectionEventHandler());
|
|
20
|
-
})];
|
|
21
|
-
};
|
|
3
|
+
const createAssetDelivery = (params = {})=>[
|
|
4
|
+
createAssetDeliveryPluginLoader(()=>import("./assetDeliveryConfig.js").then(({ assetDeliveryConfig })=>assetDeliveryConfig(params))),
|
|
5
|
+
createThreatDetectionPluginLoader(()=>import("./threatDetection/createThreatDetectionEventHandler.js").then(({ createThreatDetectionEventHandler })=>createThreatDetectionEventHandler()))
|
|
6
|
+
];
|
|
7
|
+
export { createAssetDelivery };
|
|
22
8
|
|
|
23
9
|
//# sourceMappingURL=createAssetDelivery.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"
|
|
1
|
+
{"version":3,"file":"assetDelivery/createAssetDelivery.js","sources":["../../src/assetDelivery/createAssetDelivery.ts"],"sourcesContent":["import { createAssetDeliveryPluginLoader } from \"@webiny/api-file-manager\";\nimport type { PluginFactory } from \"@webiny/plugins/types.js\";\nimport { createThreatDetectionPluginLoader } from \"~/assetDelivery/threatDetection/index.js\";\nimport type { AssetDeliveryParams } from \"~/assetDelivery/types.js\";\n\nexport const createAssetDelivery = (params: AssetDeliveryParams = {}): PluginFactory[] => {\n return [\n /**\n * We only want to load this plugin in the context of the Asset Delivery Lambda function.\n */\n createAssetDeliveryPluginLoader(() => {\n return import(\n /* webpackChunkName: \"s3AssetDelivery\" */ \"./assetDeliveryConfig.js\"\n ).then(({ assetDeliveryConfig }) => assetDeliveryConfig(params));\n }),\n /**\n * We only want to load this plugin in the context of the Threat Detection Lambda function.\n */\n createThreatDetectionPluginLoader(() => {\n return import(\n /* webpackChunkName: \"threatDetectionEventHandler\" */ \"./threatDetection/createThreatDetectionEventHandler.js\"\n ).then(({ createThreatDetectionEventHandler }) => createThreatDetectionEventHandler());\n })\n ];\n};\n"],"names":["createAssetDelivery","params","createAssetDeliveryPluginLoader","assetDeliveryConfig","createThreatDetectionPluginLoader","createThreatDetectionEventHandler"],"mappings":";;AAKO,MAAMA,sBAAsB,CAACC,SAA8B,CAAC,CAAC,GACzD;QAIHC,gCAAgC,IACrB,MAAM,CAAN,4BAEL,IAAI,CAAC,CAAC,EAAEC,mBAAmB,EAAE,GAAKA,oBAAoBF;QAK5DG,kCAAkC,IACvB,MAAM,CAAN,0DAEL,IAAI,CAAC,CAAC,EAAEC,iCAAiC,EAAE,GAAKA;KAEzD"}
|
package/assetDelivery/index.js
CHANGED
|
@@ -6,5 +6,3 @@ export { S3RedirectAssetReply } from "./s3/S3RedirectAssetReply.js";
|
|
|
6
6
|
export { S3StreamAssetReply } from "./s3/S3StreamAssetReply.js";
|
|
7
7
|
export { SharpTransform } from "./s3/SharpTransform.js";
|
|
8
8
|
export { CallableContentsReader } from "./s3/transformation/CallableContentsReader.js";
|
|
9
|
-
|
|
10
|
-
//# sourceMappingURL=index.js.map
|
|
@@ -1,29 +1,28 @@
|
|
|
1
1
|
import { Asset } from "@webiny/api-file-manager";
|
|
2
2
|
import { S3ContentsReader } from "../index.js";
|
|
3
3
|
import { ObjectKey } from "../threatDetection/ObjectKey.js";
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
4
|
+
class S3AssetResolver {
|
|
5
|
+
constructor(keyValueStore, s3, bucket){
|
|
6
|
+
this.keyValueStore = keyValueStore;
|
|
7
|
+
this.s3 = s3;
|
|
8
|
+
this.bucket = bucket;
|
|
9
|
+
}
|
|
10
|
+
async resolve(request) {
|
|
11
|
+
const fileId = ObjectKey.from(request.getKey()).id();
|
|
12
|
+
const result = await this.keyValueStore.get(`FileManager/File/${fileId}/Metadata`);
|
|
13
|
+
if (result.isFail()) return;
|
|
14
|
+
const metadata = result.value;
|
|
15
|
+
const asset = new Asset({
|
|
16
|
+
id: metadata.id,
|
|
17
|
+
tenant: metadata.tenant,
|
|
18
|
+
size: metadata.size,
|
|
19
|
+
contentType: metadata.contentType,
|
|
20
|
+
key: metadata.bucketKey
|
|
21
|
+
});
|
|
22
|
+
asset.setContentsReader(new S3ContentsReader(this.s3, this.bucket));
|
|
23
|
+
return asset;
|
|
15
24
|
}
|
|
16
|
-
const metadata = result.value;
|
|
17
|
-
const asset = new Asset({
|
|
18
|
-
id: metadata.id,
|
|
19
|
-
tenant: metadata.tenant,
|
|
20
|
-
size: metadata.size,
|
|
21
|
-
contentType: metadata.contentType,
|
|
22
|
-
key: metadata.bucketKey
|
|
23
|
-
});
|
|
24
|
-
asset.setContentsReader(new S3ContentsReader(this.s3, this.bucket));
|
|
25
|
-
return asset;
|
|
26
|
-
}
|
|
27
25
|
}
|
|
26
|
+
export { S3AssetResolver };
|
|
28
27
|
|
|
29
28
|
//# sourceMappingURL=S3AssetResolver.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"
|
|
1
|
+
{"version":3,"file":"assetDelivery/s3/S3AssetResolver.js","sources":["../../../src/assetDelivery/s3/S3AssetResolver.ts"],"sourcesContent":["import type { S3 } from \"@webiny/aws-sdk/client-s3/index.js\";\nimport type { AssetRequest, AssetResolver } from \"@webiny/api-file-manager\";\nimport { Asset } from \"@webiny/api-file-manager\";\nimport { GlobalKeyValueStore } from \"@webiny/api-core/features/keyValueStore/index.js\";\nimport { S3ContentsReader } from \"~/assetDelivery/index.js\";\nimport { ObjectKey } from \"~/assetDelivery/threatDetection/ObjectKey.js\";\n\ninterface AssetMetadata {\n id: string;\n tenant: string;\n size: number;\n contentType: string;\n bucketKey: string;\n}\n\nexport class S3AssetResolver implements AssetResolver {\n constructor(\n private keyValueStore: GlobalKeyValueStore.Interface,\n private s3: S3,\n private bucket: string\n ) {}\n\n async resolve(request: AssetRequest): Promise<Asset | undefined> {\n const fileId = ObjectKey.from(request.getKey()).id();\n const result = await this.keyValueStore.get<AssetMetadata>(\n `FileManager/File/${fileId}/Metadata`\n );\n\n if (result.isFail()) {\n return undefined;\n }\n\n const metadata = result.value;\n\n const asset = new Asset({\n id: metadata.id,\n tenant: metadata.tenant,\n size: metadata.size,\n contentType: metadata.contentType,\n key: metadata.bucketKey\n });\n\n asset.setContentsReader(new S3ContentsReader(this.s3, this.bucket));\n\n return asset;\n }\n}\n"],"names":["S3AssetResolver","keyValueStore","s3","bucket","request","fileId","ObjectKey","result","metadata","asset","Asset","S3ContentsReader"],"mappings":";;;AAeO,MAAMA;IACT,YACYC,aAA4C,EAC5CC,EAAM,EACNC,MAAc,CACxB;aAHUF,aAAa,GAAbA;aACAC,EAAE,GAAFA;aACAC,MAAM,GAANA;IACT;IAEH,MAAM,QAAQC,OAAqB,EAA8B;QAC7D,MAAMC,SAASC,UAAU,IAAI,CAACF,QAAQ,MAAM,IAAI,EAAE;QAClD,MAAMG,SAAS,MAAM,IAAI,CAAC,aAAa,CAAC,GAAG,CACvC,CAAC,iBAAiB,EAAEF,OAAO,SAAS,CAAC;QAGzC,IAAIE,OAAO,MAAM,IACb;QAGJ,MAAMC,WAAWD,OAAO,KAAK;QAE7B,MAAME,QAAQ,IAAIC,MAAM;YACpB,IAAIF,SAAS,EAAE;YACf,QAAQA,SAAS,MAAM;YACvB,MAAMA,SAAS,IAAI;YACnB,aAAaA,SAAS,WAAW;YACjC,KAAKA,SAAS,SAAS;QAC3B;QAEAC,MAAM,iBAAiB,CAAC,IAAIE,iBAAiB,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,MAAM;QAEjE,OAAOF;IACX;AACJ"}
|
|
@@ -1,20 +1,17 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
if (!Body) {
|
|
14
|
-
throw Error(`Unable to read ${asset.getKey()}!`);
|
|
1
|
+
class S3ContentsReader {
|
|
2
|
+
constructor(s3, bucket){
|
|
3
|
+
this.s3 = s3;
|
|
4
|
+
this.bucket = bucket;
|
|
5
|
+
}
|
|
6
|
+
async read(asset) {
|
|
7
|
+
const { Body } = await this.s3.getObject({
|
|
8
|
+
Bucket: this.bucket,
|
|
9
|
+
Key: asset.getKey()
|
|
10
|
+
});
|
|
11
|
+
if (!Body) throw Error(`Unable to read ${asset.getKey()}!`);
|
|
12
|
+
return Buffer.from(await Body.transformToByteArray());
|
|
15
13
|
}
|
|
16
|
-
return Buffer.from(await Body.transformToByteArray());
|
|
17
|
-
}
|
|
18
14
|
}
|
|
15
|
+
export { S3ContentsReader };
|
|
19
16
|
|
|
20
17
|
//# sourceMappingURL=S3ContentsReader.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"
|
|
1
|
+
{"version":3,"file":"assetDelivery/s3/S3ContentsReader.js","sources":["../../../src/assetDelivery/s3/S3ContentsReader.ts"],"sourcesContent":["import type { S3 } from \"@webiny/aws-sdk/client-s3/index.js\";\nimport type { Asset, AssetContentsReader } from \"@webiny/api-file-manager\";\n\nexport class S3ContentsReader implements AssetContentsReader {\n private s3: S3;\n private readonly bucket: string;\n\n constructor(s3: S3, bucket: string) {\n this.s3 = s3;\n this.bucket = bucket;\n }\n\n async read(asset: Asset): Promise<Buffer> {\n const { Body } = await this.s3.getObject({\n Bucket: this.bucket,\n Key: asset.getKey()\n });\n\n if (!Body) {\n throw Error(`Unable to read ${asset.getKey()}!`);\n }\n\n return Buffer.from(await Body.transformToByteArray());\n }\n}\n"],"names":["S3ContentsReader","s3","bucket","asset","Body","Error","Buffer"],"mappings":"AAGO,MAAMA;IAIT,YAAYC,EAAM,EAAEC,MAAc,CAAE;QAChC,IAAI,CAAC,EAAE,GAAGD;QACV,IAAI,CAAC,MAAM,GAAGC;IAClB;IAEA,MAAM,KAAKC,KAAY,EAAmB;QACtC,MAAM,EAAEC,IAAI,EAAE,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,SAAS,CAAC;YACrC,QAAQ,IAAI,CAAC,MAAM;YACnB,KAAKD,MAAM,MAAM;QACrB;QAEA,IAAI,CAACC,MACD,MAAMC,MAAM,CAAC,eAAe,EAAEF,MAAM,MAAM,GAAG,CAAC,CAAC;QAGnD,OAAOG,OAAO,IAAI,CAAC,MAAMF,KAAK,oBAAoB;IACtD;AACJ"}
|
|
@@ -1,13 +1,14 @@
|
|
|
1
1
|
import { AssetReply } from "@webiny/api-file-manager";
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
2
|
+
class S3ErrorAssetReply extends AssetReply {
|
|
3
|
+
constructor(message){
|
|
4
|
+
super({
|
|
5
|
+
code: 400,
|
|
6
|
+
body: ()=>({
|
|
7
|
+
error: message
|
|
8
|
+
})
|
|
9
|
+
});
|
|
10
|
+
}
|
|
11
11
|
}
|
|
12
|
+
export { S3ErrorAssetReply };
|
|
12
13
|
|
|
13
14
|
//# sourceMappingURL=S3ErrorAssetReply.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"
|
|
1
|
+
{"version":3,"file":"assetDelivery/s3/S3ErrorAssetReply.js","sources":["../../../src/assetDelivery/s3/S3ErrorAssetReply.ts"],"sourcesContent":["import { AssetReply } from \"@webiny/api-file-manager\";\n\nexport class S3ErrorAssetReply extends AssetReply {\n constructor(message: string) {\n super({\n code: 400,\n body: () => ({ error: message })\n });\n }\n}\n"],"names":["S3ErrorAssetReply","AssetReply","message"],"mappings":";AAEO,MAAMA,0BAA0BC;IACnC,YAAYC,OAAe,CAAE;QACzB,KAAK,CAAC;YACF,MAAM;YACN,MAAM,IAAO;oBAAE,OAAOA;gBAAQ;QAClC;IACJ;AACJ"}
|
|
@@ -1,34 +1,30 @@
|
|
|
1
1
|
import { GetObjectCommand, getSignedUrl } from "@webiny/aws-sdk/client-s3/index.js";
|
|
2
2
|
import { S3RedirectAssetReply } from "./S3RedirectAssetReply.js";
|
|
3
3
|
import { S3StreamAssetReply } from "./S3StreamAssetReply.js";
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
4
|
+
class S3OutputStrategy {
|
|
5
|
+
constructor(s3, bucket, presignedUrlTtl, assetStreamingMaxSize){
|
|
6
|
+
this.assetStreamingMaxSize = assetStreamingMaxSize;
|
|
7
|
+
this.presignedUrlTtl = presignedUrlTtl;
|
|
8
|
+
this.s3 = s3;
|
|
9
|
+
this.bucket = bucket;
|
|
10
|
+
}
|
|
11
|
+
async output(asset) {
|
|
12
|
+
if (asset.getSize() > this.assetStreamingMaxSize) {
|
|
13
|
+
console.log(`Asset size is greater than ${this.assetStreamingMaxSize}; redirecting to a presigned S3 URL.`);
|
|
14
|
+
return new S3RedirectAssetReply(await this.getPresignedUrl(asset), this.presignedUrlTtl);
|
|
15
|
+
}
|
|
16
|
+
console.log(`Asset size is smaller than ${this.assetStreamingMaxSize}; streaming directly from Lambda function.`);
|
|
17
|
+
return new S3StreamAssetReply(asset);
|
|
18
|
+
}
|
|
19
|
+
getPresignedUrl(asset) {
|
|
20
|
+
return getSignedUrl(this.s3, new GetObjectCommand({
|
|
21
|
+
Bucket: this.bucket,
|
|
22
|
+
Key: asset.getKey()
|
|
23
|
+
}), {
|
|
24
|
+
expiresIn: this.presignedUrlTtl
|
|
25
|
+
});
|
|
20
26
|
}
|
|
21
|
-
console.log(`Asset size is smaller than ${this.assetStreamingMaxSize}; streaming directly from Lambda function.`);
|
|
22
|
-
return new S3StreamAssetReply(asset);
|
|
23
|
-
}
|
|
24
|
-
getPresignedUrl(asset) {
|
|
25
|
-
return getSignedUrl(this.s3, new GetObjectCommand({
|
|
26
|
-
Bucket: this.bucket,
|
|
27
|
-
Key: asset.getKey()
|
|
28
|
-
}), {
|
|
29
|
-
expiresIn: this.presignedUrlTtl
|
|
30
|
-
});
|
|
31
|
-
}
|
|
32
27
|
}
|
|
28
|
+
export { S3OutputStrategy };
|
|
33
29
|
|
|
34
30
|
//# sourceMappingURL=S3OutputStrategy.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"
|
|
1
|
+
{"version":3,"file":"assetDelivery/s3/S3OutputStrategy.js","sources":["../../../src/assetDelivery/s3/S3OutputStrategy.ts"],"sourcesContent":["import type { Asset, AssetOutputStrategy, AssetReply } from \"@webiny/api-file-manager\";\nimport type { S3 } from \"@webiny/aws-sdk/client-s3/index.js\";\nimport { GetObjectCommand, getSignedUrl } from \"@webiny/aws-sdk/client-s3/index.js\";\nimport { S3RedirectAssetReply } from \"~/assetDelivery/s3/S3RedirectAssetReply.js\";\nimport { S3StreamAssetReply } from \"~/assetDelivery/s3/S3StreamAssetReply.js\";\n\n/**\n * This strategy outputs an asset taking into account the size of the asset contents.\n * If the asset is larger than 5MB, a presigned URL will be generated, and a redirect will happen.\n */\nexport class S3OutputStrategy implements AssetOutputStrategy {\n private readonly s3: S3;\n private readonly bucket: string;\n private readonly presignedUrlTtl: number;\n private readonly assetStreamingMaxSize: number;\n\n constructor(s3: S3, bucket: string, presignedUrlTtl: number, assetStreamingMaxSize: number) {\n this.assetStreamingMaxSize = assetStreamingMaxSize;\n this.presignedUrlTtl = presignedUrlTtl;\n this.s3 = s3;\n this.bucket = bucket;\n }\n\n async output(asset: Asset): Promise<AssetReply> {\n if (asset.getSize() > this.assetStreamingMaxSize) {\n console.log(\n `Asset size is greater than ${this.assetStreamingMaxSize}; redirecting to a presigned S3 URL.`\n );\n\n return new S3RedirectAssetReply(\n await this.getPresignedUrl(asset),\n this.presignedUrlTtl\n );\n }\n\n console.log(\n `Asset size is smaller than ${this.assetStreamingMaxSize}; streaming directly from Lambda function.`\n );\n return new S3StreamAssetReply(asset);\n }\n\n protected getPresignedUrl(asset: Asset) {\n return getSignedUrl(\n this.s3,\n new GetObjectCommand({\n Bucket: this.bucket,\n Key: asset.getKey()\n }),\n { expiresIn: this.presignedUrlTtl }\n );\n }\n}\n"],"names":["S3OutputStrategy","s3","bucket","presignedUrlTtl","assetStreamingMaxSize","asset","console","S3RedirectAssetReply","S3StreamAssetReply","getSignedUrl","GetObjectCommand"],"mappings":";;;AAUO,MAAMA;IAMT,YAAYC,EAAM,EAAEC,MAAc,EAAEC,eAAuB,EAAEC,qBAA6B,CAAE;QACxF,IAAI,CAAC,qBAAqB,GAAGA;QAC7B,IAAI,CAAC,eAAe,GAAGD;QACvB,IAAI,CAAC,EAAE,GAAGF;QACV,IAAI,CAAC,MAAM,GAAGC;IAClB;IAEA,MAAM,OAAOG,KAAY,EAAuB;QAC5C,IAAIA,MAAM,OAAO,KAAK,IAAI,CAAC,qBAAqB,EAAE;YAC9CC,QAAQ,GAAG,CACP,CAAC,2BAA2B,EAAE,IAAI,CAAC,qBAAqB,CAAC,oCAAoC,CAAC;YAGlG,OAAO,IAAIC,qBACP,MAAM,IAAI,CAAC,eAAe,CAACF,QAC3B,IAAI,CAAC,eAAe;QAE5B;QAEAC,QAAQ,GAAG,CACP,CAAC,2BAA2B,EAAE,IAAI,CAAC,qBAAqB,CAAC,0CAA0C,CAAC;QAExG,OAAO,IAAIE,mBAAmBH;IAClC;IAEU,gBAAgBA,KAAY,EAAE;QACpC,OAAOI,aACH,IAAI,CAAC,EAAE,EACP,IAAIC,iBAAiB;YACjB,QAAQ,IAAI,CAAC,MAAM;YACnB,KAAKL,MAAM,MAAM;QACrB,IACA;YAAE,WAAW,IAAI,CAAC,eAAe;QAAC;IAE1C;AACJ"}
|
|
@@ -1,16 +1,17 @@
|
|
|
1
1
|
import { AssetReply } from "@webiny/api-file-manager";
|
|
2
2
|
import { ResponseHeaders } from "@webiny/handler";
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
3
|
+
class S3RedirectAssetReply extends AssetReply {
|
|
4
|
+
constructor(url, cacheDuration){
|
|
5
|
+
super({
|
|
6
|
+
code: 301,
|
|
7
|
+
headers: ResponseHeaders.create({
|
|
8
|
+
location: url,
|
|
9
|
+
"cache-control": "public, max-age=" + cacheDuration
|
|
10
|
+
}),
|
|
11
|
+
body: ()=>""
|
|
12
|
+
});
|
|
13
|
+
}
|
|
14
14
|
}
|
|
15
|
+
export { S3RedirectAssetReply };
|
|
15
16
|
|
|
16
17
|
//# sourceMappingURL=S3RedirectAssetReply.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"
|
|
1
|
+
{"version":3,"file":"assetDelivery/s3/S3RedirectAssetReply.js","sources":["../../../src/assetDelivery/s3/S3RedirectAssetReply.ts"],"sourcesContent":["import { AssetReply } from \"@webiny/api-file-manager\";\nimport { ResponseHeaders } from \"@webiny/handler\";\n\nexport class S3RedirectAssetReply extends AssetReply {\n constructor(url: string, cacheDuration: number) {\n super({\n code: 301,\n headers: ResponseHeaders.create({\n location: url,\n \"cache-control\": \"public, max-age=\" + cacheDuration\n }),\n body: () => \"\"\n });\n }\n}\n"],"names":["S3RedirectAssetReply","AssetReply","url","cacheDuration","ResponseHeaders"],"mappings":";;AAGO,MAAMA,6BAA6BC;IACtC,YAAYC,GAAW,EAAEC,aAAqB,CAAE;QAC5C,KAAK,CAAC;YACF,MAAM;YACN,SAASC,gBAAgB,MAAM,CAAC;gBAC5B,UAAUF;gBACV,iBAAiB,qBAAqBC;YAC1C;YACA,MAAM,IAAM;QAChB;IACJ;AACJ"}
|
|
@@ -1,16 +1,17 @@
|
|
|
1
1
|
import { AssetReply } from "@webiny/api-file-manager";
|
|
2
2
|
import { ResponseHeaders } from "@webiny/handler";
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
3
|
+
class S3StreamAssetReply extends AssetReply {
|
|
4
|
+
constructor(asset){
|
|
5
|
+
super({
|
|
6
|
+
code: 200,
|
|
7
|
+
headers: ResponseHeaders.create({
|
|
8
|
+
"cache-control": "public, max-age=31536000",
|
|
9
|
+
"content-type": asset.getContentType()
|
|
10
|
+
}),
|
|
11
|
+
body: ()=>asset.getContents()
|
|
12
|
+
});
|
|
13
|
+
}
|
|
14
14
|
}
|
|
15
|
+
export { S3StreamAssetReply };
|
|
15
16
|
|
|
16
17
|
//# sourceMappingURL=S3StreamAssetReply.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"
|
|
1
|
+
{"version":3,"file":"assetDelivery/s3/S3StreamAssetReply.js","sources":["../../../src/assetDelivery/s3/S3StreamAssetReply.ts"],"sourcesContent":["import type { Asset } from \"@webiny/api-file-manager\";\nimport { AssetReply } from \"@webiny/api-file-manager\";\nimport { ResponseHeaders } from \"@webiny/handler\";\n\nexport class S3StreamAssetReply extends AssetReply {\n constructor(asset: Asset) {\n super({\n code: 200,\n headers: ResponseHeaders.create({\n \"cache-control\": `public, max-age=${86400 * 365}`,\n \"content-type\": asset.getContentType()\n }),\n body: () => asset.getContents()\n });\n }\n}\n"],"names":["S3StreamAssetReply","AssetReply","asset","ResponseHeaders"],"mappings":";;AAIO,MAAMA,2BAA2BC;IACpC,YAAYC,KAAY,CAAE;QACtB,KAAK,CAAC;YACF,MAAM;YACN,SAASC,gBAAgB,MAAM,CAAC;gBAC5B,iBAAiB;gBACjB,gBAAgBD,MAAM,cAAc;YACxC;YACA,MAAM,IAAMA,MAAM,WAAW;QACjC;IACJ;AACJ"}
|