@whatwg-node/node-fetch 0.5.11-alpha-20240327142620-7e48e923e7d5db8190d1a60110883d229f7d893c → 0.5.11-alpha-20240327142842-26e172534a26bc875f63385a16971fbdc5b95d8b

package/cjs/ReadableStream.js

@@ -3,18 +3,6 @@ var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PonyfillReadableStream = void 0;
 const stream_1 = require("stream");
-try {
-    const originalReadableFromWeb = stream_1.Readable.fromWeb;
-    stream_1.Readable.fromWeb = function fromWeb(stream) {
-        if (stream instanceof PonyfillReadableStream) {
-            return stream.readable;
-        }
-        return originalReadableFromWeb(stream);
-    };
-}
-catch (e) {
-    console.warn('Could not patch Readable.fromWeb, so this might break Readable.fromWeb usage with the whatwg-node and the integrations like Fastify', e);
-}
 function createController(desiredSize, readable) {
     let chunks = [];
     let _closed = false;

package/cjs/index.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.URLSearchParams = exports.URL = exports.btoa = exports.TextDecoder = exports.TextEncoder = exports.Blob = exports.FormData = exports.File = exports.ReadableStream = exports.Response = exports.Request = exports.Body = exports.Headers = exports.fetch = void 0;
+const utils_js_1 = require("./utils.js");
 var fetch_js_1 = require("./fetch.js");
 Object.defineProperty(exports, "fetch", { enumerable: true, get: function () { return fetch_js_1.fetchPonyfill; } });
 var Headers_js_1 = require("./Headers.js");
@@ -27,3 +28,5 @@ var URL_js_1 = require("./URL.js");
 Object.defineProperty(exports, "URL", { enumerable: true, get: function () { return URL_js_1.PonyfillURL; } });
 var URLSearchParams_js_1 = require("./URLSearchParams.js");
 Object.defineProperty(exports, "URLSearchParams", { enumerable: true, get: function () { return URLSearchParams_js_1.PonyfillURLSearchParams; } });
+// Not sure it is the right thing to do, but it is the only way to make it work for Fastify
+(0, utils_js_1.patchReadableFromWeb)();

package/cjs/utils.js

@@ -1,9 +1,27 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isNodeReadable = exports.isArrayBufferView = exports.fakePromise = exports.defaultHeadersSerializer = exports.getHeadersObj = void 0;
+exports.isNodeReadable = exports.isArrayBufferView = exports.fakePromise = exports.defaultHeadersSerializer = exports.getHeadersObj = exports.patchReadableFromWeb = void 0;
+const stream_1 = require("stream");
 function isHeadersInstance(obj) {
     return obj?.forEach != null;
 }
+function patchReadableFromWeb() {
+    try {
+        const originalReadableFromWeb = stream_1.Readable.fromWeb;
+        if (originalReadableFromWeb.name !== 'ReadableFromWebPatchedByWhatWgNode') {
+            stream_1.Readable.fromWeb = function ReadableFromWebPatchedByWhatWgNode(stream) {
+                if (stream.readable != null) {
+                    return stream.readable;
+                }
+                return originalReadableFromWeb(stream);
+            };
+        }
+    }
+    catch (e) {
+        console.warn('Could not patch Readable.fromWeb, so this might break Readable.fromWeb usage with the whatwg-node and the integrations like Fastify', e);
+    }
+}
+exports.patchReadableFromWeb = patchReadableFromWeb;
 function getHeadersObj(headers) {
     if (headers == null || !isHeadersInstance(headers)) {
         return headers;

package/esm/ReadableStream.js

@@ -1,17 +1,5 @@
 var _a;
 import { Readable } from 'stream';
-try {
-    const originalReadableFromWeb = Readable.fromWeb;
-    Readable.fromWeb = function fromWeb(stream) {
-        if (stream instanceof PonyfillReadableStream) {
-            return stream.readable;
-        }
-        return originalReadableFromWeb(stream);
-    };
-}
-catch (e) {
-    console.warn('Could not patch Readable.fromWeb, so this might break Readable.fromWeb usage with the whatwg-node and the integrations like Fastify', e);
-}
 function createController(desiredSize, readable) {
     let chunks = [];
     let _closed = false;

package/esm/index.js

@@ -1,3 +1,4 @@
+import { patchReadableFromWeb } from './utils.js';
 export { fetchPonyfill as fetch } from './fetch.js';
 export { PonyfillHeaders as Headers } from './Headers.js';
 export { PonyfillBody as Body } from './Body.js';
@@ -10,3 +11,5 @@ export { PonyfillBlob as Blob } from './Blob.js';
 export { PonyfillTextEncoder as TextEncoder, PonyfillTextDecoder as TextDecoder, PonyfillBtoa as btoa, } from './TextEncoderDecoder.js';
 export { PonyfillURL as URL } from './URL.js';
 export { PonyfillURLSearchParams as URLSearchParams } from './URLSearchParams.js';
+// Not sure it is the right thing to do, but it is the only way to make it work for Fastify
+patchReadableFromWeb();

package/esm/utils.js

@@ -1,6 +1,23 @@
+import { Readable } from 'stream';
 function isHeadersInstance(obj) {
     return obj?.forEach != null;
 }
+export function patchReadableFromWeb() {
+    try {
+        const originalReadableFromWeb = Readable.fromWeb;
+        if (originalReadableFromWeb.name !== 'ReadableFromWebPatchedByWhatWgNode') {
+            Readable.fromWeb = function ReadableFromWebPatchedByWhatWgNode(stream) {
+                if (stream.readable != null) {
+                    return stream.readable;
+                }
+                return originalReadableFromWeb(stream);
+            };
+        }
+    }
+    catch (e) {
+        console.warn('Could not patch Readable.fromWeb, so this might break Readable.fromWeb usage with the whatwg-node and the integrations like Fastify', e);
+    }
+}
 export function getHeadersObj(headers) {
     if (headers == null || !isHeadersInstance(headers)) {
         return headers;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@whatwg-node/node-fetch",
-  "version": "0.5.11-alpha-20240327142620-7e48e923e7d5db8190d1a60110883d229f7d893c",
+  "version": "0.5.11-alpha-20240327142842-26e172534a26bc875f63385a16971fbdc5b95d8b",
   "description": "Fetch API implementation for Node",
   "sideEffects": false,
   "dependencies": {

package/typings/utils.d.cts

@@ -1,5 +1,6 @@
 /// <reference types="node" />
 import { Readable } from 'stream';
+export declare function patchReadableFromWeb(): void;
 export declare function getHeadersObj(headers: Headers): Record<string, string>;
 export declare function defaultHeadersSerializer(headers: Headers, onContentLength?: (value: string) => void): string[];
 export declare function fakePromise<T>(value: T): Promise<T>;

package/typings/utils.d.ts

@@ -1,5 +1,6 @@
 /// <reference types="node" />
 import { Readable } from 'stream';
+export declare function patchReadableFromWeb(): void;
 export declare function getHeadersObj(headers: Headers): Record<string, string>;
 export declare function defaultHeadersSerializer(headers: Headers, onContentLength?: (value: string) => void): string[];
 export declare function fakePromise<T>(value: T): Promise<T>;