stream: investigate memory overconsumption by Stream.Readable.toWeb

nodejs · Feb 14, 2023 · 1f0e249 · 1f0e249
1 parent 6bbc2fb
commit 1f0e249
Showing 1 changed file with 17 additions and 0 deletions.
diff --git a/lib/internal/webstreams/readablestream.js b/lib/internal/webstreams/readablestream.js
@@ -1939,6 +1939,14 @@ function readableStreamError(stream, error) {
   }
 }
 
+function readableStreamHasReader(stream) {
+  const {
+    reader,
+  } = stream[kState];
+
+  return reader != null;
+}
+
 function readableStreamHasDefaultReader(stream) {
   const {
     reader,
@@ -2230,6 +2238,10 @@ function readableStreamDefaultControllerShouldCallPull(controller) {
       !controller[kState].started)
     return false;
 
+  if (!readableStreamHasReader(stream)) {
+    return false;
+  }
+
   if (isReadableStreamLocked(stream) &&
       readableStreamGetNumReadRequests(stream)) {
     return true;
@@ -2466,6 +2478,11 @@ function readableByteStreamControllerShouldCallPull(controller) {
       !controller[kState].started) {
     return false;
   }
+
+  if (!readableStreamHasReader(stream)) {
+    return false;
+  }
+
   if (readableStreamHasDefaultReader(stream) &&
       readableStreamGetNumReadRequests(stream) > 0) {
     return true;