@whatwg-node/node-fetch 0.0.1-alpha-20230117084928-a052439 → 0.0.1-alpha-20230117095738-14df726

package/AbortSignal.d.ts

@@ -6,4 +6,6 @@ export declare class PonyfillAbortSignal extends EventTarget implements AbortSig
     throwIfAborted(): void;
     get onabort(): ((this: AbortSignal, ev: Event) => any) | null;
     set onabort(value: ((this: AbortSignal, ev: Event) => any) | null);
+    abort(reason?: any): void;
+    static timeout(milliseconds: number): PonyfillAbortSignal;
 }

package/index.js

@@ -16,7 +16,7 @@ const fs = require('fs');
 // Will be removed after v14 reaches EOL
 class PonyfillAbortError extends Error {
     constructor(reason) {
-        super('The operation was aborted.', {
+        super('The operation was aborted' + reason || '', {
             cause: reason,
         });
         this.name = 'AbortError';
@@ -46,6 +46,14 @@ class PonyfillAbortSignal extends events.EventTarget {
         }
         this.addEventListener('abort', value);
     }
+    abort(reason) {
+        this.dispatchEvent(new CustomEvent('abort', { detail: reason }));
+    }
+    static timeout(milliseconds) {
+        const signal = new PonyfillAbortSignal();
+        setTimeout(() => signal.abort(`Operation timed out`), milliseconds);
+        return signal;
+    }
 }
 
 // Will be removed after v14 reaches EOL
@@ -303,6 +311,10 @@ class PonyfillFormData {
                         controller.enqueue(Buffer.from(`\r\n--${boundary}\r\n`));
                     }
                 }
+                else {
+                    controller.enqueue(Buffer.from(`\r\n--${boundary}--\r\n`));
+                    controller.close();
+                }
             },
         });
     }
@@ -540,6 +552,39 @@ function processBodyInit(bodyInit) {
             body,
         };
     }
+    if ('stream' in bodyInit) {
+        const bodyStream = bodyInit.stream();
+        const body = new PonyfillReadableStream(bodyStream);
+        return {
+            contentType: bodyInit.type,
+            contentLength: bodyInit.size,
+            body,
+        };
+    }
+    if (bodyInit instanceof URLSearchParams) {
+        const contentType = 'application/x-www-form-urlencoded;charset=UTF-8';
+        const body = new PonyfillReadableStream(stream.Readable.from(bodyInit.toString()));
+        return {
+            bodyType: BodyInitType.String,
+            contentType,
+            contentLength: null,
+            body,
+        };
+    }
+    if ('forEach' in bodyInit) {
+        const formData = new PonyfillFormData();
+        bodyInit.forEach((value, key) => {
+            formData.append(key, value);
+        });
+        const boundary = Math.random().toString(36).substr(2);
+        const contentType = `multipart/form-data; boundary=${boundary}`;
+        const body = formData.stream(boundary);
+        return {
+            contentType,
+            contentLength: null,
+            body,
+        };
+    }
     throw new Error('Unknown body type');
 }
 
@@ -620,6 +665,7 @@ function isRequest(input) {
 }
 class PonyfillRequest extends PonyfillBody {
     constructor(input, options) {
+        var _a;
         let url;
         let bodyInit = null;
         let requestInit;
@@ -646,7 +692,7 @@ class PonyfillRequest extends PonyfillBody {
         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) || true;
-        this.method = (requestInit === null || requestInit === void 0 ? void 0 : requestInit.method) || 'GET';
+        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';
@@ -752,9 +798,9 @@ function getResponseForFile(url$1) {
 }
 function getRequestFnForProtocol(protocol) {
     switch (protocol) {
-        case 'http':
+        case 'http:':
             return http.request;
-        case 'https':
+        case 'https:':
             return https.request;
     }
     throw new Error(`Unsupported protocol: ${protocol}`);
@@ -767,13 +813,39 @@ function fetchPonyfill(info, init) {
     const fetchRequest = info;
     return new Promise((resolve, reject) => {
         try {
-            const protocol = fetchRequest.url.split('://')[0];
-            if (protocol === 'file') {
-                const response = getResponseForFile(fetchRequest.url);
+            const url = new URL(fetchRequest.url, 'http://localhost');
+            if (url.protocol === 'data:') {
+                const [mimeType = 'text/plain', base64FlagOrText, base64String] = url.pathname.split(',');
+                if (base64FlagOrText === 'base64' && base64String) {
+                    const buffer = Buffer.from(base64String, 'base64');
+                    const response = new PonyfillResponse(buffer, {
+                        status: 200,
+                        statusText: 'OK',
+                        headers: {
+                            'content-type': mimeType,
+                        },
+                    });
+                    resolve(response);
+                    return;
+                }
+                if (base64FlagOrText) {
+                    const response = new PonyfillResponse(base64FlagOrText, {
+                        status: 200,
+                        statusText: 'OK',
+                        headers: {
+                            'content-type': mimeType,
+                        },
+                    });
+                    resolve(response);
+                    return;
+                }
+            }
+            if (url.protocol === 'file:') {
+                const response = getResponseForFile(url);
                 resolve(response);
                 return;
             }
-            const requestFn = getRequestFnForProtocol(protocol);
+            const requestFn = getRequestFnForProtocol(url.protocol);
             const nodeReadable = (fetchRequest.body != null
                 ? 'pipe' in fetchRequest.body
                     ? fetchRequest.body
@@ -782,10 +854,16 @@ function fetchPonyfill(info, init) {
             const nodeHeaders = getHeadersObj(fetchRequest.headers);
             const abortListener = function abortListener(event) {
                 nodeRequest.destroy();
-                reject(new PonyfillAbortError(event.detail));
+                const reason = event.detail;
+                if (reason instanceof Error) {
+                    reject(reason);
+                }
+                else {
+                    reject(new PonyfillAbortError(reason));
+                }
             };
             fetchRequest.signal.addEventListener('abort', abortListener);
-            const nodeRequest = requestFn(fetchRequest.url, {
+            const nodeRequest = requestFn(url, {
                 // signal: fetchRequest.signal will be added when v14 reaches EOL
                 method: fetchRequest.method,
                 headers: nodeHeaders,
@@ -799,7 +877,7 @@ function fetchPonyfill(info, init) {
                         return;
                     }
                     if (fetchRequest.redirect === 'follow') {
-                        const redirectedUrl = new URL(nodeResponse.headers.location, fetchRequest.url);
+                        const redirectedUrl = new URL(nodeResponse.headers.location, url);
                         const redirectResponse$ = fetchPonyfill(redirectedUrl, info);
                         resolve(redirectResponse$.then(redirectResponse => {
                             redirectResponse.redirected = true;

package/index.mjs

@@ -1,6 +1,6 @@
 import { request as request$1 } from 'http';
 import { request } from 'https';
-import { EventTarget, CustomEvent } from '@whatwg-node/events';
+import { EventTarget, CustomEvent as CustomEvent$1 } from '@whatwg-node/events';
 import { Blob } from 'buffer';
 import { Readable } from 'stream';
 import busboy from 'busboy';
@@ -10,7 +10,7 @@ import { createReadStream } from 'fs';
 // Will be removed after v14 reaches EOL
 class PonyfillAbortError extends Error {
     constructor(reason) {
-        super('The operation was aborted.', {
+        super('The operation was aborted' + reason || '', {
             cause: reason,
         });
         this.name = 'AbortError';
@@ -40,6 +40,14 @@ class PonyfillAbortSignal extends EventTarget {
         }
         this.addEventListener('abort', value);
     }
+    abort(reason) {
+        this.dispatchEvent(new CustomEvent('abort', { detail: reason }));
+    }
+    static timeout(milliseconds) {
+        const signal = new PonyfillAbortSignal();
+        setTimeout(() => signal.abort(`Operation timed out`), milliseconds);
+        return signal;
+    }
 }
 
 // Will be removed after v14 reaches EOL
@@ -48,7 +56,7 @@ class PonyfillAbortController {
         this.signal = new PonyfillAbortSignal();
     }
     abort(reason) {
-        this.signal.dispatchEvent(new CustomEvent('abort', { detail: reason }));
+        this.signal.dispatchEvent(new CustomEvent$1('abort', { detail: reason }));
     }
 }
 
@@ -297,6 +305,10 @@ class PonyfillFormData {
                         controller.enqueue(Buffer.from(`\r\n--${boundary}\r\n`));
                     }
                 }
+                else {
+                    controller.enqueue(Buffer.from(`\r\n--${boundary}--\r\n`));
+                    controller.close();
+                }
             },
         });
     }
@@ -534,6 +546,39 @@ function processBodyInit(bodyInit) {
             body,
         };
     }
+    if ('stream' in bodyInit) {
+        const bodyStream = bodyInit.stream();
+        const body = new PonyfillReadableStream(bodyStream);
+        return {
+            contentType: bodyInit.type,
+            contentLength: bodyInit.size,
+            body,
+        };
+    }
+    if (bodyInit instanceof URLSearchParams) {
+        const contentType = 'application/x-www-form-urlencoded;charset=UTF-8';
+        const body = new PonyfillReadableStream(Readable.from(bodyInit.toString()));
+        return {
+            bodyType: BodyInitType.String,
+            contentType,
+            contentLength: null,
+            body,
+        };
+    }
+    if ('forEach' in bodyInit) {
+        const formData = new PonyfillFormData();
+        bodyInit.forEach((value, key) => {
+            formData.append(key, value);
+        });
+        const boundary = Math.random().toString(36).substr(2);
+        const contentType = `multipart/form-data; boundary=${boundary}`;
+        const body = formData.stream(boundary);
+        return {
+            contentType,
+            contentLength: null,
+            body,
+        };
+    }
     throw new Error('Unknown body type');
 }
 
@@ -614,6 +659,7 @@ function isRequest(input) {
 }
 class PonyfillRequest extends PonyfillBody {
     constructor(input, options) {
+        var _a;
         let url;
         let bodyInit = null;
         let requestInit;
@@ -640,7 +686,7 @@ class PonyfillRequest extends PonyfillBody {
         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) || true;
-        this.method = (requestInit === null || requestInit === void 0 ? void 0 : requestInit.method) || 'GET';
+        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';
@@ -746,9 +792,9 @@ function getResponseForFile(url) {
 }
 function getRequestFnForProtocol(protocol) {
     switch (protocol) {
-        case 'http':
+        case 'http:':
             return request$1;
-        case 'https':
+        case 'https:':
             return request;
     }
     throw new Error(`Unsupported protocol: ${protocol}`);
@@ -761,13 +807,39 @@ function fetchPonyfill(info, init) {
     const fetchRequest = info;
     return new Promise((resolve, reject) => {
         try {
-            const protocol = fetchRequest.url.split('://')[0];
-            if (protocol === 'file') {
-                const response = getResponseForFile(fetchRequest.url);
+            const url = new URL(fetchRequest.url, 'http://localhost');
+            if (url.protocol === 'data:') {
+                const [mimeType = 'text/plain', base64FlagOrText, base64String] = url.pathname.split(',');
+                if (base64FlagOrText === 'base64' && base64String) {
+                    const buffer = Buffer.from(base64String, 'base64');
+                    const response = new PonyfillResponse(buffer, {
+                        status: 200,
+                        statusText: 'OK',
+                        headers: {
+                            'content-type': mimeType,
+                        },
+                    });
+                    resolve(response);
+                    return;
+                }
+                if (base64FlagOrText) {
+                    const response = new PonyfillResponse(base64FlagOrText, {
+                        status: 200,
+                        statusText: 'OK',
+                        headers: {
+                            'content-type': mimeType,
+                        },
+                    });
+                    resolve(response);
+                    return;
+                }
+            }
+            if (url.protocol === 'file:') {
+                const response = getResponseForFile(url);
                 resolve(response);
                 return;
             }
-            const requestFn = getRequestFnForProtocol(protocol);
+            const requestFn = getRequestFnForProtocol(url.protocol);
             const nodeReadable = (fetchRequest.body != null
                 ? 'pipe' in fetchRequest.body
                     ? fetchRequest.body
@@ -776,10 +848,16 @@ function fetchPonyfill(info, init) {
             const nodeHeaders = getHeadersObj(fetchRequest.headers);
             const abortListener = function abortListener(event) {
                 nodeRequest.destroy();
-                reject(new PonyfillAbortError(event.detail));
+                const reason = event.detail;
+                if (reason instanceof Error) {
+                    reject(reason);
+                }
+                else {
+                    reject(new PonyfillAbortError(reason));
+                }
             };
             fetchRequest.signal.addEventListener('abort', abortListener);
-            const nodeRequest = requestFn(fetchRequest.url, {
+            const nodeRequest = requestFn(url, {
                 // signal: fetchRequest.signal will be added when v14 reaches EOL
                 method: fetchRequest.method,
                 headers: nodeHeaders,
@@ -793,7 +871,7 @@ function fetchPonyfill(info, init) {
                         return;
                     }
                     if (fetchRequest.redirect === 'follow') {
-                        const redirectedUrl = new URL(nodeResponse.headers.location, fetchRequest.url);
+                        const redirectedUrl = new URL(nodeResponse.headers.location, url);
                         const redirectResponse$ = fetchPonyfill(redirectedUrl, info);
                         resolve(redirectResponse$.then(redirectResponse => {
                             redirectResponse.redirected = true;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@whatwg-node/node-fetch",
-  "version": "0.0.1-alpha-20230117084928-a052439",
+  "version": "0.0.1-alpha-20230117095738-14df726",
   "description": "Fetch API implementation for Node",
   "sideEffects": false,
   "peerDependencies": {