@trpc/client 11.0.0-rc.524 → 11.0.0-rc.528

package/dist/bundle-analysis.json

@@ -1,20 +1,20 @@
 {
-  "bundleSize": 52661,
-  "bundleOrigSize": 70097,
-  "bundleReduction": 24.87,
+  "bundleSize": 52387,
+  "bundleOrigSize": 69892,
+  "bundleReduction": 25.05,
   "modules": [
     {
       "id": "/src/links/wsLink.ts",
-      "size": 13710,
-      "origSize": 15265,
+      "size": 13436,
+      "origSize": 15060,
       "renderedExports": [
         "createWSClient",
         "wsLink"
       ],
       "removedExports": [],
       "dependents": [],
-      "percent": 26.03,
-      "reduction": 10.19
+      "percent": 25.65,
+      "reduction": 10.78
     },
     {
       "id": "/src/links/httpBatchStreamLink.ts",
@@ -25,7 +25,7 @@
       ],
       "removedExports": [],
       "dependents": [],
-      "percent": 11.13,
+      "percent": 11.19,
       "reduction": 3.51
     },
     {
@@ -37,7 +37,7 @@
       ],
       "removedExports": [],
       "dependents": [],
-      "percent": 10.36,
+      "percent": 10.42,
       "reduction": 18.48
     },
     {
@@ -56,12 +56,12 @@
       ],
       "removedExports": [],
       "dependents": [
-        "/src/links/httpBatchLink.ts",
         "/src/links/httpLink.ts",
+        "/src/links/httpBatchLink.ts",
         "/src/links/httpBatchStreamLink.ts",
         "/src/links/httpSubscriptionLink.ts"
       ],
-      "percent": 8.48,
+      "percent": 8.52,
       "reduction": 32.82
     },
     {
@@ -76,7 +76,7 @@
         "/src/links/httpBatchLink.ts",
         "/src/links/httpBatchStreamLink.ts"
       ],
-      "percent": 7.76,
+      "percent": 7.8,
       "reduction": 5.64
     },
     {
@@ -88,7 +88,7 @@
       ],
       "removedExports": [],
       "dependents": [],
-      "percent": 7.45,
+      "percent": 7.49,
       "reduction": 4.69
     },
     {
@@ -100,7 +100,7 @@
       ],
       "removedExports": [],
       "dependents": [],
-      "percent": 7.23,
+      "percent": 7.26,
       "reduction": 9.86
     },
     {
@@ -112,7 +112,7 @@
       ],
       "removedExports": [],
       "dependents": [],
-      "percent": 6.05,
+      "percent": 6.08,
       "reduction": 14.15
     },
     {
@@ -127,7 +127,7 @@
         "/src/createTRPCUntypedClient.ts",
         "/src/createTRPCClient.ts"
       ],
-      "percent": 4.11,
+      "percent": 4.13,
       "reduction": 47.6
     },
     {
@@ -140,14 +140,14 @@
       "removedExports": [],
       "dependents": [
         "/src/index.ts",
-        "/src/links/httpBatchLink.ts",
         "/src/links/httpLink.ts",
+        "/src/links/httpBatchLink.ts",
         "/src/links/wsLink.ts",
         "/src/links/httpBatchStreamLink.ts",
         "/src/links/httpSubscriptionLink.ts",
         "/src/internals/TRPCUntypedClient.ts"
       ],
-      "percent": 3.68,
+      "percent": 3.7,
       "reduction": 45.43
     },
     {
@@ -164,7 +164,7 @@
       "dependents": [
         "/src/index.ts"
       ],
-      "percent": 2.25,
+      "percent": 2.27,
       "reduction": 73.19
     },
     {
@@ -179,7 +179,7 @@
         "/src/links/splitLink.ts",
         "/src/internals/TRPCUntypedClient.ts"
       ],
-      "percent": 1.31,
+      "percent": 1.32,
       "reduction": 32.75
     },
     {
@@ -205,7 +205,7 @@
       "dependents": [
         "/src/unstable-internals.ts"
       ],
-      "percent": 1.07,
+      "percent": 1.08,
       "reduction": 66.75
     },
     {
@@ -220,7 +220,7 @@
         "/src/index.ts",
         "/src/links/internals/httpUtils.ts"
       ],
-      "percent": 0.81,
+      "percent": 0.82,
       "reduction": 33.54
     },
     {

package/dist/links/wsLink.js

@@ -59,11 +59,10 @@ function createWSClient(opts) {
             startLazyDisconnectTimer();
         });
     }
-    function tryReconnect(conn) {
+    function tryReconnect() {
         if (!!connectTimer) {
             return;
         }
-        conn.state = 'connecting';
         const timeout = retryDelayFn(connectAttempt++);
         reconnectInMs(timeout);
     }
@@ -126,11 +125,32 @@ function createWSClient(opts) {
             state: 'connecting'
         };
         clearTimeout(lazyDisconnectTimer);
-        const onError = (evt)=>{
+        const onCloseOrError = ()=>{
+            if (self.state === 'closed') {
+                return;
+            }
             self.state = 'closed';
-            if (self === activeConnection) {
-                tryReconnect(self);
+            if (activeConnection === self) {
+                // connection might have been replaced already
+                tryReconnect();
             }
+            for (const [key, req] of Object.entries(pendingRequests)){
+                if (req.connection !== self) {
+                    continue;
+                }
+                // The connection was closed either unexpectedly or because of a reconnect
+                if (req.type === 'subscription') {
+                    // Subscriptions will resume after we've reconnected
+                    resumeSubscriptionOnReconnect(req);
+                } else {
+                    // Queries and mutations will error if interrupted
+                    delete pendingRequests[key];
+                    req.callbacks.error?.(TRPCClientError.TRPCClientError.from(new TRPCWebSocketClosedError('WebSocket closed prematurely')));
+                }
+            }
+        };
+        const onError = (evt)=>{
+            onCloseOrError();
             opts.onError?.(evt);
         };
         run(async ()=>{
@@ -189,10 +209,12 @@ function createWSClient(opts) {
                 }
                 req.callbacks.next?.(data);
                 if (self === activeConnection && req.connection !== activeConnection) {
-                    // gracefully replace old connection with this
-                    const oldConn = req.connection;
+                    // gracefully replace old connection with a new connection
                     req.connection = self;
-                    oldConn && closeIfNoPending(oldConn);
+                }
+                if (req.connection !== self) {
+                    // the connection has been replaced
+                    return;
                 }
                 if ('result' in data && data.result.type === 'data' && typeof data.result.id === 'string') {
                     req.lastEventId = data.result.id;
@@ -215,36 +237,13 @@ function createWSClient(opts) {
                 }
             });
             ws.addEventListener('close', ({ code  })=>{
-                if (self.state === 'open') {
+                const wasOpen = self.state === 'open';
+                onCloseOrError();
+                if (wasOpen) {
                     opts.onClose?.({
                         code
                     });
                 }
-                self.state = 'closed';
-                if (activeConnection === self) {
-                    // connection might have been replaced already
-                    tryReconnect(self);
-                }
-                for (const [key, req] of Object.entries(pendingRequests)){
-                    if (req.connection !== self) {
-                        continue;
-                    }
-                    if (self.state === 'closed') {
-                        // If the connection was closed, we just call `complete()` on the request
-                        delete pendingRequests[key];
-                        req.callbacks.complete?.();
-                        continue;
-                    }
-                    // The connection was closed either unexpectedly or because of a reconnect
-                    if (req.type === 'subscription') {
-                        // Subscriptions will resume after we've reconnected
-                        resumeSubscriptionOnReconnect(req);
-                    } else {
-                        // Queries and mutations will error if interrupted
-                        delete pendingRequests[key];
-                        req.callbacks.error?.(TRPCClientError.TRPCClientError.from(new TRPCWebSocketClosedError('WebSocket closed prematurely')));
-                    }
-                }
             });
         }).catch(onError);
         return self;

package/dist/links/wsLink.mjs

@@ -57,11 +57,10 @@ function createWSClient(opts) {
             startLazyDisconnectTimer();
         });
     }
-    function tryReconnect(conn) {
+    function tryReconnect() {
         if (!!connectTimer) {
             return;
         }
-        conn.state = 'connecting';
         const timeout = retryDelayFn(connectAttempt++);
         reconnectInMs(timeout);
     }
@@ -124,11 +123,32 @@ function createWSClient(opts) {
             state: 'connecting'
         };
         clearTimeout(lazyDisconnectTimer);
-        const onError = (evt)=>{
+        const onCloseOrError = ()=>{
+            if (self.state === 'closed') {
+                return;
+            }
             self.state = 'closed';
-            if (self === activeConnection) {
-                tryReconnect(self);
+            if (activeConnection === self) {
+                // connection might have been replaced already
+                tryReconnect();
             }
+            for (const [key, req] of Object.entries(pendingRequests)){
+                if (req.connection !== self) {
+                    continue;
+                }
+                // The connection was closed either unexpectedly or because of a reconnect
+                if (req.type === 'subscription') {
+                    // Subscriptions will resume after we've reconnected
+                    resumeSubscriptionOnReconnect(req);
+                } else {
+                    // Queries and mutations will error if interrupted
+                    delete pendingRequests[key];
+                    req.callbacks.error?.(TRPCClientError.from(new TRPCWebSocketClosedError('WebSocket closed prematurely')));
+                }
+            }
+        };
+        const onError = (evt)=>{
+            onCloseOrError();
             opts.onError?.(evt);
         };
         run(async ()=>{
@@ -187,10 +207,12 @@ function createWSClient(opts) {
                 }
                 req.callbacks.next?.(data);
                 if (self === activeConnection && req.connection !== activeConnection) {
-                    // gracefully replace old connection with this
-                    const oldConn = req.connection;
+                    // gracefully replace old connection with a new connection
                     req.connection = self;
-                    oldConn && closeIfNoPending(oldConn);
+                }
+                if (req.connection !== self) {
+                    // the connection has been replaced
+                    return;
                 }
                 if ('result' in data && data.result.type === 'data' && typeof data.result.id === 'string') {
                     req.lastEventId = data.result.id;
@@ -213,36 +235,13 @@ function createWSClient(opts) {
                 }
             });
             ws.addEventListener('close', ({ code  })=>{
-                if (self.state === 'open') {
+                const wasOpen = self.state === 'open';
+                onCloseOrError();
+                if (wasOpen) {
                     opts.onClose?.({
                         code
                     });
                 }
-                self.state = 'closed';
-                if (activeConnection === self) {
-                    // connection might have been replaced already
-                    tryReconnect(self);
-                }
-                for (const [key, req] of Object.entries(pendingRequests)){
-                    if (req.connection !== self) {
-                        continue;
-                    }
-                    if (self.state === 'closed') {
-                        // If the connection was closed, we just call `complete()` on the request
-                        delete pendingRequests[key];
-                        req.callbacks.complete?.();
-                        continue;
-                    }
-                    // The connection was closed either unexpectedly or because of a reconnect
-                    if (req.type === 'subscription') {
-                        // Subscriptions will resume after we've reconnected
-                        resumeSubscriptionOnReconnect(req);
-                    } else {
-                        // Queries and mutations will error if interrupted
-                        delete pendingRequests[key];
-                        req.callbacks.error?.(TRPCClientError.from(new TRPCWebSocketClosedError('WebSocket closed prematurely')));
-                    }
-                }
             });
         }).catch(onError);
         return self;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trpc/client",
-  "version": "11.0.0-rc.524+df45b1a7c",
+  "version": "11.0.0-rc.528+32e6b1285",
   "description": "The tRPC client library",
   "author": "KATT",
   "license": "MIT",
@@ -76,10 +76,10 @@
     "!**/*.test.*"
   ],
   "peerDependencies": {
-    "@trpc/server": "11.0.0-rc.524+df45b1a7c"
+    "@trpc/server": "11.0.0-rc.528+32e6b1285"
   },
   "devDependencies": {
-    "@trpc/server": "11.0.0-rc.524+df45b1a7c",
+    "@trpc/server": "11.0.0-rc.528+32e6b1285",
     "@types/isomorphic-fetch": "^0.0.39",
     "@types/node": "^20.10.0",
     "eslint": "^8.57.0",
@@ -96,5 +96,5 @@
   "funding": [
     "https://trpc.io/sponsor"
   ],
-  "gitHead": "df45b1a7c13a3f5c47373a0d2b38c68f5c6c1028"
+  "gitHead": "32e6b1285dd844776d323ae23fbea638312d676e"
 }

package/src/links/wsLink.ts

@@ -177,12 +177,10 @@ export function createWSClient(opts: WebSocketClientOptions) {
       startLazyDisconnectTimer();
     });
   }
-  function tryReconnect(conn: Connection) {
+  function tryReconnect() {
     if (!!connectTimer) {
       return;
     }
-
-    conn.state = 'connecting';
     const timeout = retryDelayFn(connectAttempt++);
     reconnectInMs(timeout);
   }
@@ -253,11 +251,40 @@ export function createWSClient(opts: WebSocketClientOptions) {
 
     clearTimeout(lazyDisconnectTimer);
 
-    const onError = (evt?: Event) => {
-      self.state = 'closed';
-      if (self === activeConnection) {
-        tryReconnect(self);
+    const onCloseOrError = () => {
+      if (self.state === 'closed') {
+        return;
+      }
+
+      (self as Connection).state = 'closed';
+      if (activeConnection === self) {
+        // connection might have been replaced already
+        tryReconnect();
+      }
+
+      for (const [key, req] of Object.entries(pendingRequests)) {
+        if (req.connection !== self) {
+          continue;
+        }
+
+        // The connection was closed either unexpectedly or because of a reconnect
+        if (req.type === 'subscription') {
+          // Subscriptions will resume after we've reconnected
+          resumeSubscriptionOnReconnect(req);
+        } else {
+          // Queries and mutations will error if interrupted
+          delete pendingRequests[key];
+          req.callbacks.error?.(
+            TRPCClientError.from(
+              new TRPCWebSocketClosedError('WebSocket closed prematurely'),
+            ),
+          );
+        }
       }
+    };
+
+    const onError = (evt?: Event) => {
+      onCloseOrError();
       opts.onError?.(evt);
     };
     run(async () => {
@@ -328,10 +355,12 @@ export function createWSClient(opts: WebSocketClientOptions) {
 
         req.callbacks.next?.(data);
         if (self === activeConnection && req.connection !== activeConnection) {
-          // gracefully replace old connection with this
-          const oldConn = req.connection;
+          // gracefully replace old connection with a new connection
           req.connection = self;
-          oldConn && closeIfNoPending(oldConn);
+        }
+        if (req.connection !== self) {
+          // the connection has been replaced
+          return;
         }
 
         if (
@@ -366,40 +395,11 @@ export function createWSClient(opts: WebSocketClientOptions) {
       });
 
       ws.addEventListener('close', ({ code }) => {
-        if (self.state === 'open') {
-          opts.onClose?.({ code });
-        }
-        self.state = 'closed';
+        const wasOpen = self.state === 'open';
+        onCloseOrError();
 
-        if (activeConnection === self) {
-          // connection might have been replaced already
-          tryReconnect(self);
-        }
-
-        for (const [key, req] of Object.entries(pendingRequests)) {
-          if (req.connection !== self) {
-            continue;
-          }
-
-          if (self.state === 'closed') {
-            // If the connection was closed, we just call `complete()` on the request
-            delete pendingRequests[key];
-            req.callbacks.complete?.();
-            continue;
-          }
-          // The connection was closed either unexpectedly or because of a reconnect
-          if (req.type === 'subscription') {
-            // Subscriptions will resume after we've reconnected
-            resumeSubscriptionOnReconnect(req);
-          } else {
-            // Queries and mutations will error if interrupted
-            delete pendingRequests[key];
-            req.callbacks.error?.(
-              TRPCClientError.from(
-                new TRPCWebSocketClosedError('WebSocket closed prematurely'),
-              ),
-            );
-          }
+        if (wasOpen) {
+          opts.onClose?.({ code });
         }
       });
     }).catch(onError);