@orpc/shared 1.8.3 → 1.8.4

package/dist/index.d.mts

@@ -30,7 +30,7 @@ type OmitChainMethodDeep<T extends object, K extends keyof any> = {
 
 declare const ORPC_NAME = "orpc";
 declare const ORPC_SHARED_PACKAGE_NAME = "@orpc/shared";
-declare const ORPC_SHARED_PACKAGE_VERSION = "1.8.3";
+declare const ORPC_SHARED_PACKAGE_VERSION = "1.8.4";
 
 /**
  * Error thrown when an operation is aborted.
@@ -291,9 +291,11 @@ interface AsyncIdQueueCloseOptions {
 }
 declare class AsyncIdQueue<T> {
     private readonly openIds;
-    private readonly items;
-    private readonly pendingPulls;
+    private readonly queues;
+    private readonly waiters;
     get length(): number;
+    get waiterIds(): string[];
+    hasBufferedItems(id: string): boolean;
     open(id: string): void;
     isOpen(id: string): boolean;
     push(id: string, item: T): void;

package/dist/index.d.ts

@@ -30,7 +30,7 @@ type OmitChainMethodDeep<T extends object, K extends keyof any> = {
 
 declare const ORPC_NAME = "orpc";
 declare const ORPC_SHARED_PACKAGE_NAME = "@orpc/shared";
-declare const ORPC_SHARED_PACKAGE_VERSION = "1.8.3";
+declare const ORPC_SHARED_PACKAGE_VERSION = "1.8.4";
 
 /**
  * Error thrown when an operation is aborted.
@@ -291,9 +291,11 @@ interface AsyncIdQueueCloseOptions {
 }
 declare class AsyncIdQueue<T> {
     private readonly openIds;
-    private readonly items;
-    private readonly pendingPulls;
+    private readonly queues;
+    private readonly waiters;
     get length(): number;
+    get waiterIds(): string[];
+    hasBufferedItems(id: string): boolean;
     open(id: string): void;
     isOpen(id: string): boolean;
     push(id: string, item: T): void;

package/dist/index.mjs

@@ -21,7 +21,7 @@ function readAsBuffer(source) {
 
 const ORPC_NAME = "orpc";
 const ORPC_SHARED_PACKAGE_NAME = "@orpc/shared";
-const ORPC_SHARED_PACKAGE_VERSION = "1.8.3";
+const ORPC_SHARED_PACKAGE_VERSION = "1.8.4";
 
 class AbortError extends Error {
   constructor(...rest) {
@@ -153,11 +153,17 @@ async function runInSpanContext(span, fn) {
 
 class AsyncIdQueue {
   openIds = /* @__PURE__ */ new Set();
-  items = /* @__PURE__ */ new Map();
-  pendingPulls = /* @__PURE__ */ new Map();
+  queues = /* @__PURE__ */ new Map();
+  waiters = /* @__PURE__ */ new Map();
   get length() {
     return this.openIds.size;
   }
+  get waiterIds() {
+    return Array.from(this.waiters.keys());
+  }
+  hasBufferedItems(id) {
+    return Boolean(this.queues.get(id)?.length);
+  }
   open(id) {
     this.openIds.add(id);
   }
@@ -166,59 +172,59 @@ class AsyncIdQueue {
   }
   push(id, item) {
     this.assertOpen(id);
-    const pending = this.pendingPulls.get(id);
+    const pending = this.waiters.get(id);
     if (pending?.length) {
       pending.shift()[0](item);
       if (pending.length === 0) {
-        this.pendingPulls.delete(id);
+        this.waiters.delete(id);
       }
     } else {
-      const items = this.items.get(id);
+      const items = this.queues.get(id);
       if (items) {
         items.push(item);
       } else {
-        this.items.set(id, [item]);
+        this.queues.set(id, [item]);
       }
     }
   }
   async pull(id) {
     this.assertOpen(id);
-    const items = this.items.get(id);
+    const items = this.queues.get(id);
     if (items?.length) {
       const item = items.shift();
       if (items.length === 0) {
-        this.items.delete(id);
+        this.queues.delete(id);
       }
       return item;
     }
     return new Promise((resolve, reject) => {
-      const waitingPulls = this.pendingPulls.get(id);
+      const waitingPulls = this.waiters.get(id);
       const pending = [resolve, reject];
       if (waitingPulls) {
         waitingPulls.push(pending);
       } else {
-        this.pendingPulls.set(id, [pending]);
+        this.waiters.set(id, [pending]);
       }
     });
   }
   close({ id, reason } = {}) {
     if (id === void 0) {
-      this.pendingPulls.forEach((pendingPulls, id2) => {
+      this.waiters.forEach((pendingPulls, id2) => {
         pendingPulls.forEach(([, reject]) => {
           reject(reason ?? new Error(`[AsyncIdQueue] Queue[${id2}] was closed or aborted while waiting for pulling.`));
         });
       });
-      this.pendingPulls.clear();
+      this.waiters.clear();
       this.openIds.clear();
-      this.items.clear();
+      this.queues.clear();
       return;
     }
-    this.pendingPulls.get(id)?.forEach(([, reject]) => {
+    this.waiters.get(id)?.forEach(([, reject]) => {
       reject(reason ?? new Error(`[AsyncIdQueue] Queue[${id}] was closed or aborted while waiting for pulling.`));
     });
-    this.pendingPulls.delete(id);
+    this.waiters.delete(id);
     this.openIds.delete(id);
-    this.items.delete(id);
+    this.queues.delete(id);
   }
   assertOpen(id) {
     if (!this.isOpen(id)) {
@@ -304,37 +310,41 @@ function replicateAsyncIterator(source, count) {
     try {
       while (true) {
         const item = await source.next();
-        for (let id = 0; id < count; id++) {
-          if (queue.isOpen(id.toString())) {
-            queue.push(id.toString(), item);
+        for (let i = 0; i < count; i++) {
+          const id = i.toString();
+          if (queue.isOpen(id)) {
+            queue.push(id, item);
           }
         }
         if (item.done) {
           break;
         }
       }
-    } catch (e) {
-      error = { value: e };
+    } catch (reason) {
+      error = { value: reason };
+      queue.waiterIds.forEach((id) => {
+        queue.close({ id, reason });
+      });
     }
   });
-  for (let id = 0; id < count; id++) {
-    queue.open(id.toString());
+  for (let i = 0; i < count; i++) {
+    const id = i.toString();
+    queue.open(id);
     replicated.push(new AsyncIteratorClass(
       () => {
         start();
         return new Promise((resolve, reject) => {
-          queue.pull(id.toString()).then(resolve).catch(reject);
-          defer(() => {
-            if (error) {
-              reject(error.value);
-            }
-          });
+          if (!error || queue.hasBufferedItems(id)) {
+            queue.pull(id).then(resolve).catch(reject);
+          } else {
+            reject(error.value);
+          }
         });
       },
       async (reason) => {
-        queue.close({ id: id.toString() });
+        queue.close({ id });
         if (reason !== "next") {
-          if (replicated.every((_, id2) => !queue.isOpen(id2.toString()))) {
+          if (!queue.length) {
             await source?.return?.();
           }
         }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@orpc/shared",
   "type": "module",
-  "version": "1.8.3",
+  "version": "1.8.4",
   "license": "MIT",
   "homepage": "https://orpc.unnoq.com",
   "repository": {