@payloadcms/storage-r2 3.84.0 → 3.85.0

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

@@ -1 +1 @@
-{"version":3,"file":"R2ClientUploadHandler.d.ts","sourceRoot":"","sources":["../../src/client/R2ClientUploadHandler.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAGV,kCAAkC,EAGnC,MAAM,aAAa,CAAA;AAEpB,eAAO,MAAM,qBAAqB;;;;;;;aAiB7B,OAAO,aAgEV,CAAA"}
+{"version":3,"file":"R2ClientUploadHandler.d.ts","sourceRoot":"","sources":["../../src/client/R2ClientUploadHandler.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAGV,kCAAkC,EAGnC,MAAM,aAAa,CAAA;AAEpB,eAAO,MAAM,qBAAqB;;;;;;;aAed,OACpB,aAyEE,CAAA"}

package/dist/client/R2ClientUploadHandler.js

@@ -3,7 +3,7 @@ import { createClientUploadHandler } from '@payloadcms/plugin-cloud-storage/clie
 import { getFileKey } from '@payloadcms/plugin-cloud-storage/utilities';
 import { formatAdminURL } from 'payload/shared';
 export const R2ClientUploadHandler = createClientUploadHandler({
-    handler: async ({ apiRoute, collectionSlug, docPrefix, extra: { chunkSize = 5 * 1024 * 1024 }, file, prefix, serverHandlerPath, serverURL })=>{
+    handler: async ({ apiRoute, collectionSlug, docPrefix, extra: { chunkSize = 5 * 1024 * 1024 }, file, prefix, serverHandlerPath, serverURL, updateFilename })=>{
         const { sanitizedDocPrefix } = getFileKey({
             collectionPrefix: prefix,
             docPrefix,
@@ -28,7 +28,10 @@ export const R2ClientUploadHandler = createClientUploadHandler({
         if (!multipart.ok) {
             throw new Error('Failed to initialize multipart upload');
         }
-        const multipartUpload = await multipart.json();
+        const { filename: sanitizedFilename, ...multipartUpload } = await multipart.json();
+        if (sanitizedFilename && sanitizedFilename !== file.name) {
+            updateFilename(sanitizedFilename);
+        }
         const multipartUploadedParts = [];
         params.multipartId = multipartUpload.uploadId;
         params.multipartKey = multipartUpload.key;

package/dist/client/R2ClientUploadHandler.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/client/R2ClientUploadHandler.ts"],"sourcesContent":["'use client'\n\nimport { createClientUploadHandler } from '@payloadcms/plugin-cloud-storage/client'\nimport { getFileKey } from '@payloadcms/plugin-cloud-storage/utilities'\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    docPrefix,\n    extra: { chunkSize = 5 * 1024 * 1024 },\n    file,\n    prefix,\n    serverHandlerPath,\n    serverURL,\n  }): Promise<R2StorageClientUploadContext | undefined> => {\n    const { sanitizedDocPrefix } = getFileKey({\n      collectionPrefix: prefix,\n      docPrefix,\n      filename: file.name,\n    })\n\n    const params: R2StorageMultipartUploadHandlerParams = {\n      collection: collectionSlug,\n      docPrefix: sanitizedDocPrefix,\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    // upload the file directly to R2 using the signed URL\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 {\n          key,\n          prefix: sanitizedDocPrefix,\n        }\n      }\n    }\n  },\n})\n"],"names":["createClientUploadHandler","getFileKey","formatAdminURL","R2ClientUploadHandler","handler","apiRoute","collectionSlug","docPrefix","extra","chunkSize","file","prefix","serverHandlerPath","serverURL","sanitizedDocPrefix","collectionPrefix","filename","name","params","collection","fileName","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,UAAU,QAAQ,6CAA4C;AACvE,SAASC,cAAc,QAAQ,iBAAgB;AAU/C,OAAO,MAAMC,wBAAwBH,0BAA8D;IACjGI,SAAS,OAAO,EACdC,QAAQ,EACRC,cAAc,EACdC,SAAS,EACTC,OAAO,EAAEC,YAAY,IAAI,OAAO,IAAI,EAAE,EACtCC,IAAI,EACJC,MAAM,EACNC,iBAAiB,EACjBC,SAAS,EACV;QACC,MAAM,EAAEC,kBAAkB,EAAE,GAAGb,WAAW;YACxCc,kBAAkBJ;YAClBJ;YACAS,UAAUN,KAAKO,IAAI;QACrB;QAEA,MAAMC,SAAgD;YACpDC,YAAYb;YACZC,WAAWO;YACXM,UAAUV,KAAKO,IAAI;YACnBI,UAAUX,KAAKY,IAAI;QACrB;QACA,MAAMC,UAAUrB,eAAe;YAC7BG;YACAmB,MAAMZ;YACNC;QACF;QAEA,MAAMY,WAAW,GAAGF,QAAQ,CAAC,EAAEG,OAAO,IAAIC,gBAAgBT,UAAU;QAEpE,sDAAsD;QACtD,MAAMU,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;QAEnDjB,OAAOkB,WAAW,GAAGH,gBAAgBI,QAAQ;QAC7CnB,OAAOoB,YAAY,GAAGL,gBAAgBM,GAAG;QAEzC,MAAMC,YAAYC,KAAKC,IAAI,CAAChC,KAAKiC,IAAI,GAAGlC;QAExC,IAAK,IAAImC,OAAO,GAAGA,QAAQJ,WAAWI,OAAQ;YAC5C,MAAMC,WAAWJ,KAAKK,GAAG,CAACF,OAAOnC,WAAWC,KAAKiC,IAAI;YACrD,MAAMI,aAAa,AAACH,CAAAA,OAAO,CAAA,IAAKnC;YAEhCS,OAAO8B,eAAe,GAAGtB,OAAOkB;YAEhC,MAAMK,OAAOvC,KAAKwC,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,OAAOtB,OAAO8B,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;oBACLlB;oBACA5B,QAAQG;gBACV;YACF;QACF;IACF;AACF,GAAE"}
+{"version":3,"sources":["../../src/client/R2ClientUploadHandler.ts"],"sourcesContent":["'use client'\n\nimport { createClientUploadHandler } from '@payloadcms/plugin-cloud-storage/client'\nimport { getFileKey } from '@payloadcms/plugin-cloud-storage/utilities'\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    docPrefix,\n    extra: { chunkSize = 5 * 1024 * 1024 },\n    file,\n    prefix,\n    serverHandlerPath,\n    serverURL,\n    updateFilename,\n  }): Promise<R2StorageClientUploadContext | undefined> => {\n    const { sanitizedDocPrefix } = getFileKey({\n      collectionPrefix: prefix,\n      docPrefix,\n      filename: file.name,\n    })\n\n    const params: R2StorageMultipartUploadHandlerParams = {\n      collection: collectionSlug,\n      docPrefix: sanitizedDocPrefix,\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    // upload the file directly to R2 using the signed URL\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 { filename: sanitizedFilename, ...multipartUpload } = (await multipart.json()) as {\n      filename?: string\n    } & Pick<R2MultipartUpload, 'key' | 'uploadId'>\n\n    if (sanitizedFilename && sanitizedFilename !== file.name) {\n      updateFilename(sanitizedFilename)\n    }\n\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 {\n          key,\n          prefix: sanitizedDocPrefix,\n        }\n      }\n    }\n  },\n})\n"],"names":["createClientUploadHandler","getFileKey","formatAdminURL","R2ClientUploadHandler","handler","apiRoute","collectionSlug","docPrefix","extra","chunkSize","file","prefix","serverHandlerPath","serverURL","updateFilename","sanitizedDocPrefix","collectionPrefix","filename","name","params","collection","fileName","fileType","type","baseURL","path","endpoint","String","URLSearchParams","multipart","fetch","method","ok","Error","sanitizedFilename","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,UAAU,QAAQ,6CAA4C;AACvE,SAASC,cAAc,QAAQ,iBAAgB;AAU/C,OAAO,MAAMC,wBAAwBH,0BAA8D;IACjGI,SAAS,OAAO,EACdC,QAAQ,EACRC,cAAc,EACdC,SAAS,EACTC,OAAO,EAAEC,YAAY,IAAI,OAAO,IAAI,EAAE,EACtCC,IAAI,EACJC,MAAM,EACNC,iBAAiB,EACjBC,SAAS,EACTC,cAAc,EACf;QACC,MAAM,EAAEC,kBAAkB,EAAE,GAAGd,WAAW;YACxCe,kBAAkBL;YAClBJ;YACAU,UAAUP,KAAKQ,IAAI;QACrB;QAEA,MAAMC,SAAgD;YACpDC,YAAYd;YACZC,WAAWQ;YACXM,UAAUX,KAAKQ,IAAI;YACnBI,UAAUZ,KAAKa,IAAI;QACrB;QACA,MAAMC,UAAUtB,eAAe;YAC7BG;YACAoB,MAAMb;YACNC;QACF;QAEA,MAAMa,WAAW,GAAGF,QAAQ,CAAC,EAAEG,OAAO,IAAIC,gBAAgBT,UAAU;QAEpE,sDAAsD;QACtD,MAAMU,YAAY,MAAMC,MAAMJ,UAAU;YAAEK,QAAQ;QAAO;QACzD,IAAI,CAACF,UAAUG,EAAE,EAAE;YACjB,MAAM,IAAIC,MAAM;QAClB;QAEA,MAAM,EAAEhB,UAAUiB,iBAAiB,EAAE,GAAGC,iBAAiB,GAAI,MAAMN,UAAUO,IAAI;QAIjF,IAAIF,qBAAqBA,sBAAsBxB,KAAKQ,IAAI,EAAE;YACxDJ,eAAeoB;QACjB;QAEA,MAAMG,yBAA2C,EAAE;QAEnDlB,OAAOmB,WAAW,GAAGH,gBAAgBI,QAAQ;QAC7CpB,OAAOqB,YAAY,GAAGL,gBAAgBM,GAAG;QAEzC,MAAMC,YAAYC,KAAKC,IAAI,CAAClC,KAAKmC,IAAI,GAAGpC;QAExC,IAAK,IAAIqC,OAAO,GAAGA,QAAQJ,WAAWI,OAAQ;YAC5C,MAAMC,WAAWJ,KAAKK,GAAG,CAACF,OAAOrC,WAAWC,KAAKmC,IAAI;YACrD,MAAMI,aAAa,AAACH,CAAAA,OAAO,CAAA,IAAKrC;YAEhCU,OAAO+B,eAAe,GAAGvB,OAAOmB;YAEhC,MAAMK,OAAOzC,KAAK0C,KAAK,CAACH,YAAYF;YACpC,MAAMM,UAAU;gBACd,kBAAkB1B,OAAOwB,KAAKN,IAAI;gBAClC,gBAAgB;YAClB;YACA,MAAMS,WAAW,MAAMxB,MAAMJ,UAAU;gBAAEyB;gBAAME;gBAAStB,QAAQ;YAAO;YACvE,IAAI,CAACuB,SAAStB,EAAE,EAAE;gBAChB,MAAM,IAAIC,MAAM,CAAC,sBAAsB,EAAEa,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,MAAM5B,MAAMJ,UAAU;oBAAEyB;oBAAME;oBAAStB,QAAQ;gBAAO;gBACvE,IAAI,CAAC2B,SAAS1B,EAAE,EAAE;oBAChB,MAAM,IAAIC,MAAM,CAAC,mCAAmC,CAAC;gBACvD;gBAEA,MAAMQ,MAAM,MAAMiB,SAASC,IAAI;gBAC/B,OAAO;oBACLlB;oBACA9B,QAAQI;gBACV;YACF;QACF;IACF;AACF,GAAE"}

package/dist/handleMultiPartUpload.d.ts.map

@@ -1 +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;IAC5C,oBAAoB,CAAC,EAAE,OAAO,CAAA;CAC/B,CAAA;AAGD,eAAO,MAAM,wBAAwB,0DAC6B,IAAI,KAAG,cA4EtE,CAAA"}
+{"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;IAC5C,oBAAoB,CAAC,EAAE,OAAO,CAAA;CAC/B,CAAA;AAGD,eAAO,MAAM,wBAAwB,0DAC6B,IAAI,KAAG,cA+EtE,CAAA"}

package/dist/handleMultiPartUpload.js

@@ -1,4 +1,4 @@
-import { getFileKey } from '@payloadcms/plugin-cloud-storage/utilities';
+import { resolveSignedURLKey } from '@payloadcms/plugin-cloud-storage/utilities';
 import { APIError, Forbidden } from 'payload';
 // Adapted from https://developers.cloudflare.com/r2/api/workers/workers-multipart-usage/
 export const getHandleMultiPartUpload = ({ access, bucket, collections, useCompositePrefixes = false })=>async (req)=>{
@@ -37,10 +37,12 @@ export const getHandleMultiPartUpload = ({ access, bucket, collections, useCompo
             }
         }
         const collectionPrefix = typeof collectionConfig === 'object' && collectionConfig.prefix || '';
-        const { fileKey } = getFileKey({
+        const { fileKey, sanitizedFilename } = await resolveSignedURLKey({
             collectionPrefix,
+            collectionSlug,
             docPrefix: params.docPrefix ?? undefined,
             filename: params.fileName,
+            req,
             useCompositePrefixes
         });
         const multipartId = params.multipartId;
@@ -68,6 +70,7 @@ export const getHandleMultiPartUpload = ({ access, bucket, collections, useCompo
                 }
             });
             return Response.json({
+                filename: sanitizedFilename,
                 key: multipartUpload.key,
                 uploadId: multipartUpload.uploadId
             });

package/dist/handleMultiPartUpload.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/handleMultiPartUpload.ts"],"sourcesContent":["import type { ClientUploadsAccess } from '@payloadcms/plugin-cloud-storage/types'\nimport type { PayloadHandler } from 'payload'\n\nimport { getFileKey } from '@payloadcms/plugin-cloud-storage/utilities'\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  useCompositePrefixes?: boolean\n}\n\n// Adapted from https://developers.cloudflare.com/r2/api/workers/workers-multipart-usage/\nexport const getHandleMultiPartUpload =\n  ({ access, bucket, collections, useCompositePrefixes = false }: 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 collectionPrefix = (typeof collectionConfig === 'object' && collectionConfig.prefix) || ''\n    const { fileKey } = getFileKey({\n      collectionPrefix,\n      docPrefix: params.docPrefix ?? undefined,\n      filename: params.fileName,\n      useCompositePrefixes,\n    })\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":["getFileKey","APIError","Forbidden","getHandleMultiPartUpload","access","bucket","collections","useCompositePrefixes","req","params","Object","fromEntries","searchParams","collectionSlug","collection","filetype","fileType","collectionConfig","t","payload","createAccess","config","create","hasAccess","user","collectionPrefix","prefix","fileKey","docPrefix","undefined","filename","fileName","multipartId","multipartKey","multipartNumber","parseInt","multipartUpload","resumeMultipartUpload","request","isNaN","object","complete","json","Response","key","status","uploadedPart","uploadPart","arrayBuffer","createMultipartUpload","httpMetadata","contentType","uploadId"],"mappings":"AAGA,SAASA,UAAU,QAAQ,6CAA4C;AACvE,SAASC,QAAQ,EAAEC,SAAS,QAAQ,UAAS;AAY7C,yFAAyF;AACzF,OAAO,MAAMC,2BACX,CAAC,EAAEC,MAAM,EAAEC,MAAM,EAAEC,WAAW,EAAEC,uBAAuB,KAAK,EAAQ,GACpE,OAAOC;QACL,MAAMC,SAASC,OAAOC,WAAW,CAACH,IAAII,YAAY;QAClD,MAAMC,iBAAiBJ,OAAOK,UAAU;QACxC,MAAMC,WAAWN,OAAOO,QAAQ;QAEhC,MAAMC,mBAAmBX,WAAW,CAACO,eAAe;QACpD,IAAI,CAACI,kBAAkB;YACrB,MAAM,IAAIhB,SAAS,CAAC,WAAW,EAAEY,eAAe,oCAAoC,CAAC;QACvF;QAEA,8EAA8E;QAC9E,IAAIT,QAAQ;YACV,IAAI,CAAE,MAAMA,OAAO;gBAAES;gBAAgBL;YAAI,IAAK;gBAC5C,MAAM,IAAIN,UAAUM,IAAIU,CAAC;YAC3B;QACF,OAAO;YACL,6CAA6C;YAC7C,MAAMJ,aAAaN,IAAIW,OAAO,CAACb,WAAW,CAACO,eAAe;YAC1D,IAAI,CAACC,YAAY;gBACf,MAAM,IAAIb,SAAS,CAAC,WAAW,EAAEY,eAAe,UAAU,CAAC;YAC7D;YAEA,MAAMO,eAAeN,WAAWO,MAAM,CAACjB,MAAM,EAAEkB;YAC/C,IAAIF,cAAc;gBAChB,MAAMG,YAAY,MAAMH,aAAa;oBAAEZ;gBAAI;gBAC3C,IAAI,CAACe,WAAW;oBACd,MAAM,IAAIrB,UAAUM,IAAIU,CAAC;gBAC3B;YACF,OAAO,IAAI,CAACV,IAAIgB,IAAI,EAAE;gBACpB,iDAAiD;gBACjD,MAAM,IAAItB,UAAUM,IAAIU,CAAC;YAC3B;QACF;QAEA,MAAMO,mBAAmB,AAAC,OAAOR,qBAAqB,YAAYA,iBAAiBS,MAAM,IAAK;QAC9F,MAAM,EAAEC,OAAO,EAAE,GAAG3B,WAAW;YAC7ByB;YACAG,WAAWnB,OAAOmB,SAAS,IAAIC;YAC/BC,UAAUrB,OAAOsB,QAAQ;YACzBxB;QACF;QAEA,MAAMyB,cAAcvB,OAAOuB,WAAW;QACtC,MAAMC,eAAexB,OAAOwB,YAAY;QACxC,MAAMC,kBAAkBC,SAAS1B,OAAOyB,eAAe,IAAI;QAE3D,IAAIF,eAAeC,cAAc;YAC/B,MAAMG,kBAAkB/B,OAAOgC,qBAAqB,CAACJ,cAAcD;YACnE,MAAMM,UAAU9B;YAEhB,IAAI+B,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,MAAM/B,OAAO4C,qBAAqB,CAACtB,SAAS;gBAClEuB,cAAc;oBACZC,aAAapC;gBACf;YACF;YAEA,OAAO4B,SAASD,IAAI,CAAC;gBACnBE,KAAKR,gBAAgBQ,GAAG;gBACxBQ,UAAUhB,gBAAgBgB,QAAQ;YACpC;QACF;IACF,EAAC"}
+{"version":3,"sources":["../src/handleMultiPartUpload.ts"],"sourcesContent":["import type { ClientUploadsAccess } from '@payloadcms/plugin-cloud-storage/types'\nimport type { PayloadHandler } from 'payload'\n\nimport { resolveSignedURLKey } from '@payloadcms/plugin-cloud-storage/utilities'\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  useCompositePrefixes?: boolean\n}\n\n// Adapted from https://developers.cloudflare.com/r2/api/workers/workers-multipart-usage/\nexport const getHandleMultiPartUpload =\n  ({ access, bucket, collections, useCompositePrefixes = false }: 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 collectionPrefix = (typeof collectionConfig === 'object' && collectionConfig.prefix) || ''\n    const { fileKey, sanitizedFilename } = await resolveSignedURLKey({\n      collectionPrefix,\n      collectionSlug,\n      docPrefix: params.docPrefix ?? undefined,\n      filename: params.fileName,\n      req,\n      useCompositePrefixes,\n    })\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        filename: sanitizedFilename,\n        key: multipartUpload.key,\n        uploadId: multipartUpload.uploadId,\n      })\n    }\n  }\n"],"names":["resolveSignedURLKey","APIError","Forbidden","getHandleMultiPartUpload","access","bucket","collections","useCompositePrefixes","req","params","Object","fromEntries","searchParams","collectionSlug","collection","filetype","fileType","collectionConfig","t","payload","createAccess","config","create","hasAccess","user","collectionPrefix","prefix","fileKey","sanitizedFilename","docPrefix","undefined","filename","fileName","multipartId","multipartKey","multipartNumber","parseInt","multipartUpload","resumeMultipartUpload","request","isNaN","object","complete","json","Response","key","status","uploadedPart","uploadPart","arrayBuffer","createMultipartUpload","httpMetadata","contentType","uploadId"],"mappings":"AAGA,SAASA,mBAAmB,QAAQ,6CAA4C;AAChF,SAASC,QAAQ,EAAEC,SAAS,QAAQ,UAAS;AAY7C,yFAAyF;AACzF,OAAO,MAAMC,2BACX,CAAC,EAAEC,MAAM,EAAEC,MAAM,EAAEC,WAAW,EAAEC,uBAAuB,KAAK,EAAQ,GACpE,OAAOC;QACL,MAAMC,SAASC,OAAOC,WAAW,CAACH,IAAII,YAAY;QAClD,MAAMC,iBAAiBJ,OAAOK,UAAU;QACxC,MAAMC,WAAWN,OAAOO,QAAQ;QAEhC,MAAMC,mBAAmBX,WAAW,CAACO,eAAe;QACpD,IAAI,CAACI,kBAAkB;YACrB,MAAM,IAAIhB,SAAS,CAAC,WAAW,EAAEY,eAAe,oCAAoC,CAAC;QACvF;QAEA,8EAA8E;QAC9E,IAAIT,QAAQ;YACV,IAAI,CAAE,MAAMA,OAAO;gBAAES;gBAAgBL;YAAI,IAAK;gBAC5C,MAAM,IAAIN,UAAUM,IAAIU,CAAC;YAC3B;QACF,OAAO;YACL,6CAA6C;YAC7C,MAAMJ,aAAaN,IAAIW,OAAO,CAACb,WAAW,CAACO,eAAe;YAC1D,IAAI,CAACC,YAAY;gBACf,MAAM,IAAIb,SAAS,CAAC,WAAW,EAAEY,eAAe,UAAU,CAAC;YAC7D;YAEA,MAAMO,eAAeN,WAAWO,MAAM,CAACjB,MAAM,EAAEkB;YAC/C,IAAIF,cAAc;gBAChB,MAAMG,YAAY,MAAMH,aAAa;oBAAEZ;gBAAI;gBAC3C,IAAI,CAACe,WAAW;oBACd,MAAM,IAAIrB,UAAUM,IAAIU,CAAC;gBAC3B;YACF,OAAO,IAAI,CAACV,IAAIgB,IAAI,EAAE;gBACpB,iDAAiD;gBACjD,MAAM,IAAItB,UAAUM,IAAIU,CAAC;YAC3B;QACF;QAEA,MAAMO,mBAAmB,AAAC,OAAOR,qBAAqB,YAAYA,iBAAiBS,MAAM,IAAK;QAC9F,MAAM,EAAEC,OAAO,EAAEC,iBAAiB,EAAE,GAAG,MAAM5B,oBAAoB;YAC/DyB;YACAZ;YACAgB,WAAWpB,OAAOoB,SAAS,IAAIC;YAC/BC,UAAUtB,OAAOuB,QAAQ;YACzBxB;YACAD;QACF;QAEA,MAAM0B,cAAcxB,OAAOwB,WAAW;QACtC,MAAMC,eAAezB,OAAOyB,YAAY;QACxC,MAAMC,kBAAkBC,SAAS3B,OAAO0B,eAAe,IAAI;QAE3D,IAAIF,eAAeC,cAAc;YAC/B,MAAMG,kBAAkBhC,OAAOiC,qBAAqB,CAACJ,cAAcD;YACnE,MAAMM,UAAU/B;YAEhB,IAAIgC,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,MAAMhC,OAAO6C,qBAAqB,CAACvB,SAAS;gBAClEwB,cAAc;oBACZC,aAAarC;gBACf;YACF;YAEA,OAAO6B,SAASD,IAAI,CAAC;gBACnBZ,UAAUH;gBACViB,KAAKR,gBAAgBQ,GAAG;gBACxBQ,UAAUhB,gBAAgBgB,QAAQ;YACpC;QACF;IACF,EAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/storage-r2",
-  "version": "3.84.0",
+  "version": "3.85.0",
   "description": "Payload storage adapter for Cloudflare R2",
   "homepage": "https://payloadcms.com",
   "repository": {
@@ -37,14 +37,14 @@
     "dist"
   ],
   "dependencies": {
-    "@payloadcms/plugin-cloud-storage": "3.84.0"
+    "@payloadcms/plugin-cloud-storage": "3.85.0"
   },
   "devDependencies": {
     "@cloudflare/workers-types": "4.20260218.0",
-    "payload": "3.84.0"
+    "payload": "3.85.0"
   },
   "peerDependencies": {
-    "payload": "3.84.0"
+    "payload": "3.85.0"
   },
   "engines": {
     "node": "^18.20.2 || >=20.9.0"

package/dist/handleDelete.d.ts

@@ -1,8 +0,0 @@
-import type { HandleDelete } from '@payloadcms/plugin-cloud-storage/types';
-import type { R2Bucket } from './types.js';
-interface Args {
-    bucket: R2Bucket;
-}
-export declare const getHandleDelete: ({ bucket }: Args) => HandleDelete;
-export {};
-//# sourceMappingURL=handleDelete.d.ts.map

package/dist/handleDelete.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"handleDelete.d.ts","sourceRoot":"","sources":["../src/handleDelete.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,wCAAwC,CAAA;AAI1E,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AAE1C,UAAU,IAAI;IACZ,MAAM,EAAE,QAAQ,CAAA;CACjB;AAED,eAAO,MAAM,eAAe,eAAgB,IAAI,KAAG,YAIlD,CAAA"}

package/dist/handleDelete.js

@@ -1,8 +0,0 @@
-import path from 'path';
-export const getHandleDelete = ({ bucket })=>{
-    return async ({ doc: { prefix = '' }, filename })=>{
-        await bucket.delete(path.posix.join(prefix, filename));
-    };
-};
-
-//# sourceMappingURL=handleDelete.js.map

package/dist/handleDelete.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../src/handleDelete.ts"],"sourcesContent":["import type { HandleDelete } from '@payloadcms/plugin-cloud-storage/types'\n\nimport path from 'path'\n\nimport type { R2Bucket } from './types.js'\n\ninterface Args {\n  bucket: R2Bucket\n}\n\nexport const getHandleDelete = ({ bucket }: Args): HandleDelete => {\n  return async ({ doc: { prefix = '' }, filename }) => {\n    await bucket.delete(path.posix.join(prefix, filename))\n  }\n}\n"],"names":["path","getHandleDelete","bucket","doc","prefix","filename","delete","posix","join"],"mappings":"AAEA,OAAOA,UAAU,OAAM;AAQvB,OAAO,MAAMC,kBAAkB,CAAC,EAAEC,MAAM,EAAQ;IAC9C,OAAO,OAAO,EAAEC,KAAK,EAAEC,SAAS,EAAE,EAAE,EAAEC,QAAQ,EAAE;QAC9C,MAAMH,OAAOI,MAAM,CAACN,KAAKO,KAAK,CAACC,IAAI,CAACJ,QAAQC;IAC9C;AACF,EAAC"}

package/dist/handleUpload.d.ts

@@ -1,11 +0,0 @@
-import type { HandleUpload } from '@payloadcms/plugin-cloud-storage/types';
-import type { CollectionConfig } from 'payload';
-import type { R2Bucket } from './types.js';
-interface Args {
-    bucket: R2Bucket;
-    collection: CollectionConfig;
-    prefix?: string;
-}
-export declare const getHandleUpload: ({ bucket, prefix }: Args) => HandleUpload;
-export {};
-//# sourceMappingURL=handleUpload.d.ts.map

package/dist/handleUpload.d.ts.map

@@ -1 +0,0 @@
-{"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

@@ -1,16 +0,0 @@
-import path from 'path';
-export const getHandleUpload = ({ bucket, prefix = '' })=>{
-    return async ({ data, file })=>{
-        // Read more: https://github.com/cloudflare/workers-sdk/issues/6047#issuecomment-2691217843
-        const buffer = process.env.NODE_ENV === 'development' ? new Blob([
-            file.buffer
-        ]) : file.buffer;
-        await bucket.put(path.posix.join(data.prefix || prefix, file.filename), buffer, {
-            httpMetadata: {
-                contentType: file.mimeType
-            }
-        });
-    };
-};
-
-//# sourceMappingURL=handleUpload.js.map

package/dist/handleUpload.js.map

@@ -1 +0,0 @@
-{"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/staticHandler.d.ts

@@ -1,11 +0,0 @@
-import type { StaticHandler } from '@payloadcms/plugin-cloud-storage/types';
-import type { CollectionConfig } from 'payload';
-import type { R2Bucket } from './types.js';
-interface Args {
-    bucket: R2Bucket;
-    collection: CollectionConfig;
-    prefix?: string;
-}
-export declare const getHandler: ({ bucket, collection, prefix }: Args) => StaticHandler;
-export {};
-//# sourceMappingURL=staticHandler.d.ts.map

package/dist/staticHandler.d.ts.map

@@ -1 +0,0 @@
-{"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;AAM/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,aA2GtE,CAAA"}

package/dist/staticHandler.js

@@ -1,107 +0,0 @@
-import path from 'path';
-import { getRangeRequestInfo } from 'payload/internal';
-import { sanitizeFilename } from 'payload/shared';
-const isMiniflare = process.env.NODE_ENV === 'development';
-export const getHandler = ({ bucket, collection, prefix = '' })=>{
-    return async (req, { headers: incomingHeaders, params: { clientUploadContext, filename } })=>{
-        try {
-            const key = path.posix.join(prefix, sanitizeFilename(filename));
-            // Get file size for range validation
-            const headObj = await bucket?.head(key);
-            if (!headObj) {
-                return new Response(null, {
-                    status: 404,
-                    statusText: 'Not Found'
-                });
-            }
-            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({
-                fileSize,
-                rangeHeader
-            });
-            if (rangeResult.type === 'invalid') {
-                return new Response(null, {
-                    headers: new Headers(rangeResult.headers),
-                    status: rangeResult.status
-                });
-            }
-            // Get object with range if needed
-            // Due to https://github.com/cloudflare/workers-sdk/issues/6047
-            // We cannot send a Headers instance to Miniflare
-            const obj = rangeResult.type === 'partial' && !isMiniflare ? await bucket?.get(key, {
-                range: {
-                    length: rangeResult.rangeEnd - rangeResult.rangeStart + 1,
-                    offset: rangeResult.rangeStart
-                }
-            }) : await bucket?.get(key);
-            if (!obj || obj.body == undefined) {
-                return new Response(null, {
-                    status: 404,
-                    statusText: 'Not Found'
-                });
-            }
-            let headers = new Headers(incomingHeaders);
-            // Add range-related headers from the result
-            for (const [key, value] of Object.entries(rangeResult.headers)){
-                headers.append(key, value);
-            }
-            // Add R2-specific headers
-            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);
-            }
-            // Add Content-Security-Policy header for SVG files to prevent executable code
-            const contentType = headers.get('Content-Type');
-            if (contentType === 'image/svg+xml') {
-                headers.set('Content-Security-Policy', "script-src 'none'");
-            }
-            const etagFromHeaders = req.headers.get('etag') || req.headers.get('if-none-match');
-            if (collection.upload && typeof collection.upload === 'object' && typeof collection.upload.modifyResponseHeaders === 'function') {
-                headers = collection.upload.modifyResponseHeaders({
-                    headers
-                }) || headers;
-            }
-            if (etagFromHeaders && etagFromHeaders === obj.etag) {
-                return new Response(null, {
-                    headers,
-                    status: 304
-                });
-            }
-            return new Response(obj.body, {
-                headers,
-                status: rangeResult.status
-            });
-        } catch (err) {
-            return new Response('Internal Server Error', {
-                status: 500
-            });
-        }
-    };
-};
-
-//# sourceMappingURL=staticHandler.js.map

package/dist/staticHandler.js.map

@@ -1 +0,0 @@
-{"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'\nimport { sanitizeFilename } from 'payload/shared'\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, sanitizeFilename(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 =\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 || 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      // Add Content-Security-Policy header for SVG files to prevent executable code\n      const contentType = headers.get('Content-Type')\n      if (contentType === 'image/svg+xml') {\n        headers.set('Content-Security-Policy', \"script-src 'none'\")\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","sanitizeFilename","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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"}