@whatwg-node/node-fetch 0.5.0-alpha-20230531142055-c567621 → 0.5.0-alpha-20230531143520-481e7fa

package/cjs/Request.js

@@ -41,7 +41,7 @@ class PonyfillRequest extends Body_js_1.PonyfillBody {
         this.referrer = requestInit?.referrer || 'about:client';
         this.referrerPolicy = requestInit?.referrerPolicy || 'no-referrer';
         this.signal = requestInit?.signal || new AbortController().signal;
-        this.headersSerializer = requestInit?.headersSerializer || utils_js_1.getHeadersObj;
+        this.headersSerializer = requestInit?.headersSerializer || utils_js_1.defaultHeadersSerializer;
         this.url = url || '';
         const contentTypeInHeaders = this.headers.get('content-type');
         if (!contentTypeInHeaders) {

package/cjs/fetch.js

@@ -24,15 +24,16 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.fetchPonyfill = void 0;
+/* eslint-disable @typescript-eslint/no-this-alias */
 const fs_1 = require("fs");
 const stream_1 = require("stream");
 const url_1 = require("url");
-const node_libcurl_1 = require("node-libcurl");
 const Blob_js_1 = require("./Blob.js");
 const Headers_js_1 = require("./Headers.js");
 const Request_js_1 = require("./Request.js");
 const Response_js_1 = require("./Response.js");
 const URL_js_1 = require("./URL.js");
+const utils_js_1 = require("./utils.js");
 function getResponseForFile(url) {
     const path = (0, url_1.fileURLToPath)(url);
     const readable = (0, fs_1.createReadStream)(path);
@@ -79,20 +80,12 @@ async function fetchPonyfill(info, init) {
             ? fetchRequest.body
             : stream_1.Readable.from(fetchRequest.body)
         : null);
-    const curlyHeaders = [];
+    const headersSerializer = fetchRequest.headersSerializer || utils_js_1.defaultHeadersSerializer;
     let size;
-    fetchRequest.headers.forEach((value, key) => {
-        curlyHeaders.push(`${key}: ${value}`);
-        if (key === 'content-length') {
-            size = Number(value);
-        }
+    const curlyHeaders = headersSerializer(fetchRequest.headers, value => {
+        size = Number(value);
     });
     let easyNativeBinding;
-    fetchRequest.signal.onabort = () => {
-        if (easyNativeBinding != null) {
-            easyNativeBinding.pause(node_libcurl_1.CurlPause.Recv);
-        }
-    };
     const curlyOptions = {
         // we want the unparsed binary response to be returned as a stream to us
         curlyStreamResponse: true,
@@ -119,7 +112,12 @@ async function fetchPonyfill(info, init) {
     if (size != null) {
         curlyOptions.inFileSize = size;
     }
-    const { curly, CurlCode } = await Promise.resolve().then(() => __importStar(require('node-libcurl')));
+    const { curly, CurlCode, CurlPause } = await Promise.resolve().then(() => __importStar(require('node-libcurl')));
+    fetchRequest.signal.onabort = () => {
+        if (easyNativeBinding != null) {
+            easyNativeBinding.pause(CurlPause.Recv);
+        }
+    };
     const curlyResult = await curly(fetchRequest.url, curlyOptions);
     const responseHeaders = new Headers_js_1.PonyfillHeaders();
     curlyResult.headers.forEach(headerInfo => {

package/cjs/utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.uint8ArrayToArrayBuffer = exports.getHeadersObj = void 0;
+exports.defaultHeadersSerializer = exports.uint8ArrayToArrayBuffer = exports.getHeadersObj = void 0;
 function getHeadersObj(headers) {
     if (headers == null || !('forEach' in headers)) {
         return headers;
@@ -16,3 +16,14 @@ function uint8ArrayToArrayBuffer(uint8array) {
     return uint8array.buffer.slice(uint8array.byteOffset, uint8array.byteOffset + uint8array.byteLength);
 }
 exports.uint8ArrayToArrayBuffer = uint8ArrayToArrayBuffer;
+function defaultHeadersSerializer(headers, onContentLength) {
+    const headerArray = [];
+    headers.forEach((value, key) => {
+        if (onContentLength && key === 'content-length') {
+            onContentLength(value);
+        }
+        headerArray.push(`${key}: ${value}`);
+    });
+    return headerArray;
+}
+exports.defaultHeadersSerializer = defaultHeadersSerializer;

package/esm/Request.js

@@ -1,6 +1,6 @@
 import { PonyfillBody } from './Body.js';
 import { PonyfillHeaders } from './Headers.js';
-import { getHeadersObj } from './utils.js';
+import { defaultHeadersSerializer } from './utils.js';
 function isRequest(input) {
     return input[Symbol.toStringTag] === 'Request';
 }
@@ -38,7 +38,7 @@ export class PonyfillRequest extends PonyfillBody {
         this.referrer = requestInit?.referrer || 'about:client';
         this.referrerPolicy = requestInit?.referrerPolicy || 'no-referrer';
         this.signal = requestInit?.signal || new AbortController().signal;
-        this.headersSerializer = requestInit?.headersSerializer || getHeadersObj;
+        this.headersSerializer = requestInit?.headersSerializer || defaultHeadersSerializer;
         this.url = url || '';
         const contentTypeInHeaders = this.headers.get('content-type');
         if (!contentTypeInHeaders) {

package/esm/fetch.js

@@ -1,12 +1,13 @@
+/* eslint-disable @typescript-eslint/no-this-alias */
 import { createReadStream } from 'fs';
 import { Readable } from 'stream';
 import { fileURLToPath } from 'url';
-import { CurlPause } from 'node-libcurl';
 import { PonyfillBlob } from './Blob.js';
 import { PonyfillHeaders } from './Headers.js';
 import { PonyfillRequest } from './Request.js';
 import { PonyfillResponse } from './Response.js';
 import { PonyfillURL } from './URL.js';
+import { defaultHeadersSerializer } from './utils.js';
 function getResponseForFile(url) {
     const path = fileURLToPath(url);
     const readable = createReadStream(path);
@@ -53,20 +54,12 @@ export async function fetchPonyfill(info, init) {
             ? fetchRequest.body
             : Readable.from(fetchRequest.body)
         : null);
-    const curlyHeaders = [];
+    const headersSerializer = fetchRequest.headersSerializer || defaultHeadersSerializer;
     let size;
-    fetchRequest.headers.forEach((value, key) => {
-        curlyHeaders.push(`${key}: ${value}`);
-        if (key === 'content-length') {
-            size = Number(value);
-        }
+    const curlyHeaders = headersSerializer(fetchRequest.headers, value => {
+        size = Number(value);
     });
     let easyNativeBinding;
-    fetchRequest.signal.onabort = () => {
-        if (easyNativeBinding != null) {
-            easyNativeBinding.pause(CurlPause.Recv);
-        }
-    };
     const curlyOptions = {
         // we want the unparsed binary response to be returned as a stream to us
         curlyStreamResponse: true,
@@ -93,7 +86,12 @@ export async function fetchPonyfill(info, init) {
     if (size != null) {
         curlyOptions.inFileSize = size;
     }
-    const { curly, CurlCode } = await import('node-libcurl');
+    const { curly, CurlCode, CurlPause } = await import('node-libcurl');
+    fetchRequest.signal.onabort = () => {
+        if (easyNativeBinding != null) {
+            easyNativeBinding.pause(CurlPause.Recv);
+        }
+    };
     const curlyResult = await curly(fetchRequest.url, curlyOptions);
     const responseHeaders = new PonyfillHeaders();
     curlyResult.headers.forEach(headerInfo => {

package/esm/utils.js

@@ -11,3 +11,13 @@ export function getHeadersObj(headers) {
 export function uint8ArrayToArrayBuffer(uint8array) {
     return uint8array.buffer.slice(uint8array.byteOffset, uint8array.byteOffset + uint8array.byteLength);
 }
+export function defaultHeadersSerializer(headers, onContentLength) {
+    const headerArray = [];
+    headers.forEach((value, key) => {
+        if (onContentLength && key === 'content-length') {
+            onContentLength(value);
+        }
+        headerArray.push(`${key}: ${value}`);
+    });
+    return headerArray;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@whatwg-node/node-fetch",
-  "version": "0.5.0-alpha-20230531142055-c567621",
+  "version": "0.5.0-alpha-20230531143520-481e7fa",
   "description": "Fetch API implementation for Node",
   "sideEffects": false,
   "dependencies": {

package/typings/Request.d.cts

@@ -5,7 +5,7 @@ export type RequestPonyfillInit = PonyfillBodyOptions & Omit<RequestInit, 'body'
     headers?: PonyfillHeadersInit;
     headersSerializer?: HeadersSerializer;
 };
-type HeadersSerializer = (headers: Headers) => Record<string, string>;
+type HeadersSerializer = (headers: Headers, onContentLength?: (contentLength: string) => void) => string[];
 export declare class PonyfillRequest<TJSON = any> extends PonyfillBody<TJSON> implements Request {
     constructor(input: RequestInfo | URL, options?: RequestPonyfillInit);
     headersSerializer: HeadersSerializer;

package/typings/Request.d.ts

@@ -5,7 +5,7 @@ export type RequestPonyfillInit = PonyfillBodyOptions & Omit<RequestInit, 'body'
     headers?: PonyfillHeadersInit;
     headersSerializer?: HeadersSerializer;
 };
-type HeadersSerializer = (headers: Headers) => Record<string, string>;
+type HeadersSerializer = (headers: Headers, onContentLength?: (contentLength: string) => void) => string[];
 export declare class PonyfillRequest<TJSON = any> extends PonyfillBody<TJSON> implements Request {
     constructor(input: RequestInfo | URL, options?: RequestPonyfillInit);
     headersSerializer: HeadersSerializer;

package/typings/utils.d.cts

@@ -1,2 +1,3 @@
 export declare function getHeadersObj(headers: Headers): Record<string, string>;
 export declare function uint8ArrayToArrayBuffer(uint8array: Uint8Array): ArrayBuffer;
+export declare function defaultHeadersSerializer(headers: Headers, onContentLength?: (value: string) => void): string[];

package/typings/utils.d.ts

@@ -1,2 +1,3 @@
 export declare function getHeadersObj(headers: Headers): Record<string, string>;
 export declare function uint8ArrayToArrayBuffer(uint8array: Uint8Array): ArrayBuffer;
+export declare function defaultHeadersSerializer(headers: Headers, onContentLength?: (value: string) => void): string[];