@whatwg-node/node-fetch 0.4.0 → 0.5.0-alpha-20230522130438-430d828

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,6 +29,7 @@ function isBlob(obj) {
 class PonyfillBlob {
     constructor(blobParts, options) {
         this.blobParts = blobParts;
+        this[_a] = 'Blob';
         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';
     }
@@ -117,3 +119,4 @@ class PonyfillBlob {
     }
 }
 exports.PonyfillBlob = PonyfillBlob;
+_a = Symbol.toStringTag;

package/cjs/Body.js

@@ -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/FormData.js

@@ -6,6 +6,9 @@ const ReadableStream_js_1 = require("./ReadableStream.js");
 class PonyfillFormData {
     constructor() {
         this.map = new Map();
+        Object.defineProperty(this.constructor, 'name', {
+            value: 'FormData',
+        });
     }
     append(name, value, fileName) {
         let values = this.map.get(name);
@@ -62,6 +65,10 @@ class PonyfillFormData {
             callback(value, key, this);
         }
     }
+    // undici compat
+    stream() {
+        return getStreamFromFormData(this);
+    }
 }
 exports.PonyfillFormData = PonyfillFormData;
 function getStreamFromFormData(formData, boundary = '---') {

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,62 @@ 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);
+    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,6 +26,7 @@ function isBlob(obj) {
 export class PonyfillBlob {
     constructor(blobParts, options) {
         this.blobParts = blobParts;
+        this[_a] = 'Blob';
         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';
     }
@@ -113,3 +115,4 @@ export class PonyfillBlob {
         throw new Error('Not implemented');
     }
 }
+_a = Symbol.toStringTag;

package/esm/Body.js

@@ -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/FormData.js

@@ -3,6 +3,9 @@ import { PonyfillReadableStream } from './ReadableStream.js';
 export class PonyfillFormData {
     constructor() {
         this.map = new Map();
+        Object.defineProperty(this.constructor, 'name', {
+            value: 'FormData',
+        });
     }
     append(name, value, fileName) {
         let values = this.map.get(name);
@@ -59,6 +62,10 @@ export class PonyfillFormData {
             callback(value, key, this);
         }
     }
+    // undici compat
+    stream() {
+        return getStreamFromFormData(this);
+    }
 }
 export function getStreamFromFormData(formData, boundary = '---') {
     const entries = [];

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,61 @@ 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);
+    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-20230522130438-430d828",
   "description": "Fetch API implementation for Node",
   "sideEffects": false,
   "dependencies": {

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;
+    stream(): PonyfillReadableStream<Uint8Array>;
 }
 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;
+    stream(): PonyfillReadableStream<Uint8Array>;
 }
 export declare function getStreamFromFormData(formData: FormData, boundary?: string): PonyfillReadableStream<Uint8Array>;