@orpc/client 1.0.0-beta.2 → 1.0.0-beta.3

package/dist/adapters/fetch/index.mjs

@@ -1,5 +1,5 @@
 import { toFetchRequest, toStandardLazyResponse } from '@orpc/standard-server-fetch';
-import { b as StandardRPCJsonSerializer, c as StandardRPCLinkCodec, d as StandardRPCSerializer, S as StandardLink } from '../../shared/client.Be-O_tdu.mjs';
+import { b as StandardRPCJsonSerializer, c as StandardRPCLinkCodec, d as StandardRPCSerializer, S as StandardLink } from '../../shared/client.3Q53fveR.mjs';
 import '@orpc/shared';
 import '../../shared/client.CvnV7_uV.mjs';
 import '@orpc/standard-server';

package/dist/adapters/standard/index.mjs

@@ -1,4 +1,4 @@
-export { I as InvalidEventIteratorRetryResponse, a as STANDARD_RPC_JSON_SERIALIZER_BUILT_IN_TYPES, S as StandardLink, b as StandardRPCJsonSerializer, c as StandardRPCLinkCodec, d as StandardRPCSerializer } from '../../shared/client.Be-O_tdu.mjs';
+export { I as InvalidEventIteratorRetryResponse, a as STANDARD_RPC_JSON_SERIALIZER_BUILT_IN_TYPES, S as StandardLink, b as StandardRPCJsonSerializer, c as StandardRPCLinkCodec, d as StandardRPCSerializer } from '../../shared/client.3Q53fveR.mjs';
 import '@orpc/shared';
 import '../../shared/client.CvnV7_uV.mjs';
 import '@orpc/standard-server';

package/dist/plugins/index.d.mts

@@ -5,8 +5,8 @@ import { C as ClientOptionsOut, a as ClientContext } from '../shared/client.CupM
 import '@orpc/standard-server';
 
 interface ClientRetryPluginAttemptOptions {
-    eventIteratorLastRetry: number | undefined;
-    eventIteratorLastEventId: string | undefined;
+    lastEventRetry: number | undefined;
+    lastEventId: string | undefined;
     attemptIndex: number;
     error: unknown;
 }
@@ -21,7 +21,7 @@ interface ClientRetryPluginContext {
     /**
      * Delay (in ms) before retrying.
      *
-     * @default (o) => o.eventIteratorLastRetry ?? 2000
+     * @default (o) => o.lastEventRetry ?? 2000
      */
     retryDelay?: Value<number, [
         attemptOptions: ClientRetryPluginAttemptOptions,

package/dist/plugins/index.d.ts

@@ -5,8 +5,8 @@ import { C as ClientOptionsOut, a as ClientContext } from '../shared/client.CupM
 import '@orpc/standard-server';
 
 interface ClientRetryPluginAttemptOptions {
-    eventIteratorLastRetry: number | undefined;
-    eventIteratorLastEventId: string | undefined;
+    lastEventRetry: number | undefined;
+    lastEventId: string | undefined;
     attemptIndex: number;
     error: unknown;
 }
@@ -21,7 +21,7 @@ interface ClientRetryPluginContext {
     /**
      * Delay (in ms) before retrying.
      *
-     * @default (o) => o.eventIteratorLastRetry ?? 2000
+     * @default (o) => o.lastEventRetry ?? 2000
      */
     retryDelay?: Value<number, [
         attemptOptions: ClientRetryPluginAttemptOptions,

package/dist/plugins/index.mjs

@@ -11,7 +11,7 @@ class ClientRetryPlugin {
   defaultOnRetry;
   constructor(options = {}) {
     this.defaultRetry = options.default?.retry ?? 0;
-    this.defaultRetryDelay = options.default?.retryDelay ?? ((o) => o.eventIteratorLastRetry ?? 2e3);
+    this.defaultRetryDelay = options.default?.retryDelay ?? ((o) => o.lastEventRetry ?? 2e3);
     this.defaultShouldRetry = options.default?.shouldRetry ?? true;
     this.defaultOnRetry = options.default?.onRetry;
   }
@@ -25,13 +25,14 @@ class ClientRetryPlugin {
       if (maxAttempts <= 0) {
         return interceptorOptions.next();
       }
-      let eventIteratorLastEventId = interceptorOptions.options.lastEventId;
-      let eventIteratorLastRetry;
+      let lastEventId = interceptorOptions.options.lastEventId;
+      let lastEventRetry;
       let unsubscribe;
       let attemptIndex = 0;
       const next = async (initial) => {
         let current = initial;
         while (true) {
+          const newClientOptions = { ...interceptorOptions.options, lastEventId };
           if (current) {
             if (attemptIndex >= maxAttempts) {
               throw current.error;
@@ -39,13 +40,13 @@ class ClientRetryPlugin {
             const attemptOptions = {
               attemptIndex,
               error: current.error,
-              eventIteratorLastEventId,
-              eventIteratorLastRetry
+              lastEventId,
+              lastEventRetry
             };
             const shouldRetryBool = await value(
               shouldRetry,
               attemptOptions,
-              interceptorOptions.options,
+              newClientOptions,
               interceptorOptions.path,
               interceptorOptions.input
             );
@@ -54,14 +55,14 @@ class ClientRetryPlugin {
             }
             unsubscribe = onRetry?.(
               attemptOptions,
-              interceptorOptions.options,
+              newClientOptions,
               interceptorOptions.path,
               interceptorOptions.input
             );
             const retryDelayMs = await value(
               retryDelay,
               attemptOptions,
-              interceptorOptions.options,
+              newClientOptions,
               interceptorOptions.path,
               interceptorOptions.input
             );
@@ -69,14 +70,13 @@ class ClientRetryPlugin {
             attemptIndex++;
           }
           try {
-            const newClientOptions = { ...interceptorOptions.options, lastEventId: eventIteratorLastEventId };
             const output2 = await interceptorOptions.next({
               ...interceptorOptions,
               options: newClientOptions
             });
             return output2;
           } catch (error) {
-            if (interceptorOptions.options.signal?.aborted === true) {
+            if (newClientOptions.signal?.aborted === true) {
               throw error;
             }
             current = { error };
@@ -97,16 +97,16 @@ class ClientRetryPlugin {
             try {
               const item = await current.next();
               const meta = getEventMeta(item.value);
-              eventIteratorLastEventId = meta?.id ?? eventIteratorLastEventId;
-              eventIteratorLastRetry = meta?.retry ?? eventIteratorLastRetry;
+              lastEventId = meta?.id ?? lastEventId;
+              lastEventRetry = meta?.retry ?? lastEventRetry;
               if (item.done) {
                 return item.value;
               }
               yield item.value;
             } catch (error) {
               const meta = getEventMeta(error);
-              eventIteratorLastEventId = meta?.id ?? eventIteratorLastEventId;
-              eventIteratorLastRetry = meta?.retry ?? eventIteratorLastRetry;
+              lastEventId = meta?.id ?? lastEventId;
+              lastEventRetry = meta?.retry ?? lastEventRetry;
               const maybeEventIterator = await next({ error });
               if (!isAsyncIteratorObject(maybeEventIterator)) {
                 throw new ClientRetryPluginInvalidEventIteratorRetryResponse(

package/dist/shared/{client.Be-O_tdu.mjs → client.3Q53fveR.mjs}

@@ -111,6 +111,9 @@ class StandardRPCJsonSerializer {
     if (isObject(data)) {
       const json = {};
       for (const k in data) {
+        if (k === "toJSON" && typeof data[k] === "function") {
+          continue;
+        }
         json[k] = this.serialize(data[k], [...segments, k], meta, maps, blobs)[0];
       }
       return [json, meta, maps, blobs];

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@orpc/client",
   "type": "module",
-  "version": "1.0.0-beta.2",
+  "version": "1.0.0-beta.3",
   "license": "MIT",
   "homepage": "https://orpc.unnoq.com",
   "repository": {
@@ -39,9 +39,9 @@
     "dist"
   ],
   "dependencies": {
-    "@orpc/shared": "1.0.0-beta.2",
-    "@orpc/standard-server-fetch": "1.0.0-beta.2",
-    "@orpc/standard-server": "1.0.0-beta.2"
+    "@orpc/shared": "1.0.0-beta.3",
+    "@orpc/standard-server": "1.0.0-beta.3",
+    "@orpc/standard-server-fetch": "1.0.0-beta.3"
   },
   "devDependencies": {
     "zod": "^3.24.2"