refactor(remix-node): remove recursion from stream utilities (#7245)

remix-run · Aug 23, 2023 · ebc148c · ebc148c
1 parent 8cb33ce
commit ebc148c
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 28 deletions.
diff --git a/.changeset/remove-stream-recursion.md b/.changeset/remove-stream-recursion.md
@@ -0,0 +1,5 @@
+---
+"@remix-run/node": patch
+---
+
+remove recursion from stream utilities
diff --git a/packages/remix-node/stream.ts b/packages/remix-node/stream.ts
@@ -6,30 +6,24 @@ export async function writeReadableStreamToWritable(
   writable: Writable
 ) {
   let reader = stream.getReader();
+  let flushable = writable as { flush?: Function };
 
-  async function read() {
-    let { done, value } = await reader.read();
-
-    if (done) {
-      writable.end();
-      return;
-    }
+  try {
+    while (true) {
+      let { done, value } = await reader.read();
 
-    writable.write(value);
+      if (done) {
+        writable.end();
+        break;
+      }
 
-    // If the stream is flushable, flush it to allow streaming to continue.
-    let flushable = writable as { flush?: Function };
-    if (typeof flushable.flush === "function") {
-      flushable.flush();
+      writable.write(value);
+      if (typeof flushable.flush === "function") {
+        flushable.flush();
+      }
     }
-
-    await read();
-  }
-
-  try {
-    await read();
-  } catch (error: any) {
-    writable.destroy(error);
+  } catch (error: unknown) {
+    writable.destroy(error as Error);
     throw error;
   }
 }
@@ -56,20 +50,16 @@ export async function readableStreamToString(
   let reader = stream.getReader();
   let chunks: Uint8Array[] = [];
 
-  async function read() {
+  while (true) {
     let { done, value } = await reader.read();
-
     if (done) {
-      return;
-    } else if (value) {
+      break;
+    }
+    if (value) {
       chunks.push(value);
     }
-
-    await read();
   }
 
-  await read();
-
   return Buffer.concat(chunks).toString(encoding);
 }