Revert "stream: fix cloned webstreams not being unref'd"

This reverts commit 4d3923a. PR-URL: #51491 Reviewed-By: Vinícius Lourenço Claro Cardoso <[email protected]> Reviewed-By: Marco Ippolito <[email protected]> Reviewed-By: Matthew Aitken <[email protected]> Reviewed-By: Rafael Gonzaga <[email protected]> Reviewed-By: Moshe Atlow <[email protected]> Reviewed-By: Franziska Hinkelmann <[email protected]> Reviewed-By: Benjamin Gruenbaum <[email protected]>
nodejs · Jan 19, 2024 · 662ac95 · 662ac95
1 parent af3203f
commit 662ac95
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 34 deletions.
diff --git a/lib/internal/webstreams/readablestream.js b/lib/internal/webstreams/readablestream.js
@@ -596,8 +596,6 @@ class ReadableStream {
 
   [kTransferList]() {
     const { port1, port2 } = new MessageChannel();
-    port1.unref();
-    port2.unref();
     this[kState].transfer.port1 = port1;
     this[kState].transfer.port2 = port2;
     return [ port2 ];

diff --git a/lib/internal/webstreams/transfer.js b/lib/internal/webstreams/transfer.js
@@ -143,8 +143,6 @@ class CrossRealmTransformReadableSource {
         error);
       port.close();
     };
-
-    port.unref();
   }
 
   start(controller) {
@@ -212,7 +210,7 @@ class CrossRealmTransformWritableSink {
         error);
       port.close();
     };
-    port.unref();
+
   }
 
   start(controller) {

diff --git a/lib/internal/webstreams/writablestream.js b/lib/internal/webstreams/writablestream.js
@@ -266,8 +266,6 @@ class WritableStream {
 
   [kTransferList]() {
     const { port1, port2 } = new MessageChannel();
-    port1.unref();
-    port2.unref();
     this[kState].transfer.port1 = port1;
     this[kState].transfer.port2 = port2;
     return [ port2 ];

diff --git a/test/parallel/test-webstreams-clone-unref.js b/test/parallel/test-webstreams-clone-unref.js
diff --git a/test/parallel/test-whatwg-webstreams-transfer.js b/test/parallel/test-whatwg-webstreams-transfer.js
@@ -464,23 +464,12 @@ const theData = 'hello';
       tracker.verify();
     });
 
-    // We create an interval to keep the event loop alive while
-    // we wait for the stream read to complete. The reason this is needed is because there's
-    // otherwise nothing to keep the worker thread event loop alive long enough to actually
-    // complete the read from the stream. Under the covers the ReadableStream uses an
-    // unref'd MessagePort to communicate with the main thread. Because the MessagePort
-    // is unref'd, it's existence would not keep the thread alive on its own. There was previously
-    // a bug where this MessagePort was ref'd which would block the thread and main thread
-    // from terminating at all unless the stream was consumed/closed.
-    const i = setInterval(() => {}, 1000);
-
     parentPort.onmessage = tracker.calls(({ data }) => {
       assert(isReadableStream(data));
       const reader = data.getReader();
       reader.read().then(tracker.calls((result) => {
         assert(!result.done);
         assert(result.value instanceof Uint8Array);
-        clearInterval(i);
       }));
       parentPort.close();
     });