@whatwg-node/node-fetch 0.0.1-alpha-20221228082016-9ef2266 → 0.0.1-alpha-20221228083733-4041c71

package/Body.d.ts

@@ -7,11 +7,12 @@ export type BodyPonyfillInit = XMLHttpRequestBodyInit | Readable | PonyfillReada
 export declare class PonyfillBody implements Body {
     private bodyInit;
     bodyUsed: boolean;
-    readonly body: PonyfillReadableStream<Uint8Array> | null;
+    private _body;
     contentType: string | null;
     contentLength: number | null;
     constructor(bodyInit: BodyPonyfillInit | null);
     private bodyType?;
+    get body(): PonyfillReadableStream<Uint8Array> | null;
     arrayBuffer(): Promise<ArrayBuffer>;
     blob(): Promise<PonyfillBlob>;
     formData(): Promise<PonyfillFormData>;

package/ReadableStream.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="node" />
-import { Readable, Writable } from 'stream';
+import { Readable } from 'stream';
 export declare class PonyfillReadableStream<T> implements ReadableStream<T> {
     readable: Readable;
     constructor(underlyingSource?: UnderlyingSource<T> | Readable | ReadableStream<T> | PonyfillReadableStream<T>);
@@ -16,6 +16,5 @@ export declare class PonyfillReadableStream<T> implements ReadableStream<T> {
         writable: WritableStream<T>;
         readable: ReadableStream<T2>;
     }): ReadableStream<T2>;
-    pipe(writable: Writable): Writable;
-    on(event: string, listener: (...args: any[]) => void): this;
+    static [Symbol.hasInstance](instance: unknown): instance is PonyfillReadableStream<unknown>;
 }

package/index.js

@@ -201,13 +201,8 @@ class PonyfillReadableStream {
         this.pipeTo(writable);
         return readable;
     }
-    // Trick Fastify
-    pipe(writable) {
-        return this.readable.pipe(writable);
-    }
-    on(event, listener) {
-        this.readable.on(event, listener);
-        return this;
+    static [Symbol.hasInstance](instance) {
+        return instance != null && typeof instance === 'object' && 'getReader' in instance;
     }
 }
 
@@ -299,36 +294,36 @@ class PonyfillBody {
     constructor(bodyInit) {
         this.bodyInit = bodyInit;
         this.bodyUsed = false;
-        this.body = null;
+        this._body = null;
         this.contentType = null;
         this.contentLength = null;
         if (this.bodyInit == null) {
-            this.body = null;
+            this._body = null;
         }
         else if (typeof this.bodyInit === 'string') {
             this.bodyType = BodyInitType.String;
             const buffer = Buffer.from(this.bodyInit);
             this.contentType = 'text/plain;charset=UTF-8';
             this.contentLength = buffer.length;
-            this.body = new PonyfillReadableStream(stream.Readable.from(buffer));
+            this._body = new PonyfillReadableStream(stream.Readable.from(buffer));
         }
         else if (this.bodyInit instanceof PonyfillReadableStream) {
             this.bodyType = BodyInitType.ReadableStream;
-            this.body = this.bodyInit;
+            this._body = this.bodyInit;
         }
         else if (this.bodyInit instanceof PonyfillBlob) {
             this.bodyType = BodyInitType.Blob;
             const blobStream = this.bodyInit.stream();
             this.contentType = this.bodyInit.type;
             this.contentLength = this.bodyInit.size;
-            this.body = new PonyfillReadableStream(blobStream);
+            this._body = new PonyfillReadableStream(blobStream);
         }
         else if (this.bodyInit instanceof PonyfillFormData) {
             this.bodyType = BodyInitType.FormData;
             const boundary = Math.random().toString(36).substr(2);
             const formData = this.bodyInit;
             this.contentType = `multipart/form-data; boundary=${boundary}`;
-            this.body = new PonyfillReadableStream({
+            this._body = new PonyfillReadableStream({
                 start: async (controller) => {
                     controller.enqueue(Buffer.from(`--${boundary}\r\n`));
                     const entries = [];
@@ -363,21 +358,46 @@ class PonyfillBody {
         }
         else if ('buffer' in this.bodyInit) {
             this.contentLength = this.bodyInit.byteLength;
-            this.body = new PonyfillReadableStream(stream.Readable.from(this.bodyInit));
+            this._body = new PonyfillReadableStream(stream.Readable.from(this.bodyInit));
         }
         else if (this.bodyInit instanceof ArrayBuffer) {
             this.bodyType = BodyInitType.ArrayBuffer;
             this.contentLength = this.bodyInit.byteLength;
-            this.body = new PonyfillReadableStream(stream.Readable.from(Buffer.from(this.bodyInit)));
+            this._body = new PonyfillReadableStream(stream.Readable.from(Buffer.from(this.bodyInit)));
         }
         else if (this.bodyInit instanceof stream.Readable) {
             this.bodyType = BodyInitType.Readable;
-            this.body = new PonyfillReadableStream(this.bodyInit);
+            this._body = new PonyfillReadableStream(this.bodyInit);
         }
         else {
             throw new Error('Unknown body type');
         }
     }
+    get body() {
+        if (this._body != null) {
+            const ponyfillReadableStream = this._body;
+            const readable = this._body.readable;
+            return new Proxy(this._body.readable, {
+                get(_, prop) {
+                    if (prop in ponyfillReadableStream) {
+                        const ponyfillReadableStreamProp = ponyfillReadableStream[prop];
+                        if (typeof ponyfillReadableStreamProp === 'function') {
+                            return ponyfillReadableStreamProp.bind(ponyfillReadableStream);
+                        }
+                        return ponyfillReadableStreamProp;
+                    }
+                    if (prop in readable) {
+                        const readableProp = readable[prop];
+                        if (typeof readableProp === 'function') {
+                            return readableProp.bind(readable);
+                        }
+                        return readableProp;
+                    }
+                }
+            });
+        }
+        return null;
+    }
     async arrayBuffer() {
         if (this.bodyType === BodyInitType.ArrayBuffer) {
             return this.bodyInit;
@@ -390,8 +410,8 @@ class PonyfillBody {
             return this.bodyInit;
         }
         const chunks = [];
-        if (this.body) {
-            for await (const chunk of this.body.readable) {
+        if (this._body) {
+            for await (const chunk of this._body.readable) {
                 chunks.push(chunk);
             }
         }
@@ -418,8 +438,8 @@ class PonyfillBody {
         if (this.bodyType === BodyInitType.Readable) {
             return this.bodyInit;
         }
-        if (this.body != null) {
-            return this.body.readable;
+        if (this._body != null) {
+            return this._body.readable;
         }
         return null;
     }
@@ -648,7 +668,7 @@ const fetchPonyfill = (info, init) => {
                 return;
             }
             const requestFn = getRequestFnForProtocol(protocol);
-            const nodeReadable = fetchRequest.readable();
+            const nodeReadable = fetchRequest.body;
             const nodeHeaders = getHeadersObj(fetchRequest.headers);
             const abortListener = function abortListener(event) {
                 nodeRequest.destroy();

package/index.mjs

@@ -197,13 +197,8 @@ class PonyfillReadableStream {
         this.pipeTo(writable);
         return readable;
     }
-    // Trick Fastify
-    pipe(writable) {
-        return this.readable.pipe(writable);
-    }
-    on(event, listener) {
-        this.readable.on(event, listener);
-        return this;
+    static [Symbol.hasInstance](instance) {
+        return instance != null && typeof instance === 'object' && 'getReader' in instance;
     }
 }
 
@@ -295,36 +290,36 @@ class PonyfillBody {
     constructor(bodyInit) {
         this.bodyInit = bodyInit;
         this.bodyUsed = false;
-        this.body = null;
+        this._body = null;
         this.contentType = null;
         this.contentLength = null;
         if (this.bodyInit == null) {
-            this.body = null;
+            this._body = null;
         }
         else if (typeof this.bodyInit === 'string') {
             this.bodyType = BodyInitType.String;
             const buffer = Buffer.from(this.bodyInit);
             this.contentType = 'text/plain;charset=UTF-8';
             this.contentLength = buffer.length;
-            this.body = new PonyfillReadableStream(Readable.from(buffer));
+            this._body = new PonyfillReadableStream(Readable.from(buffer));
         }
         else if (this.bodyInit instanceof PonyfillReadableStream) {
             this.bodyType = BodyInitType.ReadableStream;
-            this.body = this.bodyInit;
+            this._body = this.bodyInit;
         }
         else if (this.bodyInit instanceof PonyfillBlob) {
             this.bodyType = BodyInitType.Blob;
             const blobStream = this.bodyInit.stream();
             this.contentType = this.bodyInit.type;
             this.contentLength = this.bodyInit.size;
-            this.body = new PonyfillReadableStream(blobStream);
+            this._body = new PonyfillReadableStream(blobStream);
         }
         else if (this.bodyInit instanceof PonyfillFormData) {
             this.bodyType = BodyInitType.FormData;
             const boundary = Math.random().toString(36).substr(2);
             const formData = this.bodyInit;
             this.contentType = `multipart/form-data; boundary=${boundary}`;
-            this.body = new PonyfillReadableStream({
+            this._body = new PonyfillReadableStream({
                 start: async (controller) => {
                     controller.enqueue(Buffer.from(`--${boundary}\r\n`));
                     const entries = [];
@@ -359,21 +354,46 @@ class PonyfillBody {
         }
         else if ('buffer' in this.bodyInit) {
             this.contentLength = this.bodyInit.byteLength;
-            this.body = new PonyfillReadableStream(Readable.from(this.bodyInit));
+            this._body = new PonyfillReadableStream(Readable.from(this.bodyInit));
         }
         else if (this.bodyInit instanceof ArrayBuffer) {
             this.bodyType = BodyInitType.ArrayBuffer;
             this.contentLength = this.bodyInit.byteLength;
-            this.body = new PonyfillReadableStream(Readable.from(Buffer.from(this.bodyInit)));
+            this._body = new PonyfillReadableStream(Readable.from(Buffer.from(this.bodyInit)));
         }
         else if (this.bodyInit instanceof Readable) {
             this.bodyType = BodyInitType.Readable;
-            this.body = new PonyfillReadableStream(this.bodyInit);
+            this._body = new PonyfillReadableStream(this.bodyInit);
         }
         else {
             throw new Error('Unknown body type');
         }
     }
+    get body() {
+        if (this._body != null) {
+            const ponyfillReadableStream = this._body;
+            const readable = this._body.readable;
+            return new Proxy(this._body.readable, {
+                get(_, prop) {
+                    if (prop in ponyfillReadableStream) {
+                        const ponyfillReadableStreamProp = ponyfillReadableStream[prop];
+                        if (typeof ponyfillReadableStreamProp === 'function') {
+                            return ponyfillReadableStreamProp.bind(ponyfillReadableStream);
+                        }
+                        return ponyfillReadableStreamProp;
+                    }
+                    if (prop in readable) {
+                        const readableProp = readable[prop];
+                        if (typeof readableProp === 'function') {
+                            return readableProp.bind(readable);
+                        }
+                        return readableProp;
+                    }
+                }
+            });
+        }
+        return null;
+    }
     async arrayBuffer() {
         if (this.bodyType === BodyInitType.ArrayBuffer) {
             return this.bodyInit;
@@ -386,8 +406,8 @@ class PonyfillBody {
             return this.bodyInit;
         }
         const chunks = [];
-        if (this.body) {
-            for await (const chunk of this.body.readable) {
+        if (this._body) {
+            for await (const chunk of this._body.readable) {
                 chunks.push(chunk);
             }
         }
@@ -414,8 +434,8 @@ class PonyfillBody {
         if (this.bodyType === BodyInitType.Readable) {
             return this.bodyInit;
         }
-        if (this.body != null) {
-            return this.body.readable;
+        if (this._body != null) {
+            return this._body.readable;
         }
         return null;
     }
@@ -644,7 +664,7 @@ const fetchPonyfill = (info, init) => {
                 return;
             }
             const requestFn = getRequestFnForProtocol(protocol);
-            const nodeReadable = fetchRequest.readable();
+            const nodeReadable = fetchRequest.body;
             const nodeHeaders = getHeadersObj(fetchRequest.headers);
             const abortListener = function abortListener(event) {
                 nodeRequest.destroy();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@whatwg-node/node-fetch",
-  "version": "0.0.1-alpha-20221228082016-9ef2266",
+  "version": "0.0.1-alpha-20221228083733-4041c71",
   "description": "Fetch API implementation for Node",
   "sideEffects": false,
   "peerDependencies": {