@whatwg-node/node-fetch 0.0.1-alpha-20221005124556-f602970 → 0.0.1-alpha-20221005131815-b0ce77a

package/AbortController.d.ts

@@ -1,4 +1,4 @@
-import { PonyfillAbortSignal } from "./AbortSignal";
+import { PonyfillAbortSignal } from './AbortSignal';
 export declare class PonyfillAbortController implements AbortController {
     signal: PonyfillAbortSignal;
     abort(reason?: any): void;

package/AbortError.d.ts

@@ -1,3 +1,4 @@
 export declare class PonyfillAbortError extends Error {
-    constructor();
+    constructor(reason?: any);
+    get reason(): unknown;
 }

package/AbortSignal.d.ts

@@ -1,3 +1,4 @@
+import { EventTarget } from '@whatwg-node/events';
 export declare class PonyfillAbortSignal extends EventTarget implements AbortSignal {
     aborted: boolean;
     _onabort: ((this: AbortSignal, ev: Event) => any) | null;

package/Blob.d.ts

@@ -1,5 +1,6 @@
-export declare const PonyfillBlob: {
-    new (blobParts?: BlobPart[] | undefined, options?: BlobPropertyBag | undefined): Blob;
-    prototype: Blob;
-};
-export declare type PonyfillBlob = Blob;
+/// <reference types="node" />
+import { Blob as NodeBlob } from 'buffer';
+export declare class PonyfillBlob extends NodeBlob implements Blob {
+    stream(): any;
+    slice(...args: any[]): any;
+}

package/Body.d.ts

@@ -1,8 +1,8 @@
 /// <reference types="node" />
 import { PonyfillBlob } from './Blob';
-import { Readable } from "stream";
-import { PonyfillFormData } from "./FormData";
-import { PonyfillReadableStream } from "./ReadableStream";
+import { Readable } from 'stream';
+import { PonyfillFormData } from './FormData';
+import { PonyfillReadableStream } from './ReadableStream';
 export declare type BodyPonyfillInit = XMLHttpRequestBodyInit | Readable | PonyfillReadableStream<Uint8Array>;
 export declare class BodyPonyfill implements Body {
     private bodyInit;

package/File.d.ts

@@ -1,4 +1,4 @@
-import { PonyfillBlob } from "./Blob";
+import { PonyfillBlob } from './Blob';
 export declare class PonyfillFile extends PonyfillBlob implements File {
     name: string;
     lastModified: number;

package/ReadableStream.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="node" />
-import { Readable } from "stream";
+import { Readable } from 'stream';
 export declare class PonyfillReadableStream<T> implements ReadableStream<T> {
     readable: Readable;
     constructor(underlyingSource?: UnderlyingSource<T> | Readable | ReadableStream<T> | PonyfillReadableStream<T>);
@@ -9,7 +9,7 @@ export declare class PonyfillReadableStream<T> implements ReadableStream<T> {
     [Symbol.asyncIterator](): AsyncIterableIterator<any>;
     tee(): [ReadableStream<T>, ReadableStream<T>];
     pipeTo(destination: WritableStream<T>): Promise<void>;
-    pipeThrough<T2>({ writable, readable }: {
+    pipeThrough<T2>({ writable, readable, }: {
         writable: WritableStream<T>;
         readable: ReadableStream<T2>;
     }): ReadableStream<T2>;

package/Request.d.ts

@@ -1,5 +1,5 @@
-import { BodyPonyfill, BodyPonyfillInit } from "./Body";
-import { PonyfillHeadersInit } from "./Headers";
+import { BodyPonyfill, BodyPonyfillInit } from './Body';
+import { PonyfillHeadersInit } from './Headers';
 export declare type RequestPonyfillInit = Omit<RequestInit, 'body' | 'headers'> & {
     body?: BodyPonyfillInit | null;
     headers?: PonyfillHeadersInit;

package/Response.d.ts

@@ -1,5 +1,5 @@
-import { BodyPonyfill, BodyPonyfillInit } from "./Body";
-import { PonyfillHeadersInit } from "./Headers";
+import { BodyPonyfill, BodyPonyfillInit } from './Body';
+import { PonyfillHeadersInit } from './Headers';
 export declare type ResponsePonyfilInit = Omit<ResponseInit, 'headers'> & {
     url?: string;
     redirected?: boolean;

package/fetch.d.ts

@@ -1,3 +1,3 @@
-import { PonyfillRequest, RequestPonyfillInit } from "./Request";
-import { PonyfillResponse } from "./Response";
+import { PonyfillRequest, RequestPonyfillInit } from './Request';
+import { PonyfillResponse } from './Response';
 export declare const fetchPonyfill: (info: string | PonyfillRequest | URL, init?: RequestPonyfillInit) => Promise<PonyfillResponse>;

package/index.js

@@ -4,17 +4,24 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 const http = require('http');
 const https = require('https');
+const events = require('@whatwg-node/events');
 const buffer = require('buffer');
 const stream = require('stream');
 
+// Will be removed after v14 reaches EOL
 class PonyfillAbortError extends Error {
-    constructor() {
-        super('The operation was aborted.');
+    constructor(reason) {
+        super('The operation was aborted.', {
+            cause: reason,
+        });
         this.name = 'AbortError';
     }
+    get reason() {
+        return this.cause;
+    }
 }
 
-class PonyfillAbortSignal extends EventTarget {
+class PonyfillAbortSignal extends events.EventTarget {
     constructor() {
         super(...arguments);
         this.aborted = false;
@@ -34,71 +41,13 @@ class PonyfillAbortSignal extends EventTarget {
     }
 }
 
+// Will be removed after v14 reaches EOL
 class PonyfillAbortController {
     constructor() {
         this.signal = new PonyfillAbortSignal();
     }
     abort(reason) {
-        this.signal.dispatchEvent(Object.assign(new Event('abort'), { reason }));
-    }
-}
-
-const PonyfillBlob = buffer.Blob;
-
-class PonyfillFile extends PonyfillBlob {
-    constructor(fileBits, name, options) {
-        super(fileBits, options);
-        this.name = name;
-        this.webkitRelativePath = '';
-        this.lastModified = (options === null || options === void 0 ? void 0 : options.lastModified) || Date.now();
-    }
-}
-
-class PonyfillFormData {
-    constructor() {
-        this.map = new Map();
-    }
-    append(name, value, fileName) {
-        let values = this.map.get(name);
-        if (!values) {
-            values = [];
-            this.map.set(name, values);
-        }
-        const entry = value instanceof PonyfillBlob ? this.getNormalizedFile(name, value, fileName) : value;
-        values.push(entry);
-    }
-    delete(name) {
-        this.map.delete(name);
-    }
-    get(name) {
-        const values = this.map.get(name);
-        return values ? values[0] : null;
-    }
-    getAll(name) {
-        return this.map.get(name) || [];
-    }
-    has(name) {
-        return this.map.has(name);
-    }
-    set(name, value, fileName) {
-        const entry = value instanceof PonyfillBlob ? this.getNormalizedFile(name, value, fileName) : value;
-        this.map.set(name, [entry]);
-    }
-    getNormalizedFile(name, blob, fileName) {
-        if (blob instanceof PonyfillFile) {
-            if (fileName == null) {
-                return new PonyfillFile([blob], name, { type: blob.type, lastModified: blob.lastModified });
-            }
-            return blob;
-        }
-        return new PonyfillFile([blob], fileName || name, { type: blob.type });
-    }
-    forEach(callback) {
-        for (const [key, values] of this.map) {
-            for (const value of values) {
-                callback(value, key, this);
-            }
-        }
+        this.signal.dispatchEvent(new events.CustomEvent('abort', { detail: reason }));
     }
 }
 
@@ -113,7 +62,7 @@ function createController(desiredSize, readable) {
         },
         error(error) {
             readable.destroy(error);
-        }
+        },
     };
 }
 class PonyfillReadableStream {
@@ -130,20 +79,23 @@ class PonyfillReadableStream {
             const reader = underlyingSource.getReader();
             this.readable = new stream.Readable({
                 read() {
-                    reader.read().then(({ value, done }) => {
+                    reader
+                        .read()
+                        .then(({ value, done }) => {
                         if (done) {
                             this.push(null);
                         }
                         else {
                             this.push(value);
                         }
-                    }).catch(err => {
+                    })
+                        .catch(err => {
                         this.destroy(err);
                     });
                 },
                 destroy(err, callback) {
                     reader.cancel(err).then(() => callback(err), callback);
-                }
+                },
             });
         }
         else {
@@ -165,7 +117,7 @@ class PonyfillReadableStream {
                     catch (err) {
                         callback(err);
                     }
-                }
+                },
             });
         }
     }
@@ -210,12 +162,87 @@ class PonyfillReadableStream {
         await writer.ready;
         return writer.close();
     }
-    pipeThrough({ writable, readable }) {
+    pipeThrough({ writable, readable, }) {
         this.pipeTo(writable);
         return readable;
     }
 }
 
+// Will be removed after v14 reaches EOL
+// Needed because v14 doesn't have .stream() implemented
+class PonyfillBlob extends buffer.Blob {
+    stream() {
+        return new PonyfillReadableStream({
+            start: async (controller) => {
+                const arrayBuffer = await this.arrayBuffer();
+                const buffer = Buffer.from(arrayBuffer);
+                controller.enqueue(buffer);
+                controller.close();
+            },
+        });
+    }
+    slice(...args) {
+        return super.slice(...args);
+    }
+}
+
+class PonyfillFile extends PonyfillBlob {
+    constructor(fileBits, name, options) {
+        super(fileBits, options);
+        this.name = name;
+        this.webkitRelativePath = '';
+        this.lastModified = (options === null || options === void 0 ? void 0 : options.lastModified) || Date.now();
+    }
+}
+
+class PonyfillFormData {
+    constructor() {
+        this.map = new Map();
+    }
+    append(name, value, fileName) {
+        let values = this.map.get(name);
+        if (!values) {
+            values = [];
+            this.map.set(name, values);
+        }
+        const entry = value instanceof PonyfillBlob ? this.getNormalizedFile(name, value, fileName) : value;
+        values.push(entry);
+    }
+    delete(name) {
+        this.map.delete(name);
+    }
+    get(name) {
+        const values = this.map.get(name);
+        return values ? values[0] : null;
+    }
+    getAll(name) {
+        return this.map.get(name) || [];
+    }
+    has(name) {
+        return this.map.has(name);
+    }
+    set(name, value, fileName) {
+        const entry = value instanceof PonyfillBlob ? this.getNormalizedFile(name, value, fileName) : value;
+        this.map.set(name, [entry]);
+    }
+    getNormalizedFile(name, blob, fileName) {
+        if (blob instanceof PonyfillFile) {
+            if (fileName == null) {
+                return new PonyfillFile([blob], name, { type: blob.type, lastModified: blob.lastModified });
+            }
+            return blob;
+        }
+        return new PonyfillFile([blob], fileName || name, { type: blob.type });
+    }
+    forEach(callback) {
+        for (const [key, values] of this.map) {
+            for (const value of values) {
+                callback(value, key, this);
+            }
+        }
+    }
+}
+
 var BodyInitType;
 (function (BodyInitType) {
     BodyInitType["ReadableStream"] = "ReadableStream";
@@ -290,7 +317,7 @@ class BodyPonyfill {
                             controller.enqueue(Buffer.from(`Content-Disposition: form-data; name="${key}"\r\n\r\n`));
                             controller.enqueue(Buffer.from(value));
                         }
-                        if (Number(i) === (entries.length - 1)) {
+                        if (Number(i) === entries.length - 1) {
                             controller.enqueue(Buffer.from(`\r\n--${boundary}--\r\n`));
                         }
                         else {
@@ -298,7 +325,7 @@ class BodyPonyfill {
                         }
                     }
                     controller.close();
-                }
+                },
             });
         }
         else if ('buffer' in this.bodyInit) {
@@ -528,7 +555,7 @@ class PonyfillResponse extends BodyPonyfill {
     static error() {
         const response = new PonyfillResponse(null, {
             status: 500,
-            statusText: 'Internal Server Error'
+            statusText: 'Internal Server Error',
         });
         return response;
     }
@@ -538,9 +565,9 @@ class PonyfillResponse extends BodyPonyfill {
         }
         return new PonyfillResponse(null, {
             headers: {
-                location: url
+                location: url,
             },
-            status
+            status,
         });
     }
 }
@@ -566,14 +593,15 @@ const fetchPonyfill = (info, init) => {
             const requestFn = fetchRequest.url.startsWith('https') ? https.request : http.request;
             const nodeReadable = fetchRequest.readable();
             const nodeHeaders = getHeadersObj(fetchRequest.headers);
-            const abortListener = function abortListener() {
-                reject(new PonyfillAbortError());
+            const abortListener = function abortListener(event) {
+                nodeRequest.destroy();
+                reject(new PonyfillAbortError(event.detail));
             };
             fetchRequest.signal.addEventListener('abort', abortListener);
             const nodeRequest = requestFn(fetchRequest.url, {
+                // signal: fetchRequest.signal will be added when v14 reaches EOL
                 method: fetchRequest.method,
                 headers: nodeHeaders,
-                signal: fetchRequest.signal,
             }, nodeResponse => {
                 if (nodeResponse.headers.location) {
                     if (fetchRequest.redirect === 'error') {
@@ -598,6 +626,7 @@ const fetchPonyfill = (info, init) => {
                     url: info.url,
                 }));
             });
+            nodeRequest.on('error', reject);
             if (nodeReadable) {
                 nodeReadable.pipe(nodeRequest);
             }

package/index.mjs

@@ -1,13 +1,20 @@
 import { request as request$1 } from 'http';
 import { request } from 'https';
+import { EventTarget, CustomEvent } from '@whatwg-node/events';
 import { Blob } from 'buffer';
 import { Readable } from 'stream';
 
+// Will be removed after v14 reaches EOL
 class PonyfillAbortError extends Error {
-    constructor() {
-        super('The operation was aborted.');
+    constructor(reason) {
+        super('The operation was aborted.', {
+            cause: reason,
+        });
         this.name = 'AbortError';
     }
+    get reason() {
+        return this.cause;
+    }
 }
 
 class PonyfillAbortSignal extends EventTarget {
@@ -30,71 +37,13 @@ class PonyfillAbortSignal extends EventTarget {
     }
 }
 
+// Will be removed after v14 reaches EOL
 class PonyfillAbortController {
     constructor() {
         this.signal = new PonyfillAbortSignal();
     }
     abort(reason) {
-        this.signal.dispatchEvent(Object.assign(new Event('abort'), { reason }));
-    }
-}
-
-const PonyfillBlob = Blob;
-
-class PonyfillFile extends PonyfillBlob {
-    constructor(fileBits, name, options) {
-        super(fileBits, options);
-        this.name = name;
-        this.webkitRelativePath = '';
-        this.lastModified = (options === null || options === void 0 ? void 0 : options.lastModified) || Date.now();
-    }
-}
-
-class PonyfillFormData {
-    constructor() {
-        this.map = new Map();
-    }
-    append(name, value, fileName) {
-        let values = this.map.get(name);
-        if (!values) {
-            values = [];
-            this.map.set(name, values);
-        }
-        const entry = value instanceof PonyfillBlob ? this.getNormalizedFile(name, value, fileName) : value;
-        values.push(entry);
-    }
-    delete(name) {
-        this.map.delete(name);
-    }
-    get(name) {
-        const values = this.map.get(name);
-        return values ? values[0] : null;
-    }
-    getAll(name) {
-        return this.map.get(name) || [];
-    }
-    has(name) {
-        return this.map.has(name);
-    }
-    set(name, value, fileName) {
-        const entry = value instanceof PonyfillBlob ? this.getNormalizedFile(name, value, fileName) : value;
-        this.map.set(name, [entry]);
-    }
-    getNormalizedFile(name, blob, fileName) {
-        if (blob instanceof PonyfillFile) {
-            if (fileName == null) {
-                return new PonyfillFile([blob], name, { type: blob.type, lastModified: blob.lastModified });
-            }
-            return blob;
-        }
-        return new PonyfillFile([blob], fileName || name, { type: blob.type });
-    }
-    forEach(callback) {
-        for (const [key, values] of this.map) {
-            for (const value of values) {
-                callback(value, key, this);
-            }
-        }
+        this.signal.dispatchEvent(new CustomEvent('abort', { detail: reason }));
     }
 }
 
@@ -109,7 +58,7 @@ function createController(desiredSize, readable) {
         },
         error(error) {
             readable.destroy(error);
-        }
+        },
     };
 }
 class PonyfillReadableStream {
@@ -126,20 +75,23 @@ class PonyfillReadableStream {
             const reader = underlyingSource.getReader();
             this.readable = new Readable({
                 read() {
-                    reader.read().then(({ value, done }) => {
+                    reader
+                        .read()
+                        .then(({ value, done }) => {
                         if (done) {
                             this.push(null);
                         }
                         else {
                             this.push(value);
                         }
-                    }).catch(err => {
+                    })
+                        .catch(err => {
                         this.destroy(err);
                     });
                 },
                 destroy(err, callback) {
                     reader.cancel(err).then(() => callback(err), callback);
-                }
+                },
             });
         }
         else {
@@ -161,7 +113,7 @@ class PonyfillReadableStream {
                     catch (err) {
                         callback(err);
                     }
-                }
+                },
             });
         }
     }
@@ -206,12 +158,87 @@ class PonyfillReadableStream {
         await writer.ready;
         return writer.close();
     }
-    pipeThrough({ writable, readable }) {
+    pipeThrough({ writable, readable, }) {
         this.pipeTo(writable);
         return readable;
     }
 }
 
+// Will be removed after v14 reaches EOL
+// Needed because v14 doesn't have .stream() implemented
+class PonyfillBlob extends Blob {
+    stream() {
+        return new PonyfillReadableStream({
+            start: async (controller) => {
+                const arrayBuffer = await this.arrayBuffer();
+                const buffer = Buffer.from(arrayBuffer);
+                controller.enqueue(buffer);
+                controller.close();
+            },
+        });
+    }
+    slice(...args) {
+        return super.slice(...args);
+    }
+}
+
+class PonyfillFile extends PonyfillBlob {
+    constructor(fileBits, name, options) {
+        super(fileBits, options);
+        this.name = name;
+        this.webkitRelativePath = '';
+        this.lastModified = (options === null || options === void 0 ? void 0 : options.lastModified) || Date.now();
+    }
+}
+
+class PonyfillFormData {
+    constructor() {
+        this.map = new Map();
+    }
+    append(name, value, fileName) {
+        let values = this.map.get(name);
+        if (!values) {
+            values = [];
+            this.map.set(name, values);
+        }
+        const entry = value instanceof PonyfillBlob ? this.getNormalizedFile(name, value, fileName) : value;
+        values.push(entry);
+    }
+    delete(name) {
+        this.map.delete(name);
+    }
+    get(name) {
+        const values = this.map.get(name);
+        return values ? values[0] : null;
+    }
+    getAll(name) {
+        return this.map.get(name) || [];
+    }
+    has(name) {
+        return this.map.has(name);
+    }
+    set(name, value, fileName) {
+        const entry = value instanceof PonyfillBlob ? this.getNormalizedFile(name, value, fileName) : value;
+        this.map.set(name, [entry]);
+    }
+    getNormalizedFile(name, blob, fileName) {
+        if (blob instanceof PonyfillFile) {
+            if (fileName == null) {
+                return new PonyfillFile([blob], name, { type: blob.type, lastModified: blob.lastModified });
+            }
+            return blob;
+        }
+        return new PonyfillFile([blob], fileName || name, { type: blob.type });
+    }
+    forEach(callback) {
+        for (const [key, values] of this.map) {
+            for (const value of values) {
+                callback(value, key, this);
+            }
+        }
+    }
+}
+
 var BodyInitType;
 (function (BodyInitType) {
     BodyInitType["ReadableStream"] = "ReadableStream";
@@ -286,7 +313,7 @@ class BodyPonyfill {
                             controller.enqueue(Buffer.from(`Content-Disposition: form-data; name="${key}"\r\n\r\n`));
                             controller.enqueue(Buffer.from(value));
                         }
-                        if (Number(i) === (entries.length - 1)) {
+                        if (Number(i) === entries.length - 1) {
                             controller.enqueue(Buffer.from(`\r\n--${boundary}--\r\n`));
                         }
                         else {
@@ -294,7 +321,7 @@ class BodyPonyfill {
                         }
                     }
                     controller.close();
-                }
+                },
             });
         }
         else if ('buffer' in this.bodyInit) {
@@ -524,7 +551,7 @@ class PonyfillResponse extends BodyPonyfill {
     static error() {
         const response = new PonyfillResponse(null, {
             status: 500,
-            statusText: 'Internal Server Error'
+            statusText: 'Internal Server Error',
         });
         return response;
     }
@@ -534,9 +561,9 @@ class PonyfillResponse extends BodyPonyfill {
         }
         return new PonyfillResponse(null, {
             headers: {
-                location: url
+                location: url,
             },
-            status
+            status,
         });
     }
 }
@@ -562,14 +589,15 @@ const fetchPonyfill = (info, init) => {
             const requestFn = fetchRequest.url.startsWith('https') ? request : request$1;
             const nodeReadable = fetchRequest.readable();
             const nodeHeaders = getHeadersObj(fetchRequest.headers);
-            const abortListener = function abortListener() {
-                reject(new PonyfillAbortError());
+            const abortListener = function abortListener(event) {
+                nodeRequest.destroy();
+                reject(new PonyfillAbortError(event.detail));
             };
             fetchRequest.signal.addEventListener('abort', abortListener);
             const nodeRequest = requestFn(fetchRequest.url, {
+                // signal: fetchRequest.signal will be added when v14 reaches EOL
                 method: fetchRequest.method,
                 headers: nodeHeaders,
-                signal: fetchRequest.signal,
             }, nodeResponse => {
                 if (nodeResponse.headers.location) {
                     if (fetchRequest.redirect === 'error') {
@@ -594,6 +622,7 @@ const fetchPonyfill = (info, init) => {
                     url: info.url,
                 }));
             });
+            nodeRequest.on('error', reject);
             if (nodeReadable) {
                 nodeReadable.pipe(nodeRequest);
             }

package/package.json

@@ -1,12 +1,13 @@
 {
   "name": "@whatwg-node/node-fetch",
-  "version": "0.0.1-alpha-20221005124556-f602970",
+  "version": "0.0.1-alpha-20221005131815-b0ce77a",
   "description": "Fetch API implementation for Node",
   "sideEffects": false,
   "peerDependencies": {
     "@types/node": "^18.0.6"
   },
   "dependencies": {
+    "@whatwg-node/events": "0.0.2",
     "tslib": "^2.3.1"
   },
   "repository": {