@whatwg-node/node-fetch 0.4.14 → 0.4.15-alpha-20230901114303-38c018b

package/cjs/Blob.js

@@ -26,59 +26,84 @@ function isBlob(obj) {
 class PonyfillBlob {
     constructor(blobParts, options) {
         this.blobParts = blobParts;
+        this._size = null;
         this.type = options?.type || 'application/octet-stream';
         this.encoding = options?.encoding || 'utf8';
+        this._size = options?.size || null;
+        if (blobParts.length === 1 && isBlob(blobParts[0])) {
+            return blobParts[0];
+        }
     }
-    async buffer() {
-        const bufferChunks = [];
-        for (const blobPart of this.blobParts) {
+    arrayBuffer() {
+        if (this.blobParts.length === 1) {
+            const blobPart = this.blobParts[0];
+            if (isBlob(blobPart)) {
+                return blobPart.arrayBuffer();
+            }
+            return (0, utils_js_1.fakePromise)(getBlobPartAsBuffer(blobPart));
+        }
+        const jobs = [];
+        const bufferChunks = this.blobParts.map((blobPart, i) => {
             if (isBlob(blobPart)) {
-                const arrayBuf = await blobPart.arrayBuffer();
-                const buf = Buffer.from(arrayBuf, undefined, blobPart.size);
-                bufferChunks.push(buf);
+                jobs.push(blobPart.arrayBuffer().then(arrayBuf => {
+                    bufferChunks[i] = Buffer.from(arrayBuf, undefined, blobPart.size);
+                }));
+                return undefined;
             }
             else {
-                const buf = getBlobPartAsBuffer(blobPart);
-                bufferChunks.push(buf);
+                return getBlobPartAsBuffer(blobPart);
             }
+        });
+        if (jobs.length > 0) {
+            return Promise.all(jobs).then(() => Buffer.concat(bufferChunks, this._size || undefined));
         }
-        return Buffer.concat(bufferChunks);
+        return (0, utils_js_1.fakePromise)(Buffer.concat(bufferChunks, this._size || undefined));
     }
-    arrayBuffer() {
-        return this.buffer().then(buf => buf.buffer);
-    }
-    async text() {
-        let text = '';
-        for (const blobPart of this.blobParts) {
+    text() {
+        if (this.blobParts.length === 1) {
+            const blobPart = this.blobParts[0];
             if (typeof blobPart === 'string') {
-                text += blobPart;
-            }
-            else if (isBlob(blobPart)) {
-                text += await blobPart.text();
+                return (0, utils_js_1.fakePromise)(blobPart);
             }
-            else {
-                const buf = getBlobPartAsBuffer(blobPart);
-                text += buf.toString(this.encoding);
+            if (isBlob(blobPart)) {
+                return blobPart.text();
             }
+            const buf = getBlobPartAsBuffer(blobPart);
+            return (0, utils_js_1.fakePromise)(buf.toString(this.encoding));
         }
-        return text;
+        return this.arrayBuffer().then(buf => buf.toString(this.encoding));
     }
     get size() {
-        let size = 0;
-        for (const blobPart of this.blobParts) {
-            if (typeof blobPart === 'string') {
-                size += Buffer.byteLength(blobPart);
-            }
-            else if (isBlob(blobPart)) {
-                size += blobPart.size;
-            }
-            else if ((0, utils_js_1.isArrayBufferView)(blobPart)) {
-                size += blobPart.byteLength;
+        if (this._size == null) {
+            this._size = 0;
+            for (const blobPart of this.blobParts) {
+                if (typeof blobPart === 'string') {
+                    this._size += Buffer.byteLength(blobPart);
+                }
+                else if (isBlob(blobPart)) {
+                    this._size += blobPart.size;
+                }
+                else if ((0, utils_js_1.isArrayBufferView)(blobPart)) {
+                    this._size += blobPart.byteLength;
+                }
             }
         }
-        return size;
+        return this._size;
     }
     stream() {
+        if (this.blobParts.length === 1) {
+            const blobPart = this.blobParts[0];
+            if (isBlob(blobPart)) {
+                return blobPart.stream();
+            }
+            const buf = getBlobPartAsBuffer(blobPart);
+            return new ReadableStream_js_1.PonyfillReadableStream({
+                start: controller => {
+                    controller.enqueue(buf);
+                    controller.close();
+                },
+            });
+        }
         let partQueue = [];
         return new ReadableStream_js_1.PonyfillReadableStream({
             start: controller => {

package/cjs/Body.js

@@ -14,11 +14,9 @@ var BodyInitType;
     BodyInitType["ReadableStream"] = "ReadableStream";
     BodyInitType["Blob"] = "Blob";
     BodyInitType["FormData"] = "FormData";
-    BodyInitType["ArrayBuffer"] = "ArrayBuffer";
     BodyInitType["String"] = "String";
     BodyInitType["Readable"] = "Readable";
     BodyInitType["Buffer"] = "Buffer";
-    BodyInitType["Uint8Array"] = "Uint8Array";
 })(BodyInitType || (BodyInitType = {}));
 class PonyfillBody {
     constructor(bodyInit, options = {}) {
@@ -70,19 +68,6 @@ class PonyfillBody {
         }
         return null;
     }
-    arrayBuffer() {
-        if (this.bodyType === BodyInitType.ArrayBuffer) {
-            return (0, utils_js_1.fakePromise)(this.bodyInit);
-        }
-        if (this._buffer) {
-            return (0, utils_js_1.fakePromise)(this._buffer.buffer);
-        }
-        if (this.bodyType === BodyInitType.Blob) {
-            const blob = this.bodyInit;
-            return blob.arrayBuffer();
-        }
-        return this.blob().then(blob => blob.arrayBuffer());
-    }
     _collectChunksFromReadable() {
         return new Promise((resolve, reject) => {
             const chunks = [];
@@ -110,12 +95,14 @@ class PonyfillBody {
         if (this._buffer) {
             const blob = new Blob_js_1.PonyfillBlob([this._buffer], {
                 type: this.contentType || '',
+                size: this.contentLength,
             });
             return (0, utils_js_1.fakePromise)(blob);
         }
         return this._collectChunksFromReadable().then(chunks => {
             return new Blob_js_1.PonyfillBlob(chunks, {
                 type: this.contentType || '',
+                size: this.contentLength,
             });
         });
     }
@@ -183,20 +170,25 @@ class PonyfillBody {
             _body?.readable.pipe(bb);
         });
     }
-    buffer() {
+    arrayBuffer() {
         if (this._buffer) {
-            return (0, utils_js_1.fakePromise)(Buffer.from(this._buffer.buffer, this._buffer.byteOffset, this._buffer.byteLength));
+            return (0, utils_js_1.fakePromise)(this._buffer);
         }
         if (this.bodyType === BodyInitType.Blob) {
             if (this.bodyInit instanceof Blob_js_1.PonyfillBlob) {
-                return this.bodyInit.buffer();
+                return this.bodyInit.arrayBuffer();
             }
             const bodyInitTyped = this.bodyInit;
             return bodyInitTyped
                 .arrayBuffer()
                 .then(arrayBuffer => Buffer.from(arrayBuffer, undefined, bodyInitTyped.size));
         }
-        return this._collectChunksFromReadable().then(chunks => Buffer.concat(chunks));
+        return this._collectChunksFromReadable().then(chunks => {
+            if (chunks.length === 1) {
+                return chunks[0];
+            }
+            return Buffer.concat(chunks, this.contentLength || undefined);
+        });
     }
     json() {
         return this.text().then(text => JSON.parse(text));
@@ -205,7 +197,7 @@ class PonyfillBody {
         if (this.bodyType === BodyInitType.String) {
             return (0, utils_js_1.fakePromise)(this.bodyInit);
         }
-        return this.buffer().then(buffer => buffer.toString('utf-8'));
+        return this.arrayBuffer().then(buffer => buffer.toString('utf-8'));
     }
 }
 exports.PonyfillBody = PonyfillBody;
@@ -231,12 +223,11 @@ function processBodyInit(bodyInit) {
             },
         };
     }
-    if (bodyInit instanceof Buffer) {
-        const contentLength = bodyInit.byteLength;
+    if (Buffer.isBuffer(bodyInit)) {
         return {
             bodyType: BodyInitType.Buffer,
-            contentLength,
             contentType: null,
+            contentLength: bodyInit.length,
             buffer: bodyInit,
             bodyFactory() {
                 const readable = stream_1.Readable.from(bodyInit);
@@ -245,6 +236,20 @@ function processBodyInit(bodyInit) {
             },
         };
     }
+    if ((0, utils_js_1.isArrayBufferView)(bodyInit)) {
+        const buffer = Buffer.from(bodyInit.buffer, bodyInit.byteOffset, bodyInit.byteLength);
+        return {
+            bodyType: BodyInitType.Buffer,
+            contentLength: bodyInit.byteLength,
+            contentType: null,
+            buffer,
+            bodyFactory() {
+                const readable = stream_1.Readable.from(buffer);
+                const body = new ReadableStream_js_1.PonyfillReadableStream(readable);
+                return body;
+            },
+        };
+    }
     if (bodyInit instanceof ReadableStream_js_1.PonyfillReadableStream) {
         return {
             bodyType: BodyInitType.ReadableStream,
@@ -253,7 +258,7 @@ function processBodyInit(bodyInit) {
             contentLength: null,
         };
     }
-    if (bodyInit instanceof Blob_js_1.PonyfillBlob) {
+    if (isBlob(bodyInit)) {
         return {
             bodyType: BodyInitType.Blob,
             contentType: bodyInit.type,
@@ -263,26 +268,11 @@ function processBodyInit(bodyInit) {
             },
         };
     }
-    if ((0, utils_js_1.isArrayBufferView)(bodyInit)) {
-        const contentLength = bodyInit.byteLength;
-        const buffer = Buffer.from(bodyInit.buffer, bodyInit.byteOffset, bodyInit.byteLength);
-        return {
-            bodyType: BodyInitType.Uint8Array,
-            buffer,
-            contentLength,
-            contentType: null,
-            bodyFactory() {
-                const readable = stream_1.Readable.from(buffer);
-                const body = new ReadableStream_js_1.PonyfillReadableStream(readable);
-                return body;
-            },
-        };
-    }
     if (bodyInit instanceof ArrayBuffer) {
         const contentLength = bodyInit.byteLength;
         const buffer = Buffer.from(bodyInit, undefined, bodyInit.byteLength);
         return {
-            bodyType: BodyInitType.ArrayBuffer,
+            bodyType: BodyInitType.Buffer,
             contentType: null,
             contentLength,
             buffer,
@@ -304,18 +294,6 @@ function processBodyInit(bodyInit) {
             },
         };
     }
-    if (isBlob(bodyInit)) {
-        return {
-            bodyType: BodyInitType.Blob,
-            contentType: bodyInit.type,
-            contentLength: bodyInit.size,
-            bodyFactory() {
-                const bodyStream = bodyInit.stream();
-                const body = new ReadableStream_js_1.PonyfillReadableStream(bodyStream);
-                return body;
-            },
-        };
-    }
     if (isURLSearchParams(bodyInit)) {
         const contentType = 'application/x-www-form-urlencoded;charset=UTF-8';
         return {

package/cjs/ReadableStream.js

@@ -36,7 +36,7 @@ function createController(desiredSize, readable) {
         _flush() {
             flushed = true;
             if (chunks.length > 0) {
-                const concatenated = Buffer.concat(chunks);
+                const concatenated = chunks.length > 1 ? Buffer.concat(chunks) : chunks[0];
                 readable.push(concatenated);
                 chunks = [];
             }

package/cjs/TextEncoderDecoder.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PonyfillBtoa = exports.PonyfillTextDecoder = exports.PonyfillTextEncoder = void 0;
+const utils_js_1 = require("./utils.js");
 class PonyfillTextEncoder {
     constructor(encoding = 'utf-8') {
         this.encoding = encoding;
@@ -29,6 +30,12 @@ class PonyfillTextDecoder {
         }
     }
     decode(input) {
+        if (Buffer.isBuffer(input)) {
+            return input.toString(this.encoding);
+        }
+        if ((0, utils_js_1.isArrayBufferView)(input)) {
+            return Buffer.from(input.buffer, input.byteOffset, input.byteLength).toString(this.encoding);
+        }
         return Buffer.from(input).toString(this.encoding);
     }
 }

package/cjs/fetch.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.fetchPonyfill = void 0;
 const fs_1 = require("fs");
 const url_1 = require("url");
-const Blob_js_1 = require("./Blob.js");
 const fetchCurl_js_1 = require("./fetchCurl.js");
 const fetchNodeHttp_js_1 = require("./fetchNodeHttp.js");
 const Request_js_1 = require("./Request.js");
@@ -21,10 +20,12 @@ function getResponseForDataUri(url) {
     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, {
+        return new Response_js_1.PonyfillResponse(buffer, {
             status: 200,
             statusText: 'OK',
+            headers: {
+                'content-type': realMimeType,
+            },
         });
     }
     return new Response_js_1.PonyfillResponse(data, {

package/cjs/utils.js

@@ -61,11 +61,7 @@ function fakePromise(value) {
 }
 exports.fakePromise = fakePromise;
 function isArrayBufferView(obj) {
-    return (obj != null &&
-        typeof obj === 'object' &&
-        obj.buffer != null &&
-        obj.byteLength != null &&
-        obj.byteOffset != null);
+    return obj != null && obj.buffer != null && obj.byteLength != null && obj.byteOffset != null;
 }
 exports.isArrayBufferView = isArrayBufferView;
 function isNodeReadable(obj) {

package/esm/Blob.js

@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/no-unsafe-declaration-merging */
 import { PonyfillReadableStream } from './ReadableStream.js';
-import { isArrayBufferView } from './utils.js';
+import { fakePromise, isArrayBufferView } from './utils.js';
 function getBlobPartAsBuffer(blobPart) {
     if (typeof blobPart === 'string') {
         return Buffer.from(blobPart);
@@ -23,59 +23,84 @@ function isBlob(obj) {
 export class PonyfillBlob {
     constructor(blobParts, options) {
         this.blobParts = blobParts;
+        this._size = null;
         this.type = options?.type || 'application/octet-stream';
         this.encoding = options?.encoding || 'utf8';
+        this._size = options?.size || null;
+        if (blobParts.length === 1 && isBlob(blobParts[0])) {
+            return blobParts[0];
+        }
     }
-    async buffer() {
-        const bufferChunks = [];
-        for (const blobPart of this.blobParts) {
+    arrayBuffer() {
+        if (this.blobParts.length === 1) {
+            const blobPart = this.blobParts[0];
+            if (isBlob(blobPart)) {
+                return blobPart.arrayBuffer();
+            }
+            return fakePromise(getBlobPartAsBuffer(blobPart));
+        }
+        const jobs = [];
+        const bufferChunks = this.blobParts.map((blobPart, i) => {
             if (isBlob(blobPart)) {
-                const arrayBuf = await blobPart.arrayBuffer();
-                const buf = Buffer.from(arrayBuf, undefined, blobPart.size);
-                bufferChunks.push(buf);
+                jobs.push(blobPart.arrayBuffer().then(arrayBuf => {
+                    bufferChunks[i] = Buffer.from(arrayBuf, undefined, blobPart.size);
+                }));
+                return undefined;
             }
             else {
-                const buf = getBlobPartAsBuffer(blobPart);
-                bufferChunks.push(buf);
+                return getBlobPartAsBuffer(blobPart);
             }
+        });
+        if (jobs.length > 0) {
+            return Promise.all(jobs).then(() => Buffer.concat(bufferChunks, this._size || undefined));
         }
-        return Buffer.concat(bufferChunks);
+        return fakePromise(Buffer.concat(bufferChunks, this._size || undefined));
     }
-    arrayBuffer() {
-        return this.buffer().then(buf => buf.buffer);
-    }
-    async text() {
-        let text = '';
-        for (const blobPart of this.blobParts) {
+    text() {
+        if (this.blobParts.length === 1) {
+            const blobPart = this.blobParts[0];
             if (typeof blobPart === 'string') {
-                text += blobPart;
-            }
-            else if (isBlob(blobPart)) {
-                text += await blobPart.text();
+                return fakePromise(blobPart);
             }
-            else {
-                const buf = getBlobPartAsBuffer(blobPart);
-                text += buf.toString(this.encoding);
+            if (isBlob(blobPart)) {
+                return blobPart.text();
             }
+            const buf = getBlobPartAsBuffer(blobPart);
+            return fakePromise(buf.toString(this.encoding));
         }
-        return text;
+        return this.arrayBuffer().then(buf => buf.toString(this.encoding));
     }
     get size() {
-        let size = 0;
-        for (const blobPart of this.blobParts) {
-            if (typeof blobPart === 'string') {
-                size += Buffer.byteLength(blobPart);
-            }
-            else if (isBlob(blobPart)) {
-                size += blobPart.size;
-            }
-            else if (isArrayBufferView(blobPart)) {
-                size += blobPart.byteLength;
+        if (this._size == null) {
+            this._size = 0;
+            for (const blobPart of this.blobParts) {
+                if (typeof blobPart === 'string') {
+                    this._size += Buffer.byteLength(blobPart);
+                }
+                else if (isBlob(blobPart)) {
+                    this._size += blobPart.size;
+                }
+                else if (isArrayBufferView(blobPart)) {
+                    this._size += blobPart.byteLength;
+                }
             }
         }
-        return size;
+        return this._size;
     }
     stream() {
+        if (this.blobParts.length === 1) {
+            const blobPart = this.blobParts[0];
+            if (isBlob(blobPart)) {
+                return blobPart.stream();
+            }
+            const buf = getBlobPartAsBuffer(blobPart);
+            return new PonyfillReadableStream({
+                start: controller => {
+                    controller.enqueue(buf);
+                    controller.close();
+                },
+            });
+        }
         let partQueue = [];
         return new PonyfillReadableStream({
             start: controller => {

package/esm/Body.js

@@ -10,11 +10,9 @@ var BodyInitType;
     BodyInitType["ReadableStream"] = "ReadableStream";
     BodyInitType["Blob"] = "Blob";
     BodyInitType["FormData"] = "FormData";
-    BodyInitType["ArrayBuffer"] = "ArrayBuffer";
     BodyInitType["String"] = "String";
     BodyInitType["Readable"] = "Readable";
     BodyInitType["Buffer"] = "Buffer";
-    BodyInitType["Uint8Array"] = "Uint8Array";
 })(BodyInitType || (BodyInitType = {}));
 export class PonyfillBody {
     constructor(bodyInit, options = {}) {
@@ -66,19 +64,6 @@ export class PonyfillBody {
         }
         return null;
     }
-    arrayBuffer() {
-        if (this.bodyType === BodyInitType.ArrayBuffer) {
-            return fakePromise(this.bodyInit);
-        }
-        if (this._buffer) {
-            return fakePromise(this._buffer.buffer);
-        }
-        if (this.bodyType === BodyInitType.Blob) {
-            const blob = this.bodyInit;
-            return blob.arrayBuffer();
-        }
-        return this.blob().then(blob => blob.arrayBuffer());
-    }
     _collectChunksFromReadable() {
         return new Promise((resolve, reject) => {
             const chunks = [];
@@ -106,12 +91,14 @@ export class PonyfillBody {
         if (this._buffer) {
             const blob = new PonyfillBlob([this._buffer], {
                 type: this.contentType || '',
+                size: this.contentLength,
             });
             return fakePromise(blob);
         }
         return this._collectChunksFromReadable().then(chunks => {
             return new PonyfillBlob(chunks, {
                 type: this.contentType || '',
+                size: this.contentLength,
             });
         });
     }
@@ -179,20 +166,25 @@ export class PonyfillBody {
             _body?.readable.pipe(bb);
         });
     }
-    buffer() {
+    arrayBuffer() {
         if (this._buffer) {
-            return fakePromise(Buffer.from(this._buffer.buffer, this._buffer.byteOffset, this._buffer.byteLength));
+            return fakePromise(this._buffer);
         }
         if (this.bodyType === BodyInitType.Blob) {
             if (this.bodyInit instanceof PonyfillBlob) {
-                return this.bodyInit.buffer();
+                return this.bodyInit.arrayBuffer();
             }
             const bodyInitTyped = this.bodyInit;
             return bodyInitTyped
                 .arrayBuffer()
                 .then(arrayBuffer => Buffer.from(arrayBuffer, undefined, bodyInitTyped.size));
         }
-        return this._collectChunksFromReadable().then(chunks => Buffer.concat(chunks));
+        return this._collectChunksFromReadable().then(chunks => {
+            if (chunks.length === 1) {
+                return chunks[0];
+            }
+            return Buffer.concat(chunks, this.contentLength || undefined);
+        });
     }
     json() {
         return this.text().then(text => JSON.parse(text));
@@ -201,7 +193,7 @@ export class PonyfillBody {
         if (this.bodyType === BodyInitType.String) {
             return fakePromise(this.bodyInit);
         }
-        return this.buffer().then(buffer => buffer.toString('utf-8'));
+        return this.arrayBuffer().then(buffer => buffer.toString('utf-8'));
     }
 }
 function processBodyInit(bodyInit) {
@@ -226,12 +218,11 @@ function processBodyInit(bodyInit) {
             },
         };
     }
-    if (bodyInit instanceof Buffer) {
-        const contentLength = bodyInit.byteLength;
+    if (Buffer.isBuffer(bodyInit)) {
         return {
             bodyType: BodyInitType.Buffer,
-            contentLength,
             contentType: null,
+            contentLength: bodyInit.length,
             buffer: bodyInit,
             bodyFactory() {
                 const readable = Readable.from(bodyInit);
@@ -240,6 +231,20 @@ function processBodyInit(bodyInit) {
             },
         };
     }
+    if (isArrayBufferView(bodyInit)) {
+        const buffer = Buffer.from(bodyInit.buffer, bodyInit.byteOffset, bodyInit.byteLength);
+        return {
+            bodyType: BodyInitType.Buffer,
+            contentLength: bodyInit.byteLength,
+            contentType: null,
+            buffer,
+            bodyFactory() {
+                const readable = Readable.from(buffer);
+                const body = new PonyfillReadableStream(readable);
+                return body;
+            },
+        };
+    }
     if (bodyInit instanceof PonyfillReadableStream) {
         return {
             bodyType: BodyInitType.ReadableStream,
@@ -248,7 +253,7 @@ function processBodyInit(bodyInit) {
             contentLength: null,
         };
     }
-    if (bodyInit instanceof PonyfillBlob) {
+    if (isBlob(bodyInit)) {
         return {
             bodyType: BodyInitType.Blob,
             contentType: bodyInit.type,
@@ -258,26 +263,11 @@ function processBodyInit(bodyInit) {
             },
         };
     }
-    if (isArrayBufferView(bodyInit)) {
-        const contentLength = bodyInit.byteLength;
-        const buffer = Buffer.from(bodyInit.buffer, bodyInit.byteOffset, bodyInit.byteLength);
-        return {
-            bodyType: BodyInitType.Uint8Array,
-            buffer,
-            contentLength,
-            contentType: null,
-            bodyFactory() {
-                const readable = Readable.from(buffer);
-                const body = new PonyfillReadableStream(readable);
-                return body;
-            },
-        };
-    }
     if (bodyInit instanceof ArrayBuffer) {
         const contentLength = bodyInit.byteLength;
         const buffer = Buffer.from(bodyInit, undefined, bodyInit.byteLength);
         return {
-            bodyType: BodyInitType.ArrayBuffer,
+            bodyType: BodyInitType.Buffer,
             contentType: null,
             contentLength,
             buffer,
@@ -299,18 +289,6 @@ function processBodyInit(bodyInit) {
             },
         };
     }
-    if (isBlob(bodyInit)) {
-        return {
-            bodyType: BodyInitType.Blob,
-            contentType: bodyInit.type,
-            contentLength: bodyInit.size,
-            bodyFactory() {
-                const bodyStream = bodyInit.stream();
-                const body = new PonyfillReadableStream(bodyStream);
-                return body;
-            },
-        };
-    }
     if (isURLSearchParams(bodyInit)) {
         const contentType = 'application/x-www-form-urlencoded;charset=UTF-8';
         return {

package/esm/ReadableStream.js

@@ -33,7 +33,7 @@ function createController(desiredSize, readable) {
         _flush() {
             flushed = true;
             if (chunks.length > 0) {
-                const concatenated = Buffer.concat(chunks);
+                const concatenated = chunks.length > 1 ? Buffer.concat(chunks) : chunks[0];
                 readable.push(concatenated);
                 chunks = [];
             }

package/esm/TextEncoderDecoder.js

@@ -1,3 +1,4 @@
+import { isArrayBufferView } from './utils.js';
 export class PonyfillTextEncoder {
     constructor(encoding = 'utf-8') {
         this.encoding = encoding;
@@ -25,6 +26,12 @@ export class PonyfillTextDecoder {
         }
     }
     decode(input) {
+        if (Buffer.isBuffer(input)) {
+            return input.toString(this.encoding);
+        }
+        if (isArrayBufferView(input)) {
+            return Buffer.from(input.buffer, input.byteOffset, input.byteLength).toString(this.encoding);
+        }
         return Buffer.from(input).toString(this.encoding);
     }
 }

package/esm/fetch.js

@@ -1,6 +1,5 @@
 import { createReadStream } from 'fs';
 import { fileURLToPath } from 'url';
-import { PonyfillBlob } from './Blob.js';
 import { fetchCurl } from './fetchCurl.js';
 import { fetchNodeHttp } from './fetchNodeHttp.js';
 import { PonyfillRequest } from './Request.js';
@@ -18,10 +17,12 @@ function getResponseForDataUri(url) {
     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, {
+        return new PonyfillResponse(buffer, {
             status: 200,
             statusText: 'OK',
+            headers: {
+                'content-type': realMimeType,
+            },
         });
     }
     return new PonyfillResponse(data, {

package/esm/utils.js

@@ -55,11 +55,7 @@ export function fakePromise(value) {
     };
 }
 export function isArrayBufferView(obj) {
-    return (obj != null &&
-        typeof obj === 'object' &&
-        obj.buffer != null &&
-        obj.byteLength != null &&
-        obj.byteOffset != null);
+    return obj != null && obj.buffer != null && obj.byteLength != null && obj.byteOffset != null;
 }
 export function isNodeReadable(obj) {
     return obj != null && obj.pipe != null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@whatwg-node/node-fetch",
-  "version": "0.4.14",
+  "version": "0.4.15-alpha-20230901114303-38c018b",
   "description": "Fetch API implementation for Node",
   "sideEffects": false,
   "dependencies": {

package/typings/Blob.d.cts

@@ -10,14 +10,18 @@ interface BlobOptions {
      * is performed.
      */
     type?: string | undefined;
+    /**
+     * The size of the Blob object in bytes.
+     */
+    size?: number | null;
 }
 export declare class PonyfillBlob implements Blob {
     private blobParts;
     type: string;
     private encoding;
+    private _size;
     constructor(blobParts: BlobPart[], options?: BlobOptions);
-    buffer(): Promise<Buffer>;
-    arrayBuffer(): Promise<ArrayBuffer | SharedArrayBuffer>;
+    arrayBuffer(): Promise<Buffer>;
     text(): Promise<string>;
     get size(): number;
     stream(): any;

package/typings/Blob.d.ts

@@ -10,14 +10,18 @@ interface BlobOptions {
      * is performed.
      */
     type?: string | undefined;
+    /**
+     * The size of the Blob object in bytes.
+     */
+    size?: number | null;
 }
 export declare class PonyfillBlob implements Blob {
     private blobParts;
     type: string;
     private encoding;
+    private _size;
     constructor(blobParts: BlobPart[], options?: BlobOptions);
-    buffer(): Promise<Buffer>;
-    arrayBuffer(): Promise<ArrayBuffer | SharedArrayBuffer>;
+    arrayBuffer(): Promise<Buffer>;
     text(): Promise<string>;
     get size(): number;
     stream(): any;

package/typings/Body.d.cts

@@ -30,13 +30,12 @@ export declare class PonyfillBody<TJSON = any> implements Body {
     private _buffer?;
     private generateBody;
     get body(): PonyfillReadableStream<Uint8Array> | null;
-    arrayBuffer(): Promise<ArrayBuffer>;
     _collectChunksFromReadable(): Promise<Uint8Array[]>;
     blob(): Promise<PonyfillBlob>;
     formData(opts?: {
         formDataLimits: FormDataLimits;
     }): Promise<PonyfillFormData>;
-    buffer(): Promise<Buffer>;
+    arrayBuffer(): Promise<Buffer>;
     json(): Promise<TJSON>;
     text(): Promise<string>;
 }

package/typings/Body.d.ts

@@ -30,13 +30,12 @@ export declare class PonyfillBody<TJSON = any> implements Body {
     private _buffer?;
     private generateBody;
     get body(): PonyfillReadableStream<Uint8Array> | null;
-    arrayBuffer(): Promise<ArrayBuffer>;
     _collectChunksFromReadable(): Promise<Uint8Array[]>;
     blob(): Promise<PonyfillBlob>;
     formData(opts?: {
         formDataLimits: FormDataLimits;
     }): Promise<PonyfillFormData>;
-    buffer(): Promise<Buffer>;
+    arrayBuffer(): Promise<Buffer>;
     json(): Promise<TJSON>;
     text(): Promise<string>;
 }

package/typings/TextEncoderDecoder.d.cts

@@ -9,7 +9,7 @@ export declare class PonyfillTextDecoder implements TextDecoder {
     encoding: BufferEncoding;
     fatal: boolean;
     ignoreBOM: boolean;
-    constructor(encoding: BufferEncoding, options: TextDecoderOptions);
-    decode(input: Uint8Array): string;
+    constructor(encoding?: BufferEncoding, options?: TextDecoderOptions);
+    decode(input: BufferSource): string;
 }
 export declare function PonyfillBtoa(input: string): string;

package/typings/TextEncoderDecoder.d.ts

@@ -9,7 +9,7 @@ export declare class PonyfillTextDecoder implements TextDecoder {
     encoding: BufferEncoding;
     fatal: boolean;
     ignoreBOM: boolean;
-    constructor(encoding: BufferEncoding, options: TextDecoderOptions);
-    decode(input: Uint8Array): string;
+    constructor(encoding?: BufferEncoding, options?: TextDecoderOptions);
+    decode(input: BufferSource): string;
 }
 export declare function PonyfillBtoa(input: string): string;