@trpc/client 11.0.0-rc.553 → 11.0.0-rc.561

package/dist/bundle-analysis.json

@@ -1,7 +1,7 @@
 {
-  "bundleSize": 54227,
-  "bundleOrigSize": 71929,
-  "bundleReduction": 24.61,
+  "bundleSize": 54651,
+  "bundleOrigSize": 72819,
+  "bundleReduction": 24.95,
   "modules": [
     {
       "id": "/src/links/wsLink.ts",
@@ -13,20 +13,20 @@
       ],
       "removedExports": [],
       "dependents": [],
-      "percent": 28.17,
+      "percent": 27.96,
       "reduction": 10.13
     },
     {
       "id": "/src/links/httpBatchStreamLink.ts",
-      "size": 5861,
-      "origSize": 6074,
+      "size": 6007,
+      "origSize": 6284,
       "renderedExports": [
         "unstable_httpBatchStreamLink"
       ],
       "removedExports": [],
       "dependents": [],
-      "percent": 10.81,
-      "reduction": 3.51
+      "percent": 10.99,
+      "reduction": 4.41
     },
     {
       "id": "/src/links/loggerLink.ts",
@@ -37,33 +37,9 @@
       ],
       "removedExports": [],
       "dependents": [],
-      "percent": 10.06,
+      "percent": 9.98,
       "reduction": 18.48
     },
-    {
-      "id": "/src/links/internals/httpUtils.ts",
-      "size": 4465,
-      "origSize": 6645,
-      "renderedExports": [
-        "resolveHTTPLinkOptions",
-        "getInput",
-        "getUrl",
-        "getBody",
-        "jsonHttpRequester",
-        "fetchHTTPResponse",
-        "httpRequest",
-        "mergeAbortSignals"
-      ],
-      "removedExports": [],
-      "dependents": [
-        "/src/links/httpBatchLink.ts",
-        "/src/links/httpLink.ts",
-        "/src/links/httpBatchStreamLink.ts",
-        "/src/links/httpSubscriptionLink.ts"
-      ],
-      "percent": 8.23,
-      "reduction": 32.81
-    },
     {
       "id": "/src/internals/dataLoader.ts",
       "size": 4084,
@@ -76,32 +52,55 @@
         "/src/links/httpBatchLink.ts",
         "/src/links/httpBatchStreamLink.ts"
       ],
-      "percent": 7.53,
+      "percent": 7.47,
       "reduction": 5.64
     },
     {
       "id": "/src/links/httpBatchLink.ts",
-      "size": 3925,
-      "origSize": 4118,
+      "size": 3938,
+      "origSize": 4170,
       "renderedExports": [
         "httpBatchLink"
       ],
       "removedExports": [],
       "dependents": [],
-      "percent": 7.24,
-      "reduction": 4.69
+      "percent": 7.21,
+      "reduction": 5.56
     },
     {
       "id": "/src/links/httpSubscriptionLink.ts",
-      "size": 3805,
-      "origSize": 4221,
+      "size": 3776,
+      "origSize": 4507,
       "renderedExports": [
         "unstable_httpSubscriptionLink"
       ],
       "removedExports": [],
       "dependents": [],
-      "percent": 7.02,
-      "reduction": 9.86
+      "percent": 6.91,
+      "reduction": 16.22
+    },
+    {
+      "id": "/src/links/internals/httpUtils.ts",
+      "size": 3693,
+      "origSize": 5873,
+      "renderedExports": [
+        "resolveHTTPLinkOptions",
+        "getInput",
+        "getUrl",
+        "getBody",
+        "jsonHttpRequester",
+        "fetchHTTPResponse",
+        "httpRequest"
+      ],
+      "removedExports": [],
+      "dependents": [
+        "/src/links/httpBatchLink.ts",
+        "/src/links/httpLink.ts",
+        "/src/links/httpBatchStreamLink.ts",
+        "/src/links/httpSubscriptionLink.ts"
+      ],
+      "percent": 6.76,
+      "reduction": 37.12
     },
     {
       "id": "/src/links/httpLink.ts",
@@ -112,13 +111,13 @@
       ],
       "removedExports": [],
       "dependents": [],
-      "percent": 5.87,
+      "percent": 5.82,
       "reduction": 14.14
     },
     {
       "id": "/src/internals/TRPCUntypedClient.ts",
-      "size": 2162,
-      "origSize": 4228,
+      "size": 2169,
+      "origSize": 4235,
       "renderedExports": [
         "TRPCUntypedClient"
       ],
@@ -127,8 +126,8 @@
         "/src/createTRPCUntypedClient.ts",
         "/src/createTRPCClient.ts"
       ],
-      "percent": 3.99,
-      "reduction": 48.86
+      "percent": 3.97,
+      "reduction": 48.78
     },
     {
       "id": "/src/TRPCClientError.ts",
@@ -141,13 +140,13 @@
       "dependents": [
         "/src/index.ts",
         "/src/links/httpBatchLink.ts",
-        "/src/links/wsLink.ts",
         "/src/links/httpLink.ts",
+        "/src/links/wsLink.ts",
         "/src/links/httpBatchStreamLink.ts",
         "/src/links/httpSubscriptionLink.ts",
         "/src/internals/TRPCUntypedClient.ts"
       ],
-      "percent": 3.58,
+      "percent": 3.55,
       "reduction": 45.43
     },
     {
@@ -164,9 +163,26 @@
       "dependents": [
         "/src/index.ts"
       ],
-      "percent": 2.19,
+      "percent": 2.17,
       "reduction": 73.19
     },
+    {
+      "id": "/src/internals/signals.ts",
+      "size": 1059,
+      "origSize": 1107,
+      "renderedExports": [
+        "allAbortSignals",
+        "raceAbortSignals"
+      ],
+      "removedExports": [],
+      "dependents": [
+        "/src/links/httpBatchLink.ts",
+        "/src/links/httpBatchStreamLink.ts",
+        "/src/links/httpSubscriptionLink.ts"
+      ],
+      "percent": 1.94,
+      "reduction": 4.34
+    },
     {
       "id": "/src/links/internals/createChain.ts",
       "size": 690,
@@ -179,7 +195,7 @@
         "/src/links/splitLink.ts",
         "/src/internals/TRPCUntypedClient.ts"
       ],
-      "percent": 1.27,
+      "percent": 1.26,
       "reduction": 32.75
     },
     {
@@ -205,7 +221,7 @@
       "dependents": [
         "/src/unstable-internals.ts"
       ],
-      "percent": 1.04,
+      "percent": 1.03,
       "reduction": 66.71
     },
     {
@@ -220,7 +236,7 @@
         "/src/index.ts",
         "/src/links/internals/httpUtils.ts"
       ],
-      "percent": 0.79,
+      "percent": 0.78,
       "reduction": 33.54
     },
     {
@@ -234,7 +250,7 @@
       ],
       "removedExports": [],
       "dependents": [],
-      "percent": 0.61,
+      "percent": 0.6,
       "reduction": 15.17
     },
     {
@@ -291,5 +307,5 @@
       "reduction": 100
     }
   ],
-  "moduleCount": 20
+  "moduleCount": 21
 }

package/dist/internals/TRPCUntypedClient.js

@@ -50,7 +50,7 @@ class TRPCUntypedClient {
             path,
             input,
             context: opts?.context,
-            signal: null
+            signal: opts.signal
         });
         return observable$.subscribe({
             next (envelope) {

package/dist/internals/TRPCUntypedClient.mjs

@@ -48,7 +48,7 @@ class TRPCUntypedClient {
             path,
             input,
             context: opts?.context,
-            signal: null
+            signal: opts.signal
         });
         return observable$.subscribe({
             next (envelope) {

package/dist/internals/signals.d.ts

@@ -0,0 +1,12 @@
+import type { Maybe } from '@trpc/server/unstable-core-do-not-import';
+/**
+ * Like `Promise.all()` but for abort signals
+ * - When all signals have been aborted, the merged signal will be aborted
+ * - If one signal is `null`, no signal will be aborted
+ */
+export declare function allAbortSignals(...signals: Maybe<AbortSignal>[]): AbortSignal;
+/**
+ * Like `Promise.race` but for abort signals
+ */
+export declare function raceAbortSignals(...signals: Maybe<AbortSignal>[]): AbortSignal;
+//# sourceMappingURL=signals.d.ts.map

package/dist/internals/signals.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"signals.d.ts","sourceRoot":"","sources":["../../src/internals/signals.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,0CAA0C,CAAC;AAEtE;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,GAAG,OAAO,EAAE,KAAK,CAAC,WAAW,CAAC,EAAE,GAAG,WAAW,CAwB7E;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAC9B,GAAG,OAAO,EAAE,KAAK,CAAC,WAAW,CAAC,EAAE,GAC/B,WAAW,CAYb"}

package/dist/internals/signals.js

@@ -0,0 +1,44 @@
+'use strict';
+
+/**
+ * Like `Promise.all()` but for abort signals
+ * - When all signals have been aborted, the merged signal will be aborted
+ * - If one signal is `null`, no signal will be aborted
+ */ function allAbortSignals(...signals) {
+    const ac = new AbortController();
+    const count = signals.length;
+    let abortedCount = 0;
+    const onAbort = ()=>{
+        if (++abortedCount === count) {
+            ac.abort();
+        }
+    };
+    for (const signal of signals){
+        if (signal?.aborted) {
+            onAbort();
+        } else {
+            signal?.addEventListener('abort', onAbort, {
+                once: true
+            });
+        }
+    }
+    return ac.signal;
+}
+/**
+ * Like `Promise.race` but for abort signals
+ */ function raceAbortSignals(...signals) {
+    const ac = new AbortController();
+    for (const signal of signals){
+        if (signal?.aborted) {
+            ac.abort();
+        } else {
+            signal?.addEventListener('abort', ()=>ac.abort(), {
+                once: true
+            });
+        }
+    }
+    return ac.signal;
+}
+
+exports.allAbortSignals = allAbortSignals;
+exports.raceAbortSignals = raceAbortSignals;

package/dist/internals/signals.mjs

@@ -0,0 +1,41 @@
+/**
+ * Like `Promise.all()` but for abort signals
+ * - When all signals have been aborted, the merged signal will be aborted
+ * - If one signal is `null`, no signal will be aborted
+ */ function allAbortSignals(...signals) {
+    const ac = new AbortController();
+    const count = signals.length;
+    let abortedCount = 0;
+    const onAbort = ()=>{
+        if (++abortedCount === count) {
+            ac.abort();
+        }
+    };
+    for (const signal of signals){
+        if (signal?.aborted) {
+            onAbort();
+        } else {
+            signal?.addEventListener('abort', onAbort, {
+                once: true
+            });
+        }
+    }
+    return ac.signal;
+}
+/**
+ * Like `Promise.race` but for abort signals
+ */ function raceAbortSignals(...signals) {
+    const ac = new AbortController();
+    for (const signal of signals){
+        if (signal?.aborted) {
+            ac.abort();
+        } else {
+            signal?.addEventListener('abort', ()=>ac.abort(), {
+                once: true
+            });
+        }
+    }
+    return ac.signal;
+}
+
+export { allAbortSignals, raceAbortSignals };

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

@@ -1 +1 @@
-{"version":3,"file":"httpBatchLink.d.ts","sourceRoot":"","sources":["../../src/links/httpBatchLink.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAiB,MAAM,cAAc,CAAC;AAO7D,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAQnE,OAAO,KAAK,EAAa,QAAQ,EAAE,MAAM,SAAS,CAAC;AAEnD;;GAEG;AACH,wBAAgB,aAAa,CAAC,OAAO,SAAS,SAAS,EACrD,IAAI,EAAE,oBAAoB,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC,CAAC,GAC/D,QAAQ,CAAC,OAAO,CAAC,CAkHnB"}
+{"version":3,"file":"httpBatchLink.d.ts","sourceRoot":"","sources":["../../src/links/httpBatchLink.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAiB,MAAM,cAAc,CAAC;AAQ7D,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAOnE,OAAO,KAAK,EAAa,QAAQ,EAAE,MAAM,SAAS,CAAC;AAEnD;;GAEG;AACH,wBAAgB,aAAa,CAAC,OAAO,SAAS,SAAS,EACrD,IAAI,EAAE,oBAAoB,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC,CAAC,GAC/D,QAAQ,CAAC,OAAO,CAAC,CAkHnB"}

package/dist/links/httpBatchLink.js

@@ -3,6 +3,7 @@
 var observable = require('@trpc/server/observable');
 var unstableCoreDoNotImport = require('@trpc/server/unstable-core-do-not-import');
 var dataLoader = require('../internals/dataLoader.js');
+var signals = require('../internals/signals.js');
 var TRPCClientError = require('../TRPCClientError.js');
 var httpUtils = require('./internals/httpUtils.js');
 
@@ -33,7 +34,7 @@ var httpUtils = require('./internals/httpUtils.js');
                 async fetch (batchOps) {
                     const path = batchOps.map((op)=>op.path).join(',');
                     const inputs = batchOps.map((op)=>op.input);
-                    const ac = httpUtils.mergeAbortSignals(batchOps);
+                    const signal = signals.allAbortSignals(...batchOps.map((op)=>op.signal));
                     const res = await httpUtils.jsonHttpRequester({
                         ...resolvedOpts,
                         path,
@@ -50,7 +51,7 @@ var httpUtils = require('./internals/httpUtils.js');
                             }
                             return opts.headers;
                         },
-                        signal: ac.signal
+                        signal
                     });
                     const resJSON = Array.isArray(res.json) ? res.json : batchOps.map(()=>res.json);
                     const result = resJSON.map((item)=>({

package/dist/links/httpBatchLink.mjs

@@ -1,8 +1,9 @@
 import { observable } from '@trpc/server/observable';
 import { transformResult } from '@trpc/server/unstable-core-do-not-import';
 import { dataLoader } from '../internals/dataLoader.mjs';
+import { allAbortSignals } from '../internals/signals.mjs';
 import { TRPCClientError } from '../TRPCClientError.mjs';
-import { resolveHTTPLinkOptions, getUrl, mergeAbortSignals, jsonHttpRequester } from './internals/httpUtils.mjs';
+import { resolveHTTPLinkOptions, getUrl, jsonHttpRequester } from './internals/httpUtils.mjs';
 
 /**
  * @see https://trpc.io/docs/client/links/httpBatchLink
@@ -31,7 +32,7 @@ import { resolveHTTPLinkOptions, getUrl, mergeAbortSignals, jsonHttpRequester }
                 async fetch (batchOps) {
                     const path = batchOps.map((op)=>op.path).join(',');
                     const inputs = batchOps.map((op)=>op.input);
-                    const ac = mergeAbortSignals(batchOps);
+                    const signal = allAbortSignals(...batchOps.map((op)=>op.signal));
                     const res = await jsonHttpRequester({
                         ...resolvedOpts,
                         path,
@@ -48,7 +49,7 @@ import { resolveHTTPLinkOptions, getUrl, mergeAbortSignals, jsonHttpRequester }
                             }
                             return opts.headers;
                         },
-                        signal: ac.signal
+                        signal
                     });
                     const resJSON = Array.isArray(res.json) ? res.json : batchOps.map(()=>res.json);
                     const result = resJSON.map((item)=>({

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

@@ -1 +1 @@
-{"version":3,"file":"httpBatchStreamLink.d.ts","sourceRoot":"","sources":["../../src/links/httpBatchStreamLink.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAiB,MAAM,cAAc,CAAC;AAG7D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0CAA0C,CAAC;AAM7E,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AASnE,OAAO,KAAK,EAAa,QAAQ,EAAE,MAAM,SAAS,CAAC;AAEnD,MAAM,MAAM,0BAA0B,CAAC,KAAK,SAAS,YAAY,IAC/D,oBAAoB,CAAC,KAAK,CAAC,GAAG;IAC5B;;;OAGG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,CAAC;AAEJ;;GAEG;AACH,wBAAgB,4BAA4B,CAAC,OAAO,SAAS,SAAS,EACpE,IAAI,EAAE,0BAA0B,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC,CAAC,GACrE,QAAQ,CAAC,OAAO,CAAC,CA6JnB"}
+{"version":3,"file":"httpBatchStreamLink.d.ts","sourceRoot":"","sources":["../../src/links/httpBatchStreamLink.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAiB,MAAM,cAAc,CAAC;AAG7D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0CAA0C,CAAC;AAO7E,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAQnE,OAAO,KAAK,EAAa,QAAQ,EAAE,MAAM,SAAS,CAAC;AAEnD,MAAM,MAAM,0BAA0B,CAAC,KAAK,SAAS,YAAY,IAC/D,oBAAoB,CAAC,KAAK,CAAC,GAAG;IAC5B;;;OAGG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,CAAC;AAEJ;;GAEG;AACH,wBAAgB,4BAA4B,CAAC,OAAO,SAAS,SAAS,EACpE,IAAI,EAAE,0BAA0B,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC,CAAC,GACrE,QAAQ,CAAC,OAAO,CAAC,CAgKnB"}

package/dist/links/httpBatchStreamLink.js

@@ -3,6 +3,7 @@
 var observable = require('@trpc/server/observable');
 var unstableCoreDoNotImport = require('@trpc/server/unstable-core-do-not-import');
 var dataLoader = require('../internals/dataLoader.js');
+var signals = require('../internals/signals.js');
 var TRPCClientError = require('../TRPCClientError.js');
 var httpUtils = require('./internals/httpUtils.js');
 
@@ -37,10 +38,11 @@ var httpUtils = require('./internals/httpUtils.js');
                 async fetch (batchOps) {
                     const path = batchOps.map((op)=>op.path).join(',');
                     const inputs = batchOps.map((op)=>op.input);
-                    const ac = httpUtils.mergeAbortSignals(batchOps);
+                    const batchSignals = signals.allAbortSignals(...batchOps.map((op)=>op.signal));
+                    const abortController = new AbortController();
                     const responsePromise = httpUtils.fetchHTTPResponse({
                         ...resolvedOpts,
-                        signal: ac.signal,
+                        signal: signals.raceAbortSignals(batchSignals, abortController.signal),
                         type,
                         contentTypeHeader: 'application/json',
                         trpcAcceptHeader: 'application/jsonl',
@@ -72,7 +74,7 @@ var httpUtils = require('./internals/httpUtils.js');
                                 error
                             });
                         },
-                        abortController: ac
+                        abortController
                     });
                     const promises = Object.keys(batchOps).map(async (key)=>{
                         let json = await Promise.resolve(head[key]);

package/dist/links/httpBatchStreamLink.mjs

@@ -1,8 +1,9 @@
 import { observable } from '@trpc/server/observable';
 import { jsonlStreamConsumer } from '@trpc/server/unstable-core-do-not-import';
 import { dataLoader } from '../internals/dataLoader.mjs';
+import { allAbortSignals, raceAbortSignals } from '../internals/signals.mjs';
 import { TRPCClientError } from '../TRPCClientError.mjs';
-import { resolveHTTPLinkOptions, getUrl, mergeAbortSignals, fetchHTTPResponse, getBody } from './internals/httpUtils.mjs';
+import { resolveHTTPLinkOptions, getUrl, fetchHTTPResponse, getBody } from './internals/httpUtils.mjs';
 
 /**
  * @see https://trpc.io/docs/client/links/httpBatchStreamLink
@@ -35,10 +36,11 @@ import { resolveHTTPLinkOptions, getUrl, mergeAbortSignals, fetchHTTPResponse, g
                 async fetch (batchOps) {
                     const path = batchOps.map((op)=>op.path).join(',');
                     const inputs = batchOps.map((op)=>op.input);
-                    const ac = mergeAbortSignals(batchOps);
+                    const batchSignals = allAbortSignals(...batchOps.map((op)=>op.signal));
+                    const abortController = new AbortController();
                     const responsePromise = fetchHTTPResponse({
                         ...resolvedOpts,
-                        signal: ac.signal,
+                        signal: raceAbortSignals(batchSignals, abortController.signal),
                         type,
                         contentTypeHeader: 'application/json',
                         trpcAcceptHeader: 'application/jsonl',
@@ -70,7 +72,7 @@ import { resolveHTTPLinkOptions, getUrl, mergeAbortSignals, fetchHTTPResponse, g
                                 error
                             });
                         },
-                        abortController: ac
+                        abortController
                     });
                     const promises = Object.keys(batchOps).map(async (key)=>{
                         let json = await Promise.resolve(head[key]);

package/dist/links/httpSubscriptionLink.d.ts

@@ -1,4 +1,4 @@
-import type { AnyClientTypes, inferClientTypes, InferrableClientTypes } from '@trpc/server/unstable-core-do-not-import';
+import type { AnyClientTypes, inferClientTypes, InferrableClientTypes, SSEStreamConsumerOptions } from '@trpc/server/unstable-core-do-not-import';
 import { type TransformerOptions } from '../unstable-internals';
 import type { CallbackOrValue } from './internals/urlWithConnectionParams';
 import { type UrlOptionsWithConnectionParams } from './internals/urlWithConnectionParams';
@@ -8,6 +8,10 @@ type HTTPSubscriptionLinkOptions<TRoot extends AnyClientTypes> = {
      * EventSource options or a callback that returns them
      */
     eventSourceOptions?: CallbackOrValue<EventSourceInit>;
+    /**
+     * @see https://trpc.io/docs/client/links/httpSubscriptionLink#updatingConfig
+     */
+    experimental_shouldRecreateOnError?: SSEStreamConsumerOptions['shouldRecreateOnError'];
 } & TransformerOptions<TRoot> & UrlOptionsWithConnectionParams;
 /**
  * @see https://trpc.io/docs/client/links/httpSubscriptionLink

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

@@ -1 +1 @@
-{"version":3,"file":"httpSubscriptionLink.d.ts","sourceRoot":"","sources":["../../src/links/httpSubscriptionLink.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,cAAc,EACd,gBAAgB,EAChB,qBAAqB,EACtB,MAAM,0CAA0C,CAAC;AAMlD,OAAO,EAAkB,KAAK,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAEhF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qCAAqC,CAAC;AAC3E,OAAO,EAEL,KAAK,8BAA8B,EACpC,MAAM,qCAAqC,CAAC;AAC7C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAiBxC,KAAK,2BAA2B,CAAC,KAAK,SAAS,cAAc,IAAI;IAC/D;;OAEG;IACH,kBAAkB,CAAC,EAAE,eAAe,CAAC,eAAe,CAAC,CAAC;CACvD,GAAG,kBAAkB,CAAC,KAAK,CAAC,GAC3B,8BAA8B,CAAC;AAEjC;;GAEG;AACH,wBAAgB,6BAA6B,CAC3C,WAAW,SAAS,qBAAqB,EAEzC,IAAI,EAAE,2BAA2B,CAAC,gBAAgB,CAAC,WAAW,CAAC,CAAC,GAC/D,QAAQ,CAAC,WAAW,CAAC,CA2FvB"}
+{"version":3,"file":"httpSubscriptionLink.d.ts","sourceRoot":"","sources":["../../src/links/httpSubscriptionLink.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,cAAc,EACd,gBAAgB,EAChB,qBAAqB,EACrB,wBAAwB,EACzB,MAAM,0CAA0C,CAAC;AAOlD,OAAO,EAAkB,KAAK,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAEhF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qCAAqC,CAAC;AAC3E,OAAO,EAEL,KAAK,8BAA8B,EACpC,MAAM,qCAAqC,CAAC;AAC7C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAiBxC,KAAK,2BAA2B,CAAC,KAAK,SAAS,cAAc,IAAI;IAC/D;;OAEG;IACH,kBAAkB,CAAC,EAAE,eAAe,CAAC,eAAe,CAAC,CAAC;IACtD;;OAEG;IACH,kCAAkC,CAAC,EAAE,wBAAwB,CAAC,uBAAuB,CAAC,CAAC;CACxF,GAAG,kBAAkB,CAAC,KAAK,CAAC,GAC3B,8BAA8B,CAAC;AAEjC;;GAEG;AACH,wBAAgB,6BAA6B,CAC3C,WAAW,SAAS,qBAAqB,EAEzC,IAAI,EAAE,2BAA2B,CAAC,gBAAgB,CAAC,WAAW,CAAC,CAAC,GAC/D,QAAQ,CAAC,WAAW,CAAC,CA6FvB"}

package/dist/links/httpSubscriptionLink.js

@@ -2,6 +2,7 @@
 
 var observable = require('@trpc/server/observable');
 var unstableCoreDoNotImport = require('@trpc/server/unstable-core-do-not-import');
+var signals = require('../internals/signals.js');
 var TRPCClientError = require('../TRPCClientError.js');
 var transformer = require('../internals/transformer.js');
 var httpUtils = require('./internals/httpUtils.js');
@@ -27,53 +28,51 @@ async function urlWithConnectionParams(opts) {
                 /* istanbul ignore if -- @preserve */ if (type !== 'subscription') {
                     throw new Error('httpSubscriptionLink only supports subscriptions');
                 }
-                let eventSource = null;
-                let unsubscribed = false;
+                const ac = new AbortController();
+                const signal = signals.raceAbortSignals(op.signal, ac.signal);
+                const eventSourceStream = unstableCoreDoNotImport.sseStreamConsumer({
+                    url: async ()=>httpUtils.getUrl({
+                            transformer: transformer$1,
+                            url: await urlWithConnectionParams(opts),
+                            input,
+                            path,
+                            type,
+                            signal: null
+                        }),
+                    init: ()=>urlWithConnectionParams$1.resultOf(opts.eventSourceOptions),
+                    signal,
+                    deserialize: transformer$1.output.deserialize,
+                    shouldRecreateOnError: opts.experimental_shouldRecreateOnError
+                });
                 unstableCoreDoNotImport.run(async ()=>{
-                    const url = httpUtils.getUrl({
-                        transformer: transformer$1,
-                        url: await urlWithConnectionParams(opts),
-                        input,
-                        path,
-                        type,
-                        signal: null
-                    });
-                    const eventSourceOptions = await urlWithConnectionParams$1.resultOf(opts.eventSourceOptions);
-                    /* istanbul ignore if -- @preserve */ if (unsubscribed) {
-                        // already unsubscribed - rare race condition
-                        return;
-                    }
-                    eventSource = new EventSource(url, eventSourceOptions);
-                    const onStarted = ()=>{
-                        observer.next({
-                            result: {
-                                type: 'started'
-                            },
-                            context: {
-                                eventSource
-                            }
-                        });
-                        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-                        eventSource.removeEventListener('open', onStarted);
-                    };
-                    // console.log('starting', new Date());
-                    eventSource.addEventListener('open', onStarted);
-                    const iterable = unstableCoreDoNotImport.sseStreamConsumer({
-                        from: eventSource,
-                        deserialize: transformer$1.output.deserialize
-                    });
-                    for await (const chunk of iterable){
-                        if (!chunk.ok) {
-                            continue;
+                    for await (const chunk of eventSourceStream){
+                        switch(chunk.type){
+                            case 'data':
+                                const chunkData = chunk.data;
+                                // if the `tracked()`-helper is used, we always have an `id` field
+                                const data = 'id' in chunkData ? chunkData : chunkData.data;
+                                observer.next({
+                                    result: {
+                                        data
+                                    },
+                                    context: {
+                                        eventSource: chunk.eventSource
+                                    }
+                                });
+                                break;
+                            case 'opened':
+                                {
+                                    observer.next({
+                                        result: {
+                                            type: 'started'
+                                        },
+                                        context: {
+                                            eventSource: chunk.eventSource
+                                        }
+                                    });
+                                    break;
+                                }
                         }
-                        const chunkData = chunk.data;
-                        // if the `tracked()`-helper is used, we always have an `id` field
-                        const data = 'id' in chunkData ? chunkData : chunkData.data;
-                        observer.next({
-                            result: {
-                                data
-                            }
-                        });
                     }
                     observer.next({
                         result: {
@@ -86,8 +85,7 @@ async function urlWithConnectionParams(opts) {
                 });
                 return ()=>{
                     observer.complete();
-                    eventSource?.close();
-                    unsubscribed = true;
+                    ac.abort();
                 };
             });
         };

package/dist/links/httpSubscriptionLink.mjs

@@ -1,5 +1,6 @@
 import { observable } from '@trpc/server/observable';
-import { run, sseStreamConsumer } from '@trpc/server/unstable-core-do-not-import';
+import { sseStreamConsumer, run } from '@trpc/server/unstable-core-do-not-import';
+import { raceAbortSignals } from '../internals/signals.mjs';
 import { TRPCClientError } from '../TRPCClientError.mjs';
 import { getTransformer } from '../internals/transformer.mjs';
 import { getUrl } from './internals/httpUtils.mjs';
@@ -25,53 +26,51 @@ async function urlWithConnectionParams(opts) {
                 /* istanbul ignore if -- @preserve */ if (type !== 'subscription') {
                     throw new Error('httpSubscriptionLink only supports subscriptions');
                 }
-                let eventSource = null;
-                let unsubscribed = false;
+                const ac = new AbortController();
+                const signal = raceAbortSignals(op.signal, ac.signal);
+                const eventSourceStream = sseStreamConsumer({
+                    url: async ()=>getUrl({
+                            transformer,
+                            url: await urlWithConnectionParams(opts),
+                            input,
+                            path,
+                            type,
+                            signal: null
+                        }),
+                    init: ()=>resultOf(opts.eventSourceOptions),
+                    signal,
+                    deserialize: transformer.output.deserialize,
+                    shouldRecreateOnError: opts.experimental_shouldRecreateOnError
+                });
                 run(async ()=>{
-                    const url = getUrl({
-                        transformer,
-                        url: await urlWithConnectionParams(opts),
-                        input,
-                        path,
-                        type,
-                        signal: null
-                    });
-                    const eventSourceOptions = await resultOf(opts.eventSourceOptions);
-                    /* istanbul ignore if -- @preserve */ if (unsubscribed) {
-                        // already unsubscribed - rare race condition
-                        return;
-                    }
-                    eventSource = new EventSource(url, eventSourceOptions);
-                    const onStarted = ()=>{
-                        observer.next({
-                            result: {
-                                type: 'started'
-                            },
-                            context: {
-                                eventSource
-                            }
-                        });
-                        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-                        eventSource.removeEventListener('open', onStarted);
-                    };
-                    // console.log('starting', new Date());
-                    eventSource.addEventListener('open', onStarted);
-                    const iterable = sseStreamConsumer({
-                        from: eventSource,
-                        deserialize: transformer.output.deserialize
-                    });
-                    for await (const chunk of iterable){
-                        if (!chunk.ok) {
-                            continue;
+                    for await (const chunk of eventSourceStream){
+                        switch(chunk.type){
+                            case 'data':
+                                const chunkData = chunk.data;
+                                // if the `tracked()`-helper is used, we always have an `id` field
+                                const data = 'id' in chunkData ? chunkData : chunkData.data;
+                                observer.next({
+                                    result: {
+                                        data
+                                    },
+                                    context: {
+                                        eventSource: chunk.eventSource
+                                    }
+                                });
+                                break;
+                            case 'opened':
+                                {
+                                    observer.next({
+                                        result: {
+                                            type: 'started'
+                                        },
+                                        context: {
+                                            eventSource: chunk.eventSource
+                                        }
+                                    });
+                                    break;
+                                }
                         }
-                        const chunkData = chunk.data;
-                        // if the `tracked()`-helper is used, we always have an `id` field
-                        const data = 'id' in chunkData ? chunkData : chunkData.data;
-                        observer.next({
-                            result: {
-                                data
-                            }
-                        });
                     }
                     observer.next({
                         result: {
@@ -84,8 +83,7 @@ async function urlWithConnectionParams(opts) {
                 });
                 return ()=>{
                     observer.complete();
-                    eventSource?.close();
-                    unsubscribed = true;
+                    ac.abort();
                 };
             });
         };

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

@@ -64,12 +64,5 @@ export type HTTPRequestOptions = ContentOptions & HTTPBaseRequestOptions & {
 };
 export declare function fetchHTTPResponse(opts: HTTPRequestOptions): Promise<ResponseEsque>;
 export declare function httpRequest(opts: HTTPRequestOptions): Promise<HTTPResult>;
-/**
- * Merges multiple abort signals into a single one
- * - When all signals have been aborted, the merged signal will be aborted
- */
-export declare function mergeAbortSignals(opts: {
-    signal: Maybe<AbortSignal>;
-}[]): AbortController;
 export {};
 //# sourceMappingURL=httpUtils.d.ts.map

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,KAAK,EACV,cAAc,EACd,uBAAuB,EACvB,KAAK,EACL,aAAa,EACb,gBAAgB,EAChB,YAAY,EACb,MAAM,0CAA0C,CAAC;AAElD,OAAO,KAAK,EACV,UAAU,EACV,gBAAgB,EAChB,aAAa,EACd,MAAM,uBAAuB,CAAC;AAC/B,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAEnE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAE5C;;GAEG;AACH,MAAM,MAAM,mBAAmB,CAC7B,KAAK,SAAS,IAAI,CAAC,cAAc,EAAE,aAAa,CAAC,IAC/C;IACF,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;IAClB;;OAEG;IACH,KAAK,CAAC,EAAE,UAAU,CAAC;IACnB;;;;OAIG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB,GAAG,kBAAkB,CAAC,KAAK,CAAC,CAAC;AAE9B,MAAM,WAAW,uBAAuB;IACtC,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,CAAC,EAAE,UAAU,CAAC;IACnB,WAAW,EAAE,uBAAuB,CAAC;IACrC,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAED,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,mBAAmB,CAAC,cAAc,CAAC,GACxC,uBAAuB,CAOzB;AAkBD,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,YAAY,CAAC;IACnB,IAAI,EAAE;QACJ,QAAQ,EAAE,aAAa,CAAC;QACxB,YAAY,CAAC,EAAE,OAAO,CAAC;KACxB,CAAC;CACH;AAED,KAAK,eAAe,GAAG;IACrB,WAAW,EAAE,uBAAuB,CAAC;CACtC,GAAG,CAAC;IAAE,KAAK,EAAE,OAAO,CAAA;CAAE,GAAG;IAAE,MAAM,EAAE,OAAO,EAAE,CAAA;CAAE,CAAC,CAAC;AAEjD,wBAAgB,QAAQ,CAAC,IAAI,EAAE,eAAe,OAM7C;AAED,MAAM,MAAM,sBAAsB,GAAG,eAAe,GAClD,uBAAuB,GAAG;IACxB,IAAI,EAAE,aAAa,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,KAAK,CAAC,WAAW,CAAC,CAAC;CAC5B,CAAC;AAEJ,KAAK,MAAM,GAAG,CAAC,IAAI,EAAE,sBAAsB,KAAK,MAAM,CAAC;AACvD,KAAK,OAAO,GAAG,CAAC,IAAI,EAAE,sBAAsB,KAAK,gBAAgB,CAAC,MAAM,CAAC,CAAC;AAE1E,MAAM,MAAM,cAAc,GAAG;IAC3B,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;IACpC,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,OAAO,CAAC;CAClB,CAAC;AAEF,eAAO,MAAM,MAAM,EAAE,MAuBpB,CAAC;AAEF,eAAO,MAAM,OAAO,EAAE,OAMrB,CAAC;AAEF,MAAM,MAAM,SAAS,GAAG,CACtB,IAAI,EAAE,sBAAsB,GAAG;IAC7B,OAAO,EAAE,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;CACnD,KACE,OAAO,CAAC,UAAU,CAAC,CAAC;AAEzB,eAAO,MAAM,iBAAiB,EAAE,SAO/B,CAAC;AAcF,MAAM,MAAM,kBAAkB,GAAG,cAAc,GAC7C,sBAAsB,GAAG;IACvB,OAAO,EAAE,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;CACnD,CAAC;AAuBJ,wBAAsB,iBAAiB,CAAC,IAAI,EAAE,kBAAkB,0BA6B/D;AAED,wBAAsB,WAAW,CAC/B,IAAI,EAAE,kBAAkB,GACvB,OAAO,CAAC,UAAU,CAAC,CAcrB;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,CAC/B,IAAI,EAAE;IACJ,MAAM,EAAE,KAAK,CAAC,WAAW,CAAC,CAAC;CAC5B,EAAE,GACF,eAAe,CA8BjB"}
+{"version":3,"file":"httpUtils.d.ts","sourceRoot":"","sources":["../../../src/links/internals/httpUtils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,cAAc,EACd,uBAAuB,EACvB,KAAK,EACL,aAAa,EACb,gBAAgB,EAChB,YAAY,EACb,MAAM,0CAA0C,CAAC;AAElD,OAAO,KAAK,EACV,UAAU,EACV,gBAAgB,EAChB,aAAa,EACd,MAAM,uBAAuB,CAAC;AAC/B,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAEnE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAE5C;;GAEG;AACH,MAAM,MAAM,mBAAmB,CAC7B,KAAK,SAAS,IAAI,CAAC,cAAc,EAAE,aAAa,CAAC,IAC/C;IACF,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;IAClB;;OAEG;IACH,KAAK,CAAC,EAAE,UAAU,CAAC;IACnB;;;;OAIG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB,GAAG,kBAAkB,CAAC,KAAK,CAAC,CAAC;AAE9B,MAAM,WAAW,uBAAuB;IACtC,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,CAAC,EAAE,UAAU,CAAC;IACnB,WAAW,EAAE,uBAAuB,CAAC;IACrC,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAED,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,mBAAmB,CAAC,cAAc,CAAC,GACxC,uBAAuB,CAOzB;AAkBD,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,YAAY,CAAC;IACnB,IAAI,EAAE;QACJ,QAAQ,EAAE,aAAa,CAAC;QACxB,YAAY,CAAC,EAAE,OAAO,CAAC;KACxB,CAAC;CACH;AAED,KAAK,eAAe,GAAG;IACrB,WAAW,EAAE,uBAAuB,CAAC;CACtC,GAAG,CAAC;IAAE,KAAK,EAAE,OAAO,CAAA;CAAE,GAAG;IAAE,MAAM,EAAE,OAAO,EAAE,CAAA;CAAE,CAAC,CAAC;AAEjD,wBAAgB,QAAQ,CAAC,IAAI,EAAE,eAAe,OAM7C;AAED,MAAM,MAAM,sBAAsB,GAAG,eAAe,GAClD,uBAAuB,GAAG;IACxB,IAAI,EAAE,aAAa,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,KAAK,CAAC,WAAW,CAAC,CAAC;CAC5B,CAAC;AAEJ,KAAK,MAAM,GAAG,CAAC,IAAI,EAAE,sBAAsB,KAAK,MAAM,CAAC;AACvD,KAAK,OAAO,GAAG,CAAC,IAAI,EAAE,sBAAsB,KAAK,gBAAgB,CAAC,MAAM,CAAC,CAAC;AAE1E,MAAM,MAAM,cAAc,GAAG;IAC3B,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;IACpC,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,OAAO,CAAC;CAClB,CAAC;AAEF,eAAO,MAAM,MAAM,EAAE,MAuBpB,CAAC;AAEF,eAAO,MAAM,OAAO,EAAE,OAMrB,CAAC;AAEF,MAAM,MAAM,SAAS,GAAG,CACtB,IAAI,EAAE,sBAAsB,GAAG;IAC7B,OAAO,EAAE,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;CACnD,KACE,OAAO,CAAC,UAAU,CAAC,CAAC;AAEzB,eAAO,MAAM,iBAAiB,EAAE,SAO/B,CAAC;AAcF,MAAM,MAAM,kBAAkB,GAAG,cAAc,GAC7C,sBAAsB,GAAG;IACvB,OAAO,EAAE,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;CACnD,CAAC;AAuBJ,wBAAsB,iBAAiB,CAAC,IAAI,EAAE,kBAAkB,0BA6B/D;AAED,wBAAsB,WAAW,CAC/B,IAAI,EAAE,kBAAkB,GACvB,OAAO,CAAC,UAAU,CAAC,CAcrB"}

package/dist/links/internals/httpUtils.js

@@ -131,34 +131,6 @@ async function httpRequest(opts) {
         meta
     };
 }
-/**
- * Merges multiple abort signals into a single one
- * - When all signals have been aborted, the merged signal will be aborted
- */ function mergeAbortSignals(opts) {
-    const ac = new AbortController();
-    if (opts.some((o)=>!o.signal)) {
-        return ac;
-    }
-    const count = opts.length;
-    let abortedCount = 0;
-    const onAbort = ()=>{
-        if (++abortedCount === count) {
-            ac.abort();
-        }
-    };
-    for (const o of opts){
-        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-        const signal = o.signal;
-        if (signal.aborted) {
-            onAbort();
-        } else {
-            signal.addEventListener('abort', onAbort, {
-                once: true
-            });
-        }
-    }
-    return ac;
-}
 
 exports.fetchHTTPResponse = fetchHTTPResponse;
 exports.getBody = getBody;
@@ -166,5 +138,4 @@ exports.getInput = getInput;
 exports.getUrl = getUrl;
 exports.httpRequest = httpRequest;
 exports.jsonHttpRequester = jsonHttpRequester;
-exports.mergeAbortSignals = mergeAbortSignals;
 exports.resolveHTTPLinkOptions = resolveHTTPLinkOptions;

package/dist/links/internals/httpUtils.mjs

@@ -129,33 +129,5 @@ async function httpRequest(opts) {
         meta
     };
 }
-/**
- * Merges multiple abort signals into a single one
- * - When all signals have been aborted, the merged signal will be aborted
- */ function mergeAbortSignals(opts) {
-    const ac = new AbortController();
-    if (opts.some((o)=>!o.signal)) {
-        return ac;
-    }
-    const count = opts.length;
-    let abortedCount = 0;
-    const onAbort = ()=>{
-        if (++abortedCount === count) {
-            ac.abort();
-        }
-    };
-    for (const o of opts){
-        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-        const signal = o.signal;
-        if (signal.aborted) {
-            onAbort();
-        } else {
-            signal.addEventListener('abort', onAbort, {
-                once: true
-            });
-        }
-    }
-    return ac;
-}
 
-export { fetchHTTPResponse, getBody, getInput, getUrl, httpRequest, jsonHttpRequester, mergeAbortSignals, resolveHTTPLinkOptions };
+export { fetchHTTPResponse, getBody, getInput, getUrl, httpRequest, jsonHttpRequester, resolveHTTPLinkOptions };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trpc/client",
-  "version": "11.0.0-rc.553+9b629cc67",
+  "version": "11.0.0-rc.561+c50cd4308",
   "description": "The tRPC client library",
   "author": "KATT",
   "license": "MIT",
@@ -76,10 +76,10 @@
     "!**/*.test.*"
   ],
   "peerDependencies": {
-    "@trpc/server": "11.0.0-rc.553+9b629cc67"
+    "@trpc/server": "11.0.0-rc.561+c50cd4308"
   },
   "devDependencies": {
-    "@trpc/server": "11.0.0-rc.553+9b629cc67",
+    "@trpc/server": "11.0.0-rc.561+c50cd4308",
     "@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": "9b629cc672aad7908af1d5355e3f2dd8f03f048d"
+  "gitHead": "c50cd4308223508184310103938d1fee50046989"
 }

package/src/internals/TRPCUntypedClient.ts

@@ -135,7 +135,7 @@ export class TRPCUntypedClient<TRouter extends AnyRouter> {
       path,
       input,
       context: opts?.context,
-      signal: null,
+      signal: opts.signal,
     });
     return observable$.subscribe({
       next(envelope) {

package/src/internals/signals.ts

@@ -0,0 +1,51 @@
+import type { Maybe } from '@trpc/server/unstable-core-do-not-import';
+
+/**
+ * Like `Promise.all()` but for abort signals
+ * - When all signals have been aborted, the merged signal will be aborted
+ * - If one signal is `null`, no signal will be aborted
+ */
+export function allAbortSignals(...signals: Maybe<AbortSignal>[]): AbortSignal {
+  const ac = new AbortController();
+
+  const count = signals.length;
+
+  let abortedCount = 0;
+
+  const onAbort = () => {
+    if (++abortedCount === count) {
+      ac.abort();
+    }
+  };
+
+  for (const signal of signals) {
+    if (signal?.aborted) {
+      onAbort();
+    } else {
+      signal?.addEventListener('abort', onAbort, {
+        once: true,
+      });
+    }
+  }
+
+  return ac.signal;
+}
+
+/**
+ * Like `Promise.race` but for abort signals
+ */
+export function raceAbortSignals(
+  ...signals: Maybe<AbortSignal>[]
+): AbortSignal {
+  const ac = new AbortController();
+
+  for (const signal of signals) {
+    if (signal?.aborted) {
+      ac.abort();
+    } else {
+      signal?.addEventListener('abort', () => ac.abort(), { once: true });
+    }
+  }
+
+  return ac.signal;
+}

package/src/links/httpBatchLink.ts

@@ -3,6 +3,7 @@ import { observable } from '@trpc/server/observable';
 import { transformResult } from '@trpc/server/unstable-core-do-not-import';
 import type { BatchLoader } from '../internals/dataLoader';
 import { dataLoader } from '../internals/dataLoader';
+import { allAbortSignals } from '../internals/signals';
 import type { NonEmptyArray } from '../internals/types';
 import { TRPCClientError } from '../TRPCClientError';
 import type { HTTPBatchLinkOptions } from './HTTPBatchLinkOptions';
@@ -10,7 +11,6 @@ import type { HTTPResult } from './internals/httpUtils';
 import {
   getUrl,
   jsonHttpRequester,
-  mergeAbortSignals,
   resolveHTTPLinkOptions,
 } from './internals/httpUtils';
 import type { Operation, TRPCLink } from './types';
@@ -50,7 +50,7 @@ export function httpBatchLink<TRouter extends AnyRouter>(
         async fetch(batchOps) {
           const path = batchOps.map((op) => op.path).join(',');
           const inputs = batchOps.map((op) => op.input);
-          const ac = mergeAbortSignals(batchOps);
+          const signal = allAbortSignals(...batchOps.map((op) => op.signal));
 
           const res = await jsonHttpRequester({
             ...resolvedOpts,
@@ -68,7 +68,7 @@ export function httpBatchLink<TRouter extends AnyRouter>(
               }
               return opts.headers;
             },
-            signal: ac.signal,
+            signal,
           });
           const resJSON = Array.isArray(res.json)
             ? res.json

package/src/links/httpBatchStreamLink.ts

@@ -5,6 +5,7 @@ import type { AnyRootTypes } from '@trpc/server/unstable-core-do-not-import';
 import { jsonlStreamConsumer } from '@trpc/server/unstable-core-do-not-import';
 import type { BatchLoader } from '../internals/dataLoader';
 import { dataLoader } from '../internals/dataLoader';
+import { allAbortSignals, raceAbortSignals } from '../internals/signals';
 import type { NonEmptyArray } from '../internals/types';
 import { TRPCClientError } from '../TRPCClientError';
 import type { HTTPBatchLinkOptions } from './HTTPBatchLinkOptions';
@@ -13,7 +14,6 @@ import {
   fetchHTTPResponse,
   getBody,
   getUrl,
-  mergeAbortSignals,
   resolveHTTPLinkOptions,
 } from './internals/httpUtils';
 import type { Operation, TRPCLink } from './types';
@@ -67,11 +67,14 @@ export function unstable_httpBatchStreamLink<TRouter extends AnyRouter>(
           const path = batchOps.map((op) => op.path).join(',');
           const inputs = batchOps.map((op) => op.input);
 
-          const ac = mergeAbortSignals(batchOps);
+          const batchSignals = allAbortSignals(
+            ...batchOps.map((op) => op.signal),
+          );
+          const abortController = new AbortController();
 
           const responsePromise = fetchHTTPResponse({
             ...resolvedOpts,
-            signal: ac.signal,
+            signal: raceAbortSignals(batchSignals, abortController.signal),
             type,
             contentTypeHeader: 'application/json',
             trpcAcceptHeader: 'application/jsonl',
@@ -106,7 +109,7 @@ export function unstable_httpBatchStreamLink<TRouter extends AnyRouter>(
                 error,
               });
             },
-            abortController: ac,
+            abortController,
           });
           const promises = Object.keys(batchOps).map(
             async (key): Promise<HTTPResult> => {

package/src/links/httpSubscriptionLink.ts

@@ -3,11 +3,13 @@ import type {
   AnyClientTypes,
   inferClientTypes,
   InferrableClientTypes,
+  SSEStreamConsumerOptions,
 } from '@trpc/server/unstable-core-do-not-import';
 import {
   run,
   sseStreamConsumer,
 } from '@trpc/server/unstable-core-do-not-import';
+import { raceAbortSignals } from '../internals/signals';
 import { TRPCClientError } from '../TRPCClientError';
 import { getTransformer, type TransformerOptions } from '../unstable-internals';
 import { getUrl } from './internals/httpUtils';
@@ -38,6 +40,10 @@ type HTTPSubscriptionLinkOptions<TRoot extends AnyClientTypes> = {
    * EventSource options or a callback that returns them
    */
   eventSourceOptions?: CallbackOrValue<EventSourceInit>;
+  /**
+   * @see https://trpc.io/docs/client/links/httpSubscriptionLink#updatingConfig
+   */
+  experimental_shouldRecreateOnError?: SSEStreamConsumerOptions['shouldRecreateOnError'];
 } & TransformerOptions<TRoot> &
   UrlOptionsWithConnectionParams;
 
@@ -55,70 +61,73 @@ export function unstable_httpSubscriptionLink<
     return ({ op }) => {
       return observable((observer) => {
         const { type, path, input } = op;
+
         /* istanbul ignore if -- @preserve */
         if (type !== 'subscription') {
           throw new Error('httpSubscriptionLink only supports subscriptions');
         }
 
-        let eventSource: EventSource | null = null;
-        let unsubscribed = false;
+        const ac = new AbortController();
+        const signal = raceAbortSignals(op.signal, ac.signal);
+        const eventSourceStream = sseStreamConsumer<
+          Partial<{
+            id?: string;
+            data: unknown;
+          }>
+        >({
+          url: async () =>
+            getUrl({
+              transformer,
+              url: await urlWithConnectionParams(opts),
+              input,
+              path,
+              type,
+              signal: null,
+            }),
+          init: () => resultOf(opts.eventSourceOptions),
+          signal,
+          deserialize: transformer.output.deserialize,
+          shouldRecreateOnError: opts.experimental_shouldRecreateOnError,
+        });
 
         run(async () => {
-          const url = getUrl({
-            transformer,
-            url: await urlWithConnectionParams(opts),
-            input,
-            path,
-            type,
-            signal: null,
-          });
+          for await (const chunk of eventSourceStream) {
+            switch (chunk.type) {
+              case 'data':
+                const chunkData = chunk.data;
 
-          const eventSourceOptions = await resultOf(opts.eventSourceOptions);
-          /* istanbul ignore if -- @preserve */
-          if (unsubscribed) {
-            // already unsubscribed - rare race condition
-            return;
-          }
-          eventSource = new EventSource(url, eventSourceOptions);
-          const onStarted = () => {
-            observer.next({
-              result: {
-                type: 'started',
-              },
-              context: {
-                eventSource,
-              },
-            });
-
-            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-            eventSource!.removeEventListener('open', onStarted);
-          };
-          // console.log('starting', new Date());
-          eventSource.addEventListener('open', onStarted);
-          const iterable = sseStreamConsumer<
-            Partial<{
-              id?: string;
-              data: unknown;
-            }>
-          >({
-            from: eventSource,
-            deserialize: transformer.output.deserialize,
-          });
+                // if the `tracked()`-helper is used, we always have an `id` field
+                const data = 'id' in chunkData ? chunkData : chunkData.data;
 
-          for await (const chunk of iterable) {
-            if (!chunk.ok) {
-              // TODO: handle in https://github.com/trpc/trpc/issues/5871
-              continue;
+                observer.next({
+                  result: {
+                    data,
+                  },
+                  context: {
+                    eventSource: chunk.eventSource,
+                  },
+                });
+                break;
+              case 'opened': {
+                observer.next({
+                  result: {
+                    type: 'started',
+                  },
+                  context: {
+                    eventSource: chunk.eventSource,
+                  },
+                });
+                break;
+              }
+              case 'error': {
+                // TODO: handle in https://github.com/trpc/trpc/issues/5871
+                break;
+              }
+              case 'connecting': {
+                // TODO: handle in https://github.com/trpc/trpc/issues/5871
+                break;
+              }
             }
-            const chunkData = chunk.data;
-
-            // if the `tracked()`-helper is used, we always have an `id` field
-            const data = 'id' in chunkData ? chunkData : chunkData.data;
-            observer.next({
-              result: {
-                data,
-              },
-            });
           }
 
           observer.next({
@@ -133,8 +142,7 @@ export function unstable_httpSubscriptionLink<
 
         return () => {
           observer.complete();
-          eventSource?.close();
-          unsubscribed = true;
+          ac.abort();
         };
       });
     };

package/src/links/internals/httpUtils.ts

@@ -240,43 +240,3 @@ export async function httpRequest(
     meta,
   };
 }
-
-/**
- * Merges multiple abort signals into a single one
- * - When all signals have been aborted, the merged signal will be aborted
- */
-export function mergeAbortSignals(
-  opts: {
-    signal: Maybe<AbortSignal>;
-  }[],
-): AbortController {
-  const ac = new AbortController();
-
-  if (opts.some((o) => !o.signal)) {
-    return ac;
-  }
-
-  const count = opts.length;
-
-  let abortedCount = 0;
-
-  const onAbort = () => {
-    if (++abortedCount === count) {
-      ac.abort();
-    }
-  };
-
-  for (const o of opts) {
-    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-    const signal = o.signal!;
-    if (signal.aborted) {
-      onAbort();
-    } else {
-      signal.addEventListener('abort', onAbort, {
-        once: true,
-      });
-    }
-  }
-
-  return ac;
-}