Fix loop guard on streaming

lxsmnsyc · Nov 18, 2023 · 6e99a5b · 6e99a5b
1 parent 1ba379e
commit 6e99a5b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/packages/seroval/src/core/context/parser/stream.ts b/packages/seroval/src/core/context/parser/stream.ts
@@ -130,7 +130,10 @@ export default abstract class BaseStreamParserContext extends BaseSyncParserCont
           createAsyncIteratorFactoryInstanceNode(
             this.parseAsyncIteratorFactory(),
             this.parse(
-              asyncIteratorToReadableStream(properties as unknown as AsyncIterable<unknown>),
+              asyncIteratorToReadableStream(
+                properties as unknown as AsyncIterable<unknown>,
+                this,
+              ),
             ),
           ),
         );

diff --git a/packages/seroval/src/core/utils/iterator-to-sequence.ts b/packages/seroval/src/core/utils/iterator-to-sequence.ts
@@ -1,3 +1,5 @@
+import type BaseStreamParserContext from '../context/parser/stream';
+
 /* eslint-disable no-await-in-loop */
 export interface Sequence {
   v: unknown[];
@@ -124,11 +126,12 @@ export function sequenceToAsyncIterator<T>(
 
 export function asyncIteratorToReadableStream<T>(
   source: AsyncIterable<T>,
+  parser: BaseStreamParserContext,
 ): ReadableStream<unknown> {
   return new ReadableStream({
     async start(controller): Promise<void> {
       const iterator = source[Symbol.asyncIterator]();
-      while (true) {
+      while (parser.isAlive()) {
         try {
           const result = await iterator.next();
           controller.enqueue([result.done ? 2 : 0, result.value]);
@@ -140,6 +143,7 @@ export function asyncIteratorToReadableStream<T>(
           controller.enqueue([1, error]);
         }
       }
+      controller.close();
     },
   });
 }