@trpc/client 11.0.0-rc.806 → 11.0.0-rc.807

package/dist/bundle-analysis.json

@@ -1,12 +1,12 @@
 {
-  "bundleSize": 75585,
-  "bundleOrigSize": 94308,
+  "bundleSize": 75612,
+  "bundleOrigSize": 94335,
   "bundleReduction": 19.85,
   "modules": [
     {
       "id": "/src/links/wsLink/wsClient/wsClient.ts",
-      "size": 12353,
-      "origSize": 12459,
+      "size": 12067,
+      "origSize": 12199,
       "renderedExports": [
         "WsClient"
       ],
@@ -14,8 +14,8 @@
       "dependents": [
         "/src/links/wsLink/createWsClient.ts"
       ],
-      "percent": 16.34,
-      "reduction": 0.85
+      "percent": 15.96,
+      "reduction": 1.08
     },
     {
       "id": "/src/links/httpSubscriptionLink.ts",
@@ -29,6 +29,21 @@
       "percent": 10.54,
       "reduction": 0
     },
+    {
+      "id": "/src/links/wsLink/wsClient/wsConnection.ts",
+      "size": 6174,
+      "origSize": 6492,
+      "renderedExports": [
+        "WsConnection",
+        "backwardCompatibility"
+      ],
+      "removedExports": [],
+      "dependents": [
+        "/src/links/wsLink/wsClient/wsClient.ts"
+      ],
+      "percent": 8.17,
+      "reduction": 4.9
+    },
     {
       "id": "/src/links/httpBatchStreamLink.ts",
       "size": 6017,
@@ -41,21 +56,6 @@
       "percent": 7.96,
       "reduction": 4.42
     },
-    {
-      "id": "/src/links/wsLink/wsClient/wsConnection.ts",
-      "size": 5861,
-      "origSize": 6205,
-      "renderedExports": [
-        "WsConnection",
-        "backwardCompatibility"
-      ],
-      "removedExports": [],
-      "dependents": [
-        "/src/links/wsLink/wsClient/wsClient.ts"
-      ],
-      "percent": 7.75,
-      "reduction": 5.54
-    },
     {
       "id": "/src/links/loggerLink.ts",
       "size": 5596,
@@ -141,7 +141,7 @@
       ],
       "removedExports": [],
       "dependents": [],
-      "percent": 4.36,
+      "percent": 4.35,
       "reduction": 12.56
     },
     {
@@ -402,16 +402,6 @@
       "percent": 0.1,
       "reduction": 76.83
     },
-    {
-      "id": "/src/index.ts",
-      "size": 0,
-      "origSize": 540,
-      "renderedExports": [],
-      "removedExports": [],
-      "dependents": [],
-      "percent": 0,
-      "reduction": 100
-    },
     {
       "id": "/src/unstable-internals.ts",
       "size": 0,
@@ -425,6 +415,16 @@
       ],
       "percent": 0,
       "reduction": 100
+    },
+    {
+      "id": "/src/index.ts",
+      "size": 0,
+      "origSize": 540,
+      "renderedExports": [],
+      "removedExports": [],
+      "dependents": [],
+      "percent": 0,
+      "reduction": 100
     }
   ],
   "moduleCount": 29

package/dist/links/wsLink/wsClient/wsClient.d.ts

@@ -20,7 +20,6 @@ export declare class WsClient {
     private readonly reconnectRetryDelay;
     private inactivityTimeout;
     private readonly callbacks;
-    private readonly connectionParams;
     private readonly lazyMode;
     constructor(opts: WebSocketClientOptions);
     /**

package/dist/links/wsLink/wsClient/wsClient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wsClient.d.ts","sourceRoot":"","sources":["../../../../src/links/wsLink/wsClient/wsClient.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAClD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAE/D,OAAO,KAAK,EACV,uBAAuB,EAKxB,MAAM,0CAA0C,CAAC;AAMlD,OAAO,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAC3D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AACzE,OAAO,KAAK,EAAE,SAAS,EAAE,uBAAuB,EAAE,MAAM,aAAa,CAAC;AACtE,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,WAAW,CAAC;AAWxD;;;GAGG;AACH,qBAAa,QAAQ;IACnB;;OAEG;IACH,SAAgB,eAAe,EAAE,eAAe,CAC9C,mBAAmB,CAAC,eAAe,CAAC,aAAa,CAAC,CAAC,CACpD,CAAC;IAEF,OAAO,CAAC,cAAc,CAAS;IAC/B,OAAO,CAAC,cAAc,CAAwB;IAC9C,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAe;IAChD,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAmC;IACvE,OAAO,CAAC,iBAAiB,CAAoB;IAC7C,OAAO,CAAC,QAAQ,CAAC,SAAS,CAGxB;IACF,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAA6C;IAC9E,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAU;gBAEvB,IAAI,EAAE,sBAAsB;IA4DxC;;;OAGG;YACW,IAAI;IAuBlB;;;OAGG;IACU,KAAK;IA+BlB;;;;;;;;;OASG;IACI,OAAO,CAAC,EACb,EAAE,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,EACrC,WAAW,EACX,WAAW,GACZ,EAAE;QACD,EAAE,EAAE,IAAI,CAAC,SAAS,EAAE,IAAI,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,QAAQ,CAAC,CAAC;QACjE,WAAW,EAAE,uBAAuB,CAAC;QACrC,WAAW,CAAC,EAAE,MAAM,CAAC;KACtB;IA+CD,IAAW,UAAU;;;;;;;;;;;;aAEpB;IAED;;;;OAIG;IACH,OAAO,CAAC,YAAY,CAA8B;IAClD,OAAO,CAAC,SAAS;IAwBjB,OAAO,CAAC,uBAAuB;IA0F/B,OAAO,CAAC,qBAAqB;IAuB7B,OAAO,CAAC,qBAAqB;IAU7B;;OAEG;IACH,OAAO,CAAC,IAAI;IAgBZ;;;;OAIG;IACH,OAAO,CAAC,SAAS;CAmBlB"}
+{"version":3,"file":"wsClient.d.ts","sourceRoot":"","sources":["../../../../src/links/wsLink/wsClient/wsClient.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAClD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAE/D,OAAO,KAAK,EACV,uBAAuB,EAKxB,MAAM,0CAA0C,CAAC;AAMlD,OAAO,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAC3D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AACzE,OAAO,KAAK,EAAE,SAAS,EAAE,uBAAuB,EAAE,MAAM,aAAa,CAAC;AACtE,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,WAAW,CAAC;AAOxD;;;GAGG;AACH,qBAAa,QAAQ;IACnB;;OAEG;IACH,SAAgB,eAAe,EAAE,eAAe,CAC9C,mBAAmB,CAAC,eAAe,CAAC,aAAa,CAAC,CAAC,CACpD,CAAC;IAEF,OAAO,CAAC,cAAc,CAAS;IAC/B,OAAO,CAAC,cAAc,CAAwB;IAC9C,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAe;IAChD,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAmC;IACvE,OAAO,CAAC,iBAAiB,CAAoB;IAC7C,OAAO,CAAC,QAAQ,CAAC,SAAS,CAGxB;IACF,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAU;gBAEvB,IAAI,EAAE,sBAAsB;IA2DxC;;;OAGG;YACW,IAAI;IAuBlB;;;OAGG;IACU,KAAK;IA+BlB;;;;;;;;;OASG;IACI,OAAO,CAAC,EACb,EAAE,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,EACrC,WAAW,EACX,WAAW,GACZ,EAAE;QACD,EAAE,EAAE,IAAI,CAAC,SAAS,EAAE,IAAI,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,QAAQ,CAAC,CAAC;QACjE,WAAW,EAAE,uBAAuB,CAAC;QACrC,WAAW,CAAC,EAAE,MAAM,CAAC;KACtB;IA+CD,IAAW,UAAU;;;;;;;;;;;;aAEpB;IAED;;;;OAIG;IACH,OAAO,CAAC,YAAY,CAA8B;IAClD,OAAO,CAAC,SAAS;IAgCjB,OAAO,CAAC,uBAAuB;IA+E/B,OAAO,CAAC,qBAAqB;IAuB7B,OAAO,CAAC,qBAAqB;IAU7B;;OAEG;IACH,OAAO,CAAC,IAAI;IAgBZ;;;;OAIG;IACH,OAAO,CAAC,SAAS;CAmBlB"}

package/dist/links/wsLink/wsClient/wsClient.js

@@ -133,6 +133,9 @@ function _define_property(obj, key, value) {
                 if (this.allowReconnect) {
                     await this.activeConnection.close();
                     await this.activeConnection.open();
+                    if (this.requestManager.hasPendingRequests()) {
+                        this.send(this.requestManager.getPendingRequests().map(({ message })=>message));
+                    }
                 }
                 this.reconnecting = null;
             } catch  {
@@ -158,19 +161,12 @@ function _define_property(obj, key, value) {
                 if (this.lazyMode) {
                     this.inactivityTimeout.start();
                 }
-                if (this.connectionParams) {
-                    ws.send(await utils.buildConnectionMessage(this.connectionParams));
-                }
                 this.callbacks.onOpen?.();
                 this.connectionState.next({
                     type: 'state',
                     state: 'pending',
                     error: null
                 });
-                const messages = this.requestManager.getPendingRequests().map(({ message })=>message);
-                if (messages.length) {
-                    ws.send(JSON.stringify(messages));
-                }
             }).catch((error)=>{
                 ws.close(3000);
                 handleCloseOrError(error);
@@ -273,7 +269,6 @@ function _define_property(obj, key, value) {
         _define_property(this, "reconnectRetryDelay", void 0);
         _define_property(this, "inactivityTimeout", void 0);
         _define_property(this, "callbacks", void 0);
-        _define_property(this, "connectionParams", void 0);
         _define_property(this, "lazyMode", void 0);
         /**
    * Manages the reconnection process for the WebSocket using retry logic.
@@ -286,7 +281,6 @@ function _define_property(obj, key, value) {
             onClose: opts.onClose,
             onError: opts.onError
         };
-        this.connectionParams = opts.connectionParams;
         const lazyOptions = {
             ...options.lazyDefaults,
             ...opts.lazy

package/dist/links/wsLink/wsClient/wsClient.mjs

@@ -3,7 +3,7 @@ import { transformResult, run, sleep } from '@trpc/server/unstable-core-do-not-i
 import { TRPCClientError } from '../../../TRPCClientError.mjs';
 import { lazyDefaults, keepAliveDefaults, exponentialBackoff } from './options.mjs';
 import { RequestManager } from './requestManager.mjs';
-import { TRPCWebSocketClosedError, buildConnectionMessage, ResettableTimeout } from './utils.mjs';
+import { TRPCWebSocketClosedError, ResettableTimeout } from './utils.mjs';
 import { backwardCompatibility, WsConnection } from './wsConnection.mjs';
 
 function _define_property(obj, key, value) {
@@ -131,6 +131,9 @@ function _define_property(obj, key, value) {
                 if (this.allowReconnect) {
                     await this.activeConnection.close();
                     await this.activeConnection.open();
+                    if (this.requestManager.hasPendingRequests()) {
+                        this.send(this.requestManager.getPendingRequests().map(({ message })=>message));
+                    }
                 }
                 this.reconnecting = null;
             } catch  {
@@ -156,19 +159,12 @@ function _define_property(obj, key, value) {
                 if (this.lazyMode) {
                     this.inactivityTimeout.start();
                 }
-                if (this.connectionParams) {
-                    ws.send(await buildConnectionMessage(this.connectionParams));
-                }
                 this.callbacks.onOpen?.();
                 this.connectionState.next({
                     type: 'state',
                     state: 'pending',
                     error: null
                 });
-                const messages = this.requestManager.getPendingRequests().map(({ message })=>message);
-                if (messages.length) {
-                    ws.send(JSON.stringify(messages));
-                }
             }).catch((error)=>{
                 ws.close(3000);
                 handleCloseOrError(error);
@@ -271,7 +267,6 @@ function _define_property(obj, key, value) {
         _define_property(this, "reconnectRetryDelay", void 0);
         _define_property(this, "inactivityTimeout", void 0);
         _define_property(this, "callbacks", void 0);
-        _define_property(this, "connectionParams", void 0);
         _define_property(this, "lazyMode", void 0);
         /**
    * Manages the reconnection process for the WebSocket using retry logic.
@@ -284,7 +279,6 @@ function _define_property(obj, key, value) {
             onClose: opts.onClose,
             onError: opts.onError
         };
-        this.connectionParams = opts.connectionParams;
         const lazyOptions = {
             ...lazyDefaults,
             ...opts.lazy

package/dist/links/wsLink/wsClient/wsConnection.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wsConnection.d.ts","sourceRoot":"","sources":["../../../../src/links/wsLink/wsClient/wsConnection.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,8BAA8B,EAAE,MAAM,yCAAyC,CAAC;AAoB9F,UAAU,eAAe;IACvB;;OAEG;IACH,UAAU,EAAE,MAAM,CAAC;IAEnB;;OAEG;IACH,aAAa,EAAE,MAAM,CAAC;CACvB;AAuDD,MAAM,WAAW,0BAA0B;IACzC,iBAAiB,CAAC,EAAE,OAAO,SAAS,CAAC;IACrC,UAAU,EAAE,8BAA8B,CAAC;IAC3C,SAAS,EAAE,eAAe,GAAG;QAC3B,OAAO,EAAE,OAAO,CAAC;KAClB,CAAC;CACH;AAED;;;GAGG;AACH,qBAAa,YAAY;IACvB,MAAM,CAAC,YAAY,SAAK;IACjB,EAAE,SAA+B;IAExC,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAmB;IACrD,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAiC;IAC5D,OAAO,CAAC,QAAQ,CAAC,aAAa,CAA0C;IACxE,SAAgB,YAAY,sEAA2C;gBAE3D,IAAI,EAAE,0BAA0B;IAY5C,IAAW,EAAE,qBAEZ;IAED,OAAO,KAAK,EAAE,QAEb;IAED;;OAEG;IACI,MAAM,IAAI,IAAI,IAAI;QAAE,EAAE,EAAE,SAAS,CAAA;KAAE;IAI1C;;OAEG;IACI,QAAQ,IAAI,IAAI,IAAI;QAAE,EAAE,EAAE,SAAS,CAAA;KAAE;IAQ5C;;;;;;;;OAQG;IACH,OAAO,CAAC,WAAW,CAA8B;IACpC,IAAI;IAgCjB;;;OAGG;IACU,KAAK;CAOnB;AAED;;GAEG;AACH,wBAAgB,qBAAqB,CAAC,UAAU,EAAE,YAAY;;;;;;;;;;;;SA0B7D"}
+{"version":3,"file":"wsConnection.d.ts","sourceRoot":"","sources":["../../../../src/links/wsLink/wsClient/wsConnection.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,8BAA8B,EAAE,MAAM,yCAAyC,CAAC;AAoB9F,UAAU,eAAe;IACvB;;OAEG;IACH,UAAU,EAAE,MAAM,CAAC;IAEnB;;OAEG;IACH,aAAa,EAAE,MAAM,CAAC;CACvB;AAuDD,MAAM,WAAW,0BAA0B;IACzC,iBAAiB,CAAC,EAAE,OAAO,SAAS,CAAC;IACrC,UAAU,EAAE,8BAA8B,CAAC;IAC3C,SAAS,EAAE,eAAe,GAAG;QAC3B,OAAO,EAAE,OAAO,CAAC;KAClB,CAAC;CACH;AAED;;;GAGG;AACH,qBAAa,YAAY;IACvB,MAAM,CAAC,YAAY,SAAK;IACjB,EAAE,SAA+B;IAExC,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAmB;IACrD,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAiC;IAC5D,OAAO,CAAC,QAAQ,CAAC,aAAa,CAA0C;IACxE,SAAgB,YAAY,sEAA2C;gBAE3D,IAAI,EAAE,0BAA0B;IAY5C,IAAW,EAAE,qBAEZ;IAED,OAAO,KAAK,EAAE,QAEb;IAED;;OAEG;IACI,MAAM,IAAI,IAAI,IAAI;QAAE,EAAE,EAAE,SAAS,CAAA;KAAE;IAQ1C;;OAEG;IACI,QAAQ,IAAI,IAAI,IAAI;QAAE,EAAE,EAAE,SAAS,CAAA;KAAE;IAQ5C;;;;;;;;OAQG;IACH,OAAO,CAAC,WAAW,CAA8B;IACpC,IAAI;IAyCjB;;;OAGG;IACU,KAAK;CAOnB;AAED;;GAEG;AACH,wBAAgB,qBAAqB,CAAC,UAAU,EAAE,YAAY;;;;;;;;;;;;SA0B7D"}

package/dist/links/wsLink/wsClient/wsConnection.js

@@ -85,7 +85,7 @@ function _define_property(obj, key, value) {
     /**
    * Checks if the WebSocket connection is open and ready to communicate.
    */ isOpen() {
-        return !!this.ws && this.ws.readyState === this.WebSocketPonyfill.OPEN;
+        return !!this.ws && this.ws.readyState === this.WebSocketPonyfill.OPEN && !this.openPromise;
     }
     /**
    * Checks if the WebSocket connection is closed or in the process of closing.
@@ -96,19 +96,26 @@ function _define_property(obj, key, value) {
         if (this.openPromise) return this.openPromise;
         this.id = ++WsConnection.connectCount;
         const wsPromise = utils.prepareUrl(this.urlOptions).then((url)=>new this.WebSocketPonyfill(url));
-        this.openPromise = wsPromise.then(asyncWsOpen);
-        this.ws = await wsPromise;
-        // Setup ping listener
-        this.ws.addEventListener('message', function({ data }) {
-            if (data === 'PING') {
-                this.send('PONG');
+        this.openPromise = wsPromise.then(async (ws)=>{
+            this.ws = ws;
+            // Setup ping listener
+            ws.addEventListener('message', function({ data }) {
+                if (data === 'PING') {
+                    this.send('PONG');
+                }
+            });
+            if (this.keepAliveOpts.enabled) {
+                setupPingInterval(ws, this.keepAliveOpts);
+            }
+            ws.addEventListener('close', ()=>{
+                if (this.ws === ws) {
+                    this.ws = null;
+                }
+            });
+            await asyncWsOpen(ws);
+            if (this.urlOptions.connectionParams) {
+                ws.send(await utils.buildConnectionMessage(this.urlOptions.connectionParams));
             }
-        });
-        if (this.keepAliveOpts.enabled) {
-            setupPingInterval(this.ws, this.keepAliveOpts);
-        }
-        this.ws.addEventListener('close', ()=>{
-            this.ws = null;
         });
         try {
             await this.openPromise;

package/dist/links/wsLink/wsClient/wsConnection.mjs

@@ -1,5 +1,5 @@
 import { behaviorSubject } from '@trpc/server/observable';
-import { prepareUrl, withResolvers } from './utils.mjs';
+import { prepareUrl, buildConnectionMessage, withResolvers } from './utils.mjs';
 
 function _define_property(obj, key, value) {
     if (key in obj) {
@@ -83,7 +83,7 @@ function _define_property(obj, key, value) {
     /**
    * Checks if the WebSocket connection is open and ready to communicate.
    */ isOpen() {
-        return !!this.ws && this.ws.readyState === this.WebSocketPonyfill.OPEN;
+        return !!this.ws && this.ws.readyState === this.WebSocketPonyfill.OPEN && !this.openPromise;
     }
     /**
    * Checks if the WebSocket connection is closed or in the process of closing.
@@ -94,19 +94,26 @@ function _define_property(obj, key, value) {
         if (this.openPromise) return this.openPromise;
         this.id = ++WsConnection.connectCount;
         const wsPromise = prepareUrl(this.urlOptions).then((url)=>new this.WebSocketPonyfill(url));
-        this.openPromise = wsPromise.then(asyncWsOpen);
-        this.ws = await wsPromise;
-        // Setup ping listener
-        this.ws.addEventListener('message', function({ data }) {
-            if (data === 'PING') {
-                this.send('PONG');
+        this.openPromise = wsPromise.then(async (ws)=>{
+            this.ws = ws;
+            // Setup ping listener
+            ws.addEventListener('message', function({ data }) {
+                if (data === 'PING') {
+                    this.send('PONG');
+                }
+            });
+            if (this.keepAliveOpts.enabled) {
+                setupPingInterval(ws, this.keepAliveOpts);
+            }
+            ws.addEventListener('close', ()=>{
+                if (this.ws === ws) {
+                    this.ws = null;
+                }
+            });
+            await asyncWsOpen(ws);
+            if (this.urlOptions.connectionParams) {
+                ws.send(await buildConnectionMessage(this.urlOptions.connectionParams));
             }
-        });
-        if (this.keepAliveOpts.enabled) {
-            setupPingInterval(this.ws, this.keepAliveOpts);
-        }
-        this.ws.addEventListener('close', ()=>{
-            this.ws = null;
         });
         try {
             await this.openPromise;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trpc/client",
-  "version": "11.0.0-rc.806+c16467cd1",
+  "version": "11.0.0-rc.807+be14f29e3",
   "description": "The tRPC client library",
   "author": "KATT",
   "license": "MIT",
@@ -77,11 +77,11 @@
     "!**/__tests__"
   ],
   "peerDependencies": {
-    "@trpc/server": "11.0.0-rc.806+c16467cd1",
+    "@trpc/server": "11.0.0-rc.807+be14f29e3",
     "typescript": ">=5.7.2"
   },
   "devDependencies": {
-    "@trpc/server": "11.0.0-rc.806+c16467cd1",
+    "@trpc/server": "11.0.0-rc.807+be14f29e3",
     "@types/isomorphic-fetch": "^0.0.39",
     "@types/node": "^22.13.5",
     "eslint": "^9.21.0",
@@ -100,5 +100,5 @@
   "funding": [
     "https://trpc.io/sponsor"
   ],
-  "gitHead": "c16467cd1b5156dfa8a3ad4acace14f3306c66be"
+  "gitHead": "be14f29e3f0667a2670f89e2e9e6d017797502d8"
 }

package/src/links/wsLink/wsClient/wsClient.ts

@@ -20,11 +20,7 @@ import type { WebSocketClientOptions } from './options';
 import { exponentialBackoff, keepAliveDefaults, lazyDefaults } from './options';
 import type { TCallbacks } from './requestManager';
 import { RequestManager } from './requestManager';
-import {
-  buildConnectionMessage,
-  ResettableTimeout,
-  TRPCWebSocketClosedError,
-} from './utils';
+import { ResettableTimeout, TRPCWebSocketClosedError } from './utils';
 import { backwardCompatibility, WsConnection } from './wsConnection';
 
 /**
@@ -48,7 +44,6 @@ export class WsClient {
     WebSocketClientOptions,
     'onOpen' | 'onClose' | 'onError'
   >;
-  private readonly connectionParams: WebSocketClientOptions['connectionParams'];
   private readonly lazyMode: boolean;
 
   constructor(opts: WebSocketClientOptions) {
@@ -58,7 +53,6 @@ export class WsClient {
       onClose: opts.onClose,
       onError: opts.onError,
     };
-    this.connectionParams = opts.connectionParams;
 
     const lazyOptions = {
       ...lazyDefaults,
@@ -262,6 +256,14 @@ export class WsClient {
         if (this.allowReconnect) {
           await this.activeConnection.close();
           await this.activeConnection.open();
+
+          if (this.requestManager.hasPendingRequests()) {
+            this.send(
+              this.requestManager
+                .getPendingRequests()
+                .map(({ message }) => message),
+            );
+          }
         }
         this.reconnecting = null;
       } catch {
@@ -297,10 +299,6 @@ export class WsClient {
           this.inactivityTimeout.start();
         }
 
-        if (this.connectionParams) {
-          ws.send(await buildConnectionMessage(this.connectionParams));
-        }
-
         this.callbacks.onOpen?.();
 
         this.connectionState.next({
@@ -308,13 +306,6 @@ export class WsClient {
           state: 'pending',
           error: null,
         });
-
-        const messages = this.requestManager
-          .getPendingRequests()
-          .map(({ message }) => message);
-        if (messages.length) {
-          ws.send(JSON.stringify(messages));
-        }
       }).catch((error) => {
         ws.close(3000);
         handleCloseOrError(error);

package/src/links/wsLink/wsClient/wsConnection.ts

@@ -1,6 +1,6 @@
 import { behaviorSubject } from '@trpc/server/observable';
 import type { UrlOptionsWithConnectionParams } from '../../internals/urlWithConnectionParams';
-import { prepareUrl, withResolvers } from './utils';
+import { buildConnectionMessage, prepareUrl, withResolvers } from './utils';
 
 /**
  * Opens a WebSocket connection asynchronously and returns a promise
@@ -129,7 +129,11 @@ export class WsConnection {
    * Checks if the WebSocket connection is open and ready to communicate.
    */
   public isOpen(): this is { ws: WebSocket } {
-    return !!this.ws && this.ws.readyState === this.WebSocketPonyfill.OPEN;
+    return (
+      !!this.ws &&
+      this.ws.readyState === this.WebSocketPonyfill.OPEN &&
+      !this.openPromise
+    );
   }
 
   /**
@@ -160,22 +164,31 @@ export class WsConnection {
     const wsPromise = prepareUrl(this.urlOptions).then(
       (url) => new this.WebSocketPonyfill(url),
     );
-    this.openPromise = wsPromise.then(asyncWsOpen);
-    this.ws = await wsPromise;
-
-    // Setup ping listener
-    this.ws.addEventListener('message', function ({ data }) {
-      if (data === 'PING') {
-        this.send('PONG');
+    this.openPromise = wsPromise.then(async (ws) => {
+      this.ws = ws;
+
+      // Setup ping listener
+      ws.addEventListener('message', function ({ data }) {
+        if (data === 'PING') {
+          this.send('PONG');
+        }
+      });
+
+      if (this.keepAliveOpts.enabled) {
+        setupPingInterval(ws, this.keepAliveOpts);
       }
-    });
 
-    if (this.keepAliveOpts.enabled) {
-      setupPingInterval(this.ws, this.keepAliveOpts);
-    }
+      ws.addEventListener('close', () => {
+        if (this.ws === ws) {
+          this.ws = null;
+        }
+      });
 
-    this.ws.addEventListener('close', () => {
-      this.ws = null;
+      await asyncWsOpen(ws);
+
+      if (this.urlOptions.connectionParams) {
+        ws.send(await buildConnectionMessage(this.urlOptions.connectionParams));
+      }
     });
 
     try {