@whatwg-node/node-fetch 0.4.0 → 0.5.0-alpha-20230525150618-0ecd502

package/cjs/Blob.js

@@ -1,4 +1,5 @@
 "use strict";
+var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PonyfillBlob = void 0;
 const ReadableStream_js_1 = require("./ReadableStream.js");
@@ -28,8 +29,9 @@ function isBlob(obj) {
 class PonyfillBlob {
     constructor(blobParts, options) {
         this.blobParts = blobParts;
-        this.type = (options === null || options === void 0 ? void 0 : options.type) || 'application/octet-stream';
-        this.encoding = (options === null || options === void 0 ? void 0 : options.encoding) || 'utf8';
+        this[_a] = 'Blob';
+        this.type = options?.type || 'application/octet-stream';
+        this.encoding = options?.encoding || 'utf8';
     }
     async buffer() {
         const bufferChunks = [];
@@ -117,3 +119,4 @@ class PonyfillBlob {
     }
 }
 exports.PonyfillBlob = PonyfillBlob;
+_a = Symbol.toStringTag;

package/cjs/Body.js

@@ -134,7 +134,7 @@ class PonyfillBody {
         }
         const formDataLimits = {
             ...this.options.formDataLimits,
-            ...opts === null || opts === void 0 ? void 0 : opts.formDataLimits,
+            ...opts?.formDataLimits,
         };
         return new Promise((resolve, reject) => {
             const bb = (0, busboy_1.default)({
@@ -146,37 +146,37 @@ class PonyfillBody {
             });
             bb.on('field', (name, value, { nameTruncated, valueTruncated }) => {
                 if (nameTruncated) {
-                    reject(new Error(`Field name size exceeded: ${formDataLimits === null || formDataLimits === void 0 ? void 0 : formDataLimits.fieldNameSize} bytes`));
+                    reject(new Error(`Field name size exceeded: ${formDataLimits?.fieldNameSize} bytes`));
                 }
                 if (valueTruncated) {
-                    reject(new Error(`Field value size exceeded: ${formDataLimits === null || formDataLimits === void 0 ? void 0 : formDataLimits.fieldSize} bytes`));
+                    reject(new Error(`Field value size exceeded: ${formDataLimits?.fieldSize} bytes`));
                 }
                 formData.set(name, value);
             });
             bb.on('fieldsLimit', () => {
-                reject(new Error(`Fields limit exceeded: ${formDataLimits === null || formDataLimits === void 0 ? void 0 : formDataLimits.fields}`));
+                reject(new Error(`Fields limit exceeded: ${formDataLimits?.fields}`));
             });
             bb.on('file', (name, fileStream, { filename, mimeType }) => {
                 const chunks = [];
                 fileStream.on('limit', () => {
-                    reject(new Error(`File size limit exceeded: ${formDataLimits === null || formDataLimits === void 0 ? void 0 : formDataLimits.fileSize} bytes`));
+                    reject(new Error(`File size limit exceeded: ${formDataLimits?.fileSize} bytes`));
                 });
                 fileStream.on('data', chunk => {
                     chunks.push(Buffer.from(chunk));
                 });
                 fileStream.on('close', () => {
                     if (fileStream.truncated) {
-                        reject(new Error(`File size limit exceeded: ${formDataLimits === null || formDataLimits === void 0 ? void 0 : formDataLimits.fileSize} bytes`));
+                        reject(new Error(`File size limit exceeded: ${formDataLimits?.fileSize} bytes`));
                     }
                     const file = new File_js_1.PonyfillFile(chunks, filename, { type: mimeType });
                     formData.set(name, file);
                 });
             });
             bb.on('filesLimit', () => {
-                reject(new Error(`Files limit exceeded: ${formDataLimits === null || formDataLimits === void 0 ? void 0 : formDataLimits.files}`));
+                reject(new Error(`Files limit exceeded: ${formDataLimits?.files}`));
             });
             bb.on('partsLimit', () => {
-                reject(new Error(`Parts limit exceeded: ${formDataLimits === null || formDataLimits === void 0 ? void 0 : formDataLimits.parts}`));
+                reject(new Error(`Parts limit exceeded: ${formDataLimits?.parts}`));
             });
             bb.on('close', () => {
                 resolve(formData);
@@ -184,7 +184,7 @@ class PonyfillBody {
             bb.on('error', err => {
                 reject(err);
             });
-            _body === null || _body === void 0 ? void 0 : _body.readable.pipe(bb);
+            _body?.readable.pipe(bb);
         });
     }
     async buffer() {
@@ -324,17 +324,6 @@ function processBodyInit(bodyInit) {
             },
         };
     }
-    if ('stream' in bodyInit) {
-        return {
-            contentType: bodyInit.type,
-            contentLength: bodyInit.size,
-            bodyFactory() {
-                const bodyStream = bodyInit.stream();
-                const body = new ReadableStream_js_1.PonyfillReadableStream(bodyStream);
-                return body;
-            },
-        };
-    }
     if ('sort' in bodyInit) {
         const contentType = 'application/x-www-form-urlencoded;charset=UTF-8';
         return {
@@ -358,6 +347,17 @@ function processBodyInit(bodyInit) {
             },
         };
     }
+    if ('stream' in bodyInit) {
+        return {
+            contentType: bodyInit.type,
+            contentLength: bodyInit.size,
+            bodyFactory() {
+                const bodyStream = bodyInit.stream();
+                const body = new ReadableStream_js_1.PonyfillReadableStream(bodyStream);
+                return body;
+            },
+        };
+    }
     if (bodyInit[Symbol.iterator] || bodyInit[Symbol.asyncIterator]) {
         return {
             contentType: null,

package/cjs/File.js

@@ -7,7 +7,7 @@ class PonyfillFile extends Blob_js_1.PonyfillBlob {
         super(fileBits, options);
         this.name = name;
         this.webkitRelativePath = '';
-        this.lastModified = (options === null || options === void 0 ? void 0 : options.lastModified) || Date.now();
+        this.lastModified = options?.lastModified || Date.now();
     }
 }
 exports.PonyfillFile = PonyfillFile;

package/cjs/FormData.js

@@ -1,4 +1,5 @@
 "use strict";
+var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getStreamFromFormData = exports.PonyfillFormData = void 0;
 const File_js_1 = require("./File.js");
@@ -6,6 +7,10 @@ const ReadableStream_js_1 = require("./ReadableStream.js");
 class PonyfillFormData {
     constructor() {
         this.map = new Map();
+        this[_a] = 'FormData';
+        Object.defineProperty(this.constructor, 'name', {
+            value: 'FormData',
+        });
     }
     append(name, value, fileName) {
         let values = this.map.get(name);
@@ -64,6 +69,7 @@ class PonyfillFormData {
     }
 }
 exports.PonyfillFormData = PonyfillFormData;
+_a = Symbol.toStringTag;
 function getStreamFromFormData(formData, boundary = '---') {
     const entries = [];
     let sentInitialHeader = false;

package/cjs/ReadableStream.js

@@ -90,26 +90,24 @@ class PonyfillReadableStream {
                     }
                     ongoing = true;
                     return Promise.resolve().then(async () => {
-                        var _a, _b;
                         if (!started) {
                             const controller = createController(desiredSize, this);
                             started = true;
-                            await ((_a = underlyingSource === null || underlyingSource === void 0 ? void 0 : underlyingSource.start) === null || _a === void 0 ? void 0 : _a.call(underlyingSource, controller));
+                            await underlyingSource?.start?.(controller);
                             controller._flush();
                             if (controller._closed) {
                                 return;
                             }
                         }
                         const controller = createController(desiredSize, this);
-                        await ((_b = underlyingSource === null || underlyingSource === void 0 ? void 0 : underlyingSource.pull) === null || _b === void 0 ? void 0 : _b.call(underlyingSource, controller));
+                        await underlyingSource?.pull?.(controller);
                         controller._flush();
                         ongoing = false;
                     });
                 },
                 async destroy(err, callback) {
-                    var _a;
                     try {
-                        await ((_a = underlyingSource === null || underlyingSource === void 0 ? void 0 : underlyingSource.cancel) === null || _a === void 0 ? void 0 : _a.call(underlyingSource, err));
+                        await underlyingSource?.cancel?.(err);
                         callback(null);
                     }
                     catch (err) {
@@ -131,13 +129,11 @@ class PonyfillReadableStream {
                 return iterator.next();
             },
             releaseLock: () => {
-                var _a;
-                (_a = iterator.return) === null || _a === void 0 ? void 0 : _a.call(iterator);
+                iterator.return?.();
                 this.locked = false;
             },
             cancel: async (reason) => {
-                var _a;
-                await ((_a = iterator.return) === null || _a === void 0 ? void 0 : _a.call(iterator, reason));
+                await iterator.return?.(reason);
                 this.locked = false;
             },
             closed: new Promise((resolve, reject) => {

package/cjs/Request.js

@@ -9,7 +9,6 @@ function isRequest(input) {
 }
 class PonyfillRequest extends Body_js_1.PonyfillBody {
     constructor(input, options) {
-        var _a;
         let url;
         let bodyInit = null;
         let requestInit;
@@ -31,18 +30,18 @@ class PonyfillRequest extends Body_js_1.PonyfillBody {
         super(bodyInit, options);
         this.destination = '';
         this.priority = 'auto';
-        this.cache = (requestInit === null || requestInit === void 0 ? void 0 : requestInit.cache) || 'default';
-        this.credentials = (requestInit === null || requestInit === void 0 ? void 0 : requestInit.credentials) || 'same-origin';
-        this.headers = new Headers_js_1.PonyfillHeaders(requestInit === null || requestInit === void 0 ? void 0 : requestInit.headers);
-        this.integrity = (requestInit === null || requestInit === void 0 ? void 0 : requestInit.integrity) || '';
-        this.keepalive = (requestInit === null || requestInit === void 0 ? void 0 : requestInit.keepalive) != null ? requestInit === null || requestInit === void 0 ? void 0 : requestInit.keepalive : false;
-        this.method = ((_a = requestInit === null || requestInit === void 0 ? void 0 : requestInit.method) === null || _a === void 0 ? void 0 : _a.toUpperCase()) || 'GET';
-        this.mode = (requestInit === null || requestInit === void 0 ? void 0 : requestInit.mode) || 'cors';
-        this.redirect = (requestInit === null || requestInit === void 0 ? void 0 : requestInit.redirect) || 'follow';
-        this.referrer = (requestInit === null || requestInit === void 0 ? void 0 : requestInit.referrer) || 'about:client';
-        this.referrerPolicy = (requestInit === null || requestInit === void 0 ? void 0 : requestInit.referrerPolicy) || 'no-referrer';
-        this.signal = (requestInit === null || requestInit === void 0 ? void 0 : requestInit.signal) || new AbortController().signal;
-        this.headersSerializer = (requestInit === null || requestInit === void 0 ? void 0 : requestInit.headersSerializer) || utils_js_1.getHeadersObj;
+        this.cache = requestInit?.cache || 'default';
+        this.credentials = requestInit?.credentials || 'same-origin';
+        this.headers = new Headers_js_1.PonyfillHeaders(requestInit?.headers);
+        this.integrity = requestInit?.integrity || '';
+        this.keepalive = requestInit?.keepalive != null ? requestInit?.keepalive : false;
+        this.method = requestInit?.method?.toUpperCase() || 'GET';
+        this.mode = requestInit?.mode || 'cors';
+        this.redirect = requestInit?.redirect || 'follow';
+        this.referrer = requestInit?.referrer || 'about:client';
+        this.referrerPolicy = requestInit?.referrerPolicy || 'no-referrer';
+        this.signal = requestInit?.signal || new AbortController().signal;
+        this.headersSerializer = requestInit?.headersSerializer || utils_js_1.getHeadersObj;
         this.url = url || '';
         const contentTypeInHeaders = this.headers.get('content-type');
         if (!contentTypeInHeaders) {

package/cjs/Response.js

@@ -68,7 +68,7 @@ class PonyfillResponse extends Body_js_1.PonyfillBody {
             ...init,
             headers: {
                 'Content-Type': 'application/json',
-                ...init === null || init === void 0 ? void 0 : init.headers,
+                ...init?.headers,
             },
         });
     }

package/cjs/URL.js

@@ -32,15 +32,13 @@ class PonyfillURL extends fast_url_parser_1.default {
         return this._searchParams;
     }
     get username() {
-        var _a;
-        return ((_a = this.auth) === null || _a === void 0 ? void 0 : _a.split(':')[0]) || '';
+        return this.auth?.split(':')[0] || '';
     }
     set username(value) {
         this.auth = `${value}:${this.password}`;
     }
     get password() {
-        var _a;
-        return ((_a = this.auth) === null || _a === void 0 ? void 0 : _a.split(':')[1]) || '';
+        return this.auth?.split(':')[1] || '';
     }
     set password(value) {
         this.auth = `${this.username}:${value}`;

package/cjs/fetch.js

@@ -2,12 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.fetchPonyfill = void 0;
 const fs_1 = require("fs");
-const http_1 = require("http");
-const https_1 = require("https");
 const stream_1 = require("stream");
 const url_1 = require("url");
 const zlib_1 = require("zlib");
-const AbortError_js_1 = require("./AbortError.js");
+const undici_1 = require("undici");
 const Blob_js_1 = require("./Blob.js");
 const Request_js_1 = require("./Request.js");
 const Response_js_1 = require("./Response.js");
@@ -38,113 +36,65 @@ function getResponseForDataUri(url) {
         },
     });
 }
-function getRequestFnForProtocol(protocol) {
-    switch (protocol) {
-        case 'http:':
-            return http_1.request;
-        case 'https:':
-            return https_1.request;
-    }
-    throw new Error(`Unsupported protocol: ${protocol}`);
-}
 const BASE64_SUFFIX = ';base64';
-function fetchPonyfill(info, init) {
+async function fetchPonyfill(info, init) {
     if (typeof info === 'string' || 'href' in info) {
         const ponyfillRequest = new Request_js_1.PonyfillRequest(info, init);
         return fetchPonyfill(ponyfillRequest);
     }
     const fetchRequest = info;
-    return new Promise((resolve, reject) => {
-        var _a;
-        try {
-            const url = new URL_js_1.PonyfillURL(fetchRequest.url, 'http://localhost');
-            if (url.protocol === 'data:') {
-                const response = getResponseForDataUri(url);
-                resolve(response);
-                return;
-            }
-            if (url.protocol === 'file:') {
-                const response = getResponseForFile(fetchRequest.url);
-                resolve(response);
-                return;
-            }
-            const requestFn = getRequestFnForProtocol(url.protocol);
-            const nodeReadable = (fetchRequest.body != null
-                ? 'pipe' in fetchRequest.body
-                    ? fetchRequest.body
-                    : stream_1.Readable.from(fetchRequest.body)
-                : null);
-            const headersSerializer = fetchRequest.headersSerializer || utils_js_1.getHeadersObj;
-            const nodeHeaders = headersSerializer(fetchRequest.headers);
-            const nodeRequest = requestFn(fetchRequest.url, {
-                method: fetchRequest.method,
-                headers: nodeHeaders,
-                signal: fetchRequest.signal,
-            });
-            // TODO: will be removed after v16 reaches EOL
-            (_a = fetchRequest.signal) === null || _a === void 0 ? void 0 : _a.addEventListener('abort', () => {
-                if (!nodeRequest.aborted) {
-                    nodeRequest.abort();
-                }
-            });
-            // TODO: will be removed after v16 reaches EOL
-            nodeRequest.once('abort', (reason) => {
-                reject(new AbortError_js_1.PonyfillAbortError(reason));
-            });
-            nodeRequest.once('response', nodeResponse => {
-                let responseBody = nodeResponse;
-                const contentEncoding = nodeResponse.headers['content-encoding'];
-                switch (contentEncoding) {
-                    case 'x-gzip':
-                    case 'gzip':
-                        responseBody = nodeResponse.pipe((0, zlib_1.createGunzip)());
-                        break;
-                    case 'x-deflate':
-                    case 'deflate':
-                        responseBody = nodeResponse.pipe((0, zlib_1.createInflate)());
-                        break;
-                    case 'br':
-                        responseBody = nodeResponse.pipe((0, zlib_1.createBrotliDecompress)());
-                        break;
-                }
-                if (nodeResponse.headers.location) {
-                    if (fetchRequest.redirect === 'error') {
-                        const redirectError = new Error('Redirects are not allowed');
-                        reject(redirectError);
-                        nodeResponse.resume();
-                        return;
-                    }
-                    if (fetchRequest.redirect === 'follow') {
-                        const redirectedUrl = new URL_js_1.PonyfillURL(nodeResponse.headers.location, url);
-                        const redirectResponse$ = fetchPonyfill(redirectedUrl, info);
-                        resolve(redirectResponse$.then(redirectResponse => {
-                            redirectResponse.redirected = true;
-                            return redirectResponse;
-                        }));
-                        nodeResponse.resume();
-                        return;
-                    }
-                }
-                const responseHeaders = nodeResponse.headers;
-                const ponyfillResponse = new Response_js_1.PonyfillResponse(responseBody, {
-                    status: nodeResponse.statusCode,
-                    statusText: nodeResponse.statusMessage,
-                    headers: responseHeaders,
-                    url: info.url,
-                });
-                resolve(ponyfillResponse);
-            });
-            nodeRequest.once('error', reject);
-            if (nodeReadable) {
-                nodeReadable.pipe(nodeRequest);
-            }
-            else {
-                nodeRequest.end();
-            }
-        }
-        catch (e) {
-            reject(e);
-        }
+    const url = new URL_js_1.PonyfillURL(fetchRequest.url, 'http://localhost');
+    if (url.protocol === 'data:') {
+        const response = getResponseForDataUri(url);
+        return response;
+    }
+    if (url.protocol === 'file:') {
+        const response = getResponseForFile(fetchRequest.url);
+        return response;
+    }
+    const requestBody = (fetchRequest['bodyInit'] != null
+        ? fetchRequest['bodyInit']
+        : fetchRequest.body != null
+            ? 'pipe' in fetchRequest.body
+                ? fetchRequest.body
+                : stream_1.Readable.from(fetchRequest.body)
+            : null);
+    const headersSerializer = fetchRequest.headersSerializer || utils_js_1.getHeadersObj;
+    const nodeHeaders = headersSerializer(fetchRequest.headers);
+    if (requestBody?.[Symbol.toStringTag] === 'FormData') {
+        delete nodeHeaders['content-type'];
+    }
+    const undiciData = await (0, undici_1.request)(fetchRequest.url, {
+        method: fetchRequest.method,
+        headers: nodeHeaders,
+        body: requestBody,
+        signal: fetchRequest.signal,
+        maxRedirections: fetchRequest.redirect === 'follow' ? 20 : 0,
+    });
+    if (fetchRequest.redirect === 'error' && undiciData.headers.location) {
+        const redirectError = new Error('Redirects are not allowed');
+        throw redirectError;
+    }
+    let responseBody = undiciData.body;
+    const contentEncoding = undiciData.headers['content-encoding'];
+    switch (contentEncoding) {
+        case 'x-gzip':
+        case 'gzip':
+            responseBody = responseBody.pipe((0, zlib_1.createGunzip)());
+            break;
+        case 'x-deflate':
+        case 'deflate':
+            responseBody = responseBody.pipe((0, zlib_1.createInflate)());
+            break;
+        case 'br':
+            responseBody = responseBody.pipe((0, zlib_1.createBrotliDecompress)());
+            break;
+    }
+    const ponyfillResponse = new Response_js_1.PonyfillResponse(responseBody, {
+        status: undiciData.statusCode,
+        headers: undiciData.headers,
+        url: fetchRequest.url,
     });
+    return ponyfillResponse;
 }
 exports.fetchPonyfill = fetchPonyfill;

package/esm/Blob.js

@@ -1,3 +1,4 @@
+var _a;
 import { PonyfillReadableStream } from './ReadableStream.js';
 import { uint8ArrayToArrayBuffer } from './utils.js';
 function getBlobPartAsBuffer(blobPart) {
@@ -25,8 +26,9 @@ function isBlob(obj) {
 export class PonyfillBlob {
     constructor(blobParts, options) {
         this.blobParts = blobParts;
-        this.type = (options === null || options === void 0 ? void 0 : options.type) || 'application/octet-stream';
-        this.encoding = (options === null || options === void 0 ? void 0 : options.encoding) || 'utf8';
+        this[_a] = 'Blob';
+        this.type = options?.type || 'application/octet-stream';
+        this.encoding = options?.encoding || 'utf8';
     }
     async buffer() {
         const bufferChunks = [];
@@ -113,3 +115,4 @@ export class PonyfillBlob {
         throw new Error('Not implemented');
     }
 }
+_a = Symbol.toStringTag;

package/esm/Body.js

@@ -130,7 +130,7 @@ export class PonyfillBody {
         }
         const formDataLimits = {
             ...this.options.formDataLimits,
-            ...opts === null || opts === void 0 ? void 0 : opts.formDataLimits,
+            ...opts?.formDataLimits,
         };
         return new Promise((resolve, reject) => {
             const bb = busboy({
@@ -142,37 +142,37 @@ export class PonyfillBody {
             });
             bb.on('field', (name, value, { nameTruncated, valueTruncated }) => {
                 if (nameTruncated) {
-                    reject(new Error(`Field name size exceeded: ${formDataLimits === null || formDataLimits === void 0 ? void 0 : formDataLimits.fieldNameSize} bytes`));
+                    reject(new Error(`Field name size exceeded: ${formDataLimits?.fieldNameSize} bytes`));
                 }
                 if (valueTruncated) {
-                    reject(new Error(`Field value size exceeded: ${formDataLimits === null || formDataLimits === void 0 ? void 0 : formDataLimits.fieldSize} bytes`));
+                    reject(new Error(`Field value size exceeded: ${formDataLimits?.fieldSize} bytes`));
                 }
                 formData.set(name, value);
             });
             bb.on('fieldsLimit', () => {
-                reject(new Error(`Fields limit exceeded: ${formDataLimits === null || formDataLimits === void 0 ? void 0 : formDataLimits.fields}`));
+                reject(new Error(`Fields limit exceeded: ${formDataLimits?.fields}`));
             });
             bb.on('file', (name, fileStream, { filename, mimeType }) => {
                 const chunks = [];
                 fileStream.on('limit', () => {
-                    reject(new Error(`File size limit exceeded: ${formDataLimits === null || formDataLimits === void 0 ? void 0 : formDataLimits.fileSize} bytes`));
+                    reject(new Error(`File size limit exceeded: ${formDataLimits?.fileSize} bytes`));
                 });
                 fileStream.on('data', chunk => {
                     chunks.push(Buffer.from(chunk));
                 });
                 fileStream.on('close', () => {
                     if (fileStream.truncated) {
-                        reject(new Error(`File size limit exceeded: ${formDataLimits === null || formDataLimits === void 0 ? void 0 : formDataLimits.fileSize} bytes`));
+                        reject(new Error(`File size limit exceeded: ${formDataLimits?.fileSize} bytes`));
                     }
                     const file = new PonyfillFile(chunks, filename, { type: mimeType });
                     formData.set(name, file);
                 });
             });
             bb.on('filesLimit', () => {
-                reject(new Error(`Files limit exceeded: ${formDataLimits === null || formDataLimits === void 0 ? void 0 : formDataLimits.files}`));
+                reject(new Error(`Files limit exceeded: ${formDataLimits?.files}`));
             });
             bb.on('partsLimit', () => {
-                reject(new Error(`Parts limit exceeded: ${formDataLimits === null || formDataLimits === void 0 ? void 0 : formDataLimits.parts}`));
+                reject(new Error(`Parts limit exceeded: ${formDataLimits?.parts}`));
             });
             bb.on('close', () => {
                 resolve(formData);
@@ -180,7 +180,7 @@ export class PonyfillBody {
             bb.on('error', err => {
                 reject(err);
             });
-            _body === null || _body === void 0 ? void 0 : _body.readable.pipe(bb);
+            _body?.readable.pipe(bb);
         });
     }
     async buffer() {
@@ -319,17 +319,6 @@ function processBodyInit(bodyInit) {
             },
         };
     }
-    if ('stream' in bodyInit) {
-        return {
-            contentType: bodyInit.type,
-            contentLength: bodyInit.size,
-            bodyFactory() {
-                const bodyStream = bodyInit.stream();
-                const body = new PonyfillReadableStream(bodyStream);
-                return body;
-            },
-        };
-    }
     if ('sort' in bodyInit) {
         const contentType = 'application/x-www-form-urlencoded;charset=UTF-8';
         return {
@@ -353,6 +342,17 @@ function processBodyInit(bodyInit) {
             },
         };
     }
+    if ('stream' in bodyInit) {
+        return {
+            contentType: bodyInit.type,
+            contentLength: bodyInit.size,
+            bodyFactory() {
+                const bodyStream = bodyInit.stream();
+                const body = new PonyfillReadableStream(bodyStream);
+                return body;
+            },
+        };
+    }
     if (bodyInit[Symbol.iterator] || bodyInit[Symbol.asyncIterator]) {
         return {
             contentType: null,

package/esm/File.js

@@ -4,6 +4,6 @@ export class PonyfillFile extends PonyfillBlob {
         super(fileBits, options);
         this.name = name;
         this.webkitRelativePath = '';
-        this.lastModified = (options === null || options === void 0 ? void 0 : options.lastModified) || Date.now();
+        this.lastModified = options?.lastModified || Date.now();
     }
 }

package/esm/FormData.js

@@ -1,8 +1,13 @@
+var _a;
 import { PonyfillFile } from './File.js';
 import { PonyfillReadableStream } from './ReadableStream.js';
 export class PonyfillFormData {
     constructor() {
         this.map = new Map();
+        this[_a] = 'FormData';
+        Object.defineProperty(this.constructor, 'name', {
+            value: 'FormData',
+        });
     }
     append(name, value, fileName) {
         let values = this.map.get(name);
@@ -60,6 +65,7 @@ export class PonyfillFormData {
         }
     }
 }
+_a = Symbol.toStringTag;
 export function getStreamFromFormData(formData, boundary = '---') {
     const entries = [];
     let sentInitialHeader = false;

package/esm/ReadableStream.js

@@ -87,26 +87,24 @@ export class PonyfillReadableStream {
                     }
                     ongoing = true;
                     return Promise.resolve().then(async () => {
-                        var _a, _b;
                         if (!started) {
                             const controller = createController(desiredSize, this);
                             started = true;
-                            await ((_a = underlyingSource === null || underlyingSource === void 0 ? void 0 : underlyingSource.start) === null || _a === void 0 ? void 0 : _a.call(underlyingSource, controller));
+                            await underlyingSource?.start?.(controller);
                             controller._flush();
                             if (controller._closed) {
                                 return;
                             }
                         }
                         const controller = createController(desiredSize, this);
-                        await ((_b = underlyingSource === null || underlyingSource === void 0 ? void 0 : underlyingSource.pull) === null || _b === void 0 ? void 0 : _b.call(underlyingSource, controller));
+                        await underlyingSource?.pull?.(controller);
                         controller._flush();
                         ongoing = false;
                     });
                 },
                 async destroy(err, callback) {
-                    var _a;
                     try {
-                        await ((_a = underlyingSource === null || underlyingSource === void 0 ? void 0 : underlyingSource.cancel) === null || _a === void 0 ? void 0 : _a.call(underlyingSource, err));
+                        await underlyingSource?.cancel?.(err);
                         callback(null);
                     }
                     catch (err) {
@@ -128,13 +126,11 @@ export class PonyfillReadableStream {
                 return iterator.next();
             },
             releaseLock: () => {
-                var _a;
-                (_a = iterator.return) === null || _a === void 0 ? void 0 : _a.call(iterator);
+                iterator.return?.();
                 this.locked = false;
             },
             cancel: async (reason) => {
-                var _a;
-                await ((_a = iterator.return) === null || _a === void 0 ? void 0 : _a.call(iterator, reason));
+                await iterator.return?.(reason);
                 this.locked = false;
             },
             closed: new Promise((resolve, reject) => {

package/esm/Request.js

@@ -6,7 +6,6 @@ function isRequest(input) {
 }
 export class PonyfillRequest extends PonyfillBody {
     constructor(input, options) {
-        var _a;
         let url;
         let bodyInit = null;
         let requestInit;
@@ -28,18 +27,18 @@ export class PonyfillRequest extends PonyfillBody {
         super(bodyInit, options);
         this.destination = '';
         this.priority = 'auto';
-        this.cache = (requestInit === null || requestInit === void 0 ? void 0 : requestInit.cache) || 'default';
-        this.credentials = (requestInit === null || requestInit === void 0 ? void 0 : requestInit.credentials) || 'same-origin';
-        this.headers = new PonyfillHeaders(requestInit === null || requestInit === void 0 ? void 0 : requestInit.headers);
-        this.integrity = (requestInit === null || requestInit === void 0 ? void 0 : requestInit.integrity) || '';
-        this.keepalive = (requestInit === null || requestInit === void 0 ? void 0 : requestInit.keepalive) != null ? requestInit === null || requestInit === void 0 ? void 0 : requestInit.keepalive : false;
-        this.method = ((_a = requestInit === null || requestInit === void 0 ? void 0 : requestInit.method) === null || _a === void 0 ? void 0 : _a.toUpperCase()) || 'GET';
-        this.mode = (requestInit === null || requestInit === void 0 ? void 0 : requestInit.mode) || 'cors';
-        this.redirect = (requestInit === null || requestInit === void 0 ? void 0 : requestInit.redirect) || 'follow';
-        this.referrer = (requestInit === null || requestInit === void 0 ? void 0 : requestInit.referrer) || 'about:client';
-        this.referrerPolicy = (requestInit === null || requestInit === void 0 ? void 0 : requestInit.referrerPolicy) || 'no-referrer';
-        this.signal = (requestInit === null || requestInit === void 0 ? void 0 : requestInit.signal) || new AbortController().signal;
-        this.headersSerializer = (requestInit === null || requestInit === void 0 ? void 0 : requestInit.headersSerializer) || getHeadersObj;
+        this.cache = requestInit?.cache || 'default';
+        this.credentials = requestInit?.credentials || 'same-origin';
+        this.headers = new PonyfillHeaders(requestInit?.headers);
+        this.integrity = requestInit?.integrity || '';
+        this.keepalive = requestInit?.keepalive != null ? requestInit?.keepalive : false;
+        this.method = requestInit?.method?.toUpperCase() || 'GET';
+        this.mode = requestInit?.mode || 'cors';
+        this.redirect = requestInit?.redirect || 'follow';
+        this.referrer = requestInit?.referrer || 'about:client';
+        this.referrerPolicy = requestInit?.referrerPolicy || 'no-referrer';
+        this.signal = requestInit?.signal || new AbortController().signal;
+        this.headersSerializer = requestInit?.headersSerializer || getHeadersObj;
         this.url = url || '';
         const contentTypeInHeaders = this.headers.get('content-type');
         if (!contentTypeInHeaders) {

package/esm/Response.js

@@ -65,7 +65,7 @@ export class PonyfillResponse extends PonyfillBody {
             ...init,
             headers: {
                 'Content-Type': 'application/json',
-                ...init === null || init === void 0 ? void 0 : init.headers,
+                ...init?.headers,
             },
         });
     }

package/esm/URL.js

@@ -28,15 +28,13 @@ export class PonyfillURL extends FastUrl {
         return this._searchParams;
     }
     get username() {
-        var _a;
-        return ((_a = this.auth) === null || _a === void 0 ? void 0 : _a.split(':')[0]) || '';
+        return this.auth?.split(':')[0] || '';
     }
     set username(value) {
         this.auth = `${value}:${this.password}`;
     }
     get password() {
-        var _a;
-        return ((_a = this.auth) === null || _a === void 0 ? void 0 : _a.split(':')[1]) || '';
+        return this.auth?.split(':')[1] || '';
     }
     set password(value) {
         this.auth = `${this.username}:${value}`;

package/esm/fetch.js

@@ -1,10 +1,8 @@
 import { createReadStream } from 'fs';
-import { request as httpRequest } from 'http';
-import { request as httpsRequest } from 'https';
 import { Readable } from 'stream';
 import { fileURLToPath } from 'url';
 import { createBrotliDecompress, createGunzip, createInflate } from 'zlib';
-import { PonyfillAbortError } from './AbortError.js';
+import { request } from 'undici';
 import { PonyfillBlob } from './Blob.js';
 import { PonyfillRequest } from './Request.js';
 import { PonyfillResponse } from './Response.js';
@@ -35,112 +33,64 @@ function getResponseForDataUri(url) {
         },
     });
 }
-function getRequestFnForProtocol(protocol) {
-    switch (protocol) {
-        case 'http:':
-            return httpRequest;
-        case 'https:':
-            return httpsRequest;
-    }
-    throw new Error(`Unsupported protocol: ${protocol}`);
-}
 const BASE64_SUFFIX = ';base64';
-export function fetchPonyfill(info, init) {
+export async function fetchPonyfill(info, init) {
     if (typeof info === 'string' || 'href' in info) {
         const ponyfillRequest = new PonyfillRequest(info, init);
         return fetchPonyfill(ponyfillRequest);
     }
     const fetchRequest = info;
-    return new Promise((resolve, reject) => {
-        var _a;
-        try {
-            const url = new PonyfillURL(fetchRequest.url, 'http://localhost');
-            if (url.protocol === 'data:') {
-                const response = getResponseForDataUri(url);
-                resolve(response);
-                return;
-            }
-            if (url.protocol === 'file:') {
-                const response = getResponseForFile(fetchRequest.url);
-                resolve(response);
-                return;
-            }
-            const requestFn = getRequestFnForProtocol(url.protocol);
-            const nodeReadable = (fetchRequest.body != null
-                ? 'pipe' in fetchRequest.body
-                    ? fetchRequest.body
-                    : Readable.from(fetchRequest.body)
-                : null);
-            const headersSerializer = fetchRequest.headersSerializer || getHeadersObj;
-            const nodeHeaders = headersSerializer(fetchRequest.headers);
-            const nodeRequest = requestFn(fetchRequest.url, {
-                method: fetchRequest.method,
-                headers: nodeHeaders,
-                signal: fetchRequest.signal,
-            });
-            // TODO: will be removed after v16 reaches EOL
-            (_a = fetchRequest.signal) === null || _a === void 0 ? void 0 : _a.addEventListener('abort', () => {
-                if (!nodeRequest.aborted) {
-                    nodeRequest.abort();
-                }
-            });
-            // TODO: will be removed after v16 reaches EOL
-            nodeRequest.once('abort', (reason) => {
-                reject(new PonyfillAbortError(reason));
-            });
-            nodeRequest.once('response', nodeResponse => {
-                let responseBody = nodeResponse;
-                const contentEncoding = nodeResponse.headers['content-encoding'];
-                switch (contentEncoding) {
-                    case 'x-gzip':
-                    case 'gzip':
-                        responseBody = nodeResponse.pipe(createGunzip());
-                        break;
-                    case 'x-deflate':
-                    case 'deflate':
-                        responseBody = nodeResponse.pipe(createInflate());
-                        break;
-                    case 'br':
-                        responseBody = nodeResponse.pipe(createBrotliDecompress());
-                        break;
-                }
-                if (nodeResponse.headers.location) {
-                    if (fetchRequest.redirect === 'error') {
-                        const redirectError = new Error('Redirects are not allowed');
-                        reject(redirectError);
-                        nodeResponse.resume();
-                        return;
-                    }
-                    if (fetchRequest.redirect === 'follow') {
-                        const redirectedUrl = new PonyfillURL(nodeResponse.headers.location, url);
-                        const redirectResponse$ = fetchPonyfill(redirectedUrl, info);
-                        resolve(redirectResponse$.then(redirectResponse => {
-                            redirectResponse.redirected = true;
-                            return redirectResponse;
-                        }));
-                        nodeResponse.resume();
-                        return;
-                    }
-                }
-                const responseHeaders = nodeResponse.headers;
-                const ponyfillResponse = new PonyfillResponse(responseBody, {
-                    status: nodeResponse.statusCode,
-                    statusText: nodeResponse.statusMessage,
-                    headers: responseHeaders,
-                    url: info.url,
-                });
-                resolve(ponyfillResponse);
-            });
-            nodeRequest.once('error', reject);
-            if (nodeReadable) {
-                nodeReadable.pipe(nodeRequest);
-            }
-            else {
-                nodeRequest.end();
-            }
-        }
-        catch (e) {
-            reject(e);
-        }
+    const url = new PonyfillURL(fetchRequest.url, 'http://localhost');
+    if (url.protocol === 'data:') {
+        const response = getResponseForDataUri(url);
+        return response;
+    }
+    if (url.protocol === 'file:') {
+        const response = getResponseForFile(fetchRequest.url);
+        return response;
+    }
+    const requestBody = (fetchRequest['bodyInit'] != null
+        ? fetchRequest['bodyInit']
+        : fetchRequest.body != null
+            ? 'pipe' in fetchRequest.body
+                ? fetchRequest.body
+                : Readable.from(fetchRequest.body)
+            : null);
+    const headersSerializer = fetchRequest.headersSerializer || getHeadersObj;
+    const nodeHeaders = headersSerializer(fetchRequest.headers);
+    if (requestBody?.[Symbol.toStringTag] === 'FormData') {
+        delete nodeHeaders['content-type'];
+    }
+    const undiciData = await request(fetchRequest.url, {
+        method: fetchRequest.method,
+        headers: nodeHeaders,
+        body: requestBody,
+        signal: fetchRequest.signal,
+        maxRedirections: fetchRequest.redirect === 'follow' ? 20 : 0,
+    });
+    if (fetchRequest.redirect === 'error' && undiciData.headers.location) {
+        const redirectError = new Error('Redirects are not allowed');
+        throw redirectError;
+    }
+    let responseBody = undiciData.body;
+    const contentEncoding = undiciData.headers['content-encoding'];
+    switch (contentEncoding) {
+        case 'x-gzip':
+        case 'gzip':
+            responseBody = responseBody.pipe(createGunzip());
+            break;
+        case 'x-deflate':
+        case 'deflate':
+            responseBody = responseBody.pipe(createInflate());
+            break;
+        case 'br':
+            responseBody = responseBody.pipe(createBrotliDecompress());
+            break;
+    }
+    const ponyfillResponse = new PonyfillResponse(responseBody, {
+        status: undiciData.statusCode,
+        headers: undiciData.headers,
+        url: fetchRequest.url,
     });
+    return ponyfillResponse;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@whatwg-node/node-fetch",
-  "version": "0.4.0",
+  "version": "0.5.0-alpha-20230525150618-0ecd502",
   "description": "Fetch API implementation for Node",
   "sideEffects": false,
   "dependencies": {
@@ -8,7 +8,8 @@
     "busboy": "^1.6.0",
     "fast-querystring": "^1.1.1",
     "fast-url-parser": "^1.1.3",
-    "tslib": "^2.3.1"
+    "tslib": "^2.3.1",
+    "undici": "^5.22.1"
   },
   "repository": {
     "type": "git",

package/typings/Blob.d.cts

@@ -22,6 +22,7 @@ export declare class PonyfillBlob implements Blob {
     get size(): number;
     stream(): any;
     slice(): any;
+    [Symbol.toStringTag]: string;
 }
 export interface PonyfillBlob {
     prototype: Blob;

package/typings/Blob.d.ts

@@ -22,6 +22,7 @@ export declare class PonyfillBlob implements Blob {
     get size(): number;
     stream(): any;
     slice(): any;
+    [Symbol.toStringTag]: string;
 }
 export interface PonyfillBlob {
     prototype: Blob;

package/typings/FormData.d.cts

@@ -2,6 +2,7 @@ import { PonyfillBlob } from './Blob.cjs';
 import { PonyfillReadableStream } from './ReadableStream.cjs';
 export declare class PonyfillFormData implements FormData {
     private map;
+    constructor();
     append(name: string, value: PonyfillBlob | string, fileName?: string): void;
     delete(name: string): void;
     get(name: string): FormDataEntryValue | null;
@@ -13,5 +14,6 @@ export declare class PonyfillFormData implements FormData {
     keys(): IterableIterator<string>;
     values(): IterableIterator<FormDataEntryValue>;
     forEach(callback: (value: FormDataEntryValue, key: string, parent: this) => void): void;
+    [Symbol.toStringTag]: string;
 }
 export declare function getStreamFromFormData(formData: FormData, boundary?: string): PonyfillReadableStream<Uint8Array>;

package/typings/FormData.d.ts

@@ -2,6 +2,7 @@ import { PonyfillBlob } from './Blob.js';
 import { PonyfillReadableStream } from './ReadableStream.js';
 export declare class PonyfillFormData implements FormData {
     private map;
+    constructor();
     append(name: string, value: PonyfillBlob | string, fileName?: string): void;
     delete(name: string): void;
     get(name: string): FormDataEntryValue | null;
@@ -13,5 +14,6 @@ export declare class PonyfillFormData implements FormData {
     keys(): IterableIterator<string>;
     values(): IterableIterator<FormDataEntryValue>;
     forEach(callback: (value: FormDataEntryValue, key: string, parent: this) => void): void;
+    [Symbol.toStringTag]: string;
 }
 export declare function getStreamFromFormData(formData: FormData, boundary?: string): PonyfillReadableStream<Uint8Array>;