@whatwg-node/fetch 0.4.7 → 0.5.1-alpha-20221028013012-a9e07ae

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @whatwg-node/fetch
 
+## 0.5.1-alpha-20221028013012-a9e07ae
+
+### Patch Changes
+
+- [`a8a7cfc`](https://github.com/ardatan/whatwg-node/commit/a8a7cfcbb98c5ca8fff3b4a6d8638e9208690b61) Thanks [@ardatan](https://github.com/ardatan)! - Fix for new undici
+
+## 0.5.0
+
+### Minor Changes
+
+- [`ab5fb52`](https://github.com/ardatan/whatwg-node/commit/ab5fb524753bc7a210b1aaf2e1580566907d4713) Thanks [@ardatan](https://github.com/ardatan)! - Drop broken `fieldsFirst` flag
+
 ## 0.4.7
 
 ### Patch Changes

package/dist/create-node-ponyfill.js

@@ -122,6 +122,9 @@ module.exports = function createNodePonyfill(opts = {}) {
       class Request extends OriginalRequest {
         constructor(requestOrUrl, options) {
           if (typeof requestOrUrl === "string" || requestOrUrl instanceof URL) {
+            if (options != null && typeof options === "object" && !options.duplex) {
+              options.duplex = 'half';
+            }
             super(requestOrUrl, options);
             const contentType = this.headers.get("content-type");
             if (contentType && contentType.startsWith("multipart/form-data")) {
@@ -140,6 +143,9 @@ module.exports = function createNodePonyfill(opts = {}) {
 
       const fetch = function (requestOrUrl, options) {
         if (typeof requestOrUrl === "string" || requestOrUrl instanceof URL) {
+          if (options != null && typeof options === "object" && !options.duplex) {
+              options.duplex = 'half';
+          }
           // We cannot use our ctor because it leaks on Node 18's global fetch
           return originalFetch(requestOrUrl, options);
         }

package/dist/getFormDataMethod.js

@@ -3,31 +3,6 @@ const { resolve } = require('path');
 const streams = require("stream");
 
 module.exports = function getFormDataMethod(File, limits) {
-  function consumeStreamAsFile({
-    name,
-    filename,
-    mimeType,
-    fileStream,
-    formData,
-  }) {
-    return new Promise((resolve, reject) => {
-      const chunks = [];
-      fileStream.on('limit', () => {
-        reject(new Error(`File size limit exceeded: ${limits.fileSize} bytes`));
-      })
-      fileStream.on('data', (chunk) => {
-        chunks.push(...chunk);
-      })
-      fileStream.on('close', () => {
-        if (fileStream.truncated) {
-          reject(new Error(`File size limit exceeded: ${limits.fileSize} bytes`));
-        }
-        const file = new File([new Uint8Array(chunks)], filename, { type: mimeType });
-        formData.set(name, file);
-        resolve(file);
-      });
-    })
-  }
 
   return function formData() {
     if (this.body == null) {
@@ -57,56 +32,20 @@ module.exports = function getFormDataMethod(File, limits) {
         reject(new Error(`Fields limit exceeded: ${limits.fields}`));
       })
       bb.on('file', (name, fileStream, { filename, mimeType }) => {
-        let file$;
-        if (limits && limits.fieldsFirst) {
-          resolve(formData);
-          const fakeFileObj = {
-            name: filename,
-            type: mimeType,
-          }
-          Object.setPrototypeOf(fakeFileObj, File.prototype);
-          formData.set(name, new Proxy(fakeFileObj, {
-            get: (target, prop) => {
-              switch(prop) {
-                case 'name':
-                  return filename;
-                case 'type':
-                  return mimeType;
-                case 'stream':
-                  return () => fileStream;
-                case 'size':
-                  throw new Error(`Cannot access file size before consuming the stream.`);
-                case 'slice':
-                  throw new Error(`Cannot slice file before consuming the stream.`);
-                case 'text':
-                case 'arrayBuffer':
-                  return () => {
-                    if (!file$) {
-                      file$ = consumeStreamAsFile({
-                        name,
-                        filename,
-                        mimeType,
-                        fileStream,
-                        formData,
-                      })
-                    }
-                    return file$.then(file => file[prop]());
-                  }
-              }
-            },
-          }))
-        } else {
-          if (!file$) {
-            file$ = consumeStreamAsFile({
-              name,
-              filename,
-              mimeType,
-              fileStream,
-              formData,
-            })
+        const chunks = [];
+        fileStream.on('limit', () => {
+          reject(new Error(`File size limit exceeded: ${limits.fileSize} bytes`));
+        })
+        fileStream.on('data', (chunk) => {
+          chunks.push(Buffer.from(chunk));
+        })
+        fileStream.on('close', () => {
+          if (fileStream.truncated) {
+            reject(new Error(`File size limit exceeded: ${limits.fileSize} bytes`));
           }
-          file$.catch(reject);
-        }
+          const file = new File(chunks, filename, { type: mimeType });
+          formData.set(name, file);
+        });
       })
       bb.on('filesLimit', () => {
         reject(new Error(`Files limit exceeded: ${limits.files}`));

package/dist/index.d.ts

@@ -47,8 +47,6 @@ declare module "@whatwg-node/fetch" {
     parts?: number;
     /* For multipart forms, the max number of header key-value pairs to parse. Default: 2000. */
     headerSize?: number;
-    /* For multipart forms, enable this if your data has fields first, then files. Default: false. */
-    fieldsFirst?: boolean;
   }
   export const createFetch: (opts?: { useNodeFetch?: boolean; formDataLimits?: FormDataLimits }) => ({
     fetch: typeof _fetch,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@whatwg-node/fetch",
-  "version": "0.4.7",
+  "version": "0.5.1-alpha-20221028013012-a9e07ae",
   "description": "Cross Platform Smart Fetch Ponyfill",
   "author": "Arda TANRIKULU <ardatanrikulu@gmail.com>",
   "repository": {
@@ -24,7 +24,7 @@
     "form-data-encoder": "^1.7.1",
     "formdata-node": "^4.3.1",
     "node-fetch": "^2.6.7",
-    "undici": "^5.10.0",
+    "undici": "^5.12.0",
     "web-streams-polyfill": "^3.2.0"
   },
   "publishConfig": {

package/tests/getFormDataMethod.spec.ts

@@ -1,47 +1,36 @@
 import { createTestContainer } from '../../server/test/create-test-container';
 
 describe('getFormDataMethod', () => {
-  ['fieldsFirst:true', 'fieldsFirst:false'].forEach(fieldsFirstFlag => {
-    describe(fieldsFirstFlag, () => {
-      createTestContainer(
-        fetchAPI => {
-          it('should parse fields correctly', async () => {
-            const formData = new fetchAPI.FormData();
-            formData.append('greetings', 'Hello world!');
-            formData.append('bye', 'Goodbye world!');
-            const request = new fetchAPI.Request('http://localhost:8080', {
-              method: 'POST',
-              body: formData,
-            });
-            const formdata = await request.formData();
-            expect(formdata.get('greetings')).toBe('Hello world!');
-            expect(formdata.get('bye')).toBe('Goodbye world!');
-          });
-          it('should parse and receive text files correctly', async () => {
-            const formData = new fetchAPI.FormData();
-            const greetingsFile = new fetchAPI.File(['Hello world!'], 'greetings.txt', { type: 'text/plain' });
-            const byeFile = new fetchAPI.File(['Goodbye world!'], 'bye.txt', { type: 'text/plain' });
-            formData.append('greetings', greetingsFile);
-            formData.append('bye', byeFile);
-            const request = new fetchAPI.Request('http://localhost:8080', {
-              method: 'POST',
-              body: formData,
-            });
-            const formdata = await request.formData();
-            const receivedGreetingsFile = formdata.get('greetings') as File;
-            const receivedGreetingsText = await receivedGreetingsFile.text();
-            expect(receivedGreetingsText).toBe('Hello world!');
-            const receivedByeFile = formdata.get('bye') as File;
-            const receivedByeText = await receivedByeFile.text();
-            expect(receivedByeText).toBe('Goodbye world!');
-          });
-        },
-        {
-          formDataLimits: {
-            fieldsFirst: fieldsFirstFlag === 'fieldsFirst:true',
-          },
-        }
-      );
+  createTestContainer(fetchAPI => {
+    it('should parse fields correctly', async () => {
+      const formData = new fetchAPI.FormData();
+      formData.append('greetings', 'Hello world!');
+      formData.append('bye', 'Goodbye world!');
+      const request = new fetchAPI.Request('http://localhost:8080', {
+        method: 'POST',
+        body: formData,
+      });
+      const formdata = await request.formData();
+      expect(formdata.get('greetings')).toBe('Hello world!');
+      expect(formdata.get('bye')).toBe('Goodbye world!');
+    });
+    it('should parse and receive text files correctly', async () => {
+      const formData = new fetchAPI.FormData();
+      const greetingsFile = new fetchAPI.File(['Hello world!'], 'greetings.txt', { type: 'text/plain' });
+      const byeFile = new fetchAPI.File(['Goodbye world!'], 'bye.txt', { type: 'text/plain' });
+      formData.append('greetings', greetingsFile);
+      formData.append('bye', byeFile);
+      const request = new fetchAPI.Request('http://localhost:8080', {
+        method: 'POST',
+        body: formData,
+      });
+      const formdata = await request.formData();
+      const receivedGreetingsFile = formdata.get('greetings') as File;
+      const receivedGreetingsText = await receivedGreetingsFile.text();
+      expect(receivedGreetingsText).toBe('Hello world!');
+      const receivedByeFile = formdata.get('bye') as File;
+      const receivedByeText = await receivedByeFile.text();
+      expect(receivedByeText).toBe('Goodbye world!');
     });
   });
 });