@orpc/client 2.0.0-beta.40 → 2.0.0-beta.41

package/README.md

@@ -85,7 +85,7 @@ Like what we build over at [middleapi](https://github.com/middleapi)? You can he
 
 <table>
   <tr>
-   <td width="2000"><a href="https://screenshotone.com/?ref=middleapi&amp;utm_source=middleapi&amp;utm_medium=sponsor" target="_blank" rel="noopener" title="The screenshot API for developers"><img src="https://avatars.githubusercontent.com/u/97035603?v=4" width="64" align="left" hspace="12" alt="ScreenshotOne.com"/><b>ScreenshotOne.com</b></a><br /><sub>The screenshot API for developers</sub></td>
+   <td width="2000"><a href="https://screenshotone.com/?ref=middleapi&amp;utm_source=middleapi&amp;utm_medium=sponsor" target="_blank" rel="noopener sponsored" title="The screenshot API for developers"><img src="https://avatars.githubusercontent.com/u/97035603?v=4" width="64" align="left" hspace="12" alt="ScreenshotOne.com"/><b>ScreenshotOne.com</b></a><br /><sub>The screenshot API for developers</sub></td>
   </tr>
   <tr>
    <td width="2000"><a href="https://yuzu.health/careers?ref=middleapi&amp;utm_source=middleapi&amp;utm_medium=sponsor" target="_blank" rel="noopener sponsored" title="We&#39;re hiring NYC based engineers"><img src="https://avatars.githubusercontent.com/u/102488956?v=4" width="64" align="left" hspace="12" alt="Yuzu"/><b>Yuzu</b></a><br /><sub>We&#39;re hiring NYC based engineers</sub></td>
@@ -127,19 +127,18 @@ Like what we build over at [middleapi](https://github.com/middleapi)? You can he
    <td align="center"><a href="https://soymilk.party/?ref=middleapi&amp;utm_source=middleapi&amp;utm_medium=sponsor" target="_blank" rel="noopener sponsored" title="あわわわとーにゅ"><img src="https://avatars.githubusercontent.com/u/17376330?u=de3353804be889f009f7e0a1582daf04d0ab292d&amp;v=4" width="139" alt="あわわわとーにゅ"/><br />あわわわとーにゅ</a></td>
    <td align="center"><a href="https://github.com/nicognaW?ref=middleapi&amp;utm_source=middleapi&amp;utm_medium=sponsor" target="_blank" rel="noopener sponsored" title="nk"><img src="https://avatars.githubusercontent.com/u/66731869?u=4699bda3a9092d3ec34fbd959450767bcc8b8b6d&amp;v=4" width="139" alt="nk"/><br />nk</a></td>
    <td align="center"><a href="https://supastarter.dev/?ref=middleapi&amp;utm_source=middleapi&amp;utm_medium=sponsor" target="_blank" rel="noopener sponsored" title="supastarter"><img src="https://avatars.githubusercontent.com/u/110960143?v=4" width="139" alt="supastarter"/><br />supastarter</a></td>
-   <td align="center"><a href="https://github.com/divmgl?ref=middleapi&amp;utm_source=middleapi&amp;utm_medium=sponsor" target="_blank" rel="noopener sponsored" title="Dexter Miguel"><img src="https://avatars.githubusercontent.com/u/5452298?u=645993204be8696c085ecf0d228c3062efe2ed65&amp;v=4" width="139" alt="Dexter Miguel"/><br />Dexter Miguel</a></td>
    <td align="center"><a href="https://github.com/herrfugbaum?ref=middleapi&amp;utm_source=middleapi&amp;utm_medium=sponsor" target="_blank" rel="noopener sponsored" title="herrfugbaum"><img src="https://avatars.githubusercontent.com/u/12859776?u=644dc1666d0220bc0468eb0de3c56b919f635b16&amp;v=4" width="139" alt="herrfugbaum"/><br />herrfugbaum</a></td>
+   <td align="center"><a href="https://laststance.io/?ref=middleapi&amp;utm_source=middleapi&amp;utm_medium=sponsor" target="_blank" rel="noopener sponsored" title="Ryota Murakami"><img src="https://avatars.githubusercontent.com/u/5501268?u=599389e03340734325726ca3f8f423c021d47d7f&amp;v=4" width="139" alt="Ryota Murakami"/><br />Ryota Murakami</a></td>
   </tr>
   <tr>
-   <td align="center"><a href="https://laststance.io/?ref=middleapi&amp;utm_source=middleapi&amp;utm_medium=sponsor" target="_blank" rel="noopener sponsored" title="Ryota Murakami"><img src="https://avatars.githubusercontent.com/u/5501268?u=599389e03340734325726ca3f8f423c021d47d7f&amp;v=4" width="139" alt="Ryota Murakami"/><br />Ryota Murakami</a></td>
    <td align="center"><a href="https://cra.mr/?ref=middleapi&amp;utm_source=middleapi&amp;utm_medium=sponsor" target="_blank" rel="noopener sponsored" title="David Cramer"><img src="https://avatars.githubusercontent.com/u/23610?v=4" width="139" alt="David Cramer"/><br />David Cramer</a></td>
    <td align="center"><a href="https://valerii15298.github.io/?ref=middleapi&amp;utm_source=middleapi&amp;utm_medium=sponsor" target="_blank" rel="noopener sponsored" title="Valerii Petryniak"><img src="https://avatars.githubusercontent.com/u/44531564?u=88ac74d9bacd20401518441907acad21063cd397&amp;v=4" width="139" alt="Valerii Petryniak"/><br />Valerii Petryniak</a></td>
    <td align="center"><a href="https://letstri.dev/?ref=middleapi&amp;utm_source=middleapi&amp;utm_medium=sponsor" target="_blank" rel="noopener sponsored" title="Valerii Strilets"><img src="https://avatars.githubusercontent.com/u/13253748?u=c7b10399ccc8f8081e24db94ec32cd9858e86ac3&amp;v=4" width="139" alt="Valerii Strilets"/><br />Valerii Strilets</a></td>
    <td align="center"><a href="https://blacklight.sh/?ref=middleapi&amp;utm_source=middleapi&amp;utm_medium=sponsor" target="_blank" rel="noopener sponsored" title="Kyle Mistele"><img src="https://avatars.githubusercontent.com/u/18430555?u=3afebeb81de666e35aaac3ed46f14159d7603ffb&amp;v=4" width="139" alt="Kyle Mistele"/><br />Kyle Mistele</a></td>
    <td align="center"><a href="https://github.com/christ12938?ref=middleapi&amp;utm_source=middleapi&amp;utm_medium=sponsor" target="_blank" rel="noopener sponsored" title="christ12938"><img src="https://avatars.githubusercontent.com/u/25758598?v=4" width="139" alt="christ12938"/><br />christ12938</a></td>
+   <td align="center"><a href="https://github.com/Ryanjso?ref=middleapi&amp;utm_source=middleapi&amp;utm_medium=sponsor" target="_blank" rel="noopener sponsored" title="Ryan Soderberg"><img src="https://avatars.githubusercontent.com/u/39172778?u=5ed913c31d57e7221b75784abcad48c7ebddde27&amp;v=4" width="139" alt="Ryan Soderberg"/><br />Ryan Soderberg</a></td>
   </tr>
   <tr>
-   <td align="center"><a href="https://github.com/Ryanjso?ref=middleapi&amp;utm_source=middleapi&amp;utm_medium=sponsor" target="_blank" rel="noopener sponsored" title="Ryan Soderberg"><img src="https://avatars.githubusercontent.com/u/39172778?u=5ed913c31d57e7221b75784abcad48c7ebddde27&amp;v=4" width="139" alt="Ryan Soderberg"/><br />Ryan Soderberg</a></td>
    <td align="center"><a href="https://github.com/itigoore01?ref=middleapi&amp;utm_source=middleapi&amp;utm_medium=sponsor" target="_blank" rel="noopener sponsored" title="shota"><img src="https://avatars.githubusercontent.com/u/11831107?u=c976a6dc7e055eb026304c46c99100ed22b0c8e0&amp;v=4" width="139" alt="shota"/><br />shota</a></td>
    <td align="center"><a href="https://github.com/ellis-driscoll?ref=middleapi&amp;utm_source=middleapi&amp;utm_medium=sponsor" target="_blank" rel="noopener sponsored" title="Ellis Driscoll"><img src="https://avatars.githubusercontent.com/u/70685966?u=c5f95bc33b5991d9744abe00052542e4a2ed3cb9&amp;v=4" width="139" alt="Ellis Driscoll"/><br />Ellis Driscoll</a></td>
    <td align="center"><a href="https://github.com/hoangbn?ref=middleapi&amp;utm_source=middleapi&amp;utm_medium=sponsor" target="_blank" rel="noopener sponsored" title="Hoang Nguyen"><img src="https://avatars.githubusercontent.com/u/38968280?u=c90084c6de65c56facabab7ba13a72a49ddbc3e4&amp;v=4" width="139" alt="Hoang Nguyen"/><br />Hoang Nguyen</a></td>
@@ -173,12 +172,13 @@ Like what we build over at [middleapi](https://github.com/middleapi)? You can he
    <td align="center"><a href="https://kellychan.im/?ref=middleapi&amp;utm_source=middleapi&amp;utm_medium=sponsor" target="_blank" rel="noopener sponsored" title="Kelly Peilin Chan"><img src="https://avatars.githubusercontent.com/u/520852?u=6b0f7105f694e7b5cacf410a3f04c7044b469dc8&amp;v=4" width="119" alt="Kelly Peilin Chan"/><br />Kelly Peilin Chan</a></td>
    <td align="center"><a href="https://guyariely.com/?ref=middleapi&amp;utm_source=middleapi&amp;utm_medium=sponsor" target="_blank" rel="noopener sponsored" title="Guy Ariely"><img src="https://avatars.githubusercontent.com/u/42813496?u=edb6b7f563bf28e160a290832e7da57c0506f8ca&amp;v=4" width="119" alt="Guy Ariely"/><br />Guy Ariely</a></td>
    <td align="center"><a href="https://paulsenon.com/?ref=middleapi&amp;utm_source=middleapi&amp;utm_medium=sponsor" target="_blank" rel="noopener sponsored" title="PaulSenon"><img src="https://avatars.githubusercontent.com/u/19531087?u=6385741eb91d200b8c513ec6045482e301767ca6&amp;v=4" width="119" alt="PaulSenon"/><br />PaulSenon</a></td>
+   <td align="center"><a href="https://nakasyou.how/?ref=middleapi&amp;utm_source=middleapi&amp;utm_medium=sponsor" target="_blank" rel="noopener sponsored" title="Shotaro Nakamura"><img src="https://avatars.githubusercontent.com/u/79000684?u=f644df3f29f0e8677a90967115774564f1d9d6ab&amp;v=4" width="119" alt="Shotaro Nakamura"/><br />Shotaro Nakamura</a></td>
    <td align="center"><a href="https://piscis.dev/?ref=middleapi&amp;utm_source=middleapi&amp;utm_medium=sponsor" target="_blank" rel="noopener sponsored" title="Alex"><img src="https://avatars.githubusercontent.com/u/326163?u=b245f368bd940cf51d08c0b6bf55f8257f359437&amp;v=4" width="119" alt="Alex"/><br />Alex</a></td>
    <td align="center"><a href="https://opensource.gubanov.eu/?ref=middleapi&amp;utm_source=middleapi&amp;utm_medium=sponsor" target="_blank" rel="noopener sponsored" title="Andrey Gubanov"><img src="https://avatars.githubusercontent.com/u/1082083?u=c5f2daf7ebece498e85c83367bb37b4e10e2649d&amp;v=4" width="119" alt="Andrey Gubanov"/><br />Andrey Gubanov</a></td>
   </tr>
 </table>
 
-With thanks to [36 past sponsors](https://htmlpreview.github.io/?https://github.com/middleapi/static/blob/main/sponsors.svg) who helped get oRPC here.
+With thanks to [38 past sponsors](https://orpc.dev/sponsors#past-sponsors) who helped get oRPC here.
 
 ## References
 

package/dist/adapters/fetch/index.d.mts

@@ -4,7 +4,7 @@ import { StandardRequest, StandardLazyResponse } from '@standard-server/core';
 import { ToFetchBodyOptions } from '@standard-server/fetch';
 import { StandardLinkTransport, StandardLink, StandardLinkOptions } from '../standard/index.mjs';
 import { RPCLinkCodecOptions } from '../standard/index.mjs';
-import '../../shared/client.n8K9dFhY.mjs';
+import '../../shared/client.BPa_Mmuh.mjs';
 
 interface FetchLinkTransportOptions<T extends ClientContext> {
     /**

package/dist/adapters/fetch/index.d.ts

@@ -4,7 +4,7 @@ import { StandardRequest, StandardLazyResponse } from '@standard-server/core';
 import { ToFetchBodyOptions } from '@standard-server/fetch';
 import { StandardLinkTransport, StandardLink, StandardLinkOptions } from '../standard/index.js';
 import { RPCLinkCodecOptions } from '../standard/index.js';
-import '../../shared/client.n8K9dFhY.js';
+import '../../shared/client.BPa_Mmuh.js';
 
 interface FetchLinkTransportOptions<T extends ClientContext> {
     /**

package/dist/adapters/fetch/index.mjs

@@ -1,9 +1,9 @@
 import { value, once } from '@orpc/shared';
 import { toFetchBody, toFetchHeaders, toStandardLazyResponse } from '@standard-server/fetch';
-import { S as StandardLink, R as RPCLinkCodec } from '../../shared/client.VXsLhJtT.mjs';
+import { S as StandardLink, R as RPCLinkCodec } from '../../shared/client.Bstqyaro.mjs';
 import '@standard-server/core';
-import '../../shared/client.BYHnU_Z3.mjs';
-import '../../shared/client.Dtv1JPkU.mjs';
+import '../../shared/client.DpkGsZt-.mjs';
+import '../../shared/client.DD2eNne_.mjs';
 
 const GET_SUPPORTED_DUPLEX_MODE = once(() => {
   try {
@@ -53,7 +53,8 @@ class FetchLinkTransport {
         init.duplex = duplex;
       }
     }
-    const response = await this.fetch(url, init, options, path);
+    const fetch = this.fetch;
+    const response = await fetch(url, init, options, path);
     const standardResponse = toStandardLazyResponse(response);
     return standardResponse;
   }

package/dist/adapters/message-port/index.d.mts

@@ -4,7 +4,7 @@ import { StandardRequest, StandardLazyResponse } from '@standard-server/core';
 import { ClientPeer, EncodePeerMessageOptions, DecodePeerMessageOptions } from '@standard-server/peer';
 import { StandardLinkTransport, StandardLink, StandardLinkOptions } from '../standard/index.mjs';
 import { RPCLinkCodecOptions } from '../standard/index.mjs';
-import '../../shared/client.n8K9dFhY.mjs';
+import '../../shared/client.BPa_Mmuh.mjs';
 
 /**
  * The message port used by electron in main process

package/dist/adapters/message-port/index.d.ts

@@ -4,7 +4,7 @@ import { StandardRequest, StandardLazyResponse } from '@standard-server/core';
 import { ClientPeer, EncodePeerMessageOptions, DecodePeerMessageOptions } from '@standard-server/peer';
 import { StandardLinkTransport, StandardLink, StandardLinkOptions } from '../standard/index.js';
 import { RPCLinkCodecOptions } from '../standard/index.js';
-import '../../shared/client.n8K9dFhY.js';
+import '../../shared/client.BPa_Mmuh.js';
 
 /**
  * The message port used by electron in main process

package/dist/adapters/message-port/index.mjs

@@ -1,10 +1,10 @@
-import { value } from '@orpc/shared';
+import { value, AbortError } from '@orpc/shared';
 import { ClientPeer, encodePeerMessage, decodePeerMessage, isServerPeerSendMessage, isPeerMessage } from '@standard-server/peer';
-import { S as StandardLink, R as RPCLinkCodec } from '../../shared/client.VXsLhJtT.mjs';
+import { S as StandardLink, R as RPCLinkCodec } from '../../shared/client.Bstqyaro.mjs';
 import '@standard-server/core';
 import '@standard-server/fetch';
-import '../../shared/client.BYHnU_Z3.mjs';
-import '../../shared/client.Dtv1JPkU.mjs';
+import '../../shared/client.DpkGsZt-.mjs';
+import '../../shared/client.DD2eNne_.mjs';
 
 function postMessagePortMessage(port, data, transfer) {
   if (transfer) {
@@ -51,7 +51,11 @@ function onMessagePortClose(port, callback) {
 class MessagePortLinkTransport {
   peer;
   constructor({ port, experimental_transfer, encodePeerMessage: encodePeerMessageOptions, decodePeerMessage: decodePeerMessageOptions }) {
+    let closeReason;
     this.peer = new ClientPeer(async (message) => {
+      if (closeReason) {
+        throw closeReason;
+      }
       const transfer = await value(experimental_transfer, message, port);
       if (transfer) {
         postMessagePortMessage(port, message, transfer);
@@ -76,7 +80,8 @@ class MessagePortLinkTransport {
       return { matched: true };
     });
     onMessagePortClose(port, async () => {
-      await this.peer.close();
+      closeReason = new AbortError("MessagePort closed");
+      await this.peer.close(closeReason);
     });
   }
   async send(standardRequest, _path, _options) {

package/dist/adapters/standard/index.d.mts

@@ -1,5 +1,5 @@
-import { f as StandardLinkCodec, g as StandardLinkCodecDecodedResponse } from '../../shared/client.BWkR2vPU.mjs';
-export { C as CompositeStandardLinkPlugin, a as StandardLink, h as StandardLinkInterceptor, e as StandardLinkInterceptorOptions, b as StandardLinkOptions, c as StandardLinkPlugin, S as StandardLinkTransport, i as StandardLinkTransportInterceptor, d as StandardLinkTransportInterceptorOptions } from '../../shared/client.BWkR2vPU.mjs';
+import { f as StandardLinkCodec, g as StandardLinkCodecDecodedResponse } from '../../shared/client.BjbdW5Rj.mjs';
+export { C as CompositeStandardLinkPlugin, a as StandardLink, h as StandardLinkInterceptor, e as StandardLinkInterceptorOptions, b as StandardLinkOptions, c as StandardLinkPlugin, S as StandardLinkTransport, i as StandardLinkTransportInterceptor, d as StandardLinkTransportInterceptorOptions } from '../../shared/client.BjbdW5Rj.mjs';
 import { Value, Promisable, Public } from '@orpc/shared';
 import { StandardUrl, StandardHeaders, StandardRequest, StandardLazyResponse } from '@standard-server/core';
 import { ClientContext, ClientOptions } from '../../index.mjs';

package/dist/adapters/standard/index.d.ts

@@ -1,5 +1,5 @@
-import { f as StandardLinkCodec, g as StandardLinkCodecDecodedResponse } from '../../shared/client.BnpRXnLi.js';
-export { C as CompositeStandardLinkPlugin, a as StandardLink, h as StandardLinkInterceptor, e as StandardLinkInterceptorOptions, b as StandardLinkOptions, c as StandardLinkPlugin, S as StandardLinkTransport, i as StandardLinkTransportInterceptor, d as StandardLinkTransportInterceptorOptions } from '../../shared/client.BnpRXnLi.js';
+import { f as StandardLinkCodec, g as StandardLinkCodecDecodedResponse } from '../../shared/client.DiHfJmHK.js';
+export { C as CompositeStandardLinkPlugin, a as StandardLink, h as StandardLinkInterceptor, e as StandardLinkInterceptorOptions, b as StandardLinkOptions, c as StandardLinkPlugin, S as StandardLinkTransport, i as StandardLinkTransportInterceptor, d as StandardLinkTransportInterceptorOptions } from '../../shared/client.DiHfJmHK.js';
 import { Value, Promisable, Public } from '@orpc/shared';
 import { StandardUrl, StandardHeaders, StandardRequest, StandardLazyResponse } from '@standard-server/core';
 import { ClientContext, ClientOptions } from '../../index.js';

package/dist/adapters/standard/index.mjs

@@ -1,6 +1,6 @@
-export { C as CompositeStandardLinkPlugin, R as RPCLinkCodec, S as StandardLink } from '../../shared/client.VXsLhJtT.mjs';
+export { C as CompositeStandardLinkPlugin, R as RPCLinkCodec, S as StandardLink } from '../../shared/client.Bstqyaro.mjs';
 import '@orpc/shared';
 import '@standard-server/core';
 import '@standard-server/fetch';
-import '../../shared/client.BYHnU_Z3.mjs';
-import '../../shared/client.Dtv1JPkU.mjs';
+import '../../shared/client.DpkGsZt-.mjs';
+import '../../shared/client.DD2eNne_.mjs';

package/dist/adapters/websocket/index.d.mts

@@ -4,7 +4,7 @@ import { StandardRequest, StandardLazyResponse } from '@standard-server/core';
 import { EncodePeerMessageOptions, DecodePeerMessageOptions } from '@standard-server/peer';
 import { StandardLinkTransport, StandardLink, StandardLinkOptions } from '../standard/index.mjs';
 import { RPCLinkCodecOptions } from '../standard/index.mjs';
-import '../../shared/client.n8K9dFhY.mjs';
+import '../../shared/client.BPa_Mmuh.mjs';
 
 type WebSocketLike = Pick<WebSocket, 'addEventListener' | 'removeEventListener' | 'send' | 'readyState'>;
 interface WebSocketLinkTransportAttemptInfo {
@@ -17,7 +17,7 @@ interface WebSocketLinkTransportAttemptInfo {
     /**
      * Attempt number within the current (re)connect cycle.
      * Starts at 1, increments on each consecutive failure, and resets to 1
-     * once a connection succeeds. Use this for backoff calculations.
+     * once a connection succeeds or the cycle gives up. Use this for backoff calculations.
      */
     attempt: number;
 }
@@ -36,12 +36,21 @@ interface WebSocketLinkTransportReconnectOptions {
     delay?: undefined | ((info: WebSocketLinkTransportAttemptInfo) => number);
     /**
      * Maximum number of consecutive failed attempts before giving up.
-     * When exceeded, `getConnectedPeer` throws instead of retrying.
+     * When reached, calls waiting for the connection fail, and the next
+     * call starts a new reconnect cycle.
      * Should greater than 1
      *
      * @default Infinity
      */
     maxAttempt?: undefined | number;
+    /**
+     * Maximum number of connection attempts over the transport's lifetime,
+     * successful ones included (see `totalAttempt`).
+     * When reached, calls that need a new connection fail instead of connecting.
+     *
+     * @default Infinity
+     */
+    maxTotalAttempt?: undefined | number;
     /**
      * Whether to proactively reconnect right after the socket closes,
      * rather than waiting for the next call to trigger reconnection.
@@ -99,6 +108,7 @@ declare class WebSocketLinkTransport<T extends ClientContext> implements Standar
     private readonly reconnectEnabled;
     private readonly reconnectDelay;
     private readonly reconnectMaxAttempt;
+    private readonly reconnectMaxTotalAttempt;
     private readonly reconnectOnCloseEnabled;
     private readonly reconnectOnCloseDelay;
     private readonly encodePeerMessageOptions;

package/dist/adapters/websocket/index.d.ts

@@ -4,7 +4,7 @@ import { StandardRequest, StandardLazyResponse } from '@standard-server/core';
 import { EncodePeerMessageOptions, DecodePeerMessageOptions } from '@standard-server/peer';
 import { StandardLinkTransport, StandardLink, StandardLinkOptions } from '../standard/index.js';
 import { RPCLinkCodecOptions } from '../standard/index.js';
-import '../../shared/client.n8K9dFhY.js';
+import '../../shared/client.BPa_Mmuh.js';
 
 type WebSocketLike = Pick<WebSocket, 'addEventListener' | 'removeEventListener' | 'send' | 'readyState'>;
 interface WebSocketLinkTransportAttemptInfo {
@@ -17,7 +17,7 @@ interface WebSocketLinkTransportAttemptInfo {
     /**
      * Attempt number within the current (re)connect cycle.
      * Starts at 1, increments on each consecutive failure, and resets to 1
-     * once a connection succeeds. Use this for backoff calculations.
+     * once a connection succeeds or the cycle gives up. Use this for backoff calculations.
      */
     attempt: number;
 }
@@ -36,12 +36,21 @@ interface WebSocketLinkTransportReconnectOptions {
     delay?: undefined | ((info: WebSocketLinkTransportAttemptInfo) => number);
     /**
      * Maximum number of consecutive failed attempts before giving up.
-     * When exceeded, `getConnectedPeer` throws instead of retrying.
+     * When reached, calls waiting for the connection fail, and the next
+     * call starts a new reconnect cycle.
      * Should greater than 1
      *
      * @default Infinity
      */
     maxAttempt?: undefined | number;
+    /**
+     * Maximum number of connection attempts over the transport's lifetime,
+     * successful ones included (see `totalAttempt`).
+     * When reached, calls that need a new connection fail instead of connecting.
+     *
+     * @default Infinity
+     */
+    maxTotalAttempt?: undefined | number;
     /**
      * Whether to proactively reconnect right after the socket closes,
      * rather than waiting for the next call to trigger reconnection.
@@ -99,6 +108,7 @@ declare class WebSocketLinkTransport<T extends ClientContext> implements Standar
     private readonly reconnectEnabled;
     private readonly reconnectDelay;
     private readonly reconnectMaxAttempt;
+    private readonly reconnectMaxTotalAttempt;
     private readonly reconnectOnCloseEnabled;
     private readonly reconnectOnCloseDelay;
     private readonly encodePeerMessageOptions;

package/dist/adapters/websocket/index.mjs

@@ -1,10 +1,10 @@
 import { runWithSignal, AbortError, sleep, promiseWithResolvers, sequential, loadBytes, toStringOrBytes } from '@orpc/shared';
 import { ClientPeer, encodePeerMessage, decodePeerMessage, isServerPeerSendMessage } from '@standard-server/peer';
-import { S as StandardLink, R as RPCLinkCodec } from '../../shared/client.VXsLhJtT.mjs';
+import { S as StandardLink, R as RPCLinkCodec } from '../../shared/client.Bstqyaro.mjs';
 import '@standard-server/core';
 import '@standard-server/fetch';
-import '../../shared/client.BYHnU_Z3.mjs';
-import '../../shared/client.Dtv1JPkU.mjs';
+import '../../shared/client.DpkGsZt-.mjs';
+import '../../shared/client.DD2eNne_.mjs';
 
 const WEBSOCKET_CONNECTING = 0;
 const WEBSOCKET_OPEN = 1;
@@ -13,6 +13,7 @@ class WebSocketLinkTransport {
   reconnectEnabled;
   reconnectDelay;
   reconnectMaxAttempt;
+  reconnectMaxTotalAttempt;
   reconnectOnCloseEnabled;
   reconnectOnCloseDelay;
   encodePeerMessageOptions;
@@ -22,6 +23,7 @@ class WebSocketLinkTransport {
     this.reconnectEnabled = options.reconnect?.enabled ?? false;
     this.reconnectDelay = options.reconnect?.delay ?? ((info) => info.attempt === 1 ? 0 : 2e3);
     this.reconnectMaxAttempt = options.reconnect?.maxAttempt ?? Infinity;
+    this.reconnectMaxTotalAttempt = options.reconnect?.maxTotalAttempt ?? Infinity;
     this.reconnectOnCloseEnabled = this.reconnectEnabled && (options.reconnect?.onClose?.enabled ?? false);
     this.reconnectOnCloseDelay = options.reconnect?.onClose?.delay ?? 0;
     this.encodePeerMessageOptions = options.encodePeerMessage;
@@ -45,14 +47,13 @@ class WebSocketLinkTransport {
     const current = this.current;
     const resolved = await current;
     if (resolved && (!this.reconnectEnabled || resolved.websocket.readyState === WEBSOCKET_OPEN)) {
-      this.attempt = 0;
       return resolved.peer;
     }
     if (current !== this.current) {
       return this.getConnectedPeer();
     }
-    if (this.attempt >= this.reconnectMaxAttempt) {
-      throw new AbortError(`WebSocket reconnect failed after ${this.attempt} attempt(s)`);
+    if (this.totalAttempt >= this.reconnectMaxTotalAttempt) {
+      throw new AbortError(`WebSocket reconnect stopped after ${this.totalAttempt} total attempt(s)`);
     }
     this.current = (async () => {
       this.totalAttempt += 1;
@@ -60,7 +61,14 @@ class WebSocketLinkTransport {
       const info = { totalAttempt: this.totalAttempt, attempt: this.attempt };
       await sleep(this.reconnectDelay(info));
       const websocket = await this.connect(info);
+      if (websocket.readyState !== WEBSOCKET_CONNECTING && websocket.readyState !== WEBSOCKET_OPEN) {
+        throw new AbortError("WebSocket is already closing or closed");
+      }
+      let closeReason;
       const peer = new ClientPeer(async (message) => {
+        if (closeReason) {
+          throw closeReason;
+        }
         const encoded = await encodePeerMessage(message, this.encodePeerMessageOptions);
         return websocket.send(encoded);
       });
@@ -79,21 +87,34 @@ class WebSocketLinkTransport {
         }
       }));
       websocket.addEventListener("close", async (event) => {
+        closeReason = new AbortError(`WebSocket closed (code ${event.code}: ${event.reason})`);
         connectingResolvers?.resolve();
-        if (this.reconnectOnCloseEnabled) {
-          sleep(this.reconnectOnCloseDelay).then(() => this.getConnectedPeer()).catch(() => {
-          });
-        }
-        const reason = new AbortError(`WebSocket closed (code ${event.code}: ${event.reason})`);
-        await peer.close(reason);
+        await peer.close(closeReason);
+      });
+      websocket.addEventListener("error", () => {
       });
       await connectingResolvers?.promise;
-      connectingResolvers = void 0;
+      if (closeReason) {
+        throw closeReason;
+      }
+      if (this.reconnectOnCloseEnabled) {
+        websocket.addEventListener("close", () => {
+          sleep(this.reconnectOnCloseDelay).then(() => this.getConnectedPeer()).catch(() => {
+          });
+        });
+      }
+      this.attempt = 0;
       return { websocket, peer };
     })().catch((error) => {
       if (!this.reconnectEnabled) {
         throw error;
       }
+      if (this.attempt >= this.reconnectMaxAttempt) {
+        const attempt = this.attempt;
+        this.attempt = 0;
+        this.current = void 0;
+        throw new AbortError(`WebSocket reconnect failed after ${attempt} attempt(s)`, { cause: error });
+      }
     });
     return this.getConnectedPeer();
   }

package/dist/index.d.mts

@@ -1,10 +1,10 @@
 import { WrapAsyncIteratorOptions, AsyncIteratorClass, Interceptor, PromiseWithError, ThrowableError, Promisable } from '@orpc/shared';
 export { AsyncCleanupFn, AsyncIteratorClass, AsyncIteratorClassNextFn, PromiseWithError as ClientPromiseResult, MaybeOptionalOptions, PromiseWithError, Registry, ThrowableError, asyncIteratorToStream, asyncIteratorToUnproxiedDataStream, consumeAsyncIterator, consumeAsyncIterator as consumeEventIterator, asyncIteratorToStream as eventIteratorToStream, asyncIteratorToUnproxiedDataStream as eventIteratorToUnproxiedDataStream, onAsyncIteratorObjectError, onError, onFinish, onReadableStreamError, onStart, onSuccess, streamToAsyncIteratorObject, streamToAsyncIteratorObject as streamToEventIterator } from '@orpc/shared';
-import { C as ClientContext, a as ClientOptions, c as AnyNestedClient, I as InferClientContext, d as InferClientError, e as Client, b as ClientLink, A as AnyORPCError, f as ClientRest, F as FriendlyClientOptions, O as ORPCErrorCode, g as ORPCErrorJSON, h as ORPCError, M as MalformedResponseErrorOptions } from './shared/client.BoXZCzuS.mjs';
-export { i as AnyORPCErrorJSON, j as COMMON_ERROR_STATUS_MAP, k as InferClientBodyInputs, l as InferClientBodyOutputs, m as InferClientErrors, n as InferClientInputs, o as InferClientOutputs, p as MalformedResponseError, N as NestedClient, q as ORPCErrorOptions } from './shared/client.BoXZCzuS.mjs';
+import { C as ClientContext, a as ClientOptions, c as AnyNestedClient, I as InferClientContext, d as InferClientError, e as Client, b as ClientLink, A as AnyORPCError, f as ClientRest, F as FriendlyClientOptions, O as ORPCErrorCode, g as ORPCErrorJSON, h as ORPCError, M as MalformedResponseErrorOptions } from './shared/client.Dw9_40WO.mjs';
+export { i as AnyORPCErrorJSON, j as COMMON_ERROR_STATUS_MAP, k as InferClientBodyInputs, l as InferClientBodyOutputs, m as InferClientErrors, n as InferClientInputs, o as InferClientOutputs, p as MalformedResponseError, N as NestedClient, q as ORPCErrorOptions } from './shared/client.Dw9_40WO.mjs';
 import { StandardResponse } from '@standard-server/core';
 export { ErrorEvent, EventMeta, StandardBody, StandardBodyHint, StandardHeaders, StandardLazyRequest, StandardLazyResponse, StandardMethod, StandardRequest, StandardResponse, StandardUrl, getEventMeta, unwrapEvent, withEventMeta } from '@standard-server/core';
-export { R as RPCJsonSerialization, a as RPCJsonSerializationMeta, b as RPCJsonSerializer, c as RPCJsonSerializerHandler, d as RPCJsonSerializerOptions, e as RPCSerializer, f as RPCSerializerOptions, g as RPCSerializerSerializeOptions } from './shared/client.n8K9dFhY.mjs';
+export { R as RPCJsonSerialization, a as RPCJsonSerializationMeta, b as RPCJsonSerializer, c as RPCJsonSerializerHandler, d as RPCJsonSerializerOptions, e as RPCSerializer, f as RPCSerializerOptions, g as RPCSerializerSerializeOptions } from './shared/client.BPa_Mmuh.mjs';
 
 declare function wrapAsyncIteratorPreservingEventMeta<TYield, TReturn, TMappedYield = TYield, TMappedReturn = TReturn>(iterator: AsyncIterator<TYield, TReturn>, { mapResult, mapError, ...rest }: WrapAsyncIteratorOptions<TYield, TReturn, TMappedYield, TMappedReturn>): AsyncIteratorClass<TMappedYield, TMappedReturn>;
 

package/dist/index.d.ts

@@ -1,10 +1,10 @@
 import { WrapAsyncIteratorOptions, AsyncIteratorClass, Interceptor, PromiseWithError, ThrowableError, Promisable } from '@orpc/shared';
 export { AsyncCleanupFn, AsyncIteratorClass, AsyncIteratorClassNextFn, PromiseWithError as ClientPromiseResult, MaybeOptionalOptions, PromiseWithError, Registry, ThrowableError, asyncIteratorToStream, asyncIteratorToUnproxiedDataStream, consumeAsyncIterator, consumeAsyncIterator as consumeEventIterator, asyncIteratorToStream as eventIteratorToStream, asyncIteratorToUnproxiedDataStream as eventIteratorToUnproxiedDataStream, onAsyncIteratorObjectError, onError, onFinish, onReadableStreamError, onStart, onSuccess, streamToAsyncIteratorObject, streamToAsyncIteratorObject as streamToEventIterator } from '@orpc/shared';
-import { C as ClientContext, a as ClientOptions, c as AnyNestedClient, I as InferClientContext, d as InferClientError, e as Client, b as ClientLink, A as AnyORPCError, f as ClientRest, F as FriendlyClientOptions, O as ORPCErrorCode, g as ORPCErrorJSON, h as ORPCError, M as MalformedResponseErrorOptions } from './shared/client.BoXZCzuS.js';
-export { i as AnyORPCErrorJSON, j as COMMON_ERROR_STATUS_MAP, k as InferClientBodyInputs, l as InferClientBodyOutputs, m as InferClientErrors, n as InferClientInputs, o as InferClientOutputs, p as MalformedResponseError, N as NestedClient, q as ORPCErrorOptions } from './shared/client.BoXZCzuS.js';
+import { C as ClientContext, a as ClientOptions, c as AnyNestedClient, I as InferClientContext, d as InferClientError, e as Client, b as ClientLink, A as AnyORPCError, f as ClientRest, F as FriendlyClientOptions, O as ORPCErrorCode, g as ORPCErrorJSON, h as ORPCError, M as MalformedResponseErrorOptions } from './shared/client.Dw9_40WO.js';
+export { i as AnyORPCErrorJSON, j as COMMON_ERROR_STATUS_MAP, k as InferClientBodyInputs, l as InferClientBodyOutputs, m as InferClientErrors, n as InferClientInputs, o as InferClientOutputs, p as MalformedResponseError, N as NestedClient, q as ORPCErrorOptions } from './shared/client.Dw9_40WO.js';
 import { StandardResponse } from '@standard-server/core';
 export { ErrorEvent, EventMeta, StandardBody, StandardBodyHint, StandardHeaders, StandardLazyRequest, StandardLazyResponse, StandardMethod, StandardRequest, StandardResponse, StandardUrl, getEventMeta, unwrapEvent, withEventMeta } from '@standard-server/core';
-export { R as RPCJsonSerialization, a as RPCJsonSerializationMeta, b as RPCJsonSerializer, c as RPCJsonSerializerHandler, d as RPCJsonSerializerOptions, e as RPCSerializer, f as RPCSerializerOptions, g as RPCSerializerSerializeOptions } from './shared/client.n8K9dFhY.js';
+export { R as RPCJsonSerialization, a as RPCJsonSerializationMeta, b as RPCJsonSerializer, c as RPCJsonSerializerHandler, d as RPCJsonSerializerOptions, e as RPCSerializer, f as RPCSerializerOptions, g as RPCSerializerSerializeOptions } from './shared/client.BPa_Mmuh.js';
 
 declare function wrapAsyncIteratorPreservingEventMeta<TYield, TReturn, TMappedYield = TYield, TMappedReturn = TReturn>(iterator: AsyncIterator<TYield, TReturn>, { mapResult, mapError, ...rest }: WrapAsyncIteratorOptions<TYield, TReturn, TMappedYield, TMappedReturn>): AsyncIteratorClass<TMappedYield, TMappedReturn>;
 

package/dist/index.mjs

@@ -1,8 +1,8 @@
-import { b as isDefinedError } from './shared/client.BYHnU_Z3.mjs';
-export { d as RPCJsonSerializer, R as RPCSerializer, e as cloneORPCError, a as createORPCErrorFromJson, c as createORPCErrorFromMalformedResponse, i as isORPCErrorJson, t as toORPCError, w as wrapAsyncIteratorPreservingEventMeta } from './shared/client.BYHnU_Z3.mjs';
+import { b as isDefinedError } from './shared/client.DpkGsZt-.mjs';
+export { d as RPCJsonSerializer, R as RPCSerializer, e as cloneORPCError, a as createORPCErrorFromJson, c as createORPCErrorFromMalformedResponse, i as isORPCErrorJson, t as toORPCError, w as wrapAsyncIteratorPreservingEventMeta } from './shared/client.DpkGsZt-.mjs';
 import { toArray, intercept, isTypescriptObject } from '@orpc/shared';
 export { AsyncIteratorClass, asyncIteratorToStream, asyncIteratorToUnproxiedDataStream, consumeAsyncIterator, consumeAsyncIterator as consumeEventIterator, asyncIteratorToStream as eventIteratorToStream, asyncIteratorToUnproxiedDataStream as eventIteratorToUnproxiedDataStream, onAsyncIteratorObjectError, onError, onFinish, onReadableStreamError, onStart, onSuccess, streamToAsyncIteratorObject, streamToAsyncIteratorObject as streamToEventIterator } from '@orpc/shared';
-export { C as COMMON_ERROR_STATUS_MAP, M as MalformedResponseError, O as ORPCError } from './shared/client.Dtv1JPkU.mjs';
+export { C as COMMON_ERROR_STATUS_MAP, M as MalformedResponseError, O as ORPCError } from './shared/client.DD2eNne_.mjs';
 export { ErrorEvent, getEventMeta, unwrapEvent, withEventMeta } from '@standard-server/core';
 
 const RECURSIVE_CLIENT_UNWRAP_KEYS = /* @__PURE__ */ new Set([

package/dist/plugins/index.d.mts

@@ -31,12 +31,27 @@ interface BatchLinkPluginOptions<T extends ClientContext> {
      * @default () => true
      */
     filter?: Value<boolean, [options: StandardLinkTransportInterceptorOptions<T>]>;
+    /**
+     * Only requests with the same scope are batched together.
+     * On the server, return a value unique to the incoming request so different users never share a batch.
+     *
+     * @default () => undefined
+     */
+    scope?: (options: StandardLinkTransportInterceptorOptions<T>) => unknown;
     /**
      * The maximum number of requests in the batch.
      *
      * @default 10
      */
     maxSize?: Value<Promisable<number>, [subOptionsList: [StandardLinkTransportInterceptorOptions<T>, ...StandardLinkTransportInterceptorOptions<T>[]]]>;
+    /**
+     * How long (in ms) to wait for more requests before sending the batch,
+     * counted from the first queued request.
+     * With `0`, only requests made in the same event loop tick are batched.
+     *
+     * @default 0
+     */
+    wait?: number;
     /**
      * The batch response mode.
      *
@@ -90,7 +105,9 @@ declare class BatchLinkPlugin<T extends ClientContext> implements StandardLinkPl
     name: string;
     private readonly groups;
     private readonly filter;
+    private readonly scope;
     private readonly maxSize;
+    private readonly wait;
     private readonly mode;
     private readonly batchUrl;
     private readonly maxUrlLength;
@@ -101,6 +118,12 @@ declare class BatchLinkPlugin<T extends ClientContext> implements StandardLinkPl
     constructor(options: NoInfer<BatchLinkPluginOptions<T>>);
     init(options: StandardLinkOptions<T>): StandardLinkOptions<T>;
     private processPendingBatches;
+    /**
+     * Runs the batch in the async context of its first request instead of the timer's,
+     * so the transport and batch options see that caller's request state.
+     * `executeBatch` always runs in the context of its first request.
+     */
+    private executeBatchInOwnContext;
     private executeBatch;
 }
 
@@ -129,6 +152,21 @@ interface DedupeLinkPluginOptions<T extends ClientContext> {
      * @default ({ request }) => request.method === 'GET' || request.method === 'QUERY'
      */
     filter?: Value<boolean, [options: StandardLinkTransportInterceptorOptions<T>]>;
+    /**
+     * Only requests with the same scope are deduplicated together.
+     * On the server, return a value unique to the incoming request so different users never share a response.
+     *
+     * @default () => undefined
+     */
+    scope?: (options: StandardLinkTransportInterceptorOptions<T>) => unknown;
+    /**
+     * How long (in ms) to wait for more identical requests before sending,
+     * counted from the first queued request.
+     * With `0`, only requests made in the same event loop tick are deduplicated.
+     *
+     * @default 0
+     */
+    wait?: number;
 }
 /**
  * Prevents redundant requests by deduplicating similar in-flight requests,
@@ -141,6 +179,8 @@ declare class DedupeLinkPlugin<T extends ClientContext> implements StandardLinkP
     before: string[];
     private readonly groups;
     private readonly filter;
+    private readonly scope;
+    private readonly wait;
     private readonly queue;
     constructor(options: NoInfer<DedupeLinkPluginOptions<T>>);
     init(options: StandardLinkOptions<T>): StandardLinkOptions<T>;

package/dist/plugins/index.d.ts

@@ -31,12 +31,27 @@ interface BatchLinkPluginOptions<T extends ClientContext> {
      * @default () => true
      */
     filter?: Value<boolean, [options: StandardLinkTransportInterceptorOptions<T>]>;
+    /**
+     * Only requests with the same scope are batched together.
+     * On the server, return a value unique to the incoming request so different users never share a batch.
+     *
+     * @default () => undefined
+     */
+    scope?: (options: StandardLinkTransportInterceptorOptions<T>) => unknown;
     /**
      * The maximum number of requests in the batch.
      *
      * @default 10
      */
     maxSize?: Value<Promisable<number>, [subOptionsList: [StandardLinkTransportInterceptorOptions<T>, ...StandardLinkTransportInterceptorOptions<T>[]]]>;
+    /**
+     * How long (in ms) to wait for more requests before sending the batch,
+     * counted from the first queued request.
+     * With `0`, only requests made in the same event loop tick are batched.
+     *
+     * @default 0
+     */
+    wait?: number;
     /**
      * The batch response mode.
      *
@@ -90,7 +105,9 @@ declare class BatchLinkPlugin<T extends ClientContext> implements StandardLinkPl
     name: string;
     private readonly groups;
     private readonly filter;
+    private readonly scope;
     private readonly maxSize;
+    private readonly wait;
     private readonly mode;
     private readonly batchUrl;
     private readonly maxUrlLength;
@@ -101,6 +118,12 @@ declare class BatchLinkPlugin<T extends ClientContext> implements StandardLinkPl
     constructor(options: NoInfer<BatchLinkPluginOptions<T>>);
     init(options: StandardLinkOptions<T>): StandardLinkOptions<T>;
     private processPendingBatches;
+    /**
+     * Runs the batch in the async context of its first request instead of the timer's,
+     * so the transport and batch options see that caller's request state.
+     * `executeBatch` always runs in the context of its first request.
+     */
+    private executeBatchInOwnContext;
     private executeBatch;
 }
 
@@ -129,6 +152,21 @@ interface DedupeLinkPluginOptions<T extends ClientContext> {
      * @default ({ request }) => request.method === 'GET' || request.method === 'QUERY'
      */
     filter?: Value<boolean, [options: StandardLinkTransportInterceptorOptions<T>]>;
+    /**
+     * Only requests with the same scope are deduplicated together.
+     * On the server, return a value unique to the incoming request so different users never share a response.
+     *
+     * @default () => undefined
+     */
+    scope?: (options: StandardLinkTransportInterceptorOptions<T>) => unknown;
+    /**
+     * How long (in ms) to wait for more identical requests before sending,
+     * counted from the first queued request.
+     * With `0`, only requests made in the same event loop tick are deduplicated.
+     *
+     * @default 0
+     */
+    wait?: number;
 }
 /**
  * Prevents redundant requests by deduplicating similar in-flight requests,
@@ -141,6 +179,8 @@ declare class DedupeLinkPlugin<T extends ClientContext> implements StandardLinkP
     before: string[];
     private readonly groups;
     private readonly filter;
+    private readonly scope;
+    private readonly wait;
     private readonly queue;
     constructor(options: NoInfer<DedupeLinkPluginOptions<T>>);
     init(options: StandardLinkOptions<T>): StandardLinkOptions<T>;