@trpc/client 10.2.0 → 10.4.0

package/dist/{httpUtils-47077ecd.js → httpUtils-277fd63a.js}

@@ -79,7 +79,7 @@ function httpRequest(opts) {
         const body = getBody(opts);
         const meta = {};
         Promise.resolve(opts.headers()).then((headers)=>{
-            if (type === 'subscription') {
+            /* istanbul ignore if  */ if (type === 'subscription') {
                 throw new Error('Subscriptions should use wsLink');
             }
             return opts.fetch(url, {

package/dist/{httpUtils-01e0c677.mjs → httpUtils-939364d7.mjs}

@@ -77,7 +77,7 @@ function httpRequest(opts) {
         const body = getBody(opts);
         const meta = {};
         Promise.resolve(opts.headers()).then((headers)=>{
-            if (type === 'subscription') {
+            /* istanbul ignore if  */ if (type === 'subscription') {
                 throw new Error('Subscriptions should use wsLink');
             }
             return opts.fetch(url, {

package/dist/index.js

@@ -7,7 +7,7 @@ var transformResult = require('./transformResult-000baed1.js');
 var links_splitLink = require('./splitLink-f29e84be.js');
 var links_httpBatchLink = require('./links/httpBatchLink.js');
 var shared = require('@trpc/server/shared');
-var httpUtils = require('./httpUtils-47077ecd.js');
+var httpUtils = require('./httpUtils-277fd63a.js');
 var links_httpLink = require('./links/httpLink.js');
 var links_loggerLink = require('./links/loggerLink.js');
 var links_wsLink = require('./links/wsLink.js');

package/dist/index.mjs

@@ -6,7 +6,7 @@ export { s as splitLink } from './splitLink-4c75f7be.mjs';
 import { httpBatchLink } from './links/httpBatchLink.mjs';
 export { httpBatchLink } from './links/httpBatchLink.mjs';
 import { createFlatProxy, createRecursiveProxy } from '@trpc/server/shared';
-export { g as getFetch } from './httpUtils-01e0c677.mjs';
+export { g as getFetch } from './httpUtils-939364d7.mjs';
 export { httpLink } from './links/httpLink.mjs';
 export { loggerLink } from './links/loggerLink.mjs';
 export { createWSClient, wsLink } from './links/wsLink.mjs';

package/dist/links/dedupeLink.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dedupeLink.d.ts","sourceRoot":"","sources":["../../src/links/dedupeLink.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEzC,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAEnC,wBAAgB,UAAU,CACxB,OAAO,SAAS,SAAS,GAAG,SAAS,KAClC,QAAQ,CAAC,OAAO,CAAC,CA6CrB"}
+{"version":3,"file":"dedupeLink.d.ts","sourceRoot":"","sources":["../../src/links/dedupeLink.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEzC,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAEnC,wBAAgB,UAAU,CACxB,OAAO,SAAS,SAAS,GAAG,SAAS,KAClC,QAAQ,CAAC,OAAO,CAAC,CA2CrB"}

package/dist/links/httpBatchLink.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var observable = require('@trpc/server/observable');
 var transformResult = require('../transformResult-000baed1.js');
-var httpUtils = require('../httpUtils-47077ecd.js');
+var httpUtils = require('../httpUtils-277fd63a.js');
 
 /* eslint-disable @typescript-eslint/no-non-null-assertion */ /**
  * A function that should never be called unless we messed something up.

package/dist/links/httpBatchLink.mjs

@@ -1,6 +1,6 @@
 import { observable } from '@trpc/server/observable';
 import { t as transformResult, T as TRPCClientError } from '../transformResult-b10d288d.mjs';
-import { r as resolveHTTPLinkOptions, a as getUrl, h as httpRequest } from '../httpUtils-01e0c677.mjs';
+import { r as resolveHTTPLinkOptions, a as getUrl, h as httpRequest } from '../httpUtils-939364d7.mjs';
 
 /* eslint-disable @typescript-eslint/no-non-null-assertion */ /**
  * A function that should never be called unless we messed something up.

package/dist/links/httpLink.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var observable = require('@trpc/server/observable');
 var transformResult = require('../transformResult-000baed1.js');
-var httpUtils = require('../httpUtils-47077ecd.js');
+var httpUtils = require('../httpUtils-277fd63a.js');
 
 function httpLink(opts) {
     const resolvedOpts = httpUtils.resolveHTTPLinkOptions(opts);

package/dist/links/httpLink.mjs

@@ -1,6 +1,6 @@
 import { observable } from '@trpc/server/observable';
 import { t as transformResult, T as TRPCClientError } from '../transformResult-b10d288d.mjs';
-import { r as resolveHTTPLinkOptions, h as httpRequest } from '../httpUtils-01e0c677.mjs';
+import { r as resolveHTTPLinkOptions, h as httpRequest } from '../httpUtils-939364d7.mjs';
 
 function httpLink(opts) {
     const resolvedOpts = resolveHTTPLinkOptions(opts);

package/dist/links/internals/httpUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"httpUtils.d.ts","sourceRoot":"","sources":["../../../src/links/internals/httpUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAC7C,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAGhD,OAAO,EAAE,WAAW,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAE5E,MAAM,WAAW,eAAe;IAC9B,GAAG,EAAE,MAAM,CAAC;IACZ;;OAEG;IACH,KAAK,CAAC,EAAE,OAAO,KAAK,CAAC;IACrB;;OAEG;IACH,eAAe,CAAC,EAAE,OAAO,eAAe,GAAG,IAAI,CAAC;IAChD;;;OAGG;IACH,OAAO,CAAC,EAAE,WAAW,GAAG,CAAC,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC;CACpE;AAED,MAAM,WAAW,uBAAuB;IACtC,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,OAAO,KAAK,CAAC;IACpB,eAAe,EAAE,OAAO,eAAe,GAAG,IAAI,CAAC;IAC/C;;;OAGG;IACH,OAAO,EAAE,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;CACnD;AAED,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,eAAe,GACpB,uBAAuB,CAQzB;AAiBD,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,YAAY,CAAC;IACnB,IAAI,EAAE;QACJ,QAAQ,EAAE,QAAQ,CAAC;KACpB,CAAC;CACH;AAED,aAAK,eAAe,GAAG;IACrB,OAAO,EAAE,iBAAiB,CAAC;CAC5B,GAAG,CAAC;IAAE,MAAM,EAAE,OAAO,EAAE,CAAA;CAAE,GAAG;IAAE,KAAK,EAAE,OAAO,CAAA;CAAE,CAAC,CAAC;AAUjD,oBAAY,kBAAkB,GAAG,uBAAuB,GACtD,eAAe,GAAG;IAChB,IAAI,EAAE,aAAa,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEJ,wBAAgB,MAAM,CAAC,IAAI,EAAE,kBAAkB,UAgB9C;AAED,aAAK,cAAc,GAAG;IAAE,IAAI,EAAE,aAAa,CAAA;CAAE,GAAG,eAAe,CAAC;AAEhE,wBAAgB,OAAO,CAAC,IAAI,EAAE,cAAc,sBAM3C;AAED,wBAAgB,WAAW,CACzB,IAAI,EAAE,kBAAkB,GACvB,gBAAgB,CAAC,UAAU,CAAC,CAwC9B"}
+{"version":3,"file":"httpUtils.d.ts","sourceRoot":"","sources":["../../../src/links/internals/httpUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAC7C,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAGhD,OAAO,EAAE,WAAW,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAE5E,MAAM,WAAW,eAAe;IAC9B,GAAG,EAAE,MAAM,CAAC;IACZ;;OAEG;IACH,KAAK,CAAC,EAAE,OAAO,KAAK,CAAC;IACrB;;OAEG;IACH,eAAe,CAAC,EAAE,OAAO,eAAe,GAAG,IAAI,CAAC;IAChD;;;OAGG;IACH,OAAO,CAAC,EAAE,WAAW,GAAG,CAAC,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC;CACpE;AAED,MAAM,WAAW,uBAAuB;IACtC,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,OAAO,KAAK,CAAC;IACpB,eAAe,EAAE,OAAO,eAAe,GAAG,IAAI,CAAC;IAC/C;;;OAGG;IACH,OAAO,EAAE,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;CACnD;AAED,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,eAAe,GACpB,uBAAuB,CAQzB;AAiBD,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,YAAY,CAAC;IACnB,IAAI,EAAE;QACJ,QAAQ,EAAE,QAAQ,CAAC;KACpB,CAAC;CACH;AAED,aAAK,eAAe,GAAG;IACrB,OAAO,EAAE,iBAAiB,CAAC;CAC5B,GAAG,CAAC;IAAE,MAAM,EAAE,OAAO,EAAE,CAAA;CAAE,GAAG;IAAE,KAAK,EAAE,OAAO,CAAA;CAAE,CAAC,CAAC;AAUjD,oBAAY,kBAAkB,GAAG,uBAAuB,GACtD,eAAe,GAAG;IAChB,IAAI,EAAE,aAAa,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEJ,wBAAgB,MAAM,CAAC,IAAI,EAAE,kBAAkB,UAgB9C;AAED,aAAK,cAAc,GAAG;IAAE,IAAI,EAAE,aAAa,CAAA;CAAE,GAAG,eAAe,CAAC;AAEhE,wBAAgB,OAAO,CAAC,IAAI,EAAE,cAAc,sBAM3C;AAED,wBAAgB,WAAW,CACzB,IAAI,EAAE,kBAAkB,GACvB,gBAAgB,CAAC,UAAU,CAAC,CAyC9B"}

package/dist/links/retryLink.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"retryLink.d.ts","sourceRoot":"","sources":["../../src/links/retryLink.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEzC,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAEnC,wBAAgB,SAAS,CAAC,OAAO,SAAS,SAAS,GAAG,SAAS,EAAE,IAAI,EAAE;IACrE,QAAQ,EAAE,MAAM,CAAC;CAClB,GAAG,QAAQ,CAAC,OAAO,CAAC,CAiDpB"}
+{"version":3,"file":"retryLink.d.ts","sourceRoot":"","sources":["../../src/links/retryLink.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEzC,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAEnC,wBAAgB,SAAS,CAAC,OAAO,SAAS,SAAS,GAAG,SAAS,EAAE,IAAI,EAAE;IACrE,QAAQ,EAAE,MAAM,CAAC;CAClB,GAAG,QAAQ,CAAC,OAAO,CAAC,CAwCpB"}

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

@@ -1 +1 @@
-{"version":3,"file":"wsLink.d.ts","sourceRoot":"","sources":["../../src/links/wsLink.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAiB,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAC1E,OAAO,EAAE,QAAQ,EAAE,aAAa,EAAc,MAAM,yBAAyB,CAAC;AAC9E,OAAO,EAKL,mBAAmB,EACpB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAErD,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAE9C,aAAK,gBAAgB,CAAC,OAAO,SAAS,SAAS,EAAE,OAAO,IAAI,mBAAmB,CAC7E,OAAO,EACP,gBAAgB,CAAC,OAAO,CAAC,CAC1B,CAAC;AAEF,aAAK,kBAAkB,CAAC,OAAO,SAAS,SAAS,EAAE,OAAO,IAAI,QAAQ,CACpE,gBAAgB,CAAC,OAAO,EAAE,OAAO,CAAC,EAClC,eAAe,CAAC,OAAO,CAAC,CACzB,CAAC;AAEF,MAAM,WAAW,sBAAsB;IACrC,GAAG,EAAE,MAAM,CAAC;IACZ,SAAS,CAAC,EAAE,OAAO,SAAS,CAAC;IAC7B,YAAY,CAAC,EAAE,OAAO,UAAU,CAAC;IACjC,MAAM,CAAC,EAAE,MAAM,IAAI,CAAC;IACpB,OAAO,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE;QAAE,IAAI,CAAC,EAAE,MAAM,CAAA;KAAE,KAAK,IAAI,CAAC;CAC/C;AAED,wBAAgB,cAAc,CAAC,IAAI,EAAE,sBAAsB;;kBAuMpC,SAAS,wDAA0B,aAAa;;EAiDtE;AACD,oBAAY,mBAAmB,GAAG,UAAU,CAAC,OAAO,cAAc,CAAC,CAAC;AAEpE,MAAM,WAAW,oBAAoB;IACnC,MAAM,EAAE,mBAAmB,CAAC;CAC7B;AAiBD,wBAAgB,MAAM,CAAC,OAAO,SAAS,SAAS,EAC9C,IAAI,EAAE,oBAAoB,GACzB,QAAQ,CAAC,OAAO,CAAC,CA4DnB"}
+{"version":3,"file":"wsLink.d.ts","sourceRoot":"","sources":["../../src/links/wsLink.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAiB,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAC1E,OAAO,EAAE,QAAQ,EAAE,aAAa,EAAc,MAAM,yBAAyB,CAAC;AAC9E,OAAO,EAKL,mBAAmB,EACpB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAErD,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAE9C,aAAK,gBAAgB,CAAC,OAAO,SAAS,SAAS,EAAE,OAAO,IAAI,mBAAmB,CAC7E,OAAO,EACP,gBAAgB,CAAC,OAAO,CAAC,CAC1B,CAAC;AAEF,aAAK,kBAAkB,CAAC,OAAO,SAAS,SAAS,EAAE,OAAO,IAAI,QAAQ,CACpE,gBAAgB,CAAC,OAAO,EAAE,OAAO,CAAC,EAClC,eAAe,CAAC,OAAO,CAAC,CACzB,CAAC;AAEF,MAAM,WAAW,sBAAsB;IACrC,GAAG,EAAE,MAAM,CAAC;IACZ,SAAS,CAAC,EAAE,OAAO,SAAS,CAAC;IAC7B,YAAY,CAAC,EAAE,OAAO,UAAU,CAAC;IACjC,MAAM,CAAC,EAAE,MAAM,IAAI,CAAC;IACpB,OAAO,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE;QAAE,IAAI,CAAC,EAAE,MAAM,CAAA;KAAE,KAAK,IAAI,CAAC;CAC/C;AAED,wBAAgB,cAAc,CAAC,IAAI,EAAE,sBAAsB;;kBA+MpC,SAAS,wDAA0B,aAAa;;EAoDtE;AACD,oBAAY,mBAAmB,GAAG,UAAU,CAAC,OAAO,cAAc,CAAC,CAAC;AAEpE,MAAM,WAAW,oBAAoB;IACnC,MAAM,EAAE,mBAAmB,CAAC;CAC7B;AAiBD,wBAAgB,MAAM,CAAC,OAAO,SAAS,SAAS,EAC9C,IAAI,EAAE,oBAAoB,GACzB,QAAQ,CAAC,OAAO,CAAC,CA4DnB"}

package/dist/links/wsLink.js

@@ -148,13 +148,20 @@ function createWSClient(opts) {
                 if (req.ws !== conn) {
                     continue;
                 }
-                req.callbacks.error?.(transformResult.TRPCClientError.from(new TRPCWebSocketClosedError('WebSocket closed prematurely')));
-                if (req.type !== 'subscription') {
+                if (state === 'closed') {
+                    // If the connection was closed, we just call `complete()` on the request
                     delete pendingRequests[key];
                     req.callbacks.complete?.();
-                } else if (state !== 'closed') {
-                    // request restart of sub with next connection
+                    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?.(transformResult.TRPCClientError.from(new TRPCWebSocketClosedError('WebSocket closed prematurely')));
                 }
             }
         });
@@ -184,7 +191,7 @@ function createWSClient(opts) {
             delete pendingRequests[id];
             outgoing = outgoing.filter((msg)=>msg.id !== id);
             callbacks?.complete?.();
-            if (op.type === 'subscription') {
+            if (activeConnection.readyState === WebSocket.OPEN && op.type === 'subscription') {
                 outgoing.push({
                     id,
                     method: 'subscription.stop'

package/dist/links/wsLink.mjs

@@ -144,13 +144,20 @@ function createWSClient(opts) {
                 if (req.ws !== conn) {
                     continue;
                 }
-                req.callbacks.error?.(TRPCClientError.from(new TRPCWebSocketClosedError('WebSocket closed prematurely')));
-                if (req.type !== 'subscription') {
+                if (state === 'closed') {
+                    // If the connection was closed, we just call `complete()` on the request
                     delete pendingRequests[key];
                     req.callbacks.complete?.();
-                } else if (state !== 'closed') {
-                    // request restart of sub with next connection
+                    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')));
                 }
             }
         });
@@ -180,7 +187,7 @@ function createWSClient(opts) {
             delete pendingRequests[id];
             outgoing = outgoing.filter((msg)=>msg.id !== id);
             callbacks?.complete?.();
-            if (op.type === 'subscription') {
+            if (activeConnection.readyState === WebSocket.OPEN && op.type === 'subscription') {
                 outgoing.push({
                     id,
                     method: 'subscription.stop'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trpc/client",
-  "version": "10.2.0",
+  "version": "10.4.0",
   "description": "tRPC Client lib",
   "author": "KATT",
   "license": "MIT",
@@ -66,11 +66,11 @@
     "links"
   ],
   "peerDependencies": {
-    "@trpc/server": "10.2.0"
+    "@trpc/server": "10.4.0"
   },
   "devDependencies": {
     "@testing-library/dom": "^8.18.1",
-    "@trpc/server": "10.2.0",
+    "@trpc/server": "10.4.0",
     "@types/node": "^18.7.20",
     "rollup": "^2.79.1",
     "tsx": "^3.9.0"
@@ -78,5 +78,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "c4039504c5c170a6ef8a64c964f0593fafdb52ea"
+  "gitHead": "e4f5c58e4e829539bcf45f2c13283179e3e67d1b"
 }

package/src/links/dedupeLink.ts

@@ -1,3 +1,5 @@
+/* istanbul ignore file */
+// We're not actually exporting this link
 import { AnyRouter } from '@trpc/server';
 import { Observable, observable, share } from '@trpc/server/observable';
 import { TRPCLink } from './types';
@@ -28,9 +30,7 @@ export function dedupeLink<
           delete pending[key];
         }
         const subscription = next(op).subscribe({
-          next(v) {
-            observer.next(v);
-          },
+          ...observer,
           error(e) {
             reset();
             observer.error(e);

package/src/links/internals/httpUtils.ts

@@ -125,6 +125,7 @@ export function httpRequest(
     const meta = {} as HTTPResult['meta'];
     Promise.resolve(opts.headers())
       .then((headers) => {
+        /* istanbul ignore if  */
         if (type === 'subscription') {
           throw new Error('Subscriptions should use wsLink');
         }

package/src/links/retryLink.ts

@@ -1,3 +1,5 @@
+/* istanbul ignore file */
+// We're not actually exporting this link
 import { AnyRouter } from '@trpc/server';
 import { Unsubscribable, observable } from '@trpc/server/observable';
 import { TRPCLink } from './types';
@@ -19,6 +21,7 @@ export function retryLink<TRouter extends AnyRouter = AnyRouter>(opts: {
           next$?.unsubscribe();
           next$ = next(op).subscribe({
             error(error) {
+              /* istanbul ignore if  */
               if (attempts >= opts.attempts) {
                 observer.error(error);
                 return;
@@ -26,17 +29,7 @@ export function retryLink<TRouter extends AnyRouter = AnyRouter>(opts: {
               attempt();
             },
             next(result) {
-              if ('result' in result.result) {
-                isDone = true;
-                observer.next(result);
-                return;
-              }
-              if (attempts >= opts.attempts) {
-                isDone = true;
-                observer.next(result);
-                return;
-              }
-              attempt();
+              observer.next(result);
             },
             complete() {
               if (isDone) {

package/src/links/wsLink.ts

@@ -212,17 +212,25 @@ export function createWSClient(opts: WebSocketClientOptions) {
         if (req.ws !== conn) {
           continue;
         }
-        req.callbacks.error?.(
-          TRPCClientError.from(
-            new TRPCWebSocketClosedError('WebSocket closed prematurely'),
-          ),
-        );
-        if (req.type !== 'subscription') {
+
+        if (state === 'closed') {
+          // If the connection was closed, we just call `complete()` on the request
           delete pendingRequests[key];
           req.callbacks.complete?.();
-        } else if (state !== 'closed') {
-          // request restart of sub with next connection
+          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'),
+            ),
+          );
         }
       }
     });
@@ -256,7 +264,10 @@ export function createWSClient(opts: WebSocketClientOptions) {
       outgoing = outgoing.filter((msg) => msg.id !== id);
 
       callbacks?.complete?.();
-      if (op.type === 'subscription') {
+      if (
+        activeConnection.readyState === WebSocket.OPEN &&
+        op.type === 'subscription'
+      ) {
         outgoing.push({
           id,
           method: 'subscription.stop',