@orpc/standard-server-fetch 1.1.0 → 1.2.0

package/dist/index.d.mts

@@ -1,6 +1,6 @@
 import { StandardBody, StandardHeaders, StandardLazyRequest, StandardRequest, StandardResponse, StandardLazyResponse } from '@orpc/standard-server';
 
-declare function toEventIterator(stream: ReadableStream<Uint8Array>): AsyncGenerator<unknown | void, unknown | void, void>;
+declare function toEventIterator(stream: ReadableStream<Uint8Array>): AsyncIteratorObject<unknown | void, unknown | void, void> & AsyncGenerator<unknown | void, unknown | void, void>;
 interface ToEventStreamOptions {
     /**
      * If true, a ping comment is sent periodically to keep the connection alive.

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 import { StandardBody, StandardHeaders, StandardLazyRequest, StandardRequest, StandardResponse, StandardLazyResponse } from '@orpc/standard-server';
 
-declare function toEventIterator(stream: ReadableStream<Uint8Array>): AsyncGenerator<unknown | void, unknown | void, void>;
+declare function toEventIterator(stream: ReadableStream<Uint8Array>): AsyncIteratorObject<unknown | void, unknown | void, void> & AsyncGenerator<unknown | void, unknown | void, void>;
 interface ToEventStreamOptions {
     /**
      * If true, a ping comment is sent periodically to keep the connection alive.

package/dist/index.mjs

@@ -1,51 +1,48 @@
-import { stringifyJSON, parseEmptyableJSON, isTypescriptObject, isAsyncIteratorObject, once } from '@orpc/shared';
-import { EventDecoderStream, encodeEventMessage, getEventMeta, ErrorEvent, withEventMeta, getFilenameFromContentDisposition, generateContentDisposition } from '@orpc/standard-server';
+import { createAsyncIteratorObject, parseEmptyableJSON, isTypescriptObject, stringifyJSON, isAsyncIteratorObject, once } from '@orpc/shared';
+import { EventDecoderStream, withEventMeta, ErrorEvent, encodeEventMessage, getEventMeta, getFilenameFromContentDisposition, generateContentDisposition } from '@orpc/standard-server';
 
 function toEventIterator(stream) {
   const eventStream = stream.pipeThrough(new TextDecoderStream()).pipeThrough(new EventDecoderStream());
   const reader = eventStream.getReader();
-  async function* gen() {
-    try {
-      while (true) {
-        const { done, value } = await reader.read();
-        if (done) {
-          return;
-        }
-        switch (value.event) {
-          case "message": {
-            let message = parseEmptyableJSON(value.data);
-            if (isTypescriptObject(message)) {
-              message = withEventMeta(message, value);
-            }
-            yield message;
-            break;
-          }
-          case "error": {
-            let error = new ErrorEvent({
-              data: parseEmptyableJSON(value.data)
-            });
-            error = withEventMeta(error, value);
-            throw error;
+  return createAsyncIteratorObject(async () => {
+    while (true) {
+      const { done, value } = await reader.read();
+      if (done) {
+        return { done: true, value: void 0 };
+      }
+      switch (value.event) {
+        case "message": {
+          let message = parseEmptyableJSON(value.data);
+          if (isTypescriptObject(message)) {
+            message = withEventMeta(message, value);
           }
-          case "done": {
-            let done2 = parseEmptyableJSON(value.data);
-            if (isTypescriptObject(done2)) {
-              done2 = withEventMeta(done2, value);
-            }
-            return done2;
+          return { done: false, value: message };
+        }
+        case "error": {
+          let error = new ErrorEvent({
+            data: parseEmptyableJSON(value.data)
+          });
+          error = withEventMeta(error, value);
+          throw error;
+        }
+        case "done": {
+          let done2 = parseEmptyableJSON(value.data);
+          if (isTypescriptObject(done2)) {
+            done2 = withEventMeta(done2, value);
           }
+          return { done: true, value: done2 };
         }
       }
-    } finally {
-      await reader.cancel();
     }
-  }
-  return gen();
+  }, async () => {
+    await reader.cancel();
+  });
 }
 function toEventStream(iterator, options = {}) {
   const keepAliveEnabled = options.eventIteratorKeepAliveEnabled ?? true;
   const keepAliveInterval = options.eventIteratorKeepAliveInterval ?? 5e3;
   const keepAliveComment = options.eventIteratorKeepAliveComment ?? "";
+  let cancelled = false;
   let timeout;
   const stream = new ReadableStream({
     async pull(controller) {
@@ -59,6 +56,9 @@ function toEventStream(iterator, options = {}) {
         }
         const value = await iterator.next();
         clearInterval(timeout);
+        if (cancelled) {
+          return;
+        }
         const meta = getEventMeta(value.value);
         if (!value.done || value.value !== void 0 || meta !== void 0) {
           controller.enqueue(encodeEventMessage({
@@ -72,6 +72,9 @@ function toEventStream(iterator, options = {}) {
         }
       } catch (err) {
         clearInterval(timeout);
+        if (cancelled) {
+          return;
+        }
         controller.enqueue(encodeEventMessage({
           ...getEventMeta(err),
           event: "error",
@@ -80,12 +83,10 @@ function toEventStream(iterator, options = {}) {
         controller.close();
       }
     },
-    async cancel(reason) {
-      if (reason) {
-        await iterator.throw?.(reason);
-      } else {
-        await iterator.return?.();
-      }
+    async cancel() {
+      cancelled = true;
+      clearInterval(timeout);
+      await iterator.return?.();
     }
   }).pipeThrough(new TextEncoderStream());
   return stream;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@orpc/standard-server-fetch",
   "type": "module",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "license": "MIT",
   "homepage": "https://unnoq.com",
   "repository": {
@@ -23,8 +23,8 @@
     "dist"
   ],
   "dependencies": {
-    "@orpc/shared": "1.1.0",
-    "@orpc/standard-server": "1.1.0"
+    "@orpc/shared": "1.2.0",
+    "@orpc/standard-server": "1.2.0"
   },
   "devDependencies": {
     "@hono/node-server": "^1.14.1"