Tweak pipeTo a bit

whatwg · Oct 14, 2021 · 4fb181c · 4fb181c
1 parent 60ba2b2
commit 4fb181c
Showing 1 changed file with 14 additions and 10 deletions.
diff --git a/reference-implementation/lib/abstract-ops/readable-streams.js b/reference-implementation/lib/abstract-ops/readable-streams.js
@@ -205,9 +205,8 @@ function ReadableStreamPipeTo(source, dest, preventClose, preventAbort, preventC
             reader,
             {
               chunkSteps: chunk => {
-                currentWrite = transformPromiseWith(
-                  WritableStreamDefaultWriterWrite(writer, chunk), undefined, () => {}
-                );
+                currentWrite = WritableStreamDefaultWriterWrite(writer, chunk);
+                setPromiseIsHandledToTrue(currentWrite);
                 resolveRead(false);
               },
               closeSteps: () => resolveRead(true),
@@ -259,13 +258,18 @@ function ReadableStreamPipeTo(source, dest, preventClose, preventAbort, preventC
     setPromiseIsHandledToTrue(pipeLoop());
 
     function waitForWritesToFinish() {
-      // Another write may have started while we were waiting on this currentWrite, so we have to be sure to wait
-      // for that too.
-      const oldCurrentWrite = currentWrite;
-      return transformPromiseWith(
-        currentWrite,
-        () => oldCurrentWrite !== currentWrite ? waitForWritesToFinish() : undefined
-      );
+      let oldCurrentWrite;
+      return promiseResolvedWith(check());
+
+      function check() {
+        // Another write may have started while we were waiting on this currentWrite,
+        // so we have to be sure to wait for that too.
+        if (oldCurrentWrite !== currentWrite) {
+          oldCurrentWrite = currentWrite;
+          return transformPromiseWith(currentWrite, check, check);
+        }
+        return undefined;
+      }
     }
 
     function isOrBecomesErrored(stream, promise, action) {