@whatwg-node/node-fetch 0.4.8 → 0.4.9-rc-20230718150451-79c2199

package/cjs/Blob.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PonyfillBlob = void 0;
+/* eslint-disable @typescript-eslint/no-unsafe-declaration-merging */
 const ReadableStream_js_1 = require("./ReadableStream.js");
 const utils_js_1 = require("./utils.js");
 function getBlobPartAsBuffer(blobPart) {

package/cjs/Headers.js

@@ -24,7 +24,7 @@ class PonyfillHeaders {
         }
         const normalized = key.toLowerCase();
         if (Array.isArray(this.headersInit)) {
-            return this.headersInit.find(header => header[0] === normalized)?.[1] || null;
+            return this.headersInit.find(header => header[0].toLowerCase() === normalized)?.[1] || null;
         }
         else if (isHeadersLike(this.headersInit)) {
             return this.headersInit.get(normalized);

package/cjs/fetchCurl.js

@@ -1,82 +1,92 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.fetchCurl = void 0;
-/* eslint-disable @typescript-eslint/no-this-alias */
-const stream_1 = require("stream");
-const Headers_js_1 = require("./Headers.js");
+const node_stream_1 = require("node:stream");
 const Response_js_1 = require("./Response.js");
 const utils_js_1 = require("./utils.js");
-async function fetchCurl(fetchRequest) {
+function fetchCurl(fetchRequest) {
+    const { Curl, CurlCode, CurlFeature, CurlPause, CurlProgressFunc } = globalThis['libcurl'];
+    const curlHandle = new Curl();
+    if (fetchRequest['_signal']) {
+        fetchRequest['_signal'].onabort = () => {
+            curlHandle.pause(CurlPause.Recv);
+        };
+    }
+    curlHandle.enable(CurlFeature.NoDataParsing);
+    curlHandle.setOpt('URL', fetchRequest.url);
+    curlHandle.setOpt('SSL_VERIFYPEER', false);
+    curlHandle.enable(CurlFeature.StreamResponse);
+    curlHandle.setStreamProgressCallback(function () {
+        return fetchRequest['_signal']?.aborted
+            ? process.env.DEBUG
+                ? CurlProgressFunc.Continue
+                : 1
+            : 0;
+    });
     const nodeReadable = (fetchRequest.body != null
         ? 'pipe' in fetchRequest.body
             ? fetchRequest.body
-            : stream_1.Readable.from(fetchRequest.body)
+            : node_stream_1.Readable.from(fetchRequest.body)
         : null);
+    if (nodeReadable) {
+        curlHandle.setOpt('UPLOAD', true);
+        curlHandle.setUploadStream(nodeReadable);
+    }
+    if (process.env.DEBUG) {
+        curlHandle.setOpt('VERBOSE', true);
+    }
+    curlHandle.setOpt('TRANSFER_ENCODING', false);
+    curlHandle.setOpt('HTTP_TRANSFER_DECODING', true);
+    curlHandle.setOpt('FOLLOWLOCATION', fetchRequest.redirect === 'follow');
+    curlHandle.setOpt('MAXREDIRS', 20);
+    curlHandle.setOpt('ACCEPT_ENCODING', '');
+    curlHandle.setOpt('CUSTOMREQUEST', fetchRequest.method);
     const headersSerializer = fetchRequest.headersSerializer || utils_js_1.defaultHeadersSerializer;
     let size;
-    const curlyHeaders = headersSerializer(fetchRequest.headers, value => {
+    const curlHeaders = headersSerializer(fetchRequest.headers, value => {
         size = Number(value);
     });
-    let easyNativeBinding;
-    const curlyOptions = {
-        sslVerifyPeer: false,
-        // we want the unparsed binary response to be returned as a stream to us
-        curlyStreamResponse: true,
-        curlyResponseBodyParser: false,
-        curlyProgressCallback() {
-            if (easyNativeBinding == null) {
-                easyNativeBinding = this;
-            }
-            return fetchRequest['_signal']?.aborted ? 1 : 0;
-        },
-        upload: nodeReadable != null,
-        transferEncoding: false,
-        httpTransferDecoding: true,
-        followLocation: fetchRequest.redirect === 'follow',
-        maxRedirs: 20,
-        acceptEncoding: '',
-        curlyStreamUpload: nodeReadable,
-        // this will just make libcurl use their own progress function (which is pretty neat)
-        // curlyProgressCallback() { return CurlProgressFunc.Continue },
-        // verbose: true,
-        httpHeader: curlyHeaders,
-        customRequest: fetchRequest.method,
-    };
     if (size != null) {
-        curlyOptions.inFileSize = size;
+        curlHandle.setOpt('INFILESIZE', size);
     }
-    const { curly, CurlCode, CurlPause } = globalThis['libcurl'];
-    if (fetchRequest['_signal']) {
-        fetchRequest['_signal'].onabort = () => {
-            if (easyNativeBinding != null) {
-                easyNativeBinding.pause(CurlPause.Recv);
+    curlHandle.setOpt('HTTPHEADER', curlHeaders);
+    curlHandle.enable(CurlFeature.NoHeaderParsing);
+    return new Promise(function promiseResolver(resolve, reject) {
+        curlHandle.once('end', function endListener() {
+            curlHandle.close();
+        });
+        curlHandle.once('error', function errorListener(error) {
+            if (error.isCurlError && error.code === CurlCode.CURLE_ABORTED_BY_CALLBACK) {
+                // this is expected
             }
-        };
-    }
-    const curlyResult = await curly(fetchRequest.url, curlyOptions);
-    const responseHeaders = new Headers_js_1.PonyfillHeaders();
-    curlyResult.headers.forEach(headerInfo => {
-        for (const key in headerInfo) {
-            if (key === 'location' || (key === 'Location' && fetchRequest.redirect === 'error')) {
-                throw new Error('redirects are not allowed');
+            else {
+                // this is unexpected
+                reject(error);
             }
-            if (key !== 'result') {
-                responseHeaders.append(key, headerInfo[key]);
-            }
-        }
-    });
-    curlyResult.data.on('error', (err) => {
-        if (err.isCurlError && err.code === CurlCode.CURLE_ABORTED_BY_CALLBACK) {
-            // this is expected
-        }
-        else {
-            throw err;
-        }
-    });
-    return new Response_js_1.PonyfillResponse(curlyResult.data, {
-        status: curlyResult.statusCode,
-        headers: responseHeaders,
-        url: fetchRequest.url,
+            curlHandle.close();
+        });
+        curlHandle.once('stream', function streamListener(stream, status, headersBuf) {
+            const headersFlat = headersBuf
+                .toString('utf8')
+                .split(/\r?\n|\r/g)
+                .filter(headerFilter => {
+                if (headerFilter && !headerFilter.startsWith('HTTP/')) {
+                    if (fetchRequest.redirect === 'error' &&
+                        (headerFilter.includes('location') || headerFilter.includes('Location'))) {
+                        reject(new Error('redirect is not allowed'));
+                    }
+                    return true;
+                }
+                return false;
+            });
+            const headersInit = headersFlat.map(headerFlat => headerFlat.split(/:\s(.+)/).slice(0, 2));
+            resolve(new Response_js_1.PonyfillResponse(stream, {
+                status,
+                headers: headersInit,
+                url: fetchRequest.url,
+            }));
+        });
+        curlHandle.perform();
     });
 }
 exports.fetchCurl = fetchCurl;

package/esm/Blob.js

@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-unsafe-declaration-merging */
 import { PonyfillReadableStream } from './ReadableStream.js';
 import { uint8ArrayToArrayBuffer } from './utils.js';
 function getBlobPartAsBuffer(blobPart) {

package/esm/Headers.js

@@ -20,7 +20,7 @@ export class PonyfillHeaders {
         }
         const normalized = key.toLowerCase();
         if (Array.isArray(this.headersInit)) {
-            return this.headersInit.find(header => header[0] === normalized)?.[1] || null;
+            return this.headersInit.find(header => header[0].toLowerCase() === normalized)?.[1] || null;
         }
         else if (isHeadersLike(this.headersInit)) {
             return this.headersInit.get(normalized);

package/esm/fetchCurl.js

@@ -1,78 +1,88 @@
-/* eslint-disable @typescript-eslint/no-this-alias */
-import { Readable } from 'stream';
-import { PonyfillHeaders } from './Headers.js';
+import { Readable } from 'node:stream';
 import { PonyfillResponse } from './Response.js';
 import { defaultHeadersSerializer } from './utils.js';
-export async function fetchCurl(fetchRequest) {
+export function fetchCurl(fetchRequest) {
+    const { Curl, CurlCode, CurlFeature, CurlPause, CurlProgressFunc } = globalThis['libcurl'];
+    const curlHandle = new Curl();
+    if (fetchRequest['_signal']) {
+        fetchRequest['_signal'].onabort = () => {
+            curlHandle.pause(CurlPause.Recv);
+        };
+    }
+    curlHandle.enable(CurlFeature.NoDataParsing);
+    curlHandle.setOpt('URL', fetchRequest.url);
+    curlHandle.setOpt('SSL_VERIFYPEER', false);
+    curlHandle.enable(CurlFeature.StreamResponse);
+    curlHandle.setStreamProgressCallback(function () {
+        return fetchRequest['_signal']?.aborted
+            ? process.env.DEBUG
+                ? CurlProgressFunc.Continue
+                : 1
+            : 0;
+    });
     const nodeReadable = (fetchRequest.body != null
         ? 'pipe' in fetchRequest.body
             ? fetchRequest.body
             : Readable.from(fetchRequest.body)
         : null);
+    if (nodeReadable) {
+        curlHandle.setOpt('UPLOAD', true);
+        curlHandle.setUploadStream(nodeReadable);
+    }
+    if (process.env.DEBUG) {
+        curlHandle.setOpt('VERBOSE', true);
+    }
+    curlHandle.setOpt('TRANSFER_ENCODING', false);
+    curlHandle.setOpt('HTTP_TRANSFER_DECODING', true);
+    curlHandle.setOpt('FOLLOWLOCATION', fetchRequest.redirect === 'follow');
+    curlHandle.setOpt('MAXREDIRS', 20);
+    curlHandle.setOpt('ACCEPT_ENCODING', '');
+    curlHandle.setOpt('CUSTOMREQUEST', fetchRequest.method);
     const headersSerializer = fetchRequest.headersSerializer || defaultHeadersSerializer;
     let size;
-    const curlyHeaders = headersSerializer(fetchRequest.headers, value => {
+    const curlHeaders = headersSerializer(fetchRequest.headers, value => {
         size = Number(value);
     });
-    let easyNativeBinding;
-    const curlyOptions = {
-        sslVerifyPeer: false,
-        // we want the unparsed binary response to be returned as a stream to us
-        curlyStreamResponse: true,
-        curlyResponseBodyParser: false,
-        curlyProgressCallback() {
-            if (easyNativeBinding == null) {
-                easyNativeBinding = this;
-            }
-            return fetchRequest['_signal']?.aborted ? 1 : 0;
-        },
-        upload: nodeReadable != null,
-        transferEncoding: false,
-        httpTransferDecoding: true,
-        followLocation: fetchRequest.redirect === 'follow',
-        maxRedirs: 20,
-        acceptEncoding: '',
-        curlyStreamUpload: nodeReadable,
-        // this will just make libcurl use their own progress function (which is pretty neat)
-        // curlyProgressCallback() { return CurlProgressFunc.Continue },
-        // verbose: true,
-        httpHeader: curlyHeaders,
-        customRequest: fetchRequest.method,
-    };
     if (size != null) {
-        curlyOptions.inFileSize = size;
+        curlHandle.setOpt('INFILESIZE', size);
     }
-    const { curly, CurlCode, CurlPause } = globalThis['libcurl'];
-    if (fetchRequest['_signal']) {
-        fetchRequest['_signal'].onabort = () => {
-            if (easyNativeBinding != null) {
-                easyNativeBinding.pause(CurlPause.Recv);
+    curlHandle.setOpt('HTTPHEADER', curlHeaders);
+    curlHandle.enable(CurlFeature.NoHeaderParsing);
+    return new Promise(function promiseResolver(resolve, reject) {
+        curlHandle.once('end', function endListener() {
+            curlHandle.close();
+        });
+        curlHandle.once('error', function errorListener(error) {
+            if (error.isCurlError && error.code === CurlCode.CURLE_ABORTED_BY_CALLBACK) {
+                // this is expected
             }
-        };
-    }
-    const curlyResult = await curly(fetchRequest.url, curlyOptions);
-    const responseHeaders = new PonyfillHeaders();
-    curlyResult.headers.forEach(headerInfo => {
-        for (const key in headerInfo) {
-            if (key === 'location' || (key === 'Location' && fetchRequest.redirect === 'error')) {
-                throw new Error('redirects are not allowed');
+            else {
+                // this is unexpected
+                reject(error);
             }
-            if (key !== 'result') {
-                responseHeaders.append(key, headerInfo[key]);
-            }
-        }
-    });
-    curlyResult.data.on('error', (err) => {
-        if (err.isCurlError && err.code === CurlCode.CURLE_ABORTED_BY_CALLBACK) {
-            // this is expected
-        }
-        else {
-            throw err;
-        }
-    });
-    return new PonyfillResponse(curlyResult.data, {
-        status: curlyResult.statusCode,
-        headers: responseHeaders,
-        url: fetchRequest.url,
+            curlHandle.close();
+        });
+        curlHandle.once('stream', function streamListener(stream, status, headersBuf) {
+            const headersFlat = headersBuf
+                .toString('utf8')
+                .split(/\r?\n|\r/g)
+                .filter(headerFilter => {
+                if (headerFilter && !headerFilter.startsWith('HTTP/')) {
+                    if (fetchRequest.redirect === 'error' &&
+                        (headerFilter.includes('location') || headerFilter.includes('Location'))) {
+                        reject(new Error('redirect is not allowed'));
+                    }
+                    return true;
+                }
+                return false;
+            });
+            const headersInit = headersFlat.map(headerFlat => headerFlat.split(/:\s(.+)/).slice(0, 2));
+            resolve(new PonyfillResponse(stream, {
+                status,
+                headers: headersInit,
+                url: fetchRequest.url,
+            }));
+        });
+        curlHandle.perform();
     });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@whatwg-node/node-fetch",
-  "version": "0.4.8",
+  "version": "0.4.9-rc-20230718150451-79c2199",
   "description": "Fetch API implementation for Node",
   "sideEffects": false,
   "dependencies": {