@whatwg-node/node-fetch 0.5.7-alpha-20240229132341-1e3c1f24effefed571297b2c5001e44cfaefbf60 → 0.5.7-alpha-20240301155147-161016a5c5b719972dd96f47adc3ee3be99e11d4

package/cjs/fetchCurl.js

@@ -88,11 +88,13 @@ function fetchCurl(fetchRequest) {
                 return false;
             });
             const headersInit = headersFlat.map(headerFlat => headerFlat.split(/:\s(.+)/).slice(0, 2));
-            resolve(new Response_js_1.PonyfillResponse(stream.pipe(new node_stream_1.PassThrough()), {
+            const ponyfillResponse = new Response_js_1.PonyfillResponse(stream, {
                 status,
                 headers: headersInit,
                 url: fetchRequest.url,
-            }));
+            });
+            utils_js_1.readableCleanupRegistry.register(ponyfillResponse, stream);
+            resolve(ponyfillResponse);
             streamResolved = stream;
         });
         curlHandle.perform();

package/cjs/fetchNodeHttp.js

@@ -36,7 +36,7 @@ function fetchNodeHttp(fetchRequest) {
                 agent: fetchRequest.agent,
             });
             nodeRequest.once('response', nodeResponse => {
-                let responseBody = nodeResponse.pipe(new stream_1.PassThrough());
+                let responseBody = nodeResponse;
                 const contentEncoding = nodeResponse.headers['content-encoding'];
                 switch (contentEncoding) {
                     case 'x-gzip':
@@ -75,6 +75,9 @@ function fetchNodeHttp(fetchRequest) {
                     headers: nodeResponse.headers,
                     url: fetchRequest.url,
                 });
+                if (responseBody === nodeResponse) {
+                    utils_js_1.readableCleanupRegistry.register(ponyfillResponse, nodeResponse);
+                }
                 resolve(ponyfillResponse);
             });
             nodeRequest.once('error', reject);

package/cjs/utils.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isNodeReadable = exports.isArrayBufferView = exports.fakePromise = exports.defaultHeadersSerializer = exports.getHeadersObj = void 0;
+exports.readableCleanupRegistry = exports.isNodeReadable = exports.isArrayBufferView = exports.fakePromise = exports.defaultHeadersSerializer = exports.getHeadersObj = void 0;
+const node_stream_1 = require("node:stream");
 function isHeadersInstance(obj) {
     return obj?.forEach != null;
 }
@@ -71,3 +72,8 @@ function isNodeReadable(obj) {
     return obj != null && obj.pipe != null;
 }
 exports.isNodeReadable = isNodeReadable;
+exports.readableCleanupRegistry = new FinalizationRegistry(readable => {
+    if (!readable.readableFlowing) {
+        readable.pipe(new node_stream_1.PassThrough());
+    }
+});

package/esm/fetchCurl.js

@@ -1,6 +1,6 @@
-import { PassThrough, Readable } from 'node:stream';
+import { Readable } from 'node:stream';
 import { PonyfillResponse } from './Response.js';
-import { defaultHeadersSerializer, isNodeReadable } from './utils.js';
+import { defaultHeadersSerializer, isNodeReadable, readableCleanupRegistry } from './utils.js';
 export function fetchCurl(fetchRequest) {
     const { Curl, CurlFeature, CurlPause, CurlProgressFunc } = globalThis['libcurl'];
     const curlHandle = new Curl();
@@ -85,11 +85,13 @@ export function fetchCurl(fetchRequest) {
                 return false;
             });
             const headersInit = headersFlat.map(headerFlat => headerFlat.split(/:\s(.+)/).slice(0, 2));
-            resolve(new PonyfillResponse(stream.pipe(new PassThrough()), {
+            const ponyfillResponse = new PonyfillResponse(stream, {
                 status,
                 headers: headersInit,
                 url: fetchRequest.url,
-            }));
+            });
+            readableCleanupRegistry.register(ponyfillResponse, stream);
+            resolve(ponyfillResponse);
             streamResolved = stream;
         });
         curlHandle.perform();

package/esm/fetchNodeHttp.js

@@ -1,11 +1,11 @@
 import { request as httpRequest } from 'http';
 import { request as httpsRequest } from 'https';
-import { PassThrough, Readable } from 'stream';
+import { Readable } from 'stream';
 import { createBrotliDecompress, createGunzip, createInflate } from 'zlib';
 import { PonyfillRequest } from './Request.js';
 import { PonyfillResponse } from './Response.js';
 import { PonyfillURL } from './URL.js';
-import { getHeadersObj, isNodeReadable } from './utils.js';
+import { getHeadersObj, isNodeReadable, readableCleanupRegistry } from './utils.js';
 function getRequestFnForProtocol(url) {
     if (url.startsWith('http:')) {
         return httpRequest;
@@ -33,7 +33,7 @@ export function fetchNodeHttp(fetchRequest) {
                 agent: fetchRequest.agent,
             });
             nodeRequest.once('response', nodeResponse => {
-                let responseBody = nodeResponse.pipe(new PassThrough());
+                let responseBody = nodeResponse;
                 const contentEncoding = nodeResponse.headers['content-encoding'];
                 switch (contentEncoding) {
                     case 'x-gzip':
@@ -72,6 +72,9 @@ export function fetchNodeHttp(fetchRequest) {
                     headers: nodeResponse.headers,
                     url: fetchRequest.url,
                 });
+                if (responseBody === nodeResponse) {
+                    readableCleanupRegistry.register(ponyfillResponse, nodeResponse);
+                }
                 resolve(ponyfillResponse);
             });
             nodeRequest.once('error', reject);

package/esm/utils.js

@@ -1,3 +1,4 @@
+import { PassThrough } from 'node:stream';
 function isHeadersInstance(obj) {
     return obj?.forEach != null;
 }
@@ -63,3 +64,8 @@ export function isArrayBufferView(obj) {
 export function isNodeReadable(obj) {
     return obj != null && obj.pipe != null;
 }
+export const readableCleanupRegistry = new FinalizationRegistry(readable => {
+    if (!readable.readableFlowing) {
+        readable.pipe(new PassThrough());
+    }
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@whatwg-node/node-fetch",
-  "version": "0.5.7-alpha-20240229132341-1e3c1f24effefed571297b2c5001e44cfaefbf60",
+  "version": "0.5.7-alpha-20240301155147-161016a5c5b719972dd96f47adc3ee3be99e11d4",
   "description": "Fetch API implementation for Node",
   "sideEffects": false,
   "dependencies": {

package/typings/utils.d.cts

@@ -5,3 +5,4 @@ export declare function defaultHeadersSerializer(headers: Headers, onContentLeng
 export declare function fakePromise<T>(value: T): Promise<T>;
 export declare function isArrayBufferView(obj: any): obj is ArrayBufferView;
 export declare function isNodeReadable(obj: any): obj is Readable;
+export declare const readableCleanupRegistry: FinalizationRegistry<Readable>;

package/typings/utils.d.ts

@@ -5,3 +5,4 @@ export declare function defaultHeadersSerializer(headers: Headers, onContentLeng
 export declare function fakePromise<T>(value: T): Promise<T>;
 export declare function isArrayBufferView(obj: any): obj is ArrayBufferView;
 export declare function isNodeReadable(obj: any): obj is Readable;
+export declare const readableCleanupRegistry: FinalizationRegistry<Readable>;