@payloadcms/storage-s3 3.47.0-internal.b17506e → 3.47.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.
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"staticHandler.d.ts","sourceRoot":"","sources":["../src/staticHandler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,wCAAwC,CAAA;AAC3E,OAAO,KAAK,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAG/D,OAAO,KAAK,GAAG,MAAM,oBAAoB,CAAA;AAMzC,MAAM,MAAM,qBAAqB,GAC7B;IACE,oBAAoB;IACpB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,kBAAkB,CAAC,CAAC,IAAI,EAAE;QACxB,UAAU,EAAE,gBAAgB,CAAA;QAC5B,QAAQ,EAAE,MAAM,CAAA;QAChB,GAAG,EAAE,cAAc,CAAA;KACpB,GAAG,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAA;CAC/B,GACD,OAAO,CAAA;AAEX,UAAU,IAAI;IACZ,MAAM,EAAE,MAAM,CAAA;IACd,UAAU,EAAE,gBAAgB,CAAA;IAC5B,gBAAgB,EAAE,MAAM,GAAG,CAAC,EAAE,CAAA;IAC9B,eAAe,CAAC,EAAE,qBAAqB,CAAA;CACxC;AA8BD,eAAO,MAAM,UAAU,+DAKpB,IAAI,KAAG,
|
|
1
|
+
{"version":3,"file":"staticHandler.d.ts","sourceRoot":"","sources":["../src/staticHandler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,wCAAwC,CAAA;AAC3E,OAAO,KAAK,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAG/D,OAAO,KAAK,GAAG,MAAM,oBAAoB,CAAA;AAMzC,MAAM,MAAM,qBAAqB,GAC7B;IACE,oBAAoB;IACpB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,kBAAkB,CAAC,CAAC,IAAI,EAAE;QACxB,UAAU,EAAE,gBAAgB,CAAA;QAC5B,QAAQ,EAAE,MAAM,CAAA;QAChB,GAAG,EAAE,cAAc,CAAA;KACpB,GAAG,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAA;CAC/B,GACD,OAAO,CAAA;AAEX,UAAU,IAAI;IACZ,MAAM,EAAE,MAAM,CAAA;IACd,UAAU,EAAE,gBAAgB,CAAA;IAC5B,gBAAgB,EAAE,MAAM,GAAG,CAAC,EAAE,CAAA;IAC9B,eAAe,CAAC,EAAE,qBAAqB,CAAA;CACxC;AA8BD,eAAO,MAAM,UAAU,+DAKpB,IAAI,KAAG,aA4FT,CAAA"}
|
package/dist/staticHandler.js
CHANGED
|
@@ -22,7 +22,7 @@ const streamToBuffer = async (readableStream)=>{
|
|
|
22
22
|
return Buffer.concat(chunks);
|
|
23
23
|
};
|
|
24
24
|
export const getHandler = ({ bucket, collection, getStorageClient, signedDownloads })=>{
|
|
25
|
-
return async (req, { params: { clientUploadContext, filename } })=>{
|
|
25
|
+
return async (req, { headers: incomingHeaders, params: { clientUploadContext, filename } })=>{
|
|
26
26
|
let object = undefined;
|
|
27
27
|
try {
|
|
28
28
|
const prefix = await getFilePrefix({
|
|
@@ -57,16 +57,27 @@ export const getHandler = ({ bucket, collection, getStorageClient, signedDownloa
|
|
|
57
57
|
Bucket: bucket,
|
|
58
58
|
Key: key
|
|
59
59
|
});
|
|
60
|
+
if (!object.Body) {
|
|
61
|
+
return new Response(null, {
|
|
62
|
+
status: 404,
|
|
63
|
+
statusText: 'Not Found'
|
|
64
|
+
});
|
|
65
|
+
}
|
|
66
|
+
let headers = new Headers(incomingHeaders);
|
|
67
|
+
headers.append('Content-Length', String(object.ContentLength));
|
|
68
|
+
headers.append('Content-Type', String(object.ContentType));
|
|
69
|
+
headers.append('Accept-Ranges', String(object.AcceptRanges));
|
|
70
|
+
headers.append('ETag', String(object.ETag));
|
|
60
71
|
const etagFromHeaders = req.headers.get('etag') || req.headers.get('if-none-match');
|
|
61
72
|
const objectEtag = object.ETag;
|
|
73
|
+
if (collection.upload && typeof collection.upload === 'object' && typeof collection.upload.modifyResponseHeaders === 'function') {
|
|
74
|
+
headers = collection.upload.modifyResponseHeaders({
|
|
75
|
+
headers
|
|
76
|
+
}) || headers;
|
|
77
|
+
}
|
|
62
78
|
if (etagFromHeaders && etagFromHeaders === objectEtag) {
|
|
63
79
|
return new Response(null, {
|
|
64
|
-
headers
|
|
65
|
-
'Accept-Ranges': String(object.AcceptRanges),
|
|
66
|
-
'Content-Length': String(object.ContentLength),
|
|
67
|
-
'Content-Type': String(object.ContentType),
|
|
68
|
-
ETag: String(object.ETag)
|
|
69
|
-
}),
|
|
80
|
+
headers,
|
|
70
81
|
status: 304
|
|
71
82
|
});
|
|
72
83
|
}
|
|
@@ -84,12 +95,7 @@ export const getHandler = ({ bucket, collection, getStorageClient, signedDownloa
|
|
|
84
95
|
}
|
|
85
96
|
const bodyBuffer = await streamToBuffer(object.Body);
|
|
86
97
|
return new Response(bodyBuffer, {
|
|
87
|
-
headers
|
|
88
|
-
'Accept-Ranges': String(object.AcceptRanges),
|
|
89
|
-
'Content-Length': String(object.ContentLength),
|
|
90
|
-
'Content-Type': String(object.ContentType),
|
|
91
|
-
ETag: String(object.ETag)
|
|
92
|
-
}),
|
|
98
|
+
headers,
|
|
93
99
|
status: 200
|
|
94
100
|
});
|
|
95
101
|
} catch (err) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../src/staticHandler.ts"],"sourcesContent":["import type { StaticHandler } from '@payloadcms/plugin-cloud-storage/types'\nimport type { CollectionConfig, PayloadRequest } from 'payload'\nimport type { Readable } from 'stream'\n\nimport * as AWS from '@aws-sdk/client-s3'\nimport { GetObjectCommand } from '@aws-sdk/client-s3'\nimport { getSignedUrl } from '@aws-sdk/s3-request-presigner'\nimport { getFilePrefix } from '@payloadcms/plugin-cloud-storage/utilities'\nimport path from 'path'\n\nexport type SignedDownloadsConfig =\n | {\n /** @default 7200 */\n expiresIn?: number\n shouldUseSignedURL?(args: {\n collection: CollectionConfig\n filename: string\n req: PayloadRequest\n }): boolean | Promise<boolean>\n }\n | boolean\n\ninterface Args {\n bucket: string\n collection: CollectionConfig\n getStorageClient: () => AWS.S3\n signedDownloads?: SignedDownloadsConfig\n}\n\n// Type guard for NodeJS.Readable streams\nconst isNodeReadableStream = (body: unknown): body is Readable => {\n return (\n typeof body === 'object' &&\n body !== null &&\n 'pipe' in body &&\n typeof (body as any).pipe === 'function' &&\n 'destroy' in body &&\n typeof (body as any).destroy === 'function'\n )\n}\n\nconst destroyStream = (object: AWS.GetObjectOutput | undefined) => {\n if (object?.Body && isNodeReadableStream(object.Body)) {\n object.Body.destroy()\n }\n}\n\n// Convert a stream into a promise that resolves with a Buffer\n// eslint-disable-next-line @typescript-eslint/no-explicit-any\nconst streamToBuffer = async (readableStream: any) => {\n const chunks = []\n for await (const chunk of readableStream) {\n chunks.push(typeof chunk === 'string' ? Buffer.from(chunk) : chunk)\n }\n return Buffer.concat(chunks)\n}\n\nexport const getHandler = ({\n bucket,\n collection,\n getStorageClient,\n signedDownloads,\n}: Args): StaticHandler => {\n return async (req, { params: { clientUploadContext, filename } }) => {\n let object: AWS.GetObjectOutput | undefined = undefined\n try {\n const prefix = await getFilePrefix({ clientUploadContext, collection, filename, req })\n\n const key = path.posix.join(prefix, filename)\n\n if (signedDownloads && !clientUploadContext) {\n let useSignedURL = true\n if (\n typeof signedDownloads === 'object' &&\n typeof signedDownloads.shouldUseSignedURL === 'function'\n ) {\n useSignedURL = await signedDownloads.shouldUseSignedURL({ collection, filename, req })\n }\n\n if (useSignedURL) {\n const command = new GetObjectCommand({ Bucket: bucket, Key: key })\n const signedUrl = await getSignedUrl(\n // @ts-expect-error mismatch versions\n getStorageClient(),\n command,\n typeof signedDownloads === 'object' ? signedDownloads : { expiresIn: 7200 },\n )\n return Response.redirect(signedUrl, 302)\n }\n }\n\n object = await getStorageClient().getObject({\n Bucket: bucket,\n Key: key,\n })\n\n const etagFromHeaders = req.headers.get('etag') || req.headers.get('if-none-match')\n const objectEtag = object.ETag\n\n if (
|
|
1
|
+
{"version":3,"sources":["../src/staticHandler.ts"],"sourcesContent":["import type { StaticHandler } from '@payloadcms/plugin-cloud-storage/types'\nimport type { CollectionConfig, PayloadRequest } from 'payload'\nimport type { Readable } from 'stream'\n\nimport * as AWS from '@aws-sdk/client-s3'\nimport { GetObjectCommand } from '@aws-sdk/client-s3'\nimport { getSignedUrl } from '@aws-sdk/s3-request-presigner'\nimport { getFilePrefix } from '@payloadcms/plugin-cloud-storage/utilities'\nimport path from 'path'\n\nexport type SignedDownloadsConfig =\n | {\n /** @default 7200 */\n expiresIn?: number\n shouldUseSignedURL?(args: {\n collection: CollectionConfig\n filename: string\n req: PayloadRequest\n }): boolean | Promise<boolean>\n }\n | boolean\n\ninterface Args {\n bucket: string\n collection: CollectionConfig\n getStorageClient: () => AWS.S3\n signedDownloads?: SignedDownloadsConfig\n}\n\n// Type guard for NodeJS.Readable streams\nconst isNodeReadableStream = (body: unknown): body is Readable => {\n return (\n typeof body === 'object' &&\n body !== null &&\n 'pipe' in body &&\n typeof (body as any).pipe === 'function' &&\n 'destroy' in body &&\n typeof (body as any).destroy === 'function'\n )\n}\n\nconst destroyStream = (object: AWS.GetObjectOutput | undefined) => {\n if (object?.Body && isNodeReadableStream(object.Body)) {\n object.Body.destroy()\n }\n}\n\n// Convert a stream into a promise that resolves with a Buffer\n// eslint-disable-next-line @typescript-eslint/no-explicit-any\nconst streamToBuffer = async (readableStream: any) => {\n const chunks = []\n for await (const chunk of readableStream) {\n chunks.push(typeof chunk === 'string' ? Buffer.from(chunk) : chunk)\n }\n return Buffer.concat(chunks)\n}\n\nexport const getHandler = ({\n bucket,\n collection,\n getStorageClient,\n signedDownloads,\n}: Args): StaticHandler => {\n return async (req, { headers: incomingHeaders, params: { clientUploadContext, filename } }) => {\n let object: AWS.GetObjectOutput | undefined = undefined\n try {\n const prefix = await getFilePrefix({ clientUploadContext, collection, filename, req })\n\n const key = path.posix.join(prefix, filename)\n\n if (signedDownloads && !clientUploadContext) {\n let useSignedURL = true\n if (\n typeof signedDownloads === 'object' &&\n typeof signedDownloads.shouldUseSignedURL === 'function'\n ) {\n useSignedURL = await signedDownloads.shouldUseSignedURL({ collection, filename, req })\n }\n\n if (useSignedURL) {\n const command = new GetObjectCommand({ Bucket: bucket, Key: key })\n const signedUrl = await getSignedUrl(\n // @ts-expect-error mismatch versions\n getStorageClient(),\n command,\n typeof signedDownloads === 'object' ? signedDownloads : { expiresIn: 7200 },\n )\n return Response.redirect(signedUrl, 302)\n }\n }\n\n object = await getStorageClient().getObject({\n Bucket: bucket,\n Key: key,\n })\n\n if (!object.Body) {\n return new Response(null, { status: 404, statusText: 'Not Found' })\n }\n\n let headers = new Headers(incomingHeaders)\n\n headers.append('Content-Length', String(object.ContentLength))\n headers.append('Content-Type', String(object.ContentType))\n headers.append('Accept-Ranges', String(object.AcceptRanges))\n headers.append('ETag', String(object.ETag))\n\n const etagFromHeaders = req.headers.get('etag') || req.headers.get('if-none-match')\n const objectEtag = object.ETag\n\n if (\n collection.upload &&\n typeof collection.upload === 'object' &&\n typeof collection.upload.modifyResponseHeaders === 'function'\n ) {\n headers = collection.upload.modifyResponseHeaders({ headers }) || headers\n }\n\n if (etagFromHeaders && etagFromHeaders === objectEtag) {\n return new Response(null, {\n headers,\n status: 304,\n })\n }\n\n // On error, manually destroy stream to close socket\n if (object.Body && isNodeReadableStream(object.Body)) {\n const stream = object.Body\n stream.on('error', (err) => {\n req.payload.logger.error({\n err,\n key,\n msg: 'Error streaming S3 object, destroying stream',\n })\n stream.destroy()\n })\n }\n\n const bodyBuffer = await streamToBuffer(object.Body)\n\n return new Response(bodyBuffer, {\n headers,\n status: 200,\n })\n } catch (err) {\n if (err instanceof AWS.NoSuchKey) {\n return new Response(null, { status: 404, statusText: 'Not Found' })\n }\n req.payload.logger.error(err)\n return new Response('Internal Server Error', { status: 500 })\n } finally {\n destroyStream(object)\n }\n }\n}\n"],"names":["AWS","GetObjectCommand","getSignedUrl","getFilePrefix","path","isNodeReadableStream","body","pipe","destroy","destroyStream","object","Body","streamToBuffer","readableStream","chunks","chunk","push","Buffer","from","concat","getHandler","bucket","collection","getStorageClient","signedDownloads","req","headers","incomingHeaders","params","clientUploadContext","filename","undefined","prefix","key","posix","join","useSignedURL","shouldUseSignedURL","command","Bucket","Key","signedUrl","expiresIn","Response","redirect","getObject","status","statusText","Headers","append","String","ContentLength","ContentType","AcceptRanges","ETag","etagFromHeaders","get","objectEtag","upload","modifyResponseHeaders","stream","on","err","payload","logger","error","msg","bodyBuffer","NoSuchKey"],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@payloadcms/storage-s3",
|
|
3
|
-
"version": "3.47.0
|
|
3
|
+
"version": "3.47.0",
|
|
4
4
|
"description": "Payload storage adapter for Amazon S3",
|
|
5
5
|
"homepage": "https://payloadcms.com",
|
|
6
6
|
"repository": {
|
|
@@ -40,14 +40,14 @@
|
|
|
40
40
|
"@aws-sdk/client-s3": "^3.614.0",
|
|
41
41
|
"@aws-sdk/lib-storage": "^3.614.0",
|
|
42
42
|
"@aws-sdk/s3-request-presigner": "^3.614.0",
|
|
43
|
-
"@payloadcms/plugin-cloud-storage": "3.47.0
|
|
43
|
+
"@payloadcms/plugin-cloud-storage": "3.47.0"
|
|
44
44
|
},
|
|
45
45
|
"devDependencies": {
|
|
46
46
|
"@smithy/node-http-handler": "4.0.3",
|
|
47
|
-
"payload": "3.47.0
|
|
47
|
+
"payload": "3.47.0"
|
|
48
48
|
},
|
|
49
49
|
"peerDependencies": {
|
|
50
|
-
"payload": "3.47.0
|
|
50
|
+
"payload": "3.47.0"
|
|
51
51
|
},
|
|
52
52
|
"engines": {
|
|
53
53
|
"node": "^18.20.2 || >=20.9.0"
|