@whatwg-node/node-fetch 0.4.0-alpha-20230515125426-a472464 → 0.4.0-alpha-20230515132257-4514d91

package/cjs/AbortError.js

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PonyfillAbortError = void 0;
+class PonyfillAbortError extends Error {
+    constructor(reason) {
+        let message = 'The operation was aborted';
+        if (reason) {
+            message += ` reason: ${reason}`;
+        }
+        super(message, {
+            cause: reason,
+        });
+        this.name = 'AbortError';
+    }
+    get reason() {
+        return this.cause;
+    }
+}
+exports.PonyfillAbortError = PonyfillAbortError;

package/cjs/fetch.js

@@ -7,6 +7,7 @@ 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 Blob_js_1 = require("./Blob.js");
 const Request_js_1 = require("./Request.js");
 const Response_js_1 = require("./Response.js");
@@ -17,6 +18,26 @@ function getResponseForFile(url) {
     const readable = (0, fs_1.createReadStream)(path);
     return new Response_js_1.PonyfillResponse(readable);
 }
+function getResponseForDataUri(url) {
+    const [mimeType = 'text/plain', ...datas] = url.pathname.split(',');
+    const data = decodeURIComponent(datas.join(','));
+    if (mimeType.endsWith(BASE64_SUFFIX)) {
+        const buffer = Buffer.from(data, 'base64url');
+        const realMimeType = mimeType.slice(0, -BASE64_SUFFIX.length);
+        const file = new Blob_js_1.PonyfillBlob([buffer], { type: realMimeType });
+        return new Response_js_1.PonyfillResponse(file, {
+            status: 200,
+            statusText: 'OK',
+        });
+    }
+    return new Response_js_1.PonyfillResponse(data, {
+        status: 200,
+        statusText: 'OK',
+        headers: {
+            'content-type': mimeType,
+        },
+    });
+}
 function getRequestFnForProtocol(protocol) {
     switch (protocol) {
         case 'http:':
@@ -34,29 +55,11 @@ function fetchPonyfill(info, init) {
     }
     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 [mimeType = 'text/plain', ...datas] = url.pathname.split(',');
-                const data = decodeURIComponent(datas.join(','));
-                if (mimeType.endsWith(BASE64_SUFFIX)) {
-                    const buffer = Buffer.from(data, 'base64url');
-                    const realMimeType = mimeType.slice(0, -BASE64_SUFFIX.length);
-                    const file = new Blob_js_1.PonyfillBlob([buffer], { type: realMimeType });
-                    const response = new Response_js_1.PonyfillResponse(file, {
-                        status: 200,
-                        statusText: 'OK',
-                    });
-                    resolve(response);
-                    return;
-                }
-                const response = new Response_js_1.PonyfillResponse(data, {
-                    status: 200,
-                    statusText: 'OK',
-                    headers: {
-                        'content-type': mimeType,
-                    },
-                });
+                const response = getResponseForDataUri(url);
                 resolve(response);
                 return;
             }
@@ -74,11 +77,20 @@ function fetchPonyfill(info, init) {
             const headersSerializer = fetchRequest.headersSerializer || utils_js_1.getHeadersObj;
             const nodeHeaders = headersSerializer(fetchRequest.headers);
             const nodeRequest = requestFn(fetchRequest.url, {
-                // signal: fetchRequest.signal will be added when v14 reaches EOL
                 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'];

package/esm/AbortError.js

@@ -0,0 +1,15 @@
+export class PonyfillAbortError extends Error {
+    constructor(reason) {
+        let message = 'The operation was aborted';
+        if (reason) {
+            message += ` reason: ${reason}`;
+        }
+        super(message, {
+            cause: reason,
+        });
+        this.name = 'AbortError';
+    }
+    get reason() {
+        return this.cause;
+    }
+}

package/esm/fetch.js

@@ -4,6 +4,7 @@ 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 { PonyfillBlob } from './Blob.js';
 import { PonyfillRequest } from './Request.js';
 import { PonyfillResponse } from './Response.js';
@@ -14,6 +15,26 @@ function getResponseForFile(url) {
     const readable = createReadStream(path);
     return new PonyfillResponse(readable);
 }
+function getResponseForDataUri(url) {
+    const [mimeType = 'text/plain', ...datas] = url.pathname.split(',');
+    const data = decodeURIComponent(datas.join(','));
+    if (mimeType.endsWith(BASE64_SUFFIX)) {
+        const buffer = Buffer.from(data, 'base64url');
+        const realMimeType = mimeType.slice(0, -BASE64_SUFFIX.length);
+        const file = new PonyfillBlob([buffer], { type: realMimeType });
+        return new PonyfillResponse(file, {
+            status: 200,
+            statusText: 'OK',
+        });
+    }
+    return new PonyfillResponse(data, {
+        status: 200,
+        statusText: 'OK',
+        headers: {
+            'content-type': mimeType,
+        },
+    });
+}
 function getRequestFnForProtocol(protocol) {
     switch (protocol) {
         case 'http:':
@@ -31,29 +52,11 @@ export function fetchPonyfill(info, init) {
     }
     const fetchRequest = info;
     return new Promise((resolve, reject) => {
+        var _a;
         try {
             const url = new PonyfillURL(fetchRequest.url, 'http://localhost');
             if (url.protocol === 'data:') {
-                const [mimeType = 'text/plain', ...datas] = url.pathname.split(',');
-                const data = decodeURIComponent(datas.join(','));
-                if (mimeType.endsWith(BASE64_SUFFIX)) {
-                    const buffer = Buffer.from(data, 'base64url');
-                    const realMimeType = mimeType.slice(0, -BASE64_SUFFIX.length);
-                    const file = new PonyfillBlob([buffer], { type: realMimeType });
-                    const response = new PonyfillResponse(file, {
-                        status: 200,
-                        statusText: 'OK',
-                    });
-                    resolve(response);
-                    return;
-                }
-                const response = new PonyfillResponse(data, {
-                    status: 200,
-                    statusText: 'OK',
-                    headers: {
-                        'content-type': mimeType,
-                    },
-                });
+                const response = getResponseForDataUri(url);
                 resolve(response);
                 return;
             }
@@ -71,11 +74,20 @@ export function fetchPonyfill(info, init) {
             const headersSerializer = fetchRequest.headersSerializer || getHeadersObj;
             const nodeHeaders = headersSerializer(fetchRequest.headers);
             const nodeRequest = requestFn(fetchRequest.url, {
-                // signal: fetchRequest.signal will be added when v14 reaches EOL
                 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'];

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@whatwg-node/node-fetch",
-  "version": "0.4.0-alpha-20230515125426-a472464",
+  "version": "0.4.0-alpha-20230515132257-4514d91",
   "description": "Fetch API implementation for Node",
   "sideEffects": false,
   "dependencies": {
-    "@whatwg-node/events": "0.1.0-alpha-20230515125426-a472464",
+    "@whatwg-node/events": "0.1.0-alpha-20230515132257-4514d91",
     "busboy": "^1.6.0",
     "fast-querystring": "^1.1.1",
     "fast-url-parser": "^1.1.3",

package/typings/AbortError.d.cts

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

package/typings/AbortError.d.ts

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