@whatwg-node/node-fetch 0.5.0-alpha-20230531142534-b373f43 → 0.5.0-alpha-20230622145940-8d0fb21

package/cjs/Body.js

@@ -232,17 +232,31 @@ function processBodyInit(bodyInit) {
         };
     }
     if (typeof bodyInit === 'string') {
-        const buffer = Buffer.from(bodyInit, 'utf-8');
+        const buffer = Buffer.from(bodyInit);
+        const contentLength = buffer.byteLength;
         return {
             bodyType: BodyInitType.String,
             contentType: 'text/plain;charset=UTF-8',
-            contentLength: buffer.byteLength,
+            contentLength,
             bodyFactory() {
                 const readable = stream_1.Readable.from(buffer);
                 return new ReadableStream_js_1.PonyfillReadableStream(readable);
             },
         };
     }
+    if (bodyInit instanceof Buffer) {
+        const contentLength = bodyInit.byteLength;
+        return {
+            bodyType: BodyInitType.Buffer,
+            contentLength,
+            contentType: null,
+            bodyFactory() {
+                const readable = stream_1.Readable.from(bodyInit);
+                const body = new ReadableStream_js_1.PonyfillReadableStream(readable);
+                return body;
+            },
+        };
+    }
     if (bodyInit instanceof ReadableStream_js_1.PonyfillReadableStream) {
         return {
             bodyType: BodyInitType.ReadableStream,
@@ -261,19 +275,6 @@ function processBodyInit(bodyInit) {
             },
         };
     }
-    if (bodyInit instanceof Buffer) {
-        const contentLength = bodyInit.length;
-        return {
-            bodyType: BodyInitType.Buffer,
-            contentLength,
-            contentType: null,
-            bodyFactory() {
-                const readable = stream_1.Readable.from(bodyInit);
-                const body = new ReadableStream_js_1.PonyfillReadableStream(readable);
-                return body;
-            },
-        };
-    }
     if (bodyInit instanceof Uint8Array) {
         const contentLength = bodyInit.byteLength;
         return {

package/cjs/Headers.js

@@ -1,22 +1,22 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PonyfillHeaders = void 0;
+exports.splitSetCookieHeader = exports.PonyfillHeaders = exports.isHeadersLike = void 0;
+const node_util_1 = require("node:util");
 function isHeadersLike(headers) {
-    return headers && typeof headers.get === 'function';
+    return headers?.get && headers?.forEach;
 }
+exports.isHeadersLike = isHeadersLike;
 class PonyfillHeaders {
     constructor(headersInit) {
         this.headersInit = headersInit;
-        this.map = new Map();
-        this.mapIsBuilt = false;
         this.objectNormalizedKeysOfHeadersInit = [];
         this.objectOriginalKeysOfHeadersInit = [];
     }
     // perf: we don't need to build `this.map` for Requests, as we can access the headers directly
     _get(key) {
         // If the map is built, reuse it
-        if (this.mapIsBuilt) {
-            return this.map.get(key.toLowerCase()) || null;
+        if (this._map) {
+            return this._map.get(key.toLowerCase()) || null;
         }
         // If the map is not built, try to get the value from the this.headersInit
         if (this.headersInit == null) {
@@ -24,7 +24,7 @@ class PonyfillHeaders {
         }
         const normalized = key.toLowerCase();
         if (Array.isArray(this.headersInit)) {
-            return this.headersInit.find(header => header[0] === normalized);
+            return this.headersInit.find(header => header[0] === normalized)?.[1] || null;
         }
         else if (isHeadersLike(this.headersInit)) {
             return this.headersInit.get(normalized);
@@ -51,31 +51,33 @@ class PonyfillHeaders {
     // perf: Build the map of headers lazily, only when we need to access all headers or write to it.
     // I could do a getter here, but I'm too lazy to type `getter`.
     getMap() {
-        if (this.mapIsBuilt) {
-            return this.map;
-        }
-        if (this.headersInit != null) {
-            if (Array.isArray(this.headersInit)) {
-                this.map = new Map(this.headersInit);
-            }
-            else if (isHeadersLike(this.headersInit)) {
-                this.headersInit.forEach((value, key) => {
-                    this.map.set(key, value);
-                });
-            }
-            else {
-                for (const initKey in this.headersInit) {
-                    const initValue = this.headersInit[initKey];
-                    if (initValue != null) {
-                        const normalizedValue = Array.isArray(initValue) ? initValue.join(', ') : initValue;
-                        const normalizedKey = initKey.toLowerCase();
-                        this.map.set(normalizedKey, normalizedValue);
+        if (!this._map) {
+            if (this.headersInit != null) {
+                if (Array.isArray(this.headersInit)) {
+                    this._map = new Map(this.headersInit);
+                }
+                else if (isHeadersLike(this.headersInit)) {
+                    this._map = new Map();
+                    this.headersInit.forEach((value, key) => {
+                        this._map.set(key, value);
+                    });
+                }
+                else {
+                    this._map = new Map();
+                    for (const initKey in this.headersInit) {
+                        const initValue = this.headersInit[initKey];
+                        if (initValue != null) {
+                            const normalizedKey = initKey.toLowerCase();
+                            this._map.set(normalizedKey, initValue);
+                        }
                     }
                 }
             }
+            else {
+                this._map = new Map();
+            }
         }
-        this.mapIsBuilt = true;
-        return this.map;
+        return this._map;
     }
     append(name, value) {
         const key = name.toLowerCase();
@@ -84,19 +86,14 @@ class PonyfillHeaders {
         this.getMap().set(key, finalValue);
     }
     get(name) {
-        const key = name.toLowerCase();
-        const value = this._get(key);
+        const value = this._get(name);
         if (value == null) {
             return null;
         }
-        if (Array.isArray(value)) {
-            return value.join(', ');
-        }
         return value;
     }
     has(name) {
-        const key = name.toLowerCase();
-        return !!this._get(key); // we might need to check if header exists and not just check if it's not nullable
+        return !!this._get(name); // we might need to check if header exists and not just check if it's not nullable
     }
     set(name, value) {
         const key = name.toLowerCase();
@@ -107,21 +104,123 @@ class PonyfillHeaders {
         this.getMap().delete(key);
     }
     forEach(callback) {
+        if (!this._map) {
+            if (this.headersInit) {
+                if (Array.isArray(this.headersInit)) {
+                    this.headersInit.forEach(([key, value]) => {
+                        callback(value, key, this);
+                    });
+                    return;
+                }
+                if (isHeadersLike(this.headersInit)) {
+                    this.headersInit.forEach(callback);
+                    return;
+                }
+                Object.entries(this.headersInit).forEach(([key, value]) => {
+                    if (value != null) {
+                        callback(value, key, this);
+                    }
+                });
+            }
+            return;
+        }
         this.getMap().forEach((value, key) => {
             callback(value, key, this);
         });
     }
     keys() {
+        if (!this._map) {
+            if (this.headersInit) {
+                if (Array.isArray(this.headersInit)) {
+                    return this.headersInit.map(([key]) => key)[Symbol.iterator]();
+                }
+                if (isHeadersLike(this.headersInit)) {
+                    return this.headersInit.keys();
+                }
+                return Object.keys(this.headersInit)[Symbol.iterator]();
+            }
+        }
         return this.getMap().keys();
     }
     values() {
+        if (!this._map) {
+            if (this.headersInit) {
+                if (Array.isArray(this.headersInit)) {
+                    return this.headersInit.map(([, value]) => value)[Symbol.iterator]();
+                }
+                if (isHeadersLike(this.headersInit)) {
+                    return this.headersInit.values();
+                }
+                return Object.values(this.headersInit)[Symbol.iterator]();
+            }
+        }
         return this.getMap().values();
     }
     entries() {
+        if (!this._map) {
+            if (this.headersInit) {
+                if (Array.isArray(this.headersInit)) {
+                    return this.headersInit[Symbol.iterator]();
+                }
+                if (isHeadersLike(this.headersInit)) {
+                    return this.headersInit.entries();
+                }
+                return Object.entries(this.headersInit)[Symbol.iterator]();
+            }
+        }
         return this.getMap().entries();
     }
+    getSetCookie() {
+        const setCookieHeader = this.get('set-cookie');
+        if (!setCookieHeader) {
+            return [];
+        }
+        return splitSetCookieHeader(setCookieHeader);
+    }
     [Symbol.iterator]() {
-        return this.getMap().entries();
+        return this.entries();
+    }
+    [Symbol.for('nodejs.util.inspect.custom')]() {
+        const record = {};
+        this.forEach((value, key) => {
+            if (key === 'set-cookie') {
+                record['set-cookie'] = this.getSetCookie();
+            }
+            else {
+                record[key] = value.includes(',') ? value.split(',').map(el => el.trim()) : value;
+            }
+        });
+        return `Headers ${(0, node_util_1.inspect)(record)}`;
     }
 }
 exports.PonyfillHeaders = PonyfillHeaders;
+function splitSetCookieHeader(setCookieHeader) {
+    const setCookieHeaders = [];
+    let currentStr = '';
+    let ignoreComma = false;
+    for (const ch of setCookieHeader) {
+        if (currentStr.endsWith('Expires=')) {
+            ignoreComma = true;
+        }
+        if (ignoreComma) {
+            if (ch === ';') {
+                ignoreComma = false;
+            }
+            if (ch === ',' && currentStr.split('Expires=')[1].length > 3) {
+                ignoreComma = false;
+            }
+        }
+        if (ch === ',' && !ignoreComma) {
+            setCookieHeaders.push(currentStr.trim());
+            currentStr = '';
+        }
+        else {
+            currentStr += ch;
+        }
+    }
+    if (currentStr) {
+        setCookieHeaders.push(currentStr.trim());
+    }
+    return setCookieHeaders;
+}
+exports.splitSetCookieHeader = splitSetCookieHeader;

package/cjs/Request.js

@@ -28,11 +28,12 @@ class PonyfillRequest extends Body_js_1.PonyfillBody {
             requestInit = options;
         }
         super(bodyInit, options);
-        this.destination = '';
-        this.priority = 'auto';
         this.cache = requestInit?.cache || 'default';
         this.credentials = requestInit?.credentials || 'same-origin';
-        this.headers = new Headers_js_1.PonyfillHeaders(requestInit?.headers);
+        this.headers =
+            requestInit?.headers && (0, Headers_js_1.isHeadersLike)(requestInit.headers)
+                ? requestInit.headers
+                : new Headers_js_1.PonyfillHeaders(requestInit?.headers);
         this.integrity = requestInit?.integrity || '';
         this.keepalive = requestInit?.keepalive != null ? requestInit?.keepalive : false;
         this.method = requestInit?.method?.toUpperCase() || 'GET';
@@ -40,30 +41,42 @@ class PonyfillRequest extends Body_js_1.PonyfillBody {
         this.redirect = requestInit?.redirect || 'follow';
         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._signal = requestInit?.signal;
+        this.headersSerializer = requestInit?.headersSerializer || utils_js_1.defaultHeadersSerializer;
         this.url = url || '';
-        const contentTypeInHeaders = this.headers.get('content-type');
-        if (!contentTypeInHeaders) {
-            if (this.contentType) {
-                this.headers.set('content-type', this.contentType);
+        this.destination = 'document';
+        this.priority = 'auto';
+        if (this.method !== 'GET' && this.method !== 'HEAD') {
+            const contentTypeInHeaders = this.headers.get('content-type');
+            if (!contentTypeInHeaders) {
+                if (this.contentType) {
+                    this.headers.set('content-type', this.contentType);
+                }
             }
-        }
-        else {
-            this.contentType = contentTypeInHeaders;
-        }
-        const contentLengthInHeaders = this.headers.get('content-length');
-        if (!contentLengthInHeaders) {
-            if (this.contentLength) {
-                this.headers.set('content-length', this.contentLength.toString());
+            else {
+                this.contentType = contentTypeInHeaders;
+            }
+            const contentLengthInHeaders = this.headers.get('content-length');
+            if (!contentLengthInHeaders) {
+                if (this.contentLength) {
+                    this.headers.set('content-length', this.contentLength.toString());
+                }
+            }
+            else {
+                this.contentLength = parseInt(contentLengthInHeaders, 10);
             }
         }
-        else {
-            this.contentLength = parseInt(contentLengthInHeaders, 10);
+    }
+    get signal() {
+        // Create a new signal only if needed
+        // Because the creation of signal is expensive
+        if (!this._signal) {
+            this._signal = new AbortController().signal;
         }
+        return this._signal;
     }
     clone() {
-        return new Request(this);
+        return new PonyfillRequest(this);
     }
 }
 exports.PonyfillRequest = PonyfillRequest;

package/cjs/Response.js

@@ -4,23 +4,19 @@ exports.PonyfillResponse = void 0;
 const http_1 = require("http");
 const Body_js_1 = require("./Body.js");
 const Headers_js_1 = require("./Headers.js");
+const JSON_CONTENT_TYPE = 'application/json; charset=utf-8';
 class PonyfillResponse extends Body_js_1.PonyfillBody {
     constructor(body, init) {
         super(body || null, init);
-        this.headers = new Headers_js_1.PonyfillHeaders();
-        this.status = 200;
-        this.statusText = 'OK';
-        this.url = '';
-        this.redirected = false;
-        this.type = 'default';
-        if (init) {
-            this.headers = new Headers_js_1.PonyfillHeaders(init.headers);
-            this.status = init.status || 200;
-            this.statusText = init.statusText || http_1.STATUS_CODES[this.status] || 'OK';
-            this.url = init.url || '';
-            this.redirected = init.redirected || false;
-            this.type = init.type || 'default';
-        }
+        this.headers =
+            init?.headers && (0, Headers_js_1.isHeadersLike)(init.headers)
+                ? init.headers
+                : new Headers_js_1.PonyfillHeaders(init?.headers);
+        this.status = init?.status || 200;
+        this.statusText = init?.statusText || http_1.STATUS_CODES[this.status] || 'OK';
+        this.url = init?.url || '';
+        this.redirected = init?.redirected || false;
+        this.type = init?.type || 'default';
         const contentTypeInHeaders = this.headers.get('content-type');
         if (!contentTypeInHeaders) {
             if (this.contentType) {
@@ -64,13 +60,14 @@ class PonyfillResponse extends Body_js_1.PonyfillBody {
         });
     }
     static json(data, init = {}) {
-        return new PonyfillResponse(JSON.stringify(data), {
-            ...init,
-            headers: {
-                'Content-Type': 'application/json',
-                ...init?.headers,
-            },
-        });
+        init.headers =
+            init?.headers && (0, Headers_js_1.isHeadersLike)(init.headers)
+                ? init.headers
+                : new Headers_js_1.PonyfillHeaders(init?.headers);
+        if (!init.headers.has('content-type')) {
+            init.headers.set('content-type', JSON_CONTENT_TYPE);
+        }
+        return new PonyfillResponse(JSON.stringify(data), init);
     }
 }
 exports.PonyfillResponse = PonyfillResponse;

package/cjs/fetch.js

@@ -33,6 +33,7 @@ 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,13 +80,10 @@ 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;
     const curlyOptions = {
@@ -114,7 +112,7 @@ async function fetchPonyfill(info, init) {
     if (size != null) {
         curlyOptions.inFileSize = size;
     }
-    const { curly, CurlCode, CurlPause } = await Promise.resolve().then(() => __importStar(require('node-libcurl')));
+    const { curly, CurlCode, CurlPause } = globalThis['libcurl'] || (await Promise.resolve().then(() => __importStar(require('node-libcurl'))));
     fetchRequest.signal.onabort = () => {
         if (easyNativeBinding != null) {
             easyNativeBinding.pause(CurlPause.Recv);

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/Body.js

@@ -227,17 +227,31 @@ function processBodyInit(bodyInit) {
         };
     }
     if (typeof bodyInit === 'string') {
-        const buffer = Buffer.from(bodyInit, 'utf-8');
+        const buffer = Buffer.from(bodyInit);
+        const contentLength = buffer.byteLength;
         return {
             bodyType: BodyInitType.String,
             contentType: 'text/plain;charset=UTF-8',
-            contentLength: buffer.byteLength,
+            contentLength,
             bodyFactory() {
                 const readable = Readable.from(buffer);
                 return new PonyfillReadableStream(readable);
             },
         };
     }
+    if (bodyInit instanceof Buffer) {
+        const contentLength = bodyInit.byteLength;
+        return {
+            bodyType: BodyInitType.Buffer,
+            contentLength,
+            contentType: null,
+            bodyFactory() {
+                const readable = Readable.from(bodyInit);
+                const body = new PonyfillReadableStream(readable);
+                return body;
+            },
+        };
+    }
     if (bodyInit instanceof PonyfillReadableStream) {
         return {
             bodyType: BodyInitType.ReadableStream,
@@ -256,19 +270,6 @@ function processBodyInit(bodyInit) {
             },
         };
     }
-    if (bodyInit instanceof Buffer) {
-        const contentLength = bodyInit.length;
-        return {
-            bodyType: BodyInitType.Buffer,
-            contentLength,
-            contentType: null,
-            bodyFactory() {
-                const readable = Readable.from(bodyInit);
-                const body = new PonyfillReadableStream(readable);
-                return body;
-            },
-        };
-    }
     if (bodyInit instanceof Uint8Array) {
         const contentLength = bodyInit.byteLength;
         return {

package/esm/Headers.js

@@ -1,19 +1,18 @@
-function isHeadersLike(headers) {
-    return headers && typeof headers.get === 'function';
+import { inspect } from 'node:util';
+export function isHeadersLike(headers) {
+    return headers?.get && headers?.forEach;
 }
 export class PonyfillHeaders {
     constructor(headersInit) {
         this.headersInit = headersInit;
-        this.map = new Map();
-        this.mapIsBuilt = false;
         this.objectNormalizedKeysOfHeadersInit = [];
         this.objectOriginalKeysOfHeadersInit = [];
     }
     // perf: we don't need to build `this.map` for Requests, as we can access the headers directly
     _get(key) {
         // If the map is built, reuse it
-        if (this.mapIsBuilt) {
-            return this.map.get(key.toLowerCase()) || null;
+        if (this._map) {
+            return this._map.get(key.toLowerCase()) || null;
         }
         // If the map is not built, try to get the value from the this.headersInit
         if (this.headersInit == null) {
@@ -21,7 +20,7 @@ export class PonyfillHeaders {
         }
         const normalized = key.toLowerCase();
         if (Array.isArray(this.headersInit)) {
-            return this.headersInit.find(header => header[0] === normalized);
+            return this.headersInit.find(header => header[0] === normalized)?.[1] || null;
         }
         else if (isHeadersLike(this.headersInit)) {
             return this.headersInit.get(normalized);
@@ -48,31 +47,33 @@ export class PonyfillHeaders {
     // perf: Build the map of headers lazily, only when we need to access all headers or write to it.
     // I could do a getter here, but I'm too lazy to type `getter`.
     getMap() {
-        if (this.mapIsBuilt) {
-            return this.map;
-        }
-        if (this.headersInit != null) {
-            if (Array.isArray(this.headersInit)) {
-                this.map = new Map(this.headersInit);
-            }
-            else if (isHeadersLike(this.headersInit)) {
-                this.headersInit.forEach((value, key) => {
-                    this.map.set(key, value);
-                });
-            }
-            else {
-                for (const initKey in this.headersInit) {
-                    const initValue = this.headersInit[initKey];
-                    if (initValue != null) {
-                        const normalizedValue = Array.isArray(initValue) ? initValue.join(', ') : initValue;
-                        const normalizedKey = initKey.toLowerCase();
-                        this.map.set(normalizedKey, normalizedValue);
+        if (!this._map) {
+            if (this.headersInit != null) {
+                if (Array.isArray(this.headersInit)) {
+                    this._map = new Map(this.headersInit);
+                }
+                else if (isHeadersLike(this.headersInit)) {
+                    this._map = new Map();
+                    this.headersInit.forEach((value, key) => {
+                        this._map.set(key, value);
+                    });
+                }
+                else {
+                    this._map = new Map();
+                    for (const initKey in this.headersInit) {
+                        const initValue = this.headersInit[initKey];
+                        if (initValue != null) {
+                            const normalizedKey = initKey.toLowerCase();
+                            this._map.set(normalizedKey, initValue);
+                        }
                     }
                 }
             }
+            else {
+                this._map = new Map();
+            }
         }
-        this.mapIsBuilt = true;
-        return this.map;
+        return this._map;
     }
     append(name, value) {
         const key = name.toLowerCase();
@@ -81,19 +82,14 @@ export class PonyfillHeaders {
         this.getMap().set(key, finalValue);
     }
     get(name) {
-        const key = name.toLowerCase();
-        const value = this._get(key);
+        const value = this._get(name);
         if (value == null) {
             return null;
         }
-        if (Array.isArray(value)) {
-            return value.join(', ');
-        }
         return value;
     }
     has(name) {
-        const key = name.toLowerCase();
-        return !!this._get(key); // we might need to check if header exists and not just check if it's not nullable
+        return !!this._get(name); // we might need to check if header exists and not just check if it's not nullable
     }
     set(name, value) {
         const key = name.toLowerCase();
@@ -104,20 +100,121 @@ export class PonyfillHeaders {
         this.getMap().delete(key);
     }
     forEach(callback) {
+        if (!this._map) {
+            if (this.headersInit) {
+                if (Array.isArray(this.headersInit)) {
+                    this.headersInit.forEach(([key, value]) => {
+                        callback(value, key, this);
+                    });
+                    return;
+                }
+                if (isHeadersLike(this.headersInit)) {
+                    this.headersInit.forEach(callback);
+                    return;
+                }
+                Object.entries(this.headersInit).forEach(([key, value]) => {
+                    if (value != null) {
+                        callback(value, key, this);
+                    }
+                });
+            }
+            return;
+        }
         this.getMap().forEach((value, key) => {
             callback(value, key, this);
         });
     }
     keys() {
+        if (!this._map) {
+            if (this.headersInit) {
+                if (Array.isArray(this.headersInit)) {
+                    return this.headersInit.map(([key]) => key)[Symbol.iterator]();
+                }
+                if (isHeadersLike(this.headersInit)) {
+                    return this.headersInit.keys();
+                }
+                return Object.keys(this.headersInit)[Symbol.iterator]();
+            }
+        }
         return this.getMap().keys();
     }
     values() {
+        if (!this._map) {
+            if (this.headersInit) {
+                if (Array.isArray(this.headersInit)) {
+                    return this.headersInit.map(([, value]) => value)[Symbol.iterator]();
+                }
+                if (isHeadersLike(this.headersInit)) {
+                    return this.headersInit.values();
+                }
+                return Object.values(this.headersInit)[Symbol.iterator]();
+            }
+        }
         return this.getMap().values();
     }
     entries() {
+        if (!this._map) {
+            if (this.headersInit) {
+                if (Array.isArray(this.headersInit)) {
+                    return this.headersInit[Symbol.iterator]();
+                }
+                if (isHeadersLike(this.headersInit)) {
+                    return this.headersInit.entries();
+                }
+                return Object.entries(this.headersInit)[Symbol.iterator]();
+            }
+        }
         return this.getMap().entries();
     }
+    getSetCookie() {
+        const setCookieHeader = this.get('set-cookie');
+        if (!setCookieHeader) {
+            return [];
+        }
+        return splitSetCookieHeader(setCookieHeader);
+    }
     [Symbol.iterator]() {
-        return this.getMap().entries();
+        return this.entries();
+    }
+    [Symbol.for('nodejs.util.inspect.custom')]() {
+        const record = {};
+        this.forEach((value, key) => {
+            if (key === 'set-cookie') {
+                record['set-cookie'] = this.getSetCookie();
+            }
+            else {
+                record[key] = value.includes(',') ? value.split(',').map(el => el.trim()) : value;
+            }
+        });
+        return `Headers ${inspect(record)}`;
+    }
+}
+export function splitSetCookieHeader(setCookieHeader) {
+    const setCookieHeaders = [];
+    let currentStr = '';
+    let ignoreComma = false;
+    for (const ch of setCookieHeader) {
+        if (currentStr.endsWith('Expires=')) {
+            ignoreComma = true;
+        }
+        if (ignoreComma) {
+            if (ch === ';') {
+                ignoreComma = false;
+            }
+            if (ch === ',' && currentStr.split('Expires=')[1].length > 3) {
+                ignoreComma = false;
+            }
+        }
+        if (ch === ',' && !ignoreComma) {
+            setCookieHeaders.push(currentStr.trim());
+            currentStr = '';
+        }
+        else {
+            currentStr += ch;
+        }
+    }
+    if (currentStr) {
+        setCookieHeaders.push(currentStr.trim());
     }
+    return setCookieHeaders;
 }

package/esm/Request.js

@@ -1,6 +1,6 @@
 import { PonyfillBody } from './Body.js';
-import { PonyfillHeaders } from './Headers.js';
-import { getHeadersObj } from './utils.js';
+import { isHeadersLike, PonyfillHeaders } from './Headers.js';
+import { defaultHeadersSerializer } from './utils.js';
 function isRequest(input) {
     return input[Symbol.toStringTag] === 'Request';
 }
@@ -25,11 +25,12 @@ export class PonyfillRequest extends PonyfillBody {
             requestInit = options;
         }
         super(bodyInit, options);
-        this.destination = '';
-        this.priority = 'auto';
         this.cache = requestInit?.cache || 'default';
         this.credentials = requestInit?.credentials || 'same-origin';
-        this.headers = new PonyfillHeaders(requestInit?.headers);
+        this.headers =
+            requestInit?.headers && isHeadersLike(requestInit.headers)
+                ? requestInit.headers
+                : new PonyfillHeaders(requestInit?.headers);
         this.integrity = requestInit?.integrity || '';
         this.keepalive = requestInit?.keepalive != null ? requestInit?.keepalive : false;
         this.method = requestInit?.method?.toUpperCase() || 'GET';
@@ -37,29 +38,41 @@ export class PonyfillRequest extends PonyfillBody {
         this.redirect = requestInit?.redirect || 'follow';
         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._signal = requestInit?.signal;
+        this.headersSerializer = requestInit?.headersSerializer || defaultHeadersSerializer;
         this.url = url || '';
-        const contentTypeInHeaders = this.headers.get('content-type');
-        if (!contentTypeInHeaders) {
-            if (this.contentType) {
-                this.headers.set('content-type', this.contentType);
+        this.destination = 'document';
+        this.priority = 'auto';
+        if (this.method !== 'GET' && this.method !== 'HEAD') {
+            const contentTypeInHeaders = this.headers.get('content-type');
+            if (!contentTypeInHeaders) {
+                if (this.contentType) {
+                    this.headers.set('content-type', this.contentType);
+                }
             }
-        }
-        else {
-            this.contentType = contentTypeInHeaders;
-        }
-        const contentLengthInHeaders = this.headers.get('content-length');
-        if (!contentLengthInHeaders) {
-            if (this.contentLength) {
-                this.headers.set('content-length', this.contentLength.toString());
+            else {
+                this.contentType = contentTypeInHeaders;
+            }
+            const contentLengthInHeaders = this.headers.get('content-length');
+            if (!contentLengthInHeaders) {
+                if (this.contentLength) {
+                    this.headers.set('content-length', this.contentLength.toString());
+                }
+            }
+            else {
+                this.contentLength = parseInt(contentLengthInHeaders, 10);
             }
         }
-        else {
-            this.contentLength = parseInt(contentLengthInHeaders, 10);
+    }
+    get signal() {
+        // Create a new signal only if needed
+        // Because the creation of signal is expensive
+        if (!this._signal) {
+            this._signal = new AbortController().signal;
         }
+        return this._signal;
     }
     clone() {
-        return new Request(this);
+        return new PonyfillRequest(this);
     }
 }

package/esm/Response.js

@@ -1,23 +1,19 @@
 import { STATUS_CODES } from 'http';
 import { PonyfillBody } from './Body.js';
-import { PonyfillHeaders } from './Headers.js';
+import { isHeadersLike, PonyfillHeaders } from './Headers.js';
+const JSON_CONTENT_TYPE = 'application/json; charset=utf-8';
 export class PonyfillResponse extends PonyfillBody {
     constructor(body, init) {
         super(body || null, init);
-        this.headers = new PonyfillHeaders();
-        this.status = 200;
-        this.statusText = 'OK';
-        this.url = '';
-        this.redirected = false;
-        this.type = 'default';
-        if (init) {
-            this.headers = new PonyfillHeaders(init.headers);
-            this.status = init.status || 200;
-            this.statusText = init.statusText || STATUS_CODES[this.status] || 'OK';
-            this.url = init.url || '';
-            this.redirected = init.redirected || false;
-            this.type = init.type || 'default';
-        }
+        this.headers =
+            init?.headers && isHeadersLike(init.headers)
+                ? init.headers
+                : new PonyfillHeaders(init?.headers);
+        this.status = init?.status || 200;
+        this.statusText = init?.statusText || STATUS_CODES[this.status] || 'OK';
+        this.url = init?.url || '';
+        this.redirected = init?.redirected || false;
+        this.type = init?.type || 'default';
         const contentTypeInHeaders = this.headers.get('content-type');
         if (!contentTypeInHeaders) {
             if (this.contentType) {
@@ -61,12 +57,13 @@ export class PonyfillResponse extends PonyfillBody {
         });
     }
     static json(data, init = {}) {
-        return new PonyfillResponse(JSON.stringify(data), {
-            ...init,
-            headers: {
-                'Content-Type': 'application/json',
-                ...init?.headers,
-            },
-        });
+        init.headers =
+            init?.headers && isHeadersLike(init.headers)
+                ? init.headers
+                : new PonyfillHeaders(init?.headers);
+        if (!init.headers.has('content-type')) {
+            init.headers.set('content-type', JSON_CONTENT_TYPE);
+        }
+        return new PonyfillResponse(JSON.stringify(data), init);
     }
 }

package/esm/fetch.js

@@ -7,6 +7,7 @@ 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,13 +54,10 @@ 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;
     const curlyOptions = {
@@ -88,7 +86,7 @@ export async function fetchPonyfill(info, init) {
     if (size != null) {
         curlyOptions.inFileSize = size;
     }
-    const { curly, CurlCode, CurlPause } = await import('node-libcurl');
+    const { curly, CurlCode, CurlPause } = globalThis['libcurl'] || (await import('node-libcurl'));
     fetchRequest.signal.onabort = () => {
         if (easyNativeBinding != null) {
             easyNativeBinding.pause(CurlPause.Recv);

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-20230531142534-b373f43",
+  "version": "0.5.0-alpha-20230622145940-8d0fb21",
   "description": "Fetch API implementation for Node",
   "sideEffects": false,
   "dependencies": {

package/typings/Headers.d.cts

@@ -1,8 +1,8 @@
-export type PonyfillHeadersInit = [string, string][] | Record<string, string | string[] | undefined> | Headers;
+export type PonyfillHeadersInit = [string, string][] | Record<string, string> | Headers;
+export declare function isHeadersLike(headers: any): headers is Headers;
 export declare class PonyfillHeaders implements Headers {
     private headersInit?;
-    private map;
-    private mapIsBuilt;
+    private _map;
     private objectNormalizedKeysOfHeadersInit;
     private objectOriginalKeysOfHeadersInit;
     constructor(headersInit?: PonyfillHeadersInit | undefined);
@@ -17,5 +17,7 @@ export declare class PonyfillHeaders implements Headers {
     keys(): IterableIterator<string>;
     values(): IterableIterator<string>;
     entries(): IterableIterator<[string, string]>;
+    getSetCookie(): string[];
     [Symbol.iterator](): IterableIterator<[string, string]>;
 }
+export declare function splitSetCookieHeader(setCookieHeader: string): string[];

package/typings/Headers.d.ts

@@ -1,8 +1,8 @@
-export type PonyfillHeadersInit = [string, string][] | Record<string, string | string[] | undefined> | Headers;
+export type PonyfillHeadersInit = [string, string][] | Record<string, string> | Headers;
+export declare function isHeadersLike(headers: any): headers is Headers;
 export declare class PonyfillHeaders implements Headers {
     private headersInit?;
-    private map;
-    private mapIsBuilt;
+    private _map;
     private objectNormalizedKeysOfHeadersInit;
     private objectOriginalKeysOfHeadersInit;
     constructor(headersInit?: PonyfillHeadersInit | undefined);
@@ -17,5 +17,7 @@ export declare class PonyfillHeaders implements Headers {
     keys(): IterableIterator<string>;
     values(): IterableIterator<string>;
     entries(): IterableIterator<[string, string]>;
+    getSetCookie(): string[];
     [Symbol.iterator](): IterableIterator<[string, string]>;
 }
+export declare function splitSetCookieHeader(setCookieHeader: string): string[];

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;
@@ -22,7 +22,8 @@ export declare class PonyfillRequest<TJSON = any> extends PonyfillBody<TJSON> im
     referrer: string;
     referrerPolicy: ReferrerPolicy;
     url: string;
-    signal: AbortSignal;
-    clone(): Request;
+    private _signal;
+    get signal(): AbortSignal;
+    clone(): PonyfillRequest;
 }
 export {};

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;
@@ -22,7 +22,8 @@ export declare class PonyfillRequest<TJSON = any> extends PonyfillBody<TJSON> im
     referrer: string;
     referrerPolicy: ReferrerPolicy;
     url: string;
-    signal: AbortSignal;
-    clone(): Request;
+    private _signal;
+    get signal(): AbortSignal;
+    clone(): PonyfillRequest;
 }
 export {};

package/typings/Response.d.cts

@@ -7,8 +7,8 @@ export type ResponsePonyfilInit = PonyfillBodyOptions & Omit<ResponseInit, 'head
     type?: ResponseType;
 };
 export declare class PonyfillResponse<TJSON = any> extends PonyfillBody<TJSON> implements Response {
-    constructor(body?: BodyPonyfillInit | null, init?: ResponsePonyfilInit);
     headers: Headers;
+    constructor(body?: BodyPonyfillInit | null, init?: ResponsePonyfilInit);
     get ok(): boolean;
     status: number;
     statusText: string;
@@ -18,5 +18,5 @@ export declare class PonyfillResponse<TJSON = any> extends PonyfillBody<TJSON> i
     clone(): PonyfillResponse<any>;
     static error(): PonyfillResponse<any>;
     static redirect(url: string, status?: number): PonyfillResponse<any>;
-    static json<T = any>(data: T, init?: RequestInit): PonyfillResponse<T>;
+    static json<T = any>(data: T, init?: ResponsePonyfilInit): PonyfillResponse<T>;
 }

package/typings/Response.d.ts

@@ -7,8 +7,8 @@ export type ResponsePonyfilInit = PonyfillBodyOptions & Omit<ResponseInit, 'head
     type?: ResponseType;
 };
 export declare class PonyfillResponse<TJSON = any> extends PonyfillBody<TJSON> implements Response {
-    constructor(body?: BodyPonyfillInit | null, init?: ResponsePonyfilInit);
     headers: Headers;
+    constructor(body?: BodyPonyfillInit | null, init?: ResponsePonyfilInit);
     get ok(): boolean;
     status: number;
     statusText: string;
@@ -18,5 +18,5 @@ export declare class PonyfillResponse<TJSON = any> extends PonyfillBody<TJSON> i
     clone(): PonyfillResponse<any>;
     static error(): PonyfillResponse<any>;
     static redirect(url: string, status?: number): PonyfillResponse<any>;
-    static json<T = any>(data: T, init?: RequestInit): PonyfillResponse<T>;
+    static json<T = any>(data: T, init?: ResponsePonyfilInit): PonyfillResponse<T>;
 }

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[];