@payloadcms/storage-s3 3.25.0 → 3.26.0-canary.bbb3083
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/dist/client/S3ClientUploadHandler.d.ts +2 -1
- package/dist/client/S3ClientUploadHandler.d.ts.map +1 -1
- package/dist/client/S3ClientUploadHandler.js +4 -1
- package/dist/client/S3ClientUploadHandler.js.map +1 -1
- package/dist/staticHandler.js +2 -1
- package/dist/staticHandler.js.map +1 -1
- package/package.json +4 -4
|
@@ -1,8 +1,9 @@
|
|
|
1
|
-
export declare const S3ClientUploadHandler: ({ children, collectionSlug, enabled, extra, serverHandlerPath, }: {
|
|
1
|
+
export declare const S3ClientUploadHandler: ({ children, collectionSlug, enabled, extra, prefix, serverHandlerPath, }: {
|
|
2
2
|
children: import("react").ReactNode;
|
|
3
3
|
collectionSlug: import("payload").UploadCollectionSlug;
|
|
4
4
|
enabled?: boolean;
|
|
5
5
|
extra: Record<string, unknown>;
|
|
6
|
+
prefix?: string;
|
|
6
7
|
serverHandlerPath: string;
|
|
7
8
|
}) => import("react").JSX.Element;
|
|
8
9
|
//# sourceMappingURL=S3ClientUploadHandler.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"S3ClientUploadHandler.d.ts","sourceRoot":"","sources":["../../src/client/S3ClientUploadHandler.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,qBAAqB
|
|
1
|
+
{"version":3,"file":"S3ClientUploadHandler.d.ts","sourceRoot":"","sources":["../../src/client/S3ClientUploadHandler.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,qBAAqB;;;;;;;aAuBmD,OAAO,aAD1F,CAAA"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
'use client';
|
|
2
2
|
import { createClientUploadHandler } from '@payloadcms/plugin-cloud-storage/client';
|
|
3
3
|
export const S3ClientUploadHandler = createClientUploadHandler({
|
|
4
|
-
handler: async ({ apiRoute, collectionSlug, file, serverHandlerPath, serverURL })=>{
|
|
4
|
+
handler: async ({ apiRoute, collectionSlug, file, prefix, serverHandlerPath, serverURL })=>{
|
|
5
5
|
const response = await fetch(`${serverURL}${apiRoute}${serverHandlerPath}`, {
|
|
6
6
|
body: JSON.stringify({
|
|
7
7
|
collectionSlug,
|
|
@@ -20,6 +20,9 @@ export const S3ClientUploadHandler = createClientUploadHandler({
|
|
|
20
20
|
},
|
|
21
21
|
method: 'PUT'
|
|
22
22
|
});
|
|
23
|
+
return {
|
|
24
|
+
prefix
|
|
25
|
+
};
|
|
23
26
|
}
|
|
24
27
|
});
|
|
25
28
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/client/S3ClientUploadHandler.ts"],"sourcesContent":["'use client'\nimport { createClientUploadHandler } from '@payloadcms/plugin-cloud-storage/client'\n\nexport const S3ClientUploadHandler = createClientUploadHandler({\n handler: async ({ apiRoute, collectionSlug, file, serverHandlerPath, serverURL }) => {\n const response = await fetch(`${serverURL}${apiRoute}${serverHandlerPath}`, {\n body: JSON.stringify({\n collectionSlug,\n filename: file.name,\n mimeType: file.type,\n }),\n credentials: 'include',\n method: 'POST',\n })\n\n const { url } = await response.json()\n\n await fetch(url, {\n body: file,\n headers: { 'Content-Length': file.size.toString(), 'Content-Type': file.type },\n method: 'PUT',\n })\n },\n})\n"],"names":["createClientUploadHandler","S3ClientUploadHandler","handler","apiRoute","collectionSlug","file","serverHandlerPath","serverURL","response","fetch","body","JSON","stringify","filename","name","mimeType","type","credentials","method","url","json","headers","size","toString"],"mappings":"AAAA;AACA,SAASA,yBAAyB,QAAQ,0CAAyC;AAEnF,OAAO,MAAMC,wBAAwBD,0BAA0B;IAC7DE,SAAS,OAAO,EAAEC,QAAQ,EAAEC,cAAc,EAAEC,IAAI,EAAEC,iBAAiB,EAAEC,SAAS,EAAE;
|
|
1
|
+
{"version":3,"sources":["../../src/client/S3ClientUploadHandler.ts"],"sourcesContent":["'use client'\nimport { createClientUploadHandler } from '@payloadcms/plugin-cloud-storage/client'\n\nexport const S3ClientUploadHandler = createClientUploadHandler({\n handler: async ({ apiRoute, collectionSlug, file, prefix, serverHandlerPath, serverURL }) => {\n const response = await fetch(`${serverURL}${apiRoute}${serverHandlerPath}`, {\n body: JSON.stringify({\n collectionSlug,\n filename: file.name,\n mimeType: file.type,\n }),\n credentials: 'include',\n method: 'POST',\n })\n\n const { url } = await response.json()\n\n await fetch(url, {\n body: file,\n headers: { 'Content-Length': file.size.toString(), 'Content-Type': file.type },\n method: 'PUT',\n })\n\n return { prefix }\n },\n})\n"],"names":["createClientUploadHandler","S3ClientUploadHandler","handler","apiRoute","collectionSlug","file","prefix","serverHandlerPath","serverURL","response","fetch","body","JSON","stringify","filename","name","mimeType","type","credentials","method","url","json","headers","size","toString"],"mappings":"AAAA;AACA,SAASA,yBAAyB,QAAQ,0CAAyC;AAEnF,OAAO,MAAMC,wBAAwBD,0BAA0B;IAC7DE,SAAS,OAAO,EAAEC,QAAQ,EAAEC,cAAc,EAAEC,IAAI,EAAEC,MAAM,EAAEC,iBAAiB,EAAEC,SAAS,EAAE;QACtF,MAAMC,WAAW,MAAMC,MAAM,GAAGF,YAAYL,WAAWI,mBAAmB,EAAE;YAC1EI,MAAMC,KAAKC,SAAS,CAAC;gBACnBT;gBACAU,UAAUT,KAAKU,IAAI;gBACnBC,UAAUX,KAAKY,IAAI;YACrB;YACAC,aAAa;YACbC,QAAQ;QACV;QAEA,MAAM,EAAEC,GAAG,EAAE,GAAG,MAAMX,SAASY,IAAI;QAEnC,MAAMX,MAAMU,KAAK;YACfT,MAAMN;YACNiB,SAAS;gBAAE,kBAAkBjB,KAAKkB,IAAI,CAACC,QAAQ;gBAAI,gBAAgBnB,KAAKY,IAAI;YAAC;YAC7EE,QAAQ;QACV;QAEA,OAAO;YAAEb;QAAO;IAClB;AACF,GAAE"}
|
package/dist/staticHandler.js
CHANGED
|
@@ -14,9 +14,10 @@ const streamToBuffer = async (readableStream)=>{
|
|
|
14
14
|
return Buffer.concat(chunks);
|
|
15
15
|
};
|
|
16
16
|
export const getHandler = ({ bucket, collection, getStorageClient })=>{
|
|
17
|
-
return async (req, { params: { filename } })=>{
|
|
17
|
+
return async (req, { params: { clientUploadContext, filename } })=>{
|
|
18
18
|
try {
|
|
19
19
|
const prefix = await getFilePrefix({
|
|
20
|
+
clientUploadContext,
|
|
20
21
|
collection,
|
|
21
22
|
filename,
|
|
22
23
|
req
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../src/staticHandler.ts"],"sourcesContent":["import type * as AWS from '@aws-sdk/client-s3'\nimport type { StaticHandler } from '@payloadcms/plugin-cloud-storage/types'\nimport type { CollectionConfig } from 'payload'\nimport type { Readable } from 'stream'\n\nimport { getFilePrefix } from '@payloadcms/plugin-cloud-storage/utilities'\nimport path from 'path'\n\ninterface Args {\n bucket: string\n collection: CollectionConfig\n getStorageClient: () => AWS.S3\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\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 = ({ bucket, collection, getStorageClient }: Args): StaticHandler => {\n return async (req, { params: { filename } }) => {\n try {\n const prefix = await getFilePrefix({ collection, filename, req })\n\n const key = path.posix.join(prefix, filename)\n\n const 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 const etagFromHeaders = req.headers.get('etag') || req.headers.get('if-none-match')\n const objectEtag = object.ETag\n\n if (etagFromHeaders && etagFromHeaders === objectEtag) {\n const response = new Response(null, {\n headers: new Headers({\n 'Accept-Ranges': String(object.AcceptRanges),\n 'Content-Length': String(object.ContentLength),\n 'Content-Type': String(object.ContentType),\n ETag: String(object.ETag),\n }),\n status: 304,\n })\n\n // Manually destroy stream before returning cached results to close socket\n if (object.Body && isNodeReadableStream(object.Body)) {\n object.Body.destroy()\n }\n\n return response\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: new Headers({\n 'Accept-Ranges': String(object.AcceptRanges),\n 'Content-Length': String(object.ContentLength),\n 'Content-Type': String(object.ContentType),\n ETag: String(object.ETag),\n }),\n status: 200,\n })\n } catch (err) {\n req.payload.logger.error(err)\n return new Response('Internal Server Error', { status: 500 })\n }\n }\n}\n"],"names":["getFilePrefix","path","isNodeReadableStream","body","pipe","destroy","streamToBuffer","readableStream","chunks","chunk","push","Buffer","from","concat","getHandler","bucket","collection","getStorageClient","req","params","filename","prefix","key","posix","join","object","getObject","Bucket","Key","Body","Response","status","statusText","etagFromHeaders","headers","get","objectEtag","ETag","response","Headers","String","AcceptRanges","ContentLength","ContentType","stream","on","err","payload","logger","error","msg","bodyBuffer"],"mappings":"AAKA,SAASA,aAAa,QAAQ,6CAA4C;AAC1E,OAAOC,UAAU,OAAM;AAQvB,yCAAyC;AACzC,MAAMC,uBAAuB,CAACC;IAC5B,OACE,OAAOA,SAAS,YAChBA,SAAS,QACT,UAAUA,QACV,OAAO,AAACA,KAAaC,IAAI,KAAK,cAC9B,aAAaD,QACb,OAAO,AAACA,KAAaE,OAAO,KAAK;AAErC;AAEA,8DAA8D;AAC9D,8DAA8D;AAC9D,MAAMC,iBAAiB,OAAOC;IAC5B,MAAMC,SAAS,EAAE;IACjB,WAAW,MAAMC,SAASF,eAAgB;QACxCC,OAAOE,IAAI,CAAC,OAAOD,UAAU,WAAWE,OAAOC,IAAI,CAACH,SAASA;IAC/D;IACA,OAAOE,OAAOE,MAAM,CAACL;AACvB;AAEA,OAAO,MAAMM,aAAa,CAAC,EAAEC,MAAM,EAAEC,UAAU,EAAEC,gBAAgB,EAAQ;IACvE,OAAO,OAAOC,KAAK,EAAEC,QAAQ,EAAEC,QAAQ,EAAE,EAAE;
|
|
1
|
+
{"version":3,"sources":["../src/staticHandler.ts"],"sourcesContent":["import type * as AWS from '@aws-sdk/client-s3'\nimport type { StaticHandler } from '@payloadcms/plugin-cloud-storage/types'\nimport type { CollectionConfig } from 'payload'\nimport type { Readable } from 'stream'\n\nimport { getFilePrefix } from '@payloadcms/plugin-cloud-storage/utilities'\nimport path from 'path'\n\ninterface Args {\n bucket: string\n collection: CollectionConfig\n getStorageClient: () => AWS.S3\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\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 = ({ bucket, collection, getStorageClient }: Args): StaticHandler => {\n return async (req, { params: { clientUploadContext, filename } }) => {\n try {\n const prefix = await getFilePrefix({ clientUploadContext, collection, filename, req })\n\n const key = path.posix.join(prefix, filename)\n\n const 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 const etagFromHeaders = req.headers.get('etag') || req.headers.get('if-none-match')\n const objectEtag = object.ETag\n\n if (etagFromHeaders && etagFromHeaders === objectEtag) {\n const response = new Response(null, {\n headers: new Headers({\n 'Accept-Ranges': String(object.AcceptRanges),\n 'Content-Length': String(object.ContentLength),\n 'Content-Type': String(object.ContentType),\n ETag: String(object.ETag),\n }),\n status: 304,\n })\n\n // Manually destroy stream before returning cached results to close socket\n if (object.Body && isNodeReadableStream(object.Body)) {\n object.Body.destroy()\n }\n\n return response\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: new Headers({\n 'Accept-Ranges': String(object.AcceptRanges),\n 'Content-Length': String(object.ContentLength),\n 'Content-Type': String(object.ContentType),\n ETag: String(object.ETag),\n }),\n status: 200,\n })\n } catch (err) {\n req.payload.logger.error(err)\n return new Response('Internal Server Error', { status: 500 })\n }\n }\n}\n"],"names":["getFilePrefix","path","isNodeReadableStream","body","pipe","destroy","streamToBuffer","readableStream","chunks","chunk","push","Buffer","from","concat","getHandler","bucket","collection","getStorageClient","req","params","clientUploadContext","filename","prefix","key","posix","join","object","getObject","Bucket","Key","Body","Response","status","statusText","etagFromHeaders","headers","get","objectEtag","ETag","response","Headers","String","AcceptRanges","ContentLength","ContentType","stream","on","err","payload","logger","error","msg","bodyBuffer"],"mappings":"AAKA,SAASA,aAAa,QAAQ,6CAA4C;AAC1E,OAAOC,UAAU,OAAM;AAQvB,yCAAyC;AACzC,MAAMC,uBAAuB,CAACC;IAC5B,OACE,OAAOA,SAAS,YAChBA,SAAS,QACT,UAAUA,QACV,OAAO,AAACA,KAAaC,IAAI,KAAK,cAC9B,aAAaD,QACb,OAAO,AAACA,KAAaE,OAAO,KAAK;AAErC;AAEA,8DAA8D;AAC9D,8DAA8D;AAC9D,MAAMC,iBAAiB,OAAOC;IAC5B,MAAMC,SAAS,EAAE;IACjB,WAAW,MAAMC,SAASF,eAAgB;QACxCC,OAAOE,IAAI,CAAC,OAAOD,UAAU,WAAWE,OAAOC,IAAI,CAACH,SAASA;IAC/D;IACA,OAAOE,OAAOE,MAAM,CAACL;AACvB;AAEA,OAAO,MAAMM,aAAa,CAAC,EAAEC,MAAM,EAAEC,UAAU,EAAEC,gBAAgB,EAAQ;IACvE,OAAO,OAAOC,KAAK,EAAEC,QAAQ,EAAEC,mBAAmB,EAAEC,QAAQ,EAAE,EAAE;QAC9D,IAAI;YACF,MAAMC,SAAS,MAAMtB,cAAc;gBAAEoB;gBAAqBJ;gBAAYK;gBAAUH;YAAI;YAEpF,MAAMK,MAAMtB,KAAKuB,KAAK,CAACC,IAAI,CAACH,QAAQD;YAEpC,MAAMK,SAAS,MAAMT,mBAAmBU,SAAS,CAAC;gBAChDC,QAAQb;gBACRc,KAAKN;YACP;YAEA,IAAI,CAACG,OAAOI,IAAI,EAAE;gBAChB,OAAO,IAAIC,SAAS,MAAM;oBAAEC,QAAQ;oBAAKC,YAAY;gBAAY;YACnE;YAEA,MAAMC,kBAAkBhB,IAAIiB,OAAO,CAACC,GAAG,CAAC,WAAWlB,IAAIiB,OAAO,CAACC,GAAG,CAAC;YACnE,MAAMC,aAAaX,OAAOY,IAAI;YAE9B,IAAIJ,mBAAmBA,oBAAoBG,YAAY;gBACrD,MAAME,WAAW,IAAIR,SAAS,MAAM;oBAClCI,SAAS,IAAIK,QAAQ;wBACnB,iBAAiBC,OAAOf,OAAOgB,YAAY;wBAC3C,kBAAkBD,OAAOf,OAAOiB,aAAa;wBAC7C,gBAAgBF,OAAOf,OAAOkB,WAAW;wBACzCN,MAAMG,OAAOf,OAAOY,IAAI;oBAC1B;oBACAN,QAAQ;gBACV;gBAEA,0EAA0E;gBAC1E,IAAIN,OAAOI,IAAI,IAAI5B,qBAAqBwB,OAAOI,IAAI,GAAG;oBACpDJ,OAAOI,IAAI,CAACzB,OAAO;gBACrB;gBAEA,OAAOkC;YACT;YAEA,oDAAoD;YACpD,IAAIb,OAAOI,IAAI,IAAI5B,qBAAqBwB,OAAOI,IAAI,GAAG;gBACpD,MAAMe,SAASnB,OAAOI,IAAI;gBAC1Be,OAAOC,EAAE,CAAC,SAAS,CAACC;oBAClB7B,IAAI8B,OAAO,CAACC,MAAM,CAACC,KAAK,CAAC;wBACvBH;wBACAxB;wBACA4B,KAAK;oBACP;oBACAN,OAAOxC,OAAO;gBAChB;YACF;YAEA,MAAM+C,aAAa,MAAM9C,eAAeoB,OAAOI,IAAI;YAEnD,OAAO,IAAIC,SAASqB,YAAY;gBAC9BjB,SAAS,IAAIK,QAAQ;oBACnB,iBAAiBC,OAAOf,OAAOgB,YAAY;oBAC3C,kBAAkBD,OAAOf,OAAOiB,aAAa;oBAC7C,gBAAgBF,OAAOf,OAAOkB,WAAW;oBACzCN,MAAMG,OAAOf,OAAOY,IAAI;gBAC1B;gBACAN,QAAQ;YACV;QACF,EAAE,OAAOe,KAAK;YACZ7B,IAAI8B,OAAO,CAACC,MAAM,CAACC,KAAK,CAACH;YACzB,OAAO,IAAIhB,SAAS,yBAAyB;gBAAEC,QAAQ;YAAI;QAC7D;IACF;AACF,EAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@payloadcms/storage-s3",
|
|
3
|
-
"version": "3.
|
|
3
|
+
"version": "3.26.0-canary.bbb3083",
|
|
4
4
|
"description": "Payload storage adapter for Amazon S3",
|
|
5
5
|
"homepage": "https://payloadcms.com",
|
|
6
6
|
"repository": {
|
|
@@ -39,13 +39,13 @@
|
|
|
39
39
|
"@aws-sdk/client-s3": "^3.614.0",
|
|
40
40
|
"@aws-sdk/lib-storage": "^3.614.0",
|
|
41
41
|
"@aws-sdk/s3-request-presigner": "^3.614.0",
|
|
42
|
-
"@payloadcms/plugin-cloud-storage": "3.
|
|
42
|
+
"@payloadcms/plugin-cloud-storage": "3.26.0-canary.bbb3083"
|
|
43
43
|
},
|
|
44
44
|
"devDependencies": {
|
|
45
|
-
"payload": "3.
|
|
45
|
+
"payload": "3.26.0-canary.bbb3083"
|
|
46
46
|
},
|
|
47
47
|
"peerDependencies": {
|
|
48
|
-
"payload": "3.
|
|
48
|
+
"payload": "3.26.0-canary.bbb3083"
|
|
49
49
|
},
|
|
50
50
|
"engines": {
|
|
51
51
|
"node": "^18.20.2 || >=20.9.0"
|