@payloadcms/storage-r2 3.74.0-internal.bc57c0d → 3.75.0-internal.880861f

package/dist/client/R2ClientUploadHandler.d.ts

@@ -0,0 +1,10 @@
+import type { R2StorageClientUploadHandlerParams } from '../types.js';
+export declare const R2ClientUploadHandler: ({ children, collectionSlug, enabled, extra, prefix, serverHandlerPath, }: {
+    children: import("react").ReactNode;
+    collectionSlug: import("packages/payload/src/index.js").UploadCollectionSlug;
+    enabled?: boolean;
+    extra: R2StorageClientUploadHandlerParams;
+    prefix?: string;
+    serverHandlerPath: `/${string}`;
+}) => import("react").JSX.Element;
+//# sourceMappingURL=R2ClientUploadHandler.d.ts.map

package/dist/client/R2ClientUploadHandler.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"R2ClientUploadHandler.d.ts","sourceRoot":"","sources":["../../src/client/R2ClientUploadHandler.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAGV,kCAAkC,EAGnC,MAAM,aAAa,CAAA;AAEpB,eAAO,MAAM,qBAAqB;;;;;;;aAe5B,OAAK,aAqDT,CAAA"}

package/dist/client/R2ClientUploadHandler.js

@@ -0,0 +1,69 @@
+'use client';
+import { createClientUploadHandler } from '@payloadcms/plugin-cloud-storage/client';
+import { formatAdminURL } from 'payload/shared';
+export const R2ClientUploadHandler = createClientUploadHandler({
+    handler: async ({ apiRoute, collectionSlug, extra: { chunkSize = 5 * 1024 * 1024, prefix = '' }, file, serverHandlerPath, serverURL })=>{
+        const params = {
+            collection: collectionSlug,
+            fileName: file.name,
+            fileType: file.type
+        };
+        const baseURL = formatAdminURL({
+            apiRoute,
+            path: serverHandlerPath,
+            serverURL
+        });
+        const endpoint = `${baseURL}?${String(new URLSearchParams(params))}`;
+        const multipart = await fetch(endpoint, {
+            method: 'POST'
+        });
+        if (!multipart.ok) {
+            throw new Error('Failed to initialize multipart upload');
+        }
+        const multipartUpload = await multipart.json();
+        const multipartUploadedParts = [];
+        params.multipartId = multipartUpload.uploadId;
+        params.multipartKey = multipartUpload.key;
+        const partTotal = Math.ceil(file.size / chunkSize);
+        for(let part = 1; part <= partTotal; part++){
+            const bytesEnd = Math.min(part * chunkSize, file.size);
+            const bytesStart = (part - 1) * chunkSize;
+            params.multipartNumber = String(part);
+            const body = file.slice(bytesStart, bytesEnd);
+            const headers = {
+                'Content-Length': String(body.size),
+                'Content-Type': 'application/octet-stream'
+            };
+            const uploaded = await fetch(endpoint, {
+                body,
+                headers,
+                method: 'POST'
+            });
+            if (!uploaded.ok) {
+                throw new Error(`Failed to upload part ${part} / ${partTotal}`);
+            }
+            multipartUploadedParts.push(await uploaded.json());
+            if (part === partTotal) {
+                delete params.multipartNumber;
+                const body = JSON.stringify(multipartUploadedParts);
+                const headers = {
+                    'Content-Type': 'application/json'
+                };
+                const complete = await fetch(endpoint, {
+                    body,
+                    headers,
+                    method: 'POST'
+                });
+                if (!complete.ok) {
+                    throw new Error(`Failed to complete multipart upload`);
+                }
+                const key = await complete.text();
+                return {
+                    key
+                };
+            }
+        }
+    }
+});
+
+//# sourceMappingURL=R2ClientUploadHandler.js.map

package/dist/client/R2ClientUploadHandler.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/client/R2ClientUploadHandler.ts"],"sourcesContent":["'use client'\n\nimport { createClientUploadHandler } from '@payloadcms/plugin-cloud-storage/client'\nimport { formatAdminURL } from 'payload/shared'\n\nimport type {\n  R2MultipartUpload,\n  R2StorageClientUploadContext,\n  R2StorageClientUploadHandlerParams,\n  R2StorageMultipartUploadHandlerParams,\n  R2UploadedPart,\n} from '../types.js'\n\nexport const R2ClientUploadHandler = createClientUploadHandler<R2StorageClientUploadHandlerParams>({\n  handler: async ({\n    apiRoute,\n    collectionSlug,\n    extra: { chunkSize = 5 * 1024 * 1024, prefix = '' },\n    file,\n    serverHandlerPath,\n    serverURL,\n  }): Promise<R2StorageClientUploadContext | undefined> => {\n    const params: R2StorageMultipartUploadHandlerParams = {\n      collection: collectionSlug,\n      fileName: file.name,\n      fileType: file.type,\n    }\n    const baseURL = formatAdminURL({\n      apiRoute,\n      path: serverHandlerPath,\n      serverURL,\n    })\n\n    const endpoint = `${baseURL}?${String(new URLSearchParams(params))}`\n\n    const multipart = await fetch(endpoint, { method: 'POST' })\n    if (!multipart.ok) {\n      throw new Error('Failed to initialize multipart upload')\n    }\n\n    const multipartUpload = (await multipart.json()) as Pick<R2MultipartUpload, 'key' | 'uploadId'>\n    const multipartUploadedParts: R2UploadedPart[] = []\n\n    params.multipartId = multipartUpload.uploadId\n    params.multipartKey = multipartUpload.key\n\n    const partTotal = Math.ceil(file.size / chunkSize)\n\n    for (let part = 1; part <= partTotal; part++) {\n      const bytesEnd = Math.min(part * chunkSize, file.size)\n      const bytesStart = (part - 1) * chunkSize\n\n      params.multipartNumber = String(part)\n\n      const body = file.slice(bytesStart, bytesEnd)\n      const headers = {\n        'Content-Length': String(body.size),\n        'Content-Type': 'application/octet-stream',\n      }\n      const uploaded = await fetch(endpoint, { body, headers, method: 'POST' })\n      if (!uploaded.ok) {\n        throw new Error(`Failed to upload part ${part} / ${partTotal}`)\n      }\n\n      multipartUploadedParts.push((await uploaded.json()) as R2UploadedPart)\n\n      if (part === partTotal) {\n        delete params.multipartNumber\n\n        const body = JSON.stringify(multipartUploadedParts)\n        const headers = { 'Content-Type': 'application/json' }\n        const complete = await fetch(endpoint, { body, headers, method: 'POST' })\n        if (!complete.ok) {\n          throw new Error(`Failed to complete multipart upload`)\n        }\n\n        const key = await complete.text()\n        return { key }\n      }\n    }\n  },\n})\n"],"names":["createClientUploadHandler","formatAdminURL","R2ClientUploadHandler","handler","apiRoute","collectionSlug","extra","chunkSize","prefix","file","serverHandlerPath","serverURL","params","collection","fileName","name","fileType","type","baseURL","path","endpoint","String","URLSearchParams","multipart","fetch","method","ok","Error","multipartUpload","json","multipartUploadedParts","multipartId","uploadId","multipartKey","key","partTotal","Math","ceil","size","part","bytesEnd","min","bytesStart","multipartNumber","body","slice","headers","uploaded","push","JSON","stringify","complete","text"],"mappings":"AAAA;AAEA,SAASA,yBAAyB,QAAQ,0CAAyC;AACnF,SAASC,cAAc,QAAQ,iBAAgB;AAU/C,OAAO,MAAMC,wBAAwBF,0BAA8D;IACjGG,SAAS,OAAO,EACdC,QAAQ,EACRC,cAAc,EACdC,OAAO,EAAEC,YAAY,IAAI,OAAO,IAAI,EAAEC,SAAS,EAAE,EAAE,EACnDC,IAAI,EACJC,iBAAiB,EACjBC,SAAS,EACV;QACC,MAAMC,SAAgD;YACpDC,YAAYR;YACZS,UAAUL,KAAKM,IAAI;YACnBC,UAAUP,KAAKQ,IAAI;QACrB;QACA,MAAMC,UAAUjB,eAAe;YAC7BG;YACAe,MAAMT;YACNC;QACF;QAEA,MAAMS,WAAW,GAAGF,QAAQ,CAAC,EAAEG,OAAO,IAAIC,gBAAgBV,UAAU;QAEpE,MAAMW,YAAY,MAAMC,MAAMJ,UAAU;YAAEK,QAAQ;QAAO;QACzD,IAAI,CAACF,UAAUG,EAAE,EAAE;YACjB,MAAM,IAAIC,MAAM;QAClB;QAEA,MAAMC,kBAAmB,MAAML,UAAUM,IAAI;QAC7C,MAAMC,yBAA2C,EAAE;QAEnDlB,OAAOmB,WAAW,GAAGH,gBAAgBI,QAAQ;QAC7CpB,OAAOqB,YAAY,GAAGL,gBAAgBM,GAAG;QAEzC,MAAMC,YAAYC,KAAKC,IAAI,CAAC5B,KAAK6B,IAAI,GAAG/B;QAExC,IAAK,IAAIgC,OAAO,GAAGA,QAAQJ,WAAWI,OAAQ;YAC5C,MAAMC,WAAWJ,KAAKK,GAAG,CAACF,OAAOhC,WAAWE,KAAK6B,IAAI;YACrD,MAAMI,aAAa,AAACH,CAAAA,OAAO,CAAA,IAAKhC;YAEhCK,OAAO+B,eAAe,GAAGtB,OAAOkB;YAEhC,MAAMK,OAAOnC,KAAKoC,KAAK,CAACH,YAAYF;YACpC,MAAMM,UAAU;gBACd,kBAAkBzB,OAAOuB,KAAKN,IAAI;gBAClC,gBAAgB;YAClB;YACA,MAAMS,WAAW,MAAMvB,MAAMJ,UAAU;gBAAEwB;gBAAME;gBAASrB,QAAQ;YAAO;YACvE,IAAI,CAACsB,SAASrB,EAAE,EAAE;gBAChB,MAAM,IAAIC,MAAM,CAAC,sBAAsB,EAAEY,KAAK,GAAG,EAAEJ,WAAW;YAChE;YAEAL,uBAAuBkB,IAAI,CAAE,MAAMD,SAASlB,IAAI;YAEhD,IAAIU,SAASJ,WAAW;gBACtB,OAAOvB,OAAO+B,eAAe;gBAE7B,MAAMC,OAAOK,KAAKC,SAAS,CAACpB;gBAC5B,MAAMgB,UAAU;oBAAE,gBAAgB;gBAAmB;gBACrD,MAAMK,WAAW,MAAM3B,MAAMJ,UAAU;oBAAEwB;oBAAME;oBAASrB,QAAQ;gBAAO;gBACvE,IAAI,CAAC0B,SAASzB,EAAE,EAAE;oBAChB,MAAM,IAAIC,MAAM,CAAC,mCAAmC,CAAC;gBACvD;gBAEA,MAAMO,MAAM,MAAMiB,SAASC,IAAI;gBAC/B,OAAO;oBAAElB;gBAAI;YACf;QACF;IACF;AACF,GAAE"}

package/dist/exports/client.d.ts

@@ -0,0 +1,2 @@
+export { R2ClientUploadHandler } from '../client/R2ClientUploadHandler.js';
+//# sourceMappingURL=client.d.ts.map

package/dist/exports/client.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../src/exports/client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAA"}

package/dist/exports/client.js

@@ -0,0 +1,3 @@
+export { R2ClientUploadHandler } from '../client/R2ClientUploadHandler.js';
+
+//# sourceMappingURL=client.js.map

package/dist/exports/client.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/exports/client.ts"],"sourcesContent":["export { R2ClientUploadHandler } from '../client/R2ClientUploadHandler.js'\n"],"names":["R2ClientUploadHandler"],"mappings":"AAAA,SAASA,qBAAqB,QAAQ,qCAAoC"}

package/dist/handleMultiPartUpload.d.ts

@@ -0,0 +1,12 @@
+import type { ClientUploadsAccess } from '@payloadcms/plugin-cloud-storage/types';
+import type { PayloadHandler } from 'payload';
+import type { R2StorageOptions } from './index.js';
+import type { R2Bucket } from './types.js';
+type Args = {
+    access?: ClientUploadsAccess;
+    bucket: R2Bucket;
+    collections: R2StorageOptions['collections'];
+};
+export declare const getHandleMultiPartUpload: ({ access, bucket, collections }: Args) => PayloadHandler;
+export {};
+//# sourceMappingURL=handleMultiPartUpload.d.ts.map

package/dist/handleMultiPartUpload.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"handleMultiPartUpload.d.ts","sourceRoot":"","sources":["../src/handleMultiPartUpload.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,wCAAwC,CAAA;AACjF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAK7C,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAA;AAClD,OAAO,KAAK,EAAE,QAAQ,EAAyC,MAAM,YAAY,CAAA;AAEjF,KAAK,IAAI,GAAG;IACV,MAAM,CAAC,EAAE,mBAAmB,CAAA;IAC5B,MAAM,EAAE,QAAQ,CAAA;IAChB,WAAW,EAAE,gBAAgB,CAAC,aAAa,CAAC,CAAA;CAC7C,CAAA;AAGD,eAAO,MAAM,wBAAwB,oCACD,IAAI,KAAG,cAuExC,CAAA"}

package/dist/handleMultiPartUpload.js

@@ -0,0 +1,72 @@
+import path from 'path';
+import { APIError, Forbidden } from 'payload';
+// Adapted from https://developers.cloudflare.com/r2/api/workers/workers-multipart-usage/
+export const getHandleMultiPartUpload = ({ access, bucket, collections })=>async (req)=>{
+        const params = Object.fromEntries(req.searchParams);
+        const collectionSlug = params.collection;
+        const filetype = params.fileType;
+        const collectionConfig = collections[collectionSlug];
+        if (!collectionConfig) {
+            throw new APIError(`Collection ${collectionSlug} was not found in R2 Storage options`);
+        }
+        // Check custom access if provided, otherwise check collection's create access
+        if (access) {
+            if (!await access({
+                collectionSlug,
+                req
+            })) {
+                throw new Forbidden(req.t);
+            }
+        } else {
+            // Use the collection's create access control
+            const collection = req.payload.collections[collectionSlug];
+            if (!collection) {
+                throw new APIError(`Collection ${collectionSlug} not found`);
+            }
+            const createAccess = collection.config.access?.create;
+            if (createAccess) {
+                const hasAccess = await createAccess({
+                    req
+                });
+                if (!hasAccess) {
+                    throw new Forbidden(req.t);
+                }
+            } else if (!req.user) {
+                // No custom access and no user - deny by default
+                throw new Forbidden(req.t);
+            }
+        }
+        const prefix = typeof collectionConfig === 'object' && collectionConfig.prefix || '';
+        const fileKey = path.posix.join(prefix, params.fileName);
+        const multipartId = params.multipartId;
+        const multipartKey = params.multipartKey;
+        const multipartNumber = parseInt(params.multipartNumber || '');
+        if (multipartId && multipartKey) {
+            const multipartUpload = bucket.resumeMultipartUpload(multipartKey, multipartId);
+            const request = req;
+            if (isNaN(multipartNumber)) {
+                // Upload complete
+                const object = await multipartUpload.complete(await request.json());
+                return new Response(object.key, {
+                    status: 200
+                });
+            } else {
+                // Upload part
+                const uploadedPart = await multipartUpload.uploadPart(multipartNumber, await request.arrayBuffer());
+                return Response.json(uploadedPart);
+            }
+        } else {
+            // Create multipart upload
+            const multipartUpload = await bucket.createMultipartUpload(fileKey, {
+                httpMetadata: {
+                    contentType: filetype
+                }
+            });
+            return Response.json({
+                key: multipartUpload.key,
+                uploadId: multipartUpload.uploadId
+            });
+        }
+    };
+
+//# sourceMappingURL=handleMultiPartUpload.js.map

package/dist/handleMultiPartUpload.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/handleMultiPartUpload.ts"],"sourcesContent":["import type { ClientUploadsAccess } from '@payloadcms/plugin-cloud-storage/types'\nimport type { PayloadHandler } from 'payload'\n\nimport path from 'path'\nimport { APIError, Forbidden } from 'payload'\n\nimport type { R2StorageOptions } from './index.js'\nimport type { R2Bucket, R2StorageMultipartUploadHandlerParams } from './types.js'\n\ntype Args = {\n  access?: ClientUploadsAccess\n  bucket: R2Bucket\n  collections: R2StorageOptions['collections']\n}\n\n// Adapted from https://developers.cloudflare.com/r2/api/workers/workers-multipart-usage/\nexport const getHandleMultiPartUpload =\n  ({ access, bucket, collections }: Args): PayloadHandler =>\n  async (req) => {\n    const params = Object.fromEntries(req.searchParams) as R2StorageMultipartUploadHandlerParams\n    const collectionSlug = params.collection\n    const filetype = params.fileType\n\n    const collectionConfig = collections[collectionSlug]\n    if (!collectionConfig) {\n      throw new APIError(`Collection ${collectionSlug} was not found in R2 Storage options`)\n    }\n\n    // Check custom access if provided, otherwise check collection's create access\n    if (access) {\n      if (!(await access({ collectionSlug, req }))) {\n        throw new Forbidden(req.t)\n      }\n    } else {\n      // Use the collection's create access control\n      const collection = req.payload.collections[collectionSlug]\n      if (!collection) {\n        throw new APIError(`Collection ${collectionSlug} not found`)\n      }\n\n      const createAccess = collection.config.access?.create\n      if (createAccess) {\n        const hasAccess = await createAccess({ req })\n        if (!hasAccess) {\n          throw new Forbidden(req.t)\n        }\n      } else if (!req.user) {\n        // No custom access and no user - deny by default\n        throw new Forbidden(req.t)\n      }\n    }\n\n    const prefix = (typeof collectionConfig === 'object' && collectionConfig.prefix) || ''\n    const fileKey = path.posix.join(prefix, params.fileName)\n\n    const multipartId = params.multipartId\n    const multipartKey = params.multipartKey\n    const multipartNumber = parseInt(params.multipartNumber || '')\n\n    if (multipartId && multipartKey) {\n      const multipartUpload = bucket.resumeMultipartUpload(multipartKey, multipartId)\n      const request = req as Request\n\n      if (isNaN(multipartNumber)) {\n        // Upload complete\n        const object = await multipartUpload.complete((await request.json()) as any)\n        return new Response(object.key, { status: 200 })\n      } else {\n        // Upload part\n        const uploadedPart = await multipartUpload.uploadPart(\n          multipartNumber,\n          await request.arrayBuffer(),\n        )\n        return Response.json(uploadedPart)\n      }\n    } else {\n      // Create multipart upload\n      const multipartUpload = await bucket.createMultipartUpload(fileKey, {\n        httpMetadata: {\n          contentType: filetype,\n        },\n      })\n\n      return Response.json({\n        key: multipartUpload.key,\n        uploadId: multipartUpload.uploadId,\n      })\n    }\n  }\n"],"names":["path","APIError","Forbidden","getHandleMultiPartUpload","access","bucket","collections","req","params","Object","fromEntries","searchParams","collectionSlug","collection","filetype","fileType","collectionConfig","t","payload","createAccess","config","create","hasAccess","user","prefix","fileKey","posix","join","fileName","multipartId","multipartKey","multipartNumber","parseInt","multipartUpload","resumeMultipartUpload","request","isNaN","object","complete","json","Response","key","status","uploadedPart","uploadPart","arrayBuffer","createMultipartUpload","httpMetadata","contentType","uploadId"],"mappings":"AAGA,OAAOA,UAAU,OAAM;AACvB,SAASC,QAAQ,EAAEC,SAAS,QAAQ,UAAS;AAW7C,yFAAyF;AACzF,OAAO,MAAMC,2BACX,CAAC,EAAEC,MAAM,EAAEC,MAAM,EAAEC,WAAW,EAAQ,GACtC,OAAOC;QACL,MAAMC,SAASC,OAAOC,WAAW,CAACH,IAAII,YAAY;QAClD,MAAMC,iBAAiBJ,OAAOK,UAAU;QACxC,MAAMC,WAAWN,OAAOO,QAAQ;QAEhC,MAAMC,mBAAmBV,WAAW,CAACM,eAAe;QACpD,IAAI,CAACI,kBAAkB;YACrB,MAAM,IAAIf,SAAS,CAAC,WAAW,EAAEW,eAAe,oCAAoC,CAAC;QACvF;QAEA,8EAA8E;QAC9E,IAAIR,QAAQ;YACV,IAAI,CAAE,MAAMA,OAAO;gBAAEQ;gBAAgBL;YAAI,IAAK;gBAC5C,MAAM,IAAIL,UAAUK,IAAIU,CAAC;YAC3B;QACF,OAAO;YACL,6CAA6C;YAC7C,MAAMJ,aAAaN,IAAIW,OAAO,CAACZ,WAAW,CAACM,eAAe;YAC1D,IAAI,CAACC,YAAY;gBACf,MAAM,IAAIZ,SAAS,CAAC,WAAW,EAAEW,eAAe,UAAU,CAAC;YAC7D;YAEA,MAAMO,eAAeN,WAAWO,MAAM,CAAChB,MAAM,EAAEiB;YAC/C,IAAIF,cAAc;gBAChB,MAAMG,YAAY,MAAMH,aAAa;oBAAEZ;gBAAI;gBAC3C,IAAI,CAACe,WAAW;oBACd,MAAM,IAAIpB,UAAUK,IAAIU,CAAC;gBAC3B;YACF,OAAO,IAAI,CAACV,IAAIgB,IAAI,EAAE;gBACpB,iDAAiD;gBACjD,MAAM,IAAIrB,UAAUK,IAAIU,CAAC;YAC3B;QACF;QAEA,MAAMO,SAAS,AAAC,OAAOR,qBAAqB,YAAYA,iBAAiBQ,MAAM,IAAK;QACpF,MAAMC,UAAUzB,KAAK0B,KAAK,CAACC,IAAI,CAACH,QAAQhB,OAAOoB,QAAQ;QAEvD,MAAMC,cAAcrB,OAAOqB,WAAW;QACtC,MAAMC,eAAetB,OAAOsB,YAAY;QACxC,MAAMC,kBAAkBC,SAASxB,OAAOuB,eAAe,IAAI;QAE3D,IAAIF,eAAeC,cAAc;YAC/B,MAAMG,kBAAkB5B,OAAO6B,qBAAqB,CAACJ,cAAcD;YACnE,MAAMM,UAAU5B;YAEhB,IAAI6B,MAAML,kBAAkB;gBAC1B,kBAAkB;gBAClB,MAAMM,SAAS,MAAMJ,gBAAgBK,QAAQ,CAAE,MAAMH,QAAQI,IAAI;gBACjE,OAAO,IAAIC,SAASH,OAAOI,GAAG,EAAE;oBAAEC,QAAQ;gBAAI;YAChD,OAAO;gBACL,cAAc;gBACd,MAAMC,eAAe,MAAMV,gBAAgBW,UAAU,CACnDb,iBACA,MAAMI,QAAQU,WAAW;gBAE3B,OAAOL,SAASD,IAAI,CAACI;YACvB;QACF,OAAO;YACL,0BAA0B;YAC1B,MAAMV,kBAAkB,MAAM5B,OAAOyC,qBAAqB,CAACrB,SAAS;gBAClEsB,cAAc;oBACZC,aAAalC;gBACf;YACF;YAEA,OAAO0B,SAASD,IAAI,CAAC;gBACnBE,KAAKR,gBAAgBQ,GAAG;gBACxBQ,UAAUhB,gBAAgBgB,QAAQ;YACpC;QACF;IACF,EAAC"}

package/dist/handleUpload.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"handleUpload.d.ts","sourceRoot":"","sources":["../src/handleUpload.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,wCAAwC,CAAA;AAC1E,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAA;AAI/C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AAE1C,UAAU,IAAI;IACZ,MAAM,EAAE,QAAQ,CAAA;IAChB,UAAU,EAAE,gBAAgB,CAAA;IAC5B,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB;AAED,eAAO,MAAM,eAAe,uBAA6B,IAAI,KAAG,YAU/D,CAAA"}
+{"version":3,"file":"handleUpload.d.ts","sourceRoot":"","sources":["../src/handleUpload.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,wCAAwC,CAAA;AAC1E,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAA;AAI/C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AAE1C,UAAU,IAAI;IACZ,MAAM,EAAE,QAAQ,CAAA;IAChB,UAAU,EAAE,gBAAgB,CAAA;IAC5B,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB;AAED,eAAO,MAAM,eAAe,uBAA6B,IAAI,KAAG,YAQ/D,CAAA"}

package/dist/handleUpload.js

@@ -10,7 +10,6 @@ export const getHandleUpload = ({ bucket, prefix = '' })=>{
                 contentType: file.mimeType
             }
         });
-        return data;
     };
 };
 

package/dist/handleUpload.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/handleUpload.ts"],"sourcesContent":["import type { HandleUpload } from '@payloadcms/plugin-cloud-storage/types'\nimport type { CollectionConfig } from 'payload'\n\nimport path from 'path'\n\nimport type { R2Bucket } from './types.js'\n\ninterface Args {\n  bucket: R2Bucket\n  collection: CollectionConfig\n  prefix?: string\n}\n\nexport const getHandleUpload = ({ bucket, prefix = '' }: Args): HandleUpload => {\n  return async ({ data, file }) => {\n    // Read more: https://github.com/cloudflare/workers-sdk/issues/6047#issuecomment-2691217843\n    const buffer = process.env.NODE_ENV === 'development' ? new Blob([file.buffer]) : file.buffer\n    await bucket.put(path.posix.join(data.prefix || prefix, file.filename), buffer, {\n      httpMetadata: { contentType: file.mimeType },\n    })\n\n    return data\n  }\n}\n"],"names":["path","getHandleUpload","bucket","prefix","data","file","buffer","process","env","NODE_ENV","Blob","put","posix","join","filename","httpMetadata","contentType","mimeType"],"mappings":"AAGA,OAAOA,UAAU,OAAM;AAUvB,OAAO,MAAMC,kBAAkB,CAAC,EAAEC,MAAM,EAAEC,SAAS,EAAE,EAAQ;IAC3D,OAAO,OAAO,EAAEC,IAAI,EAAEC,IAAI,EAAE;QAC1B,2FAA2F;QAC3F,MAAMC,SAASC,QAAQC,GAAG,CAACC,QAAQ,KAAK,gBAAgB,IAAIC,KAAK;YAACL,KAAKC,MAAM;SAAC,IAAID,KAAKC,MAAM;QAC7F,MAAMJ,OAAOS,GAAG,CAACX,KAAKY,KAAK,CAACC,IAAI,CAACT,KAAKD,MAAM,IAAIA,QAAQE,KAAKS,QAAQ,GAAGR,QAAQ;YAC9ES,cAAc;gBAAEC,aAAaX,KAAKY,QAAQ;YAAC;QAC7C;QAEA,OAAOb;IACT;AACF,EAAC"}
+{"version":3,"sources":["../src/handleUpload.ts"],"sourcesContent":["import type { HandleUpload } from '@payloadcms/plugin-cloud-storage/types'\nimport type { CollectionConfig } from 'payload'\n\nimport path from 'path'\n\nimport type { R2Bucket } from './types.js'\n\ninterface Args {\n  bucket: R2Bucket\n  collection: CollectionConfig\n  prefix?: string\n}\n\nexport const getHandleUpload = ({ bucket, prefix = '' }: Args): HandleUpload => {\n  return async ({ data, file }) => {\n    // Read more: https://github.com/cloudflare/workers-sdk/issues/6047#issuecomment-2691217843\n    const buffer = process.env.NODE_ENV === 'development' ? new Blob([file.buffer]) : file.buffer\n    await bucket.put(path.posix.join(data.prefix || prefix, file.filename), buffer, {\n      httpMetadata: { contentType: file.mimeType },\n    })\n  }\n}\n"],"names":["path","getHandleUpload","bucket","prefix","data","file","buffer","process","env","NODE_ENV","Blob","put","posix","join","filename","httpMetadata","contentType","mimeType"],"mappings":"AAGA,OAAOA,UAAU,OAAM;AAUvB,OAAO,MAAMC,kBAAkB,CAAC,EAAEC,MAAM,EAAEC,SAAS,EAAE,EAAQ;IAC3D,OAAO,OAAO,EAAEC,IAAI,EAAEC,IAAI,EAAE;QAC1B,2FAA2F;QAC3F,MAAMC,SAASC,QAAQC,GAAG,CAACC,QAAQ,KAAK,gBAAgB,IAAIC,KAAK;YAACL,KAAKC,MAAM;SAAC,IAAID,KAAKC,MAAM;QAC7F,MAAMJ,OAAOS,GAAG,CAACX,KAAKY,KAAK,CAACC,IAAI,CAACT,KAAKD,MAAM,IAAIA,QAAQE,KAAKS,QAAQ,GAAGR,QAAQ;YAC9ES,cAAc;gBAAEC,aAAaX,KAAKY,QAAQ;YAAC;QAC7C;IACF;AACF,EAAC"}

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import type { CollectionOptions } from '@payloadcms/plugin-cloud-storage/types';
+import type { ClientUploadsConfig, CollectionOptions } from '@payloadcms/plugin-cloud-storage/types';
 import type { Plugin, UploadCollectionSlug } from 'payload';
 import type { R2Bucket } from './types.js';
 export interface R2StorageOptions {
@@ -13,6 +13,10 @@ export interface R2StorageOptions {
      */
     alwaysInsertFields?: boolean;
     bucket: R2Bucket;
+    /**
+     * Do uploads directly on the client, to bypass limits on Cloudflare/Vercel.
+     */
+    clientUploads?: ClientUploadsConfig;
     /**
      * Collection options to apply the R2 adapter to.
      */

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAGV,iBAAiB,EAElB,MAAM,wCAAwC,CAAA;AAC/C,OAAO,KAAK,EAAU,MAAM,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAA;AAInE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AAM1C,MAAM,WAAW,gBAAgB;IAC/B;;;;;;;;OAQG;IACH,kBAAkB,CAAC,EAAE,OAAO,CAAA;IAE5B,MAAM,EAAE,QAAQ,CAAA;IAChB;;OAEG;IACH,WAAW,EAAE,OAAO,CAAC,MAAM,CAAC,oBAAoB,EAAE,IAAI,CAAC,iBAAiB,EAAE,SAAS,CAAC,GAAG,IAAI,CAAC,CAAC,CAAA;IAC7F,OAAO,CAAC,EAAE,OAAO,CAAA;CAClB;AAED,KAAK,eAAe,GAAG,CAAC,aAAa,EAAE,gBAAgB,KAAK,MAAM,CAAA;AAElE,eAAO,MAAM,SAAS,EAAE,eA+CrB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,mBAAmB,EAEnB,iBAAiB,EAElB,MAAM,wCAAwC,CAAA;AAC/C,OAAO,KAAK,EAAU,MAAM,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAA;AAKnE,OAAO,KAAK,EAAE,QAAQ,EAAsC,MAAM,YAAY,CAAA;AAO9E,MAAM,WAAW,gBAAgB;IAC/B;;;;;;;;OAQG;IACH,kBAAkB,CAAC,EAAE,OAAO,CAAA;IAE5B,MAAM,EAAE,QAAQ,CAAA;IAChB;;OAEG;IACH,aAAa,CAAC,EAAE,mBAAmB,CAAA;IACnC;;OAEG;IACH,WAAW,EAAE,OAAO,CAAC,MAAM,CAAC,oBAAoB,EAAE,IAAI,CAAC,iBAAiB,EAAE,SAAS,CAAC,GAAG,IAAI,CAAC,CAAC,CAAA;IAC7F,OAAO,CAAC,EAAE,OAAO,CAAA;CAClB;AAED,KAAK,eAAe,GAAG,CAAC,aAAa,EAAE,gBAAgB,KAAK,MAAM,CAAA;AAElE,eAAO,MAAM,SAAS,EAAE,eAsErB,CAAA"}

package/dist/index.js

@@ -1,10 +1,27 @@
 import { cloudStoragePlugin } from '@payloadcms/plugin-cloud-storage';
+import { initClientUploads } from '@payloadcms/plugin-cloud-storage/utilities';
 import { getHandleDelete } from './handleDelete.js';
+import { getHandleMultiPartUpload } from './handleMultiPartUpload.js';
 import { getHandleUpload } from './handleUpload.js';
 import { getHandler } from './staticHandler.js';
 export const r2Storage = (r2StorageOptions)=>(incomingConfig)=>{
         const adapter = r2StorageInternal(r2StorageOptions);
         const isPluginDisabled = r2StorageOptions.enabled === false;
+        initClientUploads({
+            clientHandler: '@payloadcms/storage-r2/client#R2ClientUploadHandler',
+            collections: r2StorageOptions.collections,
+            config: incomingConfig,
+            enabled: !isPluginDisabled && Boolean(r2StorageOptions.clientUploads),
+            extraClientHandlerProps: (collection)=>({
+                    prefix: typeof collection === 'object' && collection.prefix && `${collection.prefix}/` || ''
+                }),
+            serverHandler: getHandleMultiPartUpload({
+                access: typeof r2StorageOptions.clientUploads === 'object' ? r2StorageOptions.clientUploads.access : undefined,
+                bucket: r2StorageOptions.bucket,
+                collections: r2StorageOptions.collections
+            }),
+            serverHandlerPath: '/storage-r2-multi-part-upload'
+        });
         if (isPluginDisabled) {
             return incomingConfig;
         }
@@ -37,10 +54,11 @@ export const r2Storage = (r2StorageOptions)=>(incomingConfig)=>{
             collections: collectionsWithAdapter
         })(config);
     };
-function r2StorageInternal({ bucket }) {
+function r2StorageInternal({ bucket, clientUploads }) {
     return ({ collection, prefix })=>{
         return {
             name: 'r2',
+            clientUploads,
             handleDelete: getHandleDelete({
                 bucket
             }),

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/index.ts"],"sourcesContent":["import type {\n  Adapter,\n  PluginOptions as CloudStoragePluginOptions,\n  CollectionOptions,\n  GeneratedAdapter,\n} from '@payloadcms/plugin-cloud-storage/types'\nimport type { Config, Plugin, UploadCollectionSlug } from 'payload'\n\nimport { cloudStoragePlugin } from '@payloadcms/plugin-cloud-storage'\n\nimport type { R2Bucket } from './types.js'\n\nimport { getHandleDelete } from './handleDelete.js'\nimport { getHandleUpload } from './handleUpload.js'\nimport { getHandler } from './staticHandler.js'\n\nexport interface R2StorageOptions {\n  /**\n   * When enabled, fields (like the prefix field) will always be inserted into\n   * the collection schema regardless of whether the plugin is enabled. This\n   * ensures a consistent schema across all environments.\n   *\n   * This will be enabled by default in Payload v4.\n   *\n   * @default false\n   */\n  alwaysInsertFields?: boolean\n\n  bucket: R2Bucket\n  /**\n   * Collection options to apply the R2 adapter to.\n   */\n  collections: Partial<Record<UploadCollectionSlug, Omit<CollectionOptions, 'adapter'> | true>>\n  enabled?: boolean\n}\n\ntype R2StoragePlugin = (r2StorageArgs: R2StorageOptions) => Plugin\n\nexport const r2Storage: R2StoragePlugin =\n  (r2StorageOptions) =>\n  (incomingConfig: Config): Config => {\n    const adapter = r2StorageInternal(r2StorageOptions)\n\n    const isPluginDisabled = r2StorageOptions.enabled === false\n\n    if (isPluginDisabled) {\n      return incomingConfig\n    }\n\n    // Add adapter to each collection option object\n    const collectionsWithAdapter: CloudStoragePluginOptions['collections'] = Object.entries(\n      r2StorageOptions.collections,\n    ).reduce(\n      (acc, [slug, collOptions]) => ({\n        ...acc,\n        [slug]: {\n          ...(collOptions === true ? {} : collOptions),\n          adapter,\n        },\n      }),\n      {} as Record<string, CollectionOptions>,\n    )\n\n    // Set disableLocalStorage: true for collections specified in the plugin options\n    const config = {\n      ...incomingConfig,\n      collections: (incomingConfig.collections || []).map((collection) => {\n        if (!collectionsWithAdapter[collection.slug]) {\n          return collection\n        }\n\n        return {\n          ...collection,\n          upload: {\n            ...(typeof collection.upload === 'object' ? collection.upload : {}),\n            disableLocalStorage: true,\n          },\n        }\n      }),\n    }\n\n    return cloudStoragePlugin({\n      alwaysInsertFields: r2StorageOptions.alwaysInsertFields,\n      collections: collectionsWithAdapter,\n    })(config)\n  }\n\nfunction r2StorageInternal({ bucket }: R2StorageOptions): Adapter {\n  return ({ collection, prefix }): GeneratedAdapter => {\n    return {\n      name: 'r2',\n      handleDelete: getHandleDelete({ bucket }),\n      handleUpload: getHandleUpload({\n        bucket,\n        collection,\n        prefix,\n      }),\n      staticHandler: getHandler({ bucket, collection, prefix }),\n    }\n  }\n}\n"],"names":["cloudStoragePlugin","getHandleDelete","getHandleUpload","getHandler","r2Storage","r2StorageOptions","incomingConfig","adapter","r2StorageInternal","isPluginDisabled","enabled","collectionsWithAdapter","Object","entries","collections","reduce","acc","slug","collOptions","config","map","collection","upload","disableLocalStorage","alwaysInsertFields","bucket","prefix","name","handleDelete","handleUpload","staticHandler"],"mappings":"AAQA,SAASA,kBAAkB,QAAQ,mCAAkC;AAIrE,SAASC,eAAe,QAAQ,oBAAmB;AACnD,SAASC,eAAe,QAAQ,oBAAmB;AACnD,SAASC,UAAU,QAAQ,qBAAoB;AAwB/C,OAAO,MAAMC,YACX,CAACC,mBACD,CAACC;QACC,MAAMC,UAAUC,kBAAkBH;QAElC,MAAMI,mBAAmBJ,iBAAiBK,OAAO,KAAK;QAEtD,IAAID,kBAAkB;YACpB,OAAOH;QACT;QAEA,+CAA+C;QAC/C,MAAMK,yBAAmEC,OAAOC,OAAO,CACrFR,iBAAiBS,WAAW,EAC5BC,MAAM,CACN,CAACC,KAAK,CAACC,MAAMC,YAAY,GAAM,CAAA;gBAC7B,GAAGF,GAAG;gBACN,CAACC,KAAK,EAAE;oBACN,GAAIC,gBAAgB,OAAO,CAAC,IAAIA,WAAW;oBAC3CX;gBACF;YACF,CAAA,GACA,CAAC;QAGH,gFAAgF;QAChF,MAAMY,SAAS;YACb,GAAGb,cAAc;YACjBQ,aAAa,AAACR,CAAAA,eAAeQ,WAAW,IAAI,EAAE,AAAD,EAAGM,GAAG,CAAC,CAACC;gBACnD,IAAI,CAACV,sBAAsB,CAACU,WAAWJ,IAAI,CAAC,EAAE;oBAC5C,OAAOI;gBACT;gBAEA,OAAO;oBACL,GAAGA,UAAU;oBACbC,QAAQ;wBACN,GAAI,OAAOD,WAAWC,MAAM,KAAK,WAAWD,WAAWC,MAAM,GAAG,CAAC,CAAC;wBAClEC,qBAAqB;oBACvB;gBACF;YACF;QACF;QAEA,OAAOvB,mBAAmB;YACxBwB,oBAAoBnB,iBAAiBmB,kBAAkB;YACvDV,aAAaH;QACf,GAAGQ;IACL,EAAC;AAEH,SAASX,kBAAkB,EAAEiB,MAAM,EAAoB;IACrD,OAAO,CAAC,EAAEJ,UAAU,EAAEK,MAAM,EAAE;QAC5B,OAAO;YACLC,MAAM;YACNC,cAAc3B,gBAAgB;gBAAEwB;YAAO;YACvCI,cAAc3B,gBAAgB;gBAC5BuB;gBACAJ;gBACAK;YACF;YACAI,eAAe3B,WAAW;gBAAEsB;gBAAQJ;gBAAYK;YAAO;QACzD;IACF;AACF"}
+{"version":3,"sources":["../src/index.ts"],"sourcesContent":["import type {\n  Adapter,\n  ClientUploadsConfig,\n  PluginOptions as CloudStoragePluginOptions,\n  CollectionOptions,\n  GeneratedAdapter,\n} from '@payloadcms/plugin-cloud-storage/types'\nimport type { Config, Plugin, UploadCollectionSlug } from 'payload'\n\nimport { cloudStoragePlugin } from '@payloadcms/plugin-cloud-storage'\nimport { initClientUploads } from '@payloadcms/plugin-cloud-storage/utilities'\n\nimport type { R2Bucket, R2StorageClientUploadHandlerParams } from './types.js'\n\nimport { getHandleDelete } from './handleDelete.js'\nimport { getHandleMultiPartUpload } from './handleMultiPartUpload.js'\nimport { getHandleUpload } from './handleUpload.js'\nimport { getHandler } from './staticHandler.js'\n\nexport interface R2StorageOptions {\n  /**\n   * When enabled, fields (like the prefix field) will always be inserted into\n   * the collection schema regardless of whether the plugin is enabled. This\n   * ensures a consistent schema across all environments.\n   *\n   * This will be enabled by default in Payload v4.\n   *\n   * @default false\n   */\n  alwaysInsertFields?: boolean\n\n  bucket: R2Bucket\n  /**\n   * Do uploads directly on the client, to bypass limits on Cloudflare/Vercel.\n   */\n  clientUploads?: ClientUploadsConfig\n  /**\n   * Collection options to apply the R2 adapter to.\n   */\n  collections: Partial<Record<UploadCollectionSlug, Omit<CollectionOptions, 'adapter'> | true>>\n  enabled?: boolean\n}\n\ntype R2StoragePlugin = (r2StorageArgs: R2StorageOptions) => Plugin\n\nexport const r2Storage: R2StoragePlugin =\n  (r2StorageOptions) =>\n  (incomingConfig: Config): Config => {\n    const adapter = r2StorageInternal(r2StorageOptions)\n\n    const isPluginDisabled = r2StorageOptions.enabled === false\n\n    initClientUploads<\n      R2StorageClientUploadHandlerParams,\n      R2StorageOptions['collections'][keyof R2StorageOptions['collections']]\n    >({\n      clientHandler: '@payloadcms/storage-r2/client#R2ClientUploadHandler',\n      collections: r2StorageOptions.collections,\n      config: incomingConfig,\n      enabled: !isPluginDisabled && Boolean(r2StorageOptions.clientUploads),\n      extraClientHandlerProps: (collection) => ({\n        prefix:\n          (typeof collection === 'object' && collection.prefix && `${collection.prefix}/`) || '',\n      }),\n      serverHandler: getHandleMultiPartUpload({\n        access:\n          typeof r2StorageOptions.clientUploads === 'object'\n            ? r2StorageOptions.clientUploads.access\n            : undefined,\n        bucket: r2StorageOptions.bucket,\n        collections: r2StorageOptions.collections,\n      }),\n      serverHandlerPath: '/storage-r2-multi-part-upload',\n    })\n\n    if (isPluginDisabled) {\n      return incomingConfig\n    }\n\n    // Add adapter to each collection option object\n    const collectionsWithAdapter: CloudStoragePluginOptions['collections'] = Object.entries(\n      r2StorageOptions.collections,\n    ).reduce(\n      (acc, [slug, collOptions]) => ({\n        ...acc,\n        [slug]: {\n          ...(collOptions === true ? {} : collOptions),\n          adapter,\n        },\n      }),\n      {} as Record<string, CollectionOptions>,\n    )\n\n    // Set disableLocalStorage: true for collections specified in the plugin options\n    const config = {\n      ...incomingConfig,\n      collections: (incomingConfig.collections || []).map((collection) => {\n        if (!collectionsWithAdapter[collection.slug]) {\n          return collection\n        }\n\n        return {\n          ...collection,\n          upload: {\n            ...(typeof collection.upload === 'object' ? collection.upload : {}),\n            disableLocalStorage: true,\n          },\n        }\n      }),\n    }\n\n    return cloudStoragePlugin({\n      alwaysInsertFields: r2StorageOptions.alwaysInsertFields,\n      collections: collectionsWithAdapter,\n    })(config)\n  }\n\nfunction r2StorageInternal({ bucket, clientUploads }: R2StorageOptions): Adapter {\n  return ({ collection, prefix }): GeneratedAdapter => {\n    return {\n      name: 'r2',\n      clientUploads,\n      handleDelete: getHandleDelete({ bucket }),\n      handleUpload: getHandleUpload({\n        bucket,\n        collection,\n        prefix,\n      }),\n      staticHandler: getHandler({ bucket, collection, prefix }),\n    }\n  }\n}\n"],"names":["cloudStoragePlugin","initClientUploads","getHandleDelete","getHandleMultiPartUpload","getHandleUpload","getHandler","r2Storage","r2StorageOptions","incomingConfig","adapter","r2StorageInternal","isPluginDisabled","enabled","clientHandler","collections","config","Boolean","clientUploads","extraClientHandlerProps","collection","prefix","serverHandler","access","undefined","bucket","serverHandlerPath","collectionsWithAdapter","Object","entries","reduce","acc","slug","collOptions","map","upload","disableLocalStorage","alwaysInsertFields","name","handleDelete","handleUpload","staticHandler"],"mappings":"AASA,SAASA,kBAAkB,QAAQ,mCAAkC;AACrE,SAASC,iBAAiB,QAAQ,6CAA4C;AAI9E,SAASC,eAAe,QAAQ,oBAAmB;AACnD,SAASC,wBAAwB,QAAQ,6BAA4B;AACrE,SAASC,eAAe,QAAQ,oBAAmB;AACnD,SAASC,UAAU,QAAQ,qBAAoB;AA4B/C,OAAO,MAAMC,YACX,CAACC,mBACD,CAACC;QACC,MAAMC,UAAUC,kBAAkBH;QAElC,MAAMI,mBAAmBJ,iBAAiBK,OAAO,KAAK;QAEtDX,kBAGE;YACAY,eAAe;YACfC,aAAaP,iBAAiBO,WAAW;YACzCC,QAAQP;YACRI,SAAS,CAACD,oBAAoBK,QAAQT,iBAAiBU,aAAa;YACpEC,yBAAyB,CAACC,aAAgB,CAAA;oBACxCC,QACE,AAAC,OAAOD,eAAe,YAAYA,WAAWC,MAAM,IAAI,GAAGD,WAAWC,MAAM,CAAC,CAAC,CAAC,IAAK;gBACxF,CAAA;YACAC,eAAelB,yBAAyB;gBACtCmB,QACE,OAAOf,iBAAiBU,aAAa,KAAK,WACtCV,iBAAiBU,aAAa,CAACK,MAAM,GACrCC;gBACNC,QAAQjB,iBAAiBiB,MAAM;gBAC/BV,aAAaP,iBAAiBO,WAAW;YAC3C;YACAW,mBAAmB;QACrB;QAEA,IAAId,kBAAkB;YACpB,OAAOH;QACT;QAEA,+CAA+C;QAC/C,MAAMkB,yBAAmEC,OAAOC,OAAO,CACrFrB,iBAAiBO,WAAW,EAC5Be,MAAM,CACN,CAACC,KAAK,CAACC,MAAMC,YAAY,GAAM,CAAA;gBAC7B,GAAGF,GAAG;gBACN,CAACC,KAAK,EAAE;oBACN,GAAIC,gBAAgB,OAAO,CAAC,IAAIA,WAAW;oBAC3CvB;gBACF;YACF,CAAA,GACA,CAAC;QAGH,gFAAgF;QAChF,MAAMM,SAAS;YACb,GAAGP,cAAc;YACjBM,aAAa,AAACN,CAAAA,eAAeM,WAAW,IAAI,EAAE,AAAD,EAAGmB,GAAG,CAAC,CAACd;gBACnD,IAAI,CAACO,sBAAsB,CAACP,WAAWY,IAAI,CAAC,EAAE;oBAC5C,OAAOZ;gBACT;gBAEA,OAAO;oBACL,GAAGA,UAAU;oBACbe,QAAQ;wBACN,GAAI,OAAOf,WAAWe,MAAM,KAAK,WAAWf,WAAWe,MAAM,GAAG,CAAC,CAAC;wBAClEC,qBAAqB;oBACvB;gBACF;YACF;QACF;QAEA,OAAOnC,mBAAmB;YACxBoC,oBAAoB7B,iBAAiB6B,kBAAkB;YACvDtB,aAAaY;QACf,GAAGX;IACL,EAAC;AAEH,SAASL,kBAAkB,EAAEc,MAAM,EAAEP,aAAa,EAAoB;IACpE,OAAO,CAAC,EAAEE,UAAU,EAAEC,MAAM,EAAE;QAC5B,OAAO;YACLiB,MAAM;YACNpB;YACAqB,cAAcpC,gBAAgB;gBAAEsB;YAAO;YACvCe,cAAcnC,gBAAgB;gBAC5BoB;gBACAL;gBACAC;YACF;YACAoB,eAAenC,WAAW;gBAAEmB;gBAAQL;gBAAYC;YAAO;QACzD;IACF;AACF"}

package/dist/staticHandler.d.ts.map

@@ -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,MAAM,SAAS,CAAA;AAK/C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AAE1C,UAAU,IAAI;IACZ,MAAM,EAAE,QAAQ,CAAA;IAChB,UAAU,EAAE,gBAAgB,CAAA;IAC5B,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB;AAID,eAAO,MAAM,UAAU,mCAAyC,IAAI,KAAG,aA8EtE,CAAA"}
+{"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,MAAM,SAAS,CAAA;AAK/C,OAAO,KAAK,EAAE,QAAQ,EAAgB,MAAM,YAAY,CAAA;AAExD,UAAU,IAAI;IACZ,MAAM,EAAE,QAAQ,CAAA;IAChB,UAAU,EAAE,gBAAgB,CAAA;IAC5B,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB;AAID,eAAO,MAAM,UAAU,mCAAyC,IAAI,KAAG,aAqGtE,CAAA"}

package/dist/staticHandler.js

@@ -2,7 +2,7 @@ import path from 'path';
 import { getRangeRequestInfo } from 'payload/internal';
 const isMiniflare = process.env.NODE_ENV === 'development';
 export const getHandler = ({ bucket, collection, prefix = '' })=>{
-    return async (req, { headers: incomingHeaders, params: { filename } })=>{
+    return async (req, { headers: incomingHeaders, params: { clientUploadContext, filename } })=>{
         try {
             const key = path.posix.join(prefix, filename);
             // Get file size for range validation
@@ -14,6 +14,12 @@ export const getHandler = ({ bucket, collection, prefix = '' })=>{
                 });
             }
             const fileSize = headObj.size;
+            // Don't return large file uploads back to the client, or the Worker will run out of memory
+            if (fileSize > 50 * 1024 * 1024 && clientUploadContext) {
+                return new Response(null, {
+                    status: 200
+                });
+            }
             // Handle range request
             const rangeHeader = req.headers.get('range');
             const rangeResult = getRangeRequestInfo({
@@ -47,7 +53,25 @@ export const getHandler = ({ bucket, collection, prefix = '' })=>{
                 headers.append(key, value);
             }
             // Add R2-specific headers
-            if (!isMiniflare) {
+            if (isMiniflare) {
+                // In development with Miniflare, manually set headers from httpMetadata
+                const metadata = obj.httpMetadata;
+                if (metadata?.cacheControl) {
+                    headers.set('Cache-Control', metadata.cacheControl);
+                }
+                if (metadata?.contentDisposition) {
+                    headers.set('Content-Disposition', metadata.contentDisposition);
+                }
+                if (metadata?.contentEncoding) {
+                    headers.set('Content-Encoding', metadata.contentEncoding);
+                }
+                if (metadata?.contentLanguage) {
+                    headers.set('Content-Language', metadata.contentLanguage);
+                }
+                if (metadata?.contentType) {
+                    headers.set('Content-Type', metadata.contentType);
+                }
+            } else {
                 obj.writeHttpMetadata(headers);
             }
             const etagFromHeaders = req.headers.get('etag') || req.headers.get('if-none-match');

package/dist/staticHandler.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/staticHandler.ts"],"sourcesContent":["import type { StaticHandler } from '@payloadcms/plugin-cloud-storage/types'\nimport type { CollectionConfig } from 'payload'\n\nimport path from 'path'\nimport { getRangeRequestInfo } from 'payload/internal'\n\nimport type { R2Bucket } from './types.js'\n\ninterface Args {\n  bucket: R2Bucket\n  collection: CollectionConfig\n  prefix?: string\n}\n\nconst isMiniflare = process.env.NODE_ENV === 'development'\n\nexport const getHandler = ({ bucket, collection, prefix = '' }: Args): StaticHandler => {\n  return async (req, { headers: incomingHeaders, params: { filename } }) => {\n    try {\n      const key = path.posix.join(prefix, filename)\n\n      // Get file size for range validation\n      const headObj = await bucket?.head(key)\n      if (!headObj) {\n        return new Response(null, { status: 404, statusText: 'Not Found' })\n      }\n\n      const fileSize = headObj.size\n\n      // Handle range request\n      const rangeHeader = req.headers.get('range')\n      const rangeResult = getRangeRequestInfo({ fileSize, rangeHeader })\n\n      if (rangeResult.type === 'invalid') {\n        return new Response(null, {\n          headers: new Headers(rangeResult.headers),\n          status: rangeResult.status,\n        })\n      }\n\n      // Get object with range if needed\n      // Due to https://github.com/cloudflare/workers-sdk/issues/6047\n      // We cannot send a Headers instance to Miniflare\n      const obj =\n        rangeResult.type === 'partial' && !isMiniflare\n          ? await bucket?.get(key, {\n              range: {\n                length: rangeResult.rangeEnd - rangeResult.rangeStart + 1,\n                offset: rangeResult.rangeStart,\n              },\n            })\n          : await bucket?.get(key)\n\n      if (obj?.body == undefined) {\n        return new Response(null, { status: 404, statusText: 'Not Found' })\n      }\n\n      let headers = new Headers(incomingHeaders)\n\n      // Add range-related headers from the result\n      for (const [key, value] of Object.entries(rangeResult.headers)) {\n        headers.append(key, value)\n      }\n\n      // Add R2-specific headers\n      if (!isMiniflare) {\n        obj.writeHttpMetadata(headers)\n      }\n\n      const etagFromHeaders = req.headers.get('etag') || req.headers.get('if-none-match')\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 === obj.etag) {\n        return new Response(null, {\n          headers,\n          status: 304,\n        })\n      }\n\n      return new Response(obj.body, {\n        headers,\n        status: rangeResult.status,\n      })\n    } catch (err: unknown) {\n      return new Response('Internal Server Error', { status: 500 })\n    }\n  }\n}\n"],"names":["path","getRangeRequestInfo","isMiniflare","process","env","NODE_ENV","getHandler","bucket","collection","prefix","req","headers","incomingHeaders","params","filename","key","posix","join","headObj","head","Response","status","statusText","fileSize","size","rangeHeader","get","rangeResult","type","Headers","obj","range","length","rangeEnd","rangeStart","offset","body","undefined","value","Object","entries","append","writeHttpMetadata","etagFromHeaders","upload","modifyResponseHeaders","etag","err"],"mappings":"AAGA,OAAOA,UAAU,OAAM;AACvB,SAASC,mBAAmB,QAAQ,mBAAkB;AAUtD,MAAMC,cAAcC,QAAQC,GAAG,CAACC,QAAQ,KAAK;AAE7C,OAAO,MAAMC,aAAa,CAAC,EAAEC,MAAM,EAAEC,UAAU,EAAEC,SAAS,EAAE,EAAQ;IAClE,OAAO,OAAOC,KAAK,EAAEC,SAASC,eAAe,EAAEC,QAAQ,EAAEC,QAAQ,EAAE,EAAE;QACnE,IAAI;YACF,MAAMC,MAAMf,KAAKgB,KAAK,CAACC,IAAI,CAACR,QAAQK;YAEpC,qCAAqC;YACrC,MAAMI,UAAU,MAAMX,QAAQY,KAAKJ;YACnC,IAAI,CAACG,SAAS;gBACZ,OAAO,IAAIE,SAAS,MAAM;oBAAEC,QAAQ;oBAAKC,YAAY;gBAAY;YACnE;YAEA,MAAMC,WAAWL,QAAQM,IAAI;YAE7B,uBAAuB;YACvB,MAAMC,cAAcf,IAAIC,OAAO,CAACe,GAAG,CAAC;YACpC,MAAMC,cAAc1B,oBAAoB;gBAAEsB;gBAAUE;YAAY;YAEhE,IAAIE,YAAYC,IAAI,KAAK,WAAW;gBAClC,OAAO,IAAIR,SAAS,MAAM;oBACxBT,SAAS,IAAIkB,QAAQF,YAAYhB,OAAO;oBACxCU,QAAQM,YAAYN,MAAM;gBAC5B;YACF;YAEA,kCAAkC;YAClC,+DAA+D;YAC/D,iDAAiD;YACjD,MAAMS,MACJH,YAAYC,IAAI,KAAK,aAAa,CAAC1B,cAC/B,MAAMK,QAAQmB,IAAIX,KAAK;gBACrBgB,OAAO;oBACLC,QAAQL,YAAYM,QAAQ,GAAGN,YAAYO,UAAU,GAAG;oBACxDC,QAAQR,YAAYO,UAAU;gBAChC;YACF,KACA,MAAM3B,QAAQmB,IAAIX;YAExB,IAAIe,KAAKM,QAAQC,WAAW;gBAC1B,OAAO,IAAIjB,SAAS,MAAM;oBAAEC,QAAQ;oBAAKC,YAAY;gBAAY;YACnE;YAEA,IAAIX,UAAU,IAAIkB,QAAQjB;YAE1B,4CAA4C;YAC5C,KAAK,MAAM,CAACG,KAAKuB,MAAM,IAAIC,OAAOC,OAAO,CAACb,YAAYhB,OAAO,EAAG;gBAC9DA,QAAQ8B,MAAM,CAAC1B,KAAKuB;YACtB;YAEA,0BAA0B;YAC1B,IAAI,CAACpC,aAAa;gBAChB4B,IAAIY,iBAAiB,CAAC/B;YACxB;YAEA,MAAMgC,kBAAkBjC,IAAIC,OAAO,CAACe,GAAG,CAAC,WAAWhB,IAAIC,OAAO,CAACe,GAAG,CAAC;YAEnE,IACElB,WAAWoC,MAAM,IACjB,OAAOpC,WAAWoC,MAAM,KAAK,YAC7B,OAAOpC,WAAWoC,MAAM,CAACC,qBAAqB,KAAK,YACnD;gBACAlC,UAAUH,WAAWoC,MAAM,CAACC,qBAAqB,CAAC;oBAAElC;gBAAQ,MAAMA;YACpE;YAEA,IAAIgC,mBAAmBA,oBAAoBb,IAAIgB,IAAI,EAAE;gBACnD,OAAO,IAAI1B,SAAS,MAAM;oBACxBT;oBACAU,QAAQ;gBACV;YACF;YAEA,OAAO,IAAID,SAASU,IAAIM,IAAI,EAAE;gBAC5BzB;gBACAU,QAAQM,YAAYN,MAAM;YAC5B;QACF,EAAE,OAAO0B,KAAc;YACrB,OAAO,IAAI3B,SAAS,yBAAyB;gBAAEC,QAAQ;YAAI;QAC7D;IACF;AACF,EAAC"}
+{"version":3,"sources":["../src/staticHandler.ts"],"sourcesContent":["import type { StaticHandler } from '@payloadcms/plugin-cloud-storage/types'\nimport type { CollectionConfig } from 'payload'\n\nimport path from 'path'\nimport { getRangeRequestInfo } from 'payload/internal'\n\nimport type { R2Bucket, R2ObjectBody } from './types.js'\n\ninterface Args {\n  bucket: R2Bucket\n  collection: CollectionConfig\n  prefix?: string\n}\n\nconst isMiniflare = process.env.NODE_ENV === 'development'\n\nexport const getHandler = ({ bucket, collection, prefix = '' }: Args): StaticHandler => {\n  return async (req, { headers: incomingHeaders, params: { clientUploadContext, filename } }) => {\n    try {\n      const key = path.posix.join(prefix, filename)\n\n      // Get file size for range validation\n      const headObj = await bucket?.head(key)\n      if (!headObj) {\n        return new Response(null, { status: 404, statusText: 'Not Found' })\n      }\n\n      const fileSize = headObj.size\n\n      // Don't return large file uploads back to the client, or the Worker will run out of memory\n      if (fileSize > 50 * 1024 * 1024 && clientUploadContext) {\n        return new Response(null, { status: 200 })\n      }\n\n      // Handle range request\n      const rangeHeader = req.headers.get('range')\n      const rangeResult = getRangeRequestInfo({ fileSize, rangeHeader })\n\n      if (rangeResult.type === 'invalid') {\n        return new Response(null, {\n          headers: new Headers(rangeResult.headers),\n          status: rangeResult.status,\n        })\n      }\n\n      // Get object with range if needed\n      // Due to https://github.com/cloudflare/workers-sdk/issues/6047\n      // We cannot send a Headers instance to Miniflare\n      const obj: R2ObjectBody =\n        rangeResult.type === 'partial' && !isMiniflare\n          ? await bucket?.get(key, {\n              range: {\n                length: rangeResult.rangeEnd - rangeResult.rangeStart + 1,\n                offset: rangeResult.rangeStart,\n              },\n            })\n          : await bucket?.get(key)\n\n      if (obj?.body == undefined) {\n        return new Response(null, { status: 404, statusText: 'Not Found' })\n      }\n\n      let headers = new Headers(incomingHeaders)\n\n      // Add range-related headers from the result\n      for (const [key, value] of Object.entries(rangeResult.headers)) {\n        headers.append(key, value)\n      }\n\n      // Add R2-specific headers\n      if (isMiniflare) {\n        // In development with Miniflare, manually set headers from httpMetadata\n        const metadata = obj.httpMetadata\n        if (metadata?.cacheControl) {\n          headers.set('Cache-Control', metadata.cacheControl)\n        }\n        if (metadata?.contentDisposition) {\n          headers.set('Content-Disposition', metadata.contentDisposition)\n        }\n        if (metadata?.contentEncoding) {\n          headers.set('Content-Encoding', metadata.contentEncoding)\n        }\n        if (metadata?.contentLanguage) {\n          headers.set('Content-Language', metadata.contentLanguage)\n        }\n        if (metadata?.contentType) {\n          headers.set('Content-Type', metadata.contentType)\n        }\n      } else {\n        obj.writeHttpMetadata(headers)\n      }\n\n      const etagFromHeaders = req.headers.get('etag') || req.headers.get('if-none-match')\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 === obj.etag) {\n        return new Response(null, {\n          headers,\n          status: 304,\n        })\n      }\n\n      return new Response(obj.body, {\n        headers,\n        status: rangeResult.status,\n      })\n    } catch (err: unknown) {\n      return new Response('Internal Server Error', { status: 500 })\n    }\n  }\n}\n"],"names":["path","getRangeRequestInfo","isMiniflare","process","env","NODE_ENV","getHandler","bucket","collection","prefix","req","headers","incomingHeaders","params","clientUploadContext","filename","key","posix","join","headObj","head","Response","status","statusText","fileSize","size","rangeHeader","get","rangeResult","type","Headers","obj","range","length","rangeEnd","rangeStart","offset","body","undefined","value","Object","entries","append","metadata","httpMetadata","cacheControl","set","contentDisposition","contentEncoding","contentLanguage","contentType","writeHttpMetadata","etagFromHeaders","upload","modifyResponseHeaders","etag","err"],"mappings":"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"}

package/dist/types.d.ts

@@ -12,7 +12,7 @@ export interface R2GetOptions {
     range?: R2Range;
 }
 export interface R2Bucket {
-    createMultipartUpload(key: string, options?: any): Promise<any>;
+    createMultipartUpload(key: string, options?: any): Promise<R2MultipartUpload>;
     delete(keys: string | string[]): Promise<void>;
     get(key: string, options?: R2GetOptions): Promise<any | null>;
     head(key: string): Promise<any>;
@@ -22,6 +22,51 @@ export interface R2Bucket {
         onlyIf: any;
     } & any): Promise<any | null>;
     put(key: string, value: ArrayBuffer | ArrayBufferView | Blob | null | ReadableStream | string, options?: any): Promise<any>;
-    resumeMultipartUpload(key: string, uploadId: string): any;
+    resumeMultipartUpload(key: string, uploadId: string): R2MultipartUpload;
 }
+interface R2HTTPMetadata {
+    cacheControl?: string;
+    cacheExpiry?: Date;
+    contentDisposition?: string;
+    contentEncoding?: string;
+    contentLanguage?: string;
+    contentType?: string;
+}
+export interface R2Object {
+    readonly etag: string;
+    readonly httpMetadata?: R2HTTPMetadata;
+    readonly key: string;
+    readonly size: number;
+    writeHttpMetadata(headers: Headers): void;
+}
+export interface R2ObjectBody extends R2Object {
+    get body(): ReadableStream;
+}
+export interface R2MultipartUpload {
+    abort(): Promise<void>;
+    complete(uploadedParts: R2UploadedPart[]): Promise<R2Object>;
+    readonly key: string;
+    readonly uploadId: string;
+    uploadPart(partNumber: number, value: (ArrayBuffer | ArrayBufferView) | Blob | ReadableStream | string, options?: any): Promise<R2UploadedPart>;
+}
+export interface R2StorageClientUploadContext {
+    key: string;
+}
+export type R2StorageClientUploadHandlerParams = {
+    chunkSize?: number;
+    prefix: string;
+};
+export type R2StorageMultipartUploadHandlerParams = {
+    collection: string;
+    fileName: string;
+    fileType: string;
+    multipartId?: string;
+    multipartKey?: string;
+    multipartNumber?: string;
+};
+export interface R2UploadedPart {
+    etag: string;
+    partNumber: number;
+}
+export {};
 //# sourceMappingURL=types.d.ts.map

package/dist/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,OAAO;IACtB,oCAAoC;IACpC,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,gDAAgD;IAChD,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,8BAA8B;IAC9B,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB;AAED,MAAM,WAAW,YAAY;IAC3B,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;IAClB,MAAM,CAAC,EAAE,GAAG,GAAG,OAAO,CAAA;IACtB,KAAK,CAAC,EAAE,OAAO,CAAA;CAChB;AAED,MAAM,WAAW,QAAQ;IACvB,qBAAqB,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,CAAA;IAC/D,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;IAC9C,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,YAAY,GAAG,OAAO,CAAC,GAAG,GAAG,IAAI,CAAC,CAAA;IAC7D,IAAI,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,CAAA;IAC/B,IAAI,CAAC,OAAO,CAAC,EAAE,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,CAAA;IACjC,GAAG,CACD,GAAG,EAAE,MAAM,EACX,KAAK,EAAE,WAAW,GAAG,eAAe,GAAG,IAAI,GAAG,IAAI,GAAG,cAAc,GAAG,MAAM,EAC5E,OAAO,CAAC,EAAE;QACR,YAAY,CAAC,EAAE,GAAG,GAAG,OAAO,CAAA;QAC5B,MAAM,EAAE,GAAG,CAAA;KACZ,GAAG,GAAG,GACN,OAAO,CAAC,GAAG,GAAG,IAAI,CAAC,CAAA;IACtB,GAAG,CACD,GAAG,EAAE,MAAM,EACX,KAAK,EAAE,WAAW,GAAG,eAAe,GAAG,IAAI,GAAG,IAAI,GAAG,cAAc,GAAG,MAAM,EAC5E,OAAO,CAAC,EAAE,GAAG,GACZ,OAAO,CAAC,GAAG,CAAC,CAAA;IACf,qBAAqB,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,GAAG,CAAA;CAC1D"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,OAAO;IACtB,oCAAoC;IACpC,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,gDAAgD;IAChD,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,8BAA8B;IAC9B,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB;AAED,MAAM,WAAW,YAAY;IAC3B,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;IAClB,MAAM,CAAC,EAAE,GAAG,GAAG,OAAO,CAAA;IACtB,KAAK,CAAC,EAAE,OAAO,CAAA;CAChB;AAED,MAAM,WAAW,QAAQ;IACvB,qBAAqB,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,GAAG,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAA;IAC7E,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;IAC9C,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,YAAY,GAAG,OAAO,CAAC,GAAG,GAAG,IAAI,CAAC,CAAA;IAC7D,IAAI,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,CAAA;IAC/B,IAAI,CAAC,OAAO,CAAC,EAAE,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,CAAA;IACjC,GAAG,CACD,GAAG,EAAE,MAAM,EACX,KAAK,EAAE,WAAW,GAAG,eAAe,GAAG,IAAI,GAAG,IAAI,GAAG,cAAc,GAAG,MAAM,EAC5E,OAAO,CAAC,EAAE;QACR,YAAY,CAAC,EAAE,GAAG,GAAG,OAAO,CAAA;QAC5B,MAAM,EAAE,GAAG,CAAA;KACZ,GAAG,GAAG,GACN,OAAO,CAAC,GAAG,GAAG,IAAI,CAAC,CAAA;IACtB,GAAG,CACD,GAAG,EAAE,MAAM,EACX,KAAK,EAAE,WAAW,GAAG,eAAe,GAAG,IAAI,GAAG,IAAI,GAAG,cAAc,GAAG,MAAM,EAC5E,OAAO,CAAC,EAAE,GAAG,GACZ,OAAO,CAAC,GAAG,CAAC,CAAA;IACf,qBAAqB,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,iBAAiB,CAAA;CACxE;AAED,UAAU,cAAc;IACtB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,WAAW,CAAC,EAAE,IAAI,CAAA;IAClB,kBAAkB,CAAC,EAAE,MAAM,CAAA;IAC3B,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,WAAW,CAAC,EAAE,MAAM,CAAA;CACrB;AAED,MAAM,WAAW,QAAQ;IACvB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,YAAY,CAAC,EAAE,cAAc,CAAA;IACtC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAA;IACpB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IAErB,iBAAiB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAAA;CAC1C;AACD,MAAM,WAAW,YAAa,SAAQ,QAAQ;IAC5C,IAAI,IAAI,IAAI,cAAc,CAAA;CAC3B;AAED,MAAM,WAAW,iBAAiB;IAChC,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAA;IACtB,QAAQ,CAAC,aAAa,EAAE,cAAc,EAAE,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAA;IAC5D,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAA;IACpB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAA;IACzB,UAAU,CACR,UAAU,EAAE,MAAM,EAClB,KAAK,EAAE,CAAC,WAAW,GAAG,eAAe,CAAC,GAAG,IAAI,GAAG,cAAc,GAAG,MAAM,EACvE,OAAO,CAAC,EAAE,GAAG,GACZ,OAAO,CAAC,cAAc,CAAC,CAAA;CAC3B;AAED,MAAM,WAAW,4BAA4B;IAC3C,GAAG,EAAE,MAAM,CAAA;CACZ;AACD,MAAM,MAAM,kCAAkC,GAAG;IAC/C,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,MAAM,EAAE,MAAM,CAAA;CACf,CAAA;AAED,MAAM,MAAM,qCAAqC,GAAG;IAClD,UAAU,EAAE,MAAM,CAAA;IAClB,QAAQ,EAAE,MAAM,CAAA;IAChB,QAAQ,EAAE,MAAM,CAAA;IAChB,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,eAAe,CAAC,EAAE,MAAM,CAAA;CACzB,CAAA;AAED,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,CAAA;IACZ,UAAU,EAAE,MAAM,CAAA;CACnB"}

package/dist/types.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/types.ts"],"sourcesContent":["export interface R2Range {\n  /** The number of bytes to return */\n  length?: number\n  /** The byte offset to start from (inclusive) */\n  offset?: number\n  /** Return the last n bytes */\n  suffix?: number\n}\n\nexport interface R2GetOptions {\n  [key: string]: any\n  onlyIf?: any | Headers\n  range?: R2Range\n}\n\nexport interface R2Bucket {\n  createMultipartUpload(key: string, options?: any): Promise<any>\n  delete(keys: string | string[]): Promise<void>\n  get(key: string, options?: R2GetOptions): Promise<any | null>\n  head(key: string): Promise<any>\n  list(options?: any): Promise<any>\n  put(\n    key: string,\n    value: ArrayBuffer | ArrayBufferView | Blob | null | ReadableStream | string,\n    options?: {\n      httpMetadata?: any | Headers\n      onlyIf: any\n    } & any,\n  ): Promise<any | null>\n  put(\n    key: string,\n    value: ArrayBuffer | ArrayBufferView | Blob | null | ReadableStream | string,\n    options?: any,\n  ): Promise<any>\n  resumeMultipartUpload(key: string, uploadId: string): any\n}\n"],"names":[],"mappings":"AAeA,WAoBC"}
+{"version":3,"sources":["../src/types.ts"],"sourcesContent":["export interface R2Range {\n  /** The number of bytes to return */\n  length?: number\n  /** The byte offset to start from (inclusive) */\n  offset?: number\n  /** Return the last n bytes */\n  suffix?: number\n}\n\nexport interface R2GetOptions {\n  [key: string]: any\n  onlyIf?: any | Headers\n  range?: R2Range\n}\n\nexport interface R2Bucket {\n  createMultipartUpload(key: string, options?: any): Promise<R2MultipartUpload>\n  delete(keys: string | string[]): Promise<void>\n  get(key: string, options?: R2GetOptions): Promise<any | null>\n  head(key: string): Promise<any>\n  list(options?: any): Promise<any>\n  put(\n    key: string,\n    value: ArrayBuffer | ArrayBufferView | Blob | null | ReadableStream | string,\n    options?: {\n      httpMetadata?: any | Headers\n      onlyIf: any\n    } & any,\n  ): Promise<any | null>\n  put(\n    key: string,\n    value: ArrayBuffer | ArrayBufferView | Blob | null | ReadableStream | string,\n    options?: any,\n  ): Promise<any>\n  resumeMultipartUpload(key: string, uploadId: string): R2MultipartUpload\n}\n\ninterface R2HTTPMetadata {\n  cacheControl?: string\n  cacheExpiry?: Date\n  contentDisposition?: string\n  contentEncoding?: string\n  contentLanguage?: string\n  contentType?: string\n}\n\nexport interface R2Object {\n  readonly etag: string\n  readonly httpMetadata?: R2HTTPMetadata\n  readonly key: string\n  readonly size: number\n\n  writeHttpMetadata(headers: Headers): void\n}\nexport interface R2ObjectBody extends R2Object {\n  get body(): ReadableStream\n}\n\nexport interface R2MultipartUpload {\n  abort(): Promise<void>\n  complete(uploadedParts: R2UploadedPart[]): Promise<R2Object>\n  readonly key: string\n  readonly uploadId: string\n  uploadPart(\n    partNumber: number,\n    value: (ArrayBuffer | ArrayBufferView) | Blob | ReadableStream | string,\n    options?: any,\n  ): Promise<R2UploadedPart>\n}\n\nexport interface R2StorageClientUploadContext {\n  key: string\n}\nexport type R2StorageClientUploadHandlerParams = {\n  chunkSize?: number\n  prefix: string\n}\n\nexport type R2StorageMultipartUploadHandlerParams = {\n  collection: string\n  fileName: string\n  fileType: string\n  multipartId?: string\n  multipartKey?: string\n  multipartNumber?: string\n}\n\nexport interface R2UploadedPart {\n  etag: string\n  partNumber: number\n}\n"],"names":[],"mappings":"AAuFA,WAGC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/storage-r2",
-  "version": "3.74.0-internal.bc57c0d",
+  "version": "3.75.0-internal.880861f",
   "description": "Payload storage adapter for Cloudflare R2",
   "homepage": "https://payloadcms.com",
   "repository": {
@@ -37,13 +37,13 @@
     "dist"
   ],
   "dependencies": {
-    "@payloadcms/plugin-cloud-storage": "3.74.0-internal.bc57c0d"
+    "@payloadcms/plugin-cloud-storage": "3.75.0-internal.880861f"
   },
   "devDependencies": {
-    "payload": "3.74.0-internal.bc57c0d"
+    "payload": "3.75.0-internal.880861f"
   },
   "peerDependencies": {
-    "payload": "3.74.0-internal.bc57c0d"
+    "payload": "3.75.0-internal.880861f"
   },
   "engines": {
     "node": "^18.20.2 || >=20.9.0"