vovk 3.0.0-draft.272 → 3.0.0-draft.273

package/cjs/JSONLinesResponse.d.ts

@@ -6,10 +6,15 @@ export declare class JSONLinesResponse<T> extends Response {
     controller?: ReadableStreamDefaultController;
     readonly encoder: TextEncoder;
     readonly readableStream: ReadableStream;
+    private iteratorQueue;
+    private iteratorResolvers;
     constructor(requestHeaders: Awaited<ReturnType<typeof headers>>, init?: ResponseInit);
     send: (data: T | StreamAbortMessage) => void;
     close: () => void;
     throw: (e: KnownAny) => void;
     [Symbol.dispose]: () => void;
     [Symbol.asyncDispose]: () => void;
+    [Symbol.asyncIterator]: () => {
+        next: () => Promise<IteratorResult<T | StreamAbortMessage>>;
+    };
 }

package/cjs/JSONLinesResponse.js

@@ -7,6 +7,9 @@ class JSONLinesResponse extends Response {
     controller;
     encoder;
     readableStream;
+    // Add these private fields for async iteration
+    iteratorQueue = [];
+    iteratorResolvers = [];
     constructor(requestHeaders, init) {
         const encoder = new TextEncoder();
         let readableController;
@@ -39,7 +42,18 @@ class JSONLinesResponse extends Response {
         const { controller, encoder } = this;
         if (this.isClosed)
             return;
-        return controller?.enqueue(encoder.encode(JSON.stringify(data) + '\n'));
+        // Enqueue to the ReadableStream
+        controller?.enqueue(encoder.encode(JSON.stringify(data) + '\n'));
+        // Handle async iterator consumers
+        if (this.iteratorResolvers.length > 0) {
+            // If there's a pending next() call, resolve it immediately
+            const resolve = this.iteratorResolvers.shift();
+            resolve({ value: data, done: false });
+        }
+        else {
+            // Otherwise, queue the value for later consumption
+            this.iteratorQueue.push(data);
+        }
     };
     close = () => {
         const { controller } = this;
@@ -47,16 +61,36 @@ class JSONLinesResponse extends Response {
             return;
         this.isClosed = true;
         controller?.close();
+        // Resolve all pending iterator next() calls with done: true
+        while (this.iteratorResolvers.length > 0) {
+            const resolve = this.iteratorResolvers.shift();
+            resolve({ done: true, value: undefined });
+        }
     };
     throw = (e) => {
         this.send({ isError: true, reason: e instanceof Error ? e.message : e });
         return this.close();
     };
-    [Symbol.dispose] = () => {
-        this.close();
-    };
-    [Symbol.asyncDispose] = () => {
-        this.close();
+    [Symbol.dispose] = () => this.close();
+    [Symbol.asyncDispose] = () => this.close();
+    [Symbol.asyncIterator] = () => {
+        return {
+            next: async () => {
+                // If we have queued values, return them immediately
+                if (this.iteratorQueue.length > 0) {
+                    const value = this.iteratorQueue.shift();
+                    return { value, done: false };
+                }
+                // If the stream is closed and no more values, we're done
+                if (this.isClosed) {
+                    return { done: true, value: undefined };
+                }
+                // Otherwise, wait for the next value or close
+                return new Promise((resolve) => {
+                    this.iteratorResolvers.push(resolve);
+                });
+            },
+        };
     };
 }
 exports.JSONLinesResponse = JSONLinesResponse;

package/cjs/VovkApp.js

@@ -152,6 +152,7 @@ class VovkApp {
             const result = await staticMethod.call(controller, req, methodParams);
             const isIterator = typeof result === 'object' &&
                 !!result &&
+                !(result instanceof Response) && // don't invoke asyncIterable for JSONLinesResponse
                 ((Reflect.has(result, Symbol.iterator) &&
                     typeof result[Symbol.iterator] === 'function') ||
                     (Reflect.has(result, Symbol.asyncIterator) &&

package/mjs/JSONLinesResponse.d.ts

@@ -6,10 +6,15 @@ export declare class JSONLinesResponse<T> extends Response {
     controller?: ReadableStreamDefaultController;
     readonly encoder: TextEncoder;
     readonly readableStream: ReadableStream;
+    private iteratorQueue;
+    private iteratorResolvers;
     constructor(requestHeaders: Awaited<ReturnType<typeof headers>>, init?: ResponseInit);
     send: (data: T | StreamAbortMessage) => void;
     close: () => void;
     throw: (e: KnownAny) => void;
     [Symbol.dispose]: () => void;
     [Symbol.asyncDispose]: () => void;
+    [Symbol.asyncIterator]: () => {
+        next: () => Promise<IteratorResult<T | StreamAbortMessage>>;
+    };
 }

package/mjs/JSONLinesResponse.js

@@ -7,6 +7,9 @@ class JSONLinesResponse extends Response {
     controller;
     encoder;
     readableStream;
+    // Add these private fields for async iteration
+    iteratorQueue = [];
+    iteratorResolvers = [];
     constructor(requestHeaders, init) {
         const encoder = new TextEncoder();
         let readableController;
@@ -39,7 +42,18 @@ class JSONLinesResponse extends Response {
         const { controller, encoder } = this;
         if (this.isClosed)
             return;
-        return controller?.enqueue(encoder.encode(JSON.stringify(data) + '\n'));
+        // Enqueue to the ReadableStream
+        controller?.enqueue(encoder.encode(JSON.stringify(data) + '\n'));
+        // Handle async iterator consumers
+        if (this.iteratorResolvers.length > 0) {
+            // If there's a pending next() call, resolve it immediately
+            const resolve = this.iteratorResolvers.shift();
+            resolve({ value: data, done: false });
+        }
+        else {
+            // Otherwise, queue the value for later consumption
+            this.iteratorQueue.push(data);
+        }
     };
     close = () => {
         const { controller } = this;
@@ -47,16 +61,36 @@ class JSONLinesResponse extends Response {
             return;
         this.isClosed = true;
         controller?.close();
+        // Resolve all pending iterator next() calls with done: true
+        while (this.iteratorResolvers.length > 0) {
+            const resolve = this.iteratorResolvers.shift();
+            resolve({ done: true, value: undefined });
+        }
     };
     throw = (e) => {
         this.send({ isError: true, reason: e instanceof Error ? e.message : e });
         return this.close();
     };
-    [Symbol.dispose] = () => {
-        this.close();
-    };
-    [Symbol.asyncDispose] = () => {
-        this.close();
+    [Symbol.dispose] = () => this.close();
+    [Symbol.asyncDispose] = () => this.close();
+    [Symbol.asyncIterator] = () => {
+        return {
+            next: async () => {
+                // If we have queued values, return them immediately
+                if (this.iteratorQueue.length > 0) {
+                    const value = this.iteratorQueue.shift();
+                    return { value, done: false };
+                }
+                // If the stream is closed and no more values, we're done
+                if (this.isClosed) {
+                    return { done: true, value: undefined };
+                }
+                // Otherwise, wait for the next value or close
+                return new Promise((resolve) => {
+                    this.iteratorResolvers.push(resolve);
+                });
+            },
+        };
     };
 }
 exports.JSONLinesResponse = JSONLinesResponse;

package/mjs/VovkApp.js

@@ -152,6 +152,7 @@ class VovkApp {
             const result = await staticMethod.call(controller, req, methodParams);
             const isIterator = typeof result === 'object' &&
                 !!result &&
+                !(result instanceof Response) && // don't invoke asyncIterable for JSONLinesResponse
                 ((Reflect.has(result, Symbol.iterator) &&
                     typeof result[Symbol.iterator] === 'function') ||
                     (Reflect.has(result, Symbol.asyncIterator) &&

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vovk",
-  "version": "3.0.0-draft.272",
+  "version": "3.0.0-draft.273",
   "main": "./cjs/index.js",
   "module": "./mjs/index.js",
   "types": "./mjs/index.d.ts",