@whatwg-node/node-fetch 0.0.7-alpha-20230208150005-0bd8aaf → 0.0.7-alpha-20230209144328-8bdce99

package/Blob.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="node" />
 import { Blob as NodeBlob } from 'buffer';
-declare const BaseBlob: typeof NodeBlob;
-export declare class PonyfillBlob extends BaseBlob implements Blob {
+declare const PonyfillBlob_base: typeof NodeBlob;
+export declare class PonyfillBlob extends PonyfillBlob_base implements Blob {
     stream(): any;
     slice(...args: any[]): any;
 }

package/Headers.d.ts

@@ -1,12 +1,7 @@
 export type PonyfillHeadersInit = [string, string][] | Record<string, string | string[] | undefined> | Headers;
 export declare class PonyfillHeaders implements Headers {
-    private headersInit?;
     private map;
-    private mapIsBuilt;
-    private objectKeysOfeadersInit;
-    constructor(headersInit?: PonyfillHeadersInit | undefined);
-    private _get;
-    private getMap;
+    constructor(headersInit?: PonyfillHeadersInit);
     append(name: string, value: string): void;
     get(name: string): string | null;
     has(name: string): boolean;

package/index.js

@@ -33,10 +33,17 @@ class PonyfillAbortError extends Error {
 function createController(desiredSize, readable) {
     let chunks = [];
     let _closed = false;
+    let flushed = false;
     return {
         desiredSize,
         enqueue(chunk) {
-            chunks.push(Buffer.from(chunk));
+            const buf = typeof chunk === 'string' ? Buffer.from(chunk) : chunk;
+            if (!flushed) {
+                chunks.push(buf);
+            }
+            else {
+                readable.push(buf);
+            }
         },
         close() {
             if (chunks.length > 0) {
@@ -55,6 +62,7 @@ function createController(desiredSize, readable) {
             return _closed;
         },
         _flush() {
+            flushed = true;
             if (chunks.length > 0) {
                 const concatenated = Buffer.concat(chunks);
                 readable.push(concatenated);
@@ -102,18 +110,29 @@ class PonyfillReadableStream {
         }
         else {
             let started = false;
+            let ongoing = false;
             this.readable = new stream.Readable({
-                async read(desiredSize) {
-                    var _a, _b;
-                    const controller = createController(desiredSize, this);
-                    if (!started) {
-                        started = true;
-                        await ((_a = underlyingSource === null || underlyingSource === void 0 ? void 0 : underlyingSource.start) === null || _a === void 0 ? void 0 : _a.call(underlyingSource, controller));
+                read(desiredSize) {
+                    if (ongoing) {
+                        return;
                     }
-                    if (!controller._closed) {
+                    ongoing = true;
+                    return Promise.resolve().then(async () => {
+                        var _a, _b;
+                        if (!started) {
+                            const controller = createController(desiredSize, this);
+                            started = true;
+                            await ((_a = underlyingSource === null || underlyingSource === void 0 ? void 0 : underlyingSource.start) === null || _a === void 0 ? void 0 : _a.call(underlyingSource, controller));
+                            controller._flush();
+                            if (controller._closed) {
+                                return;
+                            }
+                        }
+                        const controller = createController(desiredSize, this);
                         await ((_b = underlyingSource === null || underlyingSource === void 0 ? void 0 : underlyingSource.pull) === null || _b === void 0 ? void 0 : _b.call(underlyingSource, controller));
-                    }
-                    controller._flush();
+                        controller._flush();
+                        ongoing = false;
+                    });
                 },
                 async destroy(err, callback) {
                     var _a;
@@ -184,10 +203,9 @@ class DummyBlob {
         throw new Error('Blob is not supported in this environment, if you are using an older version of Node v14, please upgrade to v14.17.0 or higher');
     }
 }
-const BaseBlob = buffer.Blob || DummyBlob;
 // Will be removed after v14 reaches EOL
 // Needed because v14 doesn't have .stream() implemented
-class PonyfillBlob extends BaseBlob {
+class PonyfillBlob extends (buffer.Blob || DummyBlob) {
     stream() {
         return new PonyfillReadableStream({
             start: async (controller) => {
@@ -562,15 +580,6 @@ class PonyfillBody {
             const buffer = Buffer.from(bodyInitTyped, 'byteOffset' in bodyInitTyped ? bodyInitTyped.byteOffset : undefined, bodyInitTyped.byteLength);
             return buffer.toString('utf-8');
         }
-        // perf: avoid reading the stream twice (we read from Readable to create Blob and then we read from Blob to create a string)
-        const _body = this.generateBody();
-        if (_body) {
-            const chunks = [];
-            for await (const chunk of _body.readable) {
-                chunks.push(chunk);
-            }
-            return Buffer.concat(chunks).toString('utf-8' /* use this.contentType soon */);
-        }
         const blob = await this.blob();
         return blob.text();
     }
@@ -728,61 +737,19 @@ function isHeadersLike(headers) {
 }
 class PonyfillHeaders {
     constructor(headersInit) {
-        this.headersInit = headersInit;
         this.map = new Map();
-        this.mapIsBuilt = false;
-        this.objectKeysOfeadersInit = [];
-    }
-    // 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 the map is not built, try to get the value from the this.headersInit
-        if (this.headersInit == null) {
-            return null;
-        }
-        const normalized = key.toLowerCase();
-        if (Array.isArray(this.headersInit)) {
-            return this.headersInit.find(header => header[0] === normalized);
-        }
-        else if (isHeadersLike(this.headersInit)) {
-            return this.headersInit.get(normalized);
-        }
-        else {
-            const initValue = this.headersInit[key] || this.headersInit[normalized];
-            if (initValue != null) {
-                return initValue;
-            }
-            if (!this.objectKeysOfeadersInit.length) {
-                this.objectKeysOfeadersInit = Object.keys(this.headersInit).map(k => k.toLowerCase());
+        if (headersInit != null) {
+            if (Array.isArray(headersInit)) {
+                this.map = new Map(headersInit);
             }
-            const index = this.objectKeysOfeadersInit.indexOf(normalized);
-            if (index === -1) {
-                return null;
-            }
-            return this.headersInit[index];
-        }
-    }
-    // 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) => {
+            else if (isHeadersLike(headersInit)) {
+                headersInit.forEach((value, key) => {
                     this.map.set(key, value);
                 });
             }
             else {
-                for (const initKey in this.headersInit) {
-                    const initValue = this.headersInit[initKey];
+                for (const initKey in headersInit) {
+                    const initValue = headersInit[initKey];
                     if (initValue != null) {
                         const normalizedValue = Array.isArray(initValue) ? initValue.join(', ') : initValue;
                         const normalizedKey = initKey.toLowerCase();
@@ -791,48 +758,39 @@ class PonyfillHeaders {
                 }
             }
         }
-        this.mapIsBuilt = true;
-        return this.map;
     }
     append(name, value) {
         const key = name.toLowerCase();
-        const existingValue = this.getMap().get(key);
+        const existingValue = this.map.get(key);
         const finalValue = existingValue ? `${existingValue}, ${value}` : value;
-        this.getMap().set(key, finalValue);
+        this.map.set(key, finalValue);
     }
     get(name) {
         const key = name.toLowerCase();
-        const value = this._get(key);
-        if (value == null) {
-            return null;
-        }
-        if (Array.isArray(value)) {
-            return value.join(', ');
-        }
-        return value;
+        return this.map.get(key) || null;
     }
     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.map.has(key);
     }
     set(name, value) {
         const key = name.toLowerCase();
-        this.getMap().set(key, value);
+        this.map.set(key, value);
     }
     delete(name) {
         const key = name.toLowerCase();
-        this.getMap().delete(key);
+        this.map.delete(key);
     }
     forEach(callback) {
-        this.getMap().forEach((value, key) => {
+        this.map.forEach((value, key) => {
             callback(value, key, this);
         });
     }
     entries() {
-        return this.getMap().entries();
+        return this.map.entries();
     }
     [Symbol.iterator]() {
-        return this.getMap().entries();
+        return this.map.entries();
     }
 }
 

package/index.mjs

@@ -27,10 +27,17 @@ class PonyfillAbortError extends Error {
 function createController(desiredSize, readable) {
     let chunks = [];
     let _closed = false;
+    let flushed = false;
     return {
         desiredSize,
         enqueue(chunk) {
-            chunks.push(Buffer.from(chunk));
+            const buf = typeof chunk === 'string' ? Buffer.from(chunk) : chunk;
+            if (!flushed) {
+                chunks.push(buf);
+            }
+            else {
+                readable.push(buf);
+            }
         },
         close() {
             if (chunks.length > 0) {
@@ -49,6 +56,7 @@ function createController(desiredSize, readable) {
             return _closed;
         },
         _flush() {
+            flushed = true;
             if (chunks.length > 0) {
                 const concatenated = Buffer.concat(chunks);
                 readable.push(concatenated);
@@ -96,18 +104,29 @@ class PonyfillReadableStream {
         }
         else {
             let started = false;
+            let ongoing = false;
             this.readable = new Readable({
-                async read(desiredSize) {
-                    var _a, _b;
-                    const controller = createController(desiredSize, this);
-                    if (!started) {
-                        started = true;
-                        await ((_a = underlyingSource === null || underlyingSource === void 0 ? void 0 : underlyingSource.start) === null || _a === void 0 ? void 0 : _a.call(underlyingSource, controller));
+                read(desiredSize) {
+                    if (ongoing) {
+                        return;
                     }
-                    if (!controller._closed) {
+                    ongoing = true;
+                    return Promise.resolve().then(async () => {
+                        var _a, _b;
+                        if (!started) {
+                            const controller = createController(desiredSize, this);
+                            started = true;
+                            await ((_a = underlyingSource === null || underlyingSource === void 0 ? void 0 : underlyingSource.start) === null || _a === void 0 ? void 0 : _a.call(underlyingSource, controller));
+                            controller._flush();
+                            if (controller._closed) {
+                                return;
+                            }
+                        }
+                        const controller = createController(desiredSize, this);
                         await ((_b = underlyingSource === null || underlyingSource === void 0 ? void 0 : underlyingSource.pull) === null || _b === void 0 ? void 0 : _b.call(underlyingSource, controller));
-                    }
-                    controller._flush();
+                        controller._flush();
+                        ongoing = false;
+                    });
                 },
                 async destroy(err, callback) {
                     var _a;
@@ -178,10 +197,9 @@ class DummyBlob {
         throw new Error('Blob is not supported in this environment, if you are using an older version of Node v14, please upgrade to v14.17.0 or higher');
     }
 }
-const BaseBlob = Blob || DummyBlob;
 // Will be removed after v14 reaches EOL
 // Needed because v14 doesn't have .stream() implemented
-class PonyfillBlob extends BaseBlob {
+class PonyfillBlob extends (Blob || DummyBlob) {
     stream() {
         return new PonyfillReadableStream({
             start: async (controller) => {
@@ -556,15 +574,6 @@ class PonyfillBody {
             const buffer = Buffer.from(bodyInitTyped, 'byteOffset' in bodyInitTyped ? bodyInitTyped.byteOffset : undefined, bodyInitTyped.byteLength);
             return buffer.toString('utf-8');
         }
-        // perf: avoid reading the stream twice (we read from Readable to create Blob and then we read from Blob to create a string)
-        const _body = this.generateBody();
-        if (_body) {
-            const chunks = [];
-            for await (const chunk of _body.readable) {
-                chunks.push(chunk);
-            }
-            return Buffer.concat(chunks).toString('utf-8' /* use this.contentType soon */);
-        }
         const blob = await this.blob();
         return blob.text();
     }
@@ -722,61 +731,19 @@ function isHeadersLike(headers) {
 }
 class PonyfillHeaders {
     constructor(headersInit) {
-        this.headersInit = headersInit;
         this.map = new Map();
-        this.mapIsBuilt = false;
-        this.objectKeysOfeadersInit = [];
-    }
-    // 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 the map is not built, try to get the value from the this.headersInit
-        if (this.headersInit == null) {
-            return null;
-        }
-        const normalized = key.toLowerCase();
-        if (Array.isArray(this.headersInit)) {
-            return this.headersInit.find(header => header[0] === normalized);
-        }
-        else if (isHeadersLike(this.headersInit)) {
-            return this.headersInit.get(normalized);
-        }
-        else {
-            const initValue = this.headersInit[key] || this.headersInit[normalized];
-            if (initValue != null) {
-                return initValue;
-            }
-            if (!this.objectKeysOfeadersInit.length) {
-                this.objectKeysOfeadersInit = Object.keys(this.headersInit).map(k => k.toLowerCase());
+        if (headersInit != null) {
+            if (Array.isArray(headersInit)) {
+                this.map = new Map(headersInit);
             }
-            const index = this.objectKeysOfeadersInit.indexOf(normalized);
-            if (index === -1) {
-                return null;
-            }
-            return this.headersInit[index];
-        }
-    }
-    // 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) => {
+            else if (isHeadersLike(headersInit)) {
+                headersInit.forEach((value, key) => {
                     this.map.set(key, value);
                 });
             }
             else {
-                for (const initKey in this.headersInit) {
-                    const initValue = this.headersInit[initKey];
+                for (const initKey in headersInit) {
+                    const initValue = headersInit[initKey];
                     if (initValue != null) {
                         const normalizedValue = Array.isArray(initValue) ? initValue.join(', ') : initValue;
                         const normalizedKey = initKey.toLowerCase();
@@ -785,48 +752,39 @@ class PonyfillHeaders {
                 }
             }
         }
-        this.mapIsBuilt = true;
-        return this.map;
     }
     append(name, value) {
         const key = name.toLowerCase();
-        const existingValue = this.getMap().get(key);
+        const existingValue = this.map.get(key);
         const finalValue = existingValue ? `${existingValue}, ${value}` : value;
-        this.getMap().set(key, finalValue);
+        this.map.set(key, finalValue);
     }
     get(name) {
         const key = name.toLowerCase();
-        const value = this._get(key);
-        if (value == null) {
-            return null;
-        }
-        if (Array.isArray(value)) {
-            return value.join(', ');
-        }
-        return value;
+        return this.map.get(key) || null;
     }
     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.map.has(key);
     }
     set(name, value) {
         const key = name.toLowerCase();
-        this.getMap().set(key, value);
+        this.map.set(key, value);
     }
     delete(name) {
         const key = name.toLowerCase();
-        this.getMap().delete(key);
+        this.map.delete(key);
     }
     forEach(callback) {
-        this.getMap().forEach((value, key) => {
+        this.map.forEach((value, key) => {
             callback(value, key, this);
         });
     }
     entries() {
-        return this.getMap().entries();
+        return this.map.entries();
     }
     [Symbol.iterator]() {
-        return this.getMap().entries();
+        return this.map.entries();
     }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@whatwg-node/node-fetch",
-  "version": "0.0.7-alpha-20230208150005-0bd8aaf",
+  "version": "0.0.7-alpha-20230209144328-8bdce99",
   "description": "Fetch API implementation for Node",
   "sideEffects": false,
   "peerDependencies": {