payload 3.88.0 → 3.89.0-internal.95c9cba

package/dist/utilities/addDataAndFileToRequest.js

@@ -1,5 +1,6 @@
 import { APIError } from '../errors/APIError.js';
 import { processMultipartFormdata } from '../uploads/fetchAPI-multipart/index.js';
+import { getFileFromClientUpload } from '../uploads/getFileFromClientUpload.js';
 /**
  * Mutates the Request, appending 'data' and 'file' if found
  */ export const addDataAndFileToRequest = async (req)=>{
@@ -50,56 +51,16 @@ import { processMultipartFormdata } from '../uploads/fetchAPI-multipart/index.js
                 req.data = JSON.parse(fields._payload);
             }
             if (!req.file && fields?.file && typeof fields?.file === 'string') {
-                let clientUploadContext, collectionSlug, filename, mimeType, size;
+                let clientUploadFile;
                 try {
-                    ;
-                    ({ clientUploadContext, collectionSlug, filename, mimeType, size } = JSON.parse(fields.file));
+                    clientUploadFile = JSON.parse(fields.file);
                 } catch  {
                     throw new APIError('A file name is required.', 400);
                 }
-                const uploadConfig = req.payload.collections[collectionSlug].config.upload;
-                if (!uploadConfig.handlers) {
-                    throw new APIError('uploadConfig.handlers is not present for ' + collectionSlug);
-                }
-                let response = null;
-                let error;
-                for (const handler of uploadConfig.handlers){
-                    try {
-                        const result = await handler(req, {
-                            doc: null,
-                            params: {
-                                clientUploadContext,
-                                collection: collectionSlug,
-                                filename
-                            }
-                        });
-                        if (result) {
-                            response = result;
-                        }
-                    // If we couldn't get the file from that handler, save the error and try other.
-                    } catch (err) {
-                        error = err;
-                    }
-                }
-                if (!response) {
-                    if (error) {
-                        payload.logger.error(error);
-                    }
-                    throw new APIError('Expected response from the upload handler.');
-                }
-                if (response.status >= 300 && response.status < 400) {
-                    const redirectUrl = response.headers.get('Location');
-                    if (redirectUrl) {
-                        response = await fetch(redirectUrl);
-                    }
-                }
-                req.file = {
-                    name: filename,
-                    clientUploadContext,
-                    data: Buffer.from(await response.arrayBuffer()),
-                    mimetype: response.headers.get('Content-Type') || mimeType,
-                    size
-                };
+                req.file = await getFileFromClientUpload({
+                    file: clientUploadFile,
+                    req
+                });
             }
         }
     }

package/dist/utilities/addDataAndFileToRequest.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/utilities/addDataAndFileToRequest.ts"],"sourcesContent":["import type { PayloadRequest } from '../types/index.js'\n\nimport { APIError } from '../errors/APIError.js'\nimport { processMultipartFormdata } from '../uploads/fetchAPI-multipart/index.js'\n\ntype AddDataAndFileToRequest = (req: PayloadRequest) => Promise<void>\n\n/**\n * Mutates the Request, appending 'data' and 'file' if found\n */\nexport const addDataAndFileToRequest: AddDataAndFileToRequest = async (req) => {\n  const { body, headers, method, payload } = req\n\n  if (method && ['PATCH', 'POST', 'PUT'].includes(method.toUpperCase()) && body) {\n    const [contentType] = (headers.get('Content-Type') || '').split(';', 1)\n    const bodyByteSize = parseInt(req.headers.get('Content-Length') || '0', 10)\n    const hasBodyStream = req.body !== null\n\n    if (contentType === 'application/json') {\n      try {\n        const text = await req.text?.()\n        const data = text ? JSON.parse(text) : {}\n        req.data = data\n        // @ts-expect-error attach json method to request\n        req.json = () => Promise.resolve(data)\n      } catch (error) {\n        if (error instanceof SyntaxError) {\n          throw new APIError('Invalid JSON', 400)\n        }\n        req.payload.logger.error(error)\n        throw error\n      }\n    } else if ((bodyByteSize || hasBodyStream) && contentType?.includes('multipart/')) {\n      const { error, fields, files } = await processMultipartFormdata({\n        options: {\n          ...(payload.config.bodyParser || {}),\n          ...(payload.config.upload || {}),\n        },\n        request: req as Request,\n      })\n\n      if (error) {\n        throw new APIError(error.message)\n      }\n\n      // Set all files on req.files for access by hooks\n      if (files) {\n        req.files = files\n        // Backwards compatibility: set req.file for standard upload collections\n        // Guard: if multiple files share the field name \"file\", files.file is an array — skip\n        if (files.file && !Array.isArray(files.file)) {\n          req.file = files.file\n        }\n      }\n\n      if (fields?._payload && typeof fields._payload === 'string') {\n        req.data = JSON.parse(fields._payload)\n      }\n\n      if (!req.file && fields?.file && typeof fields?.file === 'string') {\n        let clientUploadContext, collectionSlug, filename, mimeType, size\n        try {\n          ;({ clientUploadContext, collectionSlug, filename, mimeType, size } = JSON.parse(\n            fields.file,\n          ))\n        } catch {\n          throw new APIError('A file name is required.', 400)\n        }\n        const uploadConfig = req.payload.collections[collectionSlug]!.config.upload\n\n        if (!uploadConfig.handlers) {\n          throw new APIError('uploadConfig.handlers is not present for ' + collectionSlug)\n        }\n\n        let response: null | Response = null\n        let error: unknown\n\n        for (const handler of uploadConfig.handlers) {\n          try {\n            const result = await handler(req, {\n              doc: null!,\n              params: {\n                clientUploadContext, // Pass additional specific to adapters context returned from UploadHandler, then staticHandler can use them.\n                collection: collectionSlug,\n                filename,\n              },\n            })\n            if (result) {\n              response = result\n            }\n            // If we couldn't get the file from that handler, save the error and try other.\n          } catch (err) {\n            error = err\n          }\n        }\n\n        if (!response) {\n          if (error) {\n            payload.logger.error(error)\n          }\n\n          throw new APIError('Expected response from the upload handler.')\n        }\n\n        if (response.status >= 300 && response.status < 400) {\n          const redirectUrl = response.headers.get('Location')\n          if (redirectUrl) {\n            response = await fetch(redirectUrl)\n          }\n        }\n\n        req.file = {\n          name: filename,\n          clientUploadContext,\n          data: Buffer.from(await response.arrayBuffer()),\n          mimetype: response.headers.get('Content-Type') || mimeType,\n          size,\n        }\n      }\n    }\n  }\n}\n"],"names":["APIError","processMultipartFormdata","addDataAndFileToRequest","req","body","headers","method","payload","includes","toUpperCase","contentType","get","split","bodyByteSize","parseInt","hasBodyStream","text","data","JSON","parse","json","Promise","resolve","error","SyntaxError","logger","fields","files","options","config","bodyParser","upload","request","message","file","Array","isArray","_payload","clientUploadContext","collectionSlug","filename","mimeType","size","uploadConfig","collections","handlers","response","handler","result","doc","params","collection","err","status","redirectUrl","fetch","name","Buffer","from","arrayBuffer","mimetype"],"mappings":"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"}
+{"version":3,"sources":["../../src/utilities/addDataAndFileToRequest.ts"],"sourcesContent":["import type { PayloadRequest } from '../types/index.js'\nimport type { ClientUploadData } from '../uploads/getFileFromClientUpload.js'\n\nimport { APIError } from '../errors/APIError.js'\nimport { processMultipartFormdata } from '../uploads/fetchAPI-multipart/index.js'\nimport { getFileFromClientUpload } from '../uploads/getFileFromClientUpload.js'\n\ntype AddDataAndFileToRequest = (req: PayloadRequest) => Promise<void>\n\n/**\n * Mutates the Request, appending 'data' and 'file' if found\n */\nexport const addDataAndFileToRequest: AddDataAndFileToRequest = async (req) => {\n  const { body, headers, method, payload } = req\n\n  if (method && ['PATCH', 'POST', 'PUT'].includes(method.toUpperCase()) && body) {\n    const [contentType] = (headers.get('Content-Type') || '').split(';', 1)\n    const bodyByteSize = parseInt(req.headers.get('Content-Length') || '0', 10)\n    const hasBodyStream = req.body !== null\n\n    if (contentType === 'application/json') {\n      try {\n        const text = await req.text?.()\n        const data = text ? JSON.parse(text) : {}\n        req.data = data\n        // @ts-expect-error attach json method to request\n        req.json = () => Promise.resolve(data)\n      } catch (error) {\n        if (error instanceof SyntaxError) {\n          throw new APIError('Invalid JSON', 400)\n        }\n        req.payload.logger.error(error)\n        throw error\n      }\n    } else if ((bodyByteSize || hasBodyStream) && contentType?.includes('multipart/')) {\n      const { error, fields, files } = await processMultipartFormdata({\n        options: {\n          ...(payload.config.bodyParser || {}),\n          ...(payload.config.upload || {}),\n        },\n        request: req as Request,\n      })\n\n      if (error) {\n        throw new APIError(error.message)\n      }\n\n      // Set all files on req.files for access by hooks\n      if (files) {\n        req.files = files\n        // Backwards compatibility: set req.file for standard upload collections\n        // Guard: if multiple files share the field name \"file\", files.file is an array — skip\n        if (files.file && !Array.isArray(files.file)) {\n          req.file = files.file\n        }\n      }\n\n      if (fields?._payload && typeof fields._payload === 'string') {\n        req.data = JSON.parse(fields._payload)\n      }\n\n      if (!req.file && fields?.file && typeof fields?.file === 'string') {\n        let clientUploadFile: ClientUploadData\n\n        try {\n          clientUploadFile = JSON.parse(fields.file) as ClientUploadData\n        } catch {\n          throw new APIError('A file name is required.', 400)\n        }\n\n        req.file = await getFileFromClientUpload({\n          file: clientUploadFile,\n          req,\n        })\n      }\n    }\n  }\n}\n"],"names":["APIError","processMultipartFormdata","getFileFromClientUpload","addDataAndFileToRequest","req","body","headers","method","payload","includes","toUpperCase","contentType","get","split","bodyByteSize","parseInt","hasBodyStream","text","data","JSON","parse","json","Promise","resolve","error","SyntaxError","logger","fields","files","options","config","bodyParser","upload","request","message","file","Array","isArray","_payload","clientUploadFile"],"mappings":"AAGA,SAASA,QAAQ,QAAQ,wBAAuB;AAChD,SAASC,wBAAwB,QAAQ,yCAAwC;AACjF,SAASC,uBAAuB,QAAQ,wCAAuC;AAI/E;;CAEC,GACD,OAAO,MAAMC,0BAAmD,OAAOC;IACrE,MAAM,EAAEC,IAAI,EAAEC,OAAO,EAAEC,MAAM,EAAEC,OAAO,EAAE,GAAGJ;IAE3C,IAAIG,UAAU;QAAC;QAAS;QAAQ;KAAM,CAACE,QAAQ,CAACF,OAAOG,WAAW,OAAOL,MAAM;QAC7E,MAAM,CAACM,YAAY,GAAG,AAACL,CAAAA,QAAQM,GAAG,CAAC,mBAAmB,EAAC,EAAGC,KAAK,CAAC,KAAK;QACrE,MAAMC,eAAeC,SAASX,IAAIE,OAAO,CAACM,GAAG,CAAC,qBAAqB,KAAK;QACxE,MAAMI,gBAAgBZ,IAAIC,IAAI,KAAK;QAEnC,IAAIM,gBAAgB,oBAAoB;YACtC,IAAI;gBACF,MAAMM,OAAO,MAAMb,IAAIa,IAAI;gBAC3B,MAAMC,OAAOD,OAAOE,KAAKC,KAAK,CAACH,QAAQ,CAAC;gBACxCb,IAAIc,IAAI,GAAGA;gBACX,iDAAiD;gBACjDd,IAAIiB,IAAI,GAAG,IAAMC,QAAQC,OAAO,CAACL;YACnC,EAAE,OAAOM,OAAO;gBACd,IAAIA,iBAAiBC,aAAa;oBAChC,MAAM,IAAIzB,SAAS,gBAAgB;gBACrC;gBACAI,IAAII,OAAO,CAACkB,MAAM,CAACF,KAAK,CAACA;gBACzB,MAAMA;YACR;QACF,OAAO,IAAI,AAACV,CAAAA,gBAAgBE,aAAY,KAAML,aAAaF,SAAS,eAAe;YACjF,MAAM,EAAEe,KAAK,EAAEG,MAAM,EAAEC,KAAK,EAAE,GAAG,MAAM3B,yBAAyB;gBAC9D4B,SAAS;oBACP,GAAIrB,QAAQsB,MAAM,CAACC,UAAU,IAAI,CAAC,CAAC;oBACnC,GAAIvB,QAAQsB,MAAM,CAACE,MAAM,IAAI,CAAC,CAAC;gBACjC;gBACAC,SAAS7B;YACX;YAEA,IAAIoB,OAAO;gBACT,MAAM,IAAIxB,SAASwB,MAAMU,OAAO;YAClC;YAEA,iDAAiD;YACjD,IAAIN,OAAO;gBACTxB,IAAIwB,KAAK,GAAGA;gBACZ,wEAAwE;gBACxE,sFAAsF;gBACtF,IAAIA,MAAMO,IAAI,IAAI,CAACC,MAAMC,OAAO,CAACT,MAAMO,IAAI,GAAG;oBAC5C/B,IAAI+B,IAAI,GAAGP,MAAMO,IAAI;gBACvB;YACF;YAEA,IAAIR,QAAQW,YAAY,OAAOX,OAAOW,QAAQ,KAAK,UAAU;gBAC3DlC,IAAIc,IAAI,GAAGC,KAAKC,KAAK,CAACO,OAAOW,QAAQ;YACvC;YAEA,IAAI,CAAClC,IAAI+B,IAAI,IAAIR,QAAQQ,QAAQ,OAAOR,QAAQQ,SAAS,UAAU;gBACjE,IAAII;gBAEJ,IAAI;oBACFA,mBAAmBpB,KAAKC,KAAK,CAACO,OAAOQ,IAAI;gBAC3C,EAAE,OAAM;oBACN,MAAM,IAAInC,SAAS,4BAA4B;gBACjD;gBAEAI,IAAI+B,IAAI,GAAG,MAAMjC,wBAAwB;oBACvCiC,MAAMI;oBACNnC;gBACF;YACF;QACF;IACF;AACF,EAAC"}

package/dist/utilities/addDataAndFileToRequest.spec.js

@@ -1,4 +1,5 @@
-import { describe, expect, it } from 'vitest';
+import fs from 'fs/promises';
+import { afterEach, describe, expect, it, vi } from 'vitest';
 import { addDataAndFileToRequest } from './addDataAndFileToRequest.js';
 const createReqWithMultipartBody = ()=>{
     const formData = new FormData();
@@ -27,6 +28,41 @@ const createReqWithMultipartBody = ()=>{
         }
     };
 };
+const createClientUploadReq = ({ file, handler, upload })=>{
+    const formData = new FormData();
+    formData.append('file', JSON.stringify(file));
+    const request = new Request('http://localhost/api/media', {
+        body: formData,
+        method: 'POST'
+    });
+    return {
+        body: request.body,
+        headers: request.headers,
+        method: request.method,
+        payload: {
+            collections: {
+                media: {
+                    config: {
+                        upload: {
+                            disableLocalStorage: true,
+                            handlers: [
+                                handler
+                            ],
+                            ...upload
+                        }
+                    }
+                }
+            },
+            config: {
+                bodyParser: {},
+                upload: {}
+            },
+            logger: {
+                error: ()=>{}
+            }
+        }
+    };
+};
 describe('addDataAndFileToRequest', ()=>{
     it('should parse multipart form-data even when content-length is absent', async ()=>{
         const req = createReqWithMultipartBody();
@@ -36,6 +72,100 @@ describe('addDataAndFileToRequest', ()=>{
         expect(req.file?.name).toBe('hello.txt');
         expect(req.file?.mimetype).toBe('text/plain');
     });
+    describe('client uploads', ()=>{
+        const tempFilesToRemove = [];
+        afterEach(async ()=>{
+            for (const tempFilePath of tempFilesToRemove){
+                await fs.rm(tempFilePath, {
+                    force: true
+                });
+            }
+            tempFilesToRemove.length = 0;
+        });
+        it('materializes client-upload metadata without buffering an unused cloud file', async ()=>{
+            const handler = vi.fn(()=>{
+                throw new Error('No-content handler was invoked');
+            });
+            const req = createClientUploadReq({
+                file: {
+                    clientUploadContext: {
+                        prefix: ''
+                    },
+                    collectionSlug: 'media',
+                    filename: 'large.mp4',
+                    mimeType: 'video/mp4',
+                    size: 5_000_000_000
+                },
+                handler,
+                upload: {
+                    disableLocalStorage: true
+                }
+            });
+            await addDataAndFileToRequest(req);
+            expect(handler).not.toHaveBeenCalled();
+            expect(req.file).toMatchObject({
+                clientUploadContext: {
+                    prefix: ''
+                },
+                mimetype: 'video/mp4',
+                name: 'large.mp4',
+                size: 5_000_000_000
+            });
+            expect(req.file?.data.length).toBe(0);
+        });
+        it('streams a full-content client upload to a temp file without buffering the whole body', async ()=>{
+            const chunks = [
+                Buffer.from('chunk-one-'),
+                Buffer.from('chunk-two')
+            ];
+            const stream = new ReadableStream({
+                start (controller) {
+                    for (const chunk of chunks){
+                        controller.enqueue(chunk);
+                    }
+                    controller.close();
+                }
+            });
+            const response = new Response(stream, {
+                headers: {
+                    'Content-Type': 'video/mp4'
+                },
+                status: 200
+            });
+            const arrayBufferTripwire = vi.fn(async ()=>{
+                throw new Error('Unexpected whole-body buffering');
+            });
+            Object.defineProperty(response, 'arrayBuffer', {
+                value: arrayBufferTripwire
+            });
+            const handler = vi.fn(async ()=>response);
+            const req = createClientUploadReq({
+                file: {
+                    clientUploadContext: {
+                        prefix: ''
+                    },
+                    collectionSlug: 'media',
+                    filename: 'clip.mp4',
+                    mimeType: 'video/mp4',
+                    size: 20
+                },
+                handler,
+                upload: {
+                    disableLocalStorage: true,
+                    mimeTypes: [
+                        'video/*'
+                    ]
+                }
+            });
+            await addDataAndFileToRequest(req);
+            tempFilesToRemove.push(req.file.tempFilePath);
+            expect(arrayBufferTripwire).not.toHaveBeenCalled();
+            expect(req.file?.data.length).toBe(0);
+            expect(req.file?.tempFilePath).toBeDefined();
+            const written = await fs.readFile(req.file.tempFilePath);
+            expect(written.toString()).toBe(chunks.map((chunk)=>chunk.toString()).join(''));
+        });
+    });
 });
 
 //# sourceMappingURL=addDataAndFileToRequest.spec.js.map

package/dist/utilities/addDataAndFileToRequest.spec.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/utilities/addDataAndFileToRequest.spec.ts"],"sourcesContent":["import type { PayloadRequest } from '../types/index.js'\n\nimport { describe, expect, it } from 'vitest'\n\nimport { addDataAndFileToRequest } from './addDataAndFileToRequest.js'\n\ntype MinimalReq = Pick<PayloadRequest, 'body' | 'headers' | 'method' | 'payload'> & {\n  file?: PayloadRequest['file']\n}\n\nconst createReqWithMultipartBody = (): MinimalReq => {\n  const formData = new FormData()\n  formData.append('file', new Blob(['hello world'], { type: 'text/plain' }), 'hello.txt')\n\n  const request = new Request('http://localhost/api/upload', {\n    body: formData,\n    method: 'POST',\n  })\n\n  return {\n    body: request.body,\n    headers: request.headers,\n    method: request.method,\n    payload: {\n      collections: {},\n      config: {\n        bodyParser: {},\n        upload: {},\n      },\n      logger: {\n        error: () => {},\n      },\n    } as unknown as PayloadRequest['payload'],\n  }\n}\n\ndescribe('addDataAndFileToRequest', () => {\n  it('should parse multipart form-data even when content-length is absent', async () => {\n    const req = createReqWithMultipartBody()\n\n    expect(req.headers.get('content-length')).toBeNull()\n\n    await addDataAndFileToRequest(req as PayloadRequest)\n\n    expect(req.file).toBeDefined()\n    expect(req.file?.name).toBe('hello.txt')\n    expect(req.file?.mimetype).toBe('text/plain')\n  })\n})\n"],"names":["describe","expect","it","addDataAndFileToRequest","createReqWithMultipartBody","formData","FormData","append","Blob","type","request","Request","body","method","headers","payload","collections","config","bodyParser","upload","logger","error","req","get","toBeNull","file","toBeDefined","name","toBe","mimetype"],"mappings":"AAEA,SAASA,QAAQ,EAAEC,MAAM,EAAEC,EAAE,QAAQ,SAAQ;AAE7C,SAASC,uBAAuB,QAAQ,+BAA8B;AAMtE,MAAMC,6BAA6B;IACjC,MAAMC,WAAW,IAAIC;IACrBD,SAASE,MAAM,CAAC,QAAQ,IAAIC,KAAK;QAAC;KAAc,EAAE;QAAEC,MAAM;IAAa,IAAI;IAE3E,MAAMC,UAAU,IAAIC,QAAQ,+BAA+B;QACzDC,MAAMP;QACNQ,QAAQ;IACV;IAEA,OAAO;QACLD,MAAMF,QAAQE,IAAI;QAClBE,SAASJ,QAAQI,OAAO;QACxBD,QAAQH,QAAQG,MAAM;QACtBE,SAAS;YACPC,aAAa,CAAC;YACdC,QAAQ;gBACNC,YAAY,CAAC;gBACbC,QAAQ,CAAC;YACX;YACAC,QAAQ;gBACNC,OAAO,KAAO;YAChB;QACF;IACF;AACF;AAEArB,SAAS,2BAA2B;IAClCE,GAAG,uEAAuE;QACxE,MAAMoB,MAAMlB;QAEZH,OAAOqB,IAAIR,OAAO,CAACS,GAAG,CAAC,mBAAmBC,QAAQ;QAElD,MAAMrB,wBAAwBmB;QAE9BrB,OAAOqB,IAAIG,IAAI,EAAEC,WAAW;QAC5BzB,OAAOqB,IAAIG,IAAI,EAAEE,MAAMC,IAAI,CAAC;QAC5B3B,OAAOqB,IAAIG,IAAI,EAAEI,UAAUD,IAAI,CAAC;IAClC;AACF"}
+{"version":3,"sources":["../../src/utilities/addDataAndFileToRequest.spec.ts"],"sourcesContent":["import type { PayloadRequest } from '../types/index.js'\nimport type { ClientUploadData } from '../uploads/getFileFromClientUpload.js'\nimport type { SanitizedUploadConfig } from '../uploads/types.js'\n\nimport fs from 'fs/promises'\nimport { afterEach, describe, expect, it, vi } from 'vitest'\n\nimport { addDataAndFileToRequest } from './addDataAndFileToRequest.js'\n\ntype MinimalReq = Pick<PayloadRequest, 'body' | 'headers' | 'method' | 'payload'> & {\n  file?: PayloadRequest['file']\n}\n\nconst createReqWithMultipartBody = (): MinimalReq => {\n  const formData = new FormData()\n  formData.append('file', new Blob(['hello world'], { type: 'text/plain' }), 'hello.txt')\n\n  const request = new Request('http://localhost/api/upload', {\n    body: formData,\n    method: 'POST',\n  })\n\n  return {\n    body: request.body,\n    headers: request.headers,\n    method: request.method,\n    payload: {\n      collections: {},\n      config: {\n        bodyParser: {},\n        upload: {},\n      },\n      logger: {\n        error: () => {},\n      },\n    } as unknown as PayloadRequest['payload'],\n  }\n}\n\nconst createClientUploadReq = ({\n  file,\n  handler,\n  upload,\n}: {\n  file: ClientUploadData\n  handler: NonNullable<SanitizedUploadConfig['handlers']>[number]\n  upload?: Partial<SanitizedUploadConfig>\n}): MinimalReq => {\n  const formData = new FormData()\n  formData.append('file', JSON.stringify(file))\n\n  const request = new Request('http://localhost/api/media', {\n    body: formData,\n    method: 'POST',\n  })\n\n  return {\n    body: request.body,\n    headers: request.headers,\n    method: request.method,\n    payload: {\n      collections: {\n        media: {\n          config: {\n            upload: {\n              disableLocalStorage: true,\n              handlers: [handler],\n              ...upload,\n            },\n          },\n        },\n      },\n      config: {\n        bodyParser: {},\n        upload: {},\n      },\n      logger: {\n        error: () => {},\n      },\n    } as unknown as PayloadRequest['payload'],\n  }\n}\n\ndescribe('addDataAndFileToRequest', () => {\n  it('should parse multipart form-data even when content-length is absent', async () => {\n    const req = createReqWithMultipartBody()\n\n    expect(req.headers.get('content-length')).toBeNull()\n\n    await addDataAndFileToRequest(req as PayloadRequest)\n\n    expect(req.file).toBeDefined()\n    expect(req.file?.name).toBe('hello.txt')\n    expect(req.file?.mimetype).toBe('text/plain')\n  })\n\n  describe('client uploads', () => {\n    const tempFilesToRemove: string[] = []\n\n    afterEach(async () => {\n      for (const tempFilePath of tempFilesToRemove) {\n        await fs.rm(tempFilePath, { force: true })\n      }\n      tempFilesToRemove.length = 0\n    })\n\n    it('materializes client-upload metadata without buffering an unused cloud file', async () => {\n      const handler = vi.fn(() => {\n        throw new Error('No-content handler was invoked')\n      })\n      const req = createClientUploadReq({\n        file: {\n          clientUploadContext: { prefix: '' },\n          collectionSlug: 'media',\n          filename: 'large.mp4',\n          mimeType: 'video/mp4',\n          size: 5_000_000_000,\n        },\n        handler,\n        upload: { disableLocalStorage: true },\n      })\n\n      await addDataAndFileToRequest(req as PayloadRequest)\n\n      expect(handler).not.toHaveBeenCalled()\n      expect(req.file).toMatchObject({\n        clientUploadContext: { prefix: '' },\n        mimetype: 'video/mp4',\n        name: 'large.mp4',\n        size: 5_000_000_000,\n      })\n      expect(req.file?.data.length).toBe(0)\n    })\n\n    it('streams a full-content client upload to a temp file without buffering the whole body', async () => {\n      const chunks = [Buffer.from('chunk-one-'), Buffer.from('chunk-two')]\n      const stream = new ReadableStream({\n        start(controller) {\n          for (const chunk of chunks) {\n            controller.enqueue(chunk)\n          }\n          controller.close()\n        },\n      })\n      const response = new Response(stream, {\n        headers: { 'Content-Type': 'video/mp4' },\n        status: 200,\n      })\n      const arrayBufferTripwire = vi.fn(async () => {\n        throw new Error('Unexpected whole-body buffering')\n      })\n      Object.defineProperty(response, 'arrayBuffer', { value: arrayBufferTripwire })\n\n      const handler = vi.fn(async () => response)\n      const req = createClientUploadReq({\n        file: {\n          clientUploadContext: { prefix: '' },\n          collectionSlug: 'media',\n          filename: 'clip.mp4',\n          mimeType: 'video/mp4',\n          size: 20,\n        },\n        handler,\n        upload: { disableLocalStorage: true, mimeTypes: ['video/*'] },\n      })\n\n      await addDataAndFileToRequest(req as PayloadRequest)\n      tempFilesToRemove.push(req.file!.tempFilePath!)\n\n      expect(arrayBufferTripwire).not.toHaveBeenCalled()\n      expect(req.file?.data.length).toBe(0)\n      expect(req.file?.tempFilePath).toBeDefined()\n      const written = await fs.readFile(req.file!.tempFilePath!)\n      expect(written.toString()).toBe(chunks.map((chunk) => chunk.toString()).join(''))\n    })\n  })\n})\n"],"names":["fs","afterEach","describe","expect","it","vi","addDataAndFileToRequest","createReqWithMultipartBody","formData","FormData","append","Blob","type","request","Request","body","method","headers","payload","collections","config","bodyParser","upload","logger","error","createClientUploadReq","file","handler","JSON","stringify","media","disableLocalStorage","handlers","req","get","toBeNull","toBeDefined","name","toBe","mimetype","tempFilesToRemove","tempFilePath","rm","force","length","fn","Error","clientUploadContext","prefix","collectionSlug","filename","mimeType","size","not","toHaveBeenCalled","toMatchObject","data","chunks","Buffer","from","stream","ReadableStream","start","controller","chunk","enqueue","close","response","Response","status","arrayBufferTripwire","Object","defineProperty","value","mimeTypes","push","written","readFile","toString","map","join"],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payload",
-  "version": "3.88.0",
+  "version": "3.89.0-internal.95c9cba",
   "description": "Node, React, Headless CMS and Application Framework built on Next.js",
   "keywords": [
     "admin panel",
@@ -115,7 +115,7 @@
     "undici": "7.29.0",
     "uuid": "13.0.2",
     "ws": "^8.16.0",
-    "@payloadcms/translations": "3.88.0"
+    "@payloadcms/translations": "3.89.0-internal.95c9cba"
   },
   "devDependencies": {
     "@hyrious/esbuild-plugin-commonjs": "0.2.6",