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

package/dist/links/httpSubscriptionLink.js

@@ -2,12 +2,12 @@
 
 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');
 var urlWithConnectionParams$1 = require('./internals/urlWithConnectionParams.js');
 
-var _listeners, _type, _listeners1, _type1;
 async function urlWithConnectionParams(opts) {
     let url = await urlWithConnectionParams$1.resultOf(opts.url);
     if (opts.connectionParams) {
@@ -28,72 +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 EventSourceWrapper(url, eventSourceOptions);
-                    const onStarted = ()=>{
-                        observer.next({
-                            result: {
-                                type: 'started'
-                            },
-                            context: {
-                                // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-                                eventSource: eventSource.getEventSource()
-                            }
-                        });
-                    };
-                    eventSource.addEventListener('open', onStarted, {
-                        once: true
-                    });
-                    const iterable = unstableCoreDoNotImport.sseStreamConsumer({
-                        from: eventSource,
-                        deserialize: transformer$1.output.deserialize,
-                        tryHandleError: async (ev)=>{
-                            if (typeof opts.shouldRecreateOnError !== 'function' || !eventSource) {
-                                return false;
-                            }
-                            const recreateOnErrorOpts = createRecreateOnErrorOpts(ev);
-                            const shouldRestart = await opts.shouldRecreateOnError(recreateOnErrorOpts);
-                            if (!shouldRestart) {
-                                return false;
-                            }
-                            eventSource.restart(httpUtils.getUrl({
-                                transformer: transformer$1,
-                                url: await urlWithConnectionParams(opts),
-                                input,
-                                path,
-                                type,
-                                signal: null
-                            }), await urlWithConnectionParams$1.resultOf(opts.eventSourceOptions));
-                            return true;
-                        }
-                    });
-                    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: {
@@ -106,78 +85,11 @@ async function urlWithConnectionParams(opts) {
                 });
                 return ()=>{
                     observer.complete();
-                    eventSource?.close();
-                    unsubscribed = true;
+                    ac.abort();
                 };
             });
         };
     };
 }
-function createRecreateOnErrorOpts(ev) {
-    if ('status' in ev && typeof ev.status === 'number') {
-        return {
-            type: 'http-error',
-            status: ev.status,
-            event: ev
-        };
-    }
-    return {
-        type: 'raw',
-        event: ev
-    };
-}
-/**
- * We wrap EventSource so that is can be reinitialized with new options
- */ class EventSourceWrapper {
-    *getAllEventListeners() {
-        for(const _type in this.listeners){
-            const type = _type;
-            for (const listener of this.listeners[type] ?? []){
-                yield listener;
-            }
-        }
-    }
-    restart(url, options) {
-        for (const [type, callback, options1] of this.getAllEventListeners()){
-            this.es.removeEventListener(type, callback, options1);
-        }
-        this.es.close();
-        this.es = new EventSource(url, options);
-        for (const [type1, callback1, options2] of this.getAllEventListeners()){
-            this.es.addEventListener(type1, callback1, options2);
-        }
-    }
-    close() {
-        this.listeners = {};
-        this.es.close();
-    }
-    getEventSource() {
-        return this.es;
-    }
-    get readyState() {
-        return this.es.readyState;
-    }
-    addEventListener(type, listener, options) {
-        (_listeners = this.listeners)[_type = type] ?? (_listeners[_type] = []);
-        this.listeners[type].push([
-            type,
-            listener,
-            options
-        ]);
-        this.es.addEventListener(type, listener, options);
-    }
-    removeEventListener(type, listener, options) {
-        (_listeners1 = this.listeners)[_type1 = type] ?? (_listeners1[_type1] = []);
-        const indexToRemove = this.listeners[type]?.findIndex(([_type, thisListener])=>thisListener === listener);
-        if (typeof indexToRemove === 'number' && indexToRemove >= 0) {
-            this.listeners[type].splice(indexToRemove, 1);
-        }
-        this.es.removeEventListener(type, listener, options);
-    }
-    constructor(url, options){
-        this.listeners = {};
-        this.es = new EventSource(url, options);
-    }
-}
 
 exports.unstable_httpSubscriptionLink = unstable_httpSubscriptionLink;

package/dist/links/httpSubscriptionLink.mjs

@@ -1,11 +1,11 @@
 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';
 import { resultOf } from './internals/urlWithConnectionParams.mjs';
 
-var _listeners, _type, _listeners1, _type1;
 async function urlWithConnectionParams(opts) {
     let url = await resultOf(opts.url);
     if (opts.connectionParams) {
@@ -26,72 +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 EventSourceWrapper(url, eventSourceOptions);
-                    const onStarted = ()=>{
-                        observer.next({
-                            result: {
-                                type: 'started'
-                            },
-                            context: {
-                                // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-                                eventSource: eventSource.getEventSource()
-                            }
-                        });
-                    };
-                    eventSource.addEventListener('open', onStarted, {
-                        once: true
-                    });
-                    const iterable = sseStreamConsumer({
-                        from: eventSource,
-                        deserialize: transformer.output.deserialize,
-                        tryHandleError: async (ev)=>{
-                            if (typeof opts.shouldRecreateOnError !== 'function' || !eventSource) {
-                                return false;
-                            }
-                            const recreateOnErrorOpts = createRecreateOnErrorOpts(ev);
-                            const shouldRestart = await opts.shouldRecreateOnError(recreateOnErrorOpts);
-                            if (!shouldRestart) {
-                                return false;
-                            }
-                            eventSource.restart(getUrl({
-                                transformer,
-                                url: await urlWithConnectionParams(opts),
-                                input,
-                                path,
-                                type,
-                                signal: null
-                            }), await resultOf(opts.eventSourceOptions));
-                            return true;
-                        }
-                    });
-                    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: {
@@ -104,78 +83,11 @@ async function urlWithConnectionParams(opts) {
                 });
                 return ()=>{
                     observer.complete();
-                    eventSource?.close();
-                    unsubscribed = true;
+                    ac.abort();
                 };
             });
         };
     };
 }
-function createRecreateOnErrorOpts(ev) {
-    if ('status' in ev && typeof ev.status === 'number') {
-        return {
-            type: 'http-error',
-            status: ev.status,
-            event: ev
-        };
-    }
-    return {
-        type: 'raw',
-        event: ev
-    };
-}
-/**
- * We wrap EventSource so that is can be reinitialized with new options
- */ class EventSourceWrapper {
-    *getAllEventListeners() {
-        for(const _type in this.listeners){
-            const type = _type;
-            for (const listener of this.listeners[type] ?? []){
-                yield listener;
-            }
-        }
-    }
-    restart(url, options) {
-        for (const [type, callback, options1] of this.getAllEventListeners()){
-            this.es.removeEventListener(type, callback, options1);
-        }
-        this.es.close();
-        this.es = new EventSource(url, options);
-        for (const [type1, callback1, options2] of this.getAllEventListeners()){
-            this.es.addEventListener(type1, callback1, options2);
-        }
-    }
-    close() {
-        this.listeners = {};
-        this.es.close();
-    }
-    getEventSource() {
-        return this.es;
-    }
-    get readyState() {
-        return this.es.readyState;
-    }
-    addEventListener(type, listener, options) {
-        (_listeners = this.listeners)[_type = type] ?? (_listeners[_type] = []);
-        this.listeners[type].push([
-            type,
-            listener,
-            options
-        ]);
-        this.es.addEventListener(type, listener, options);
-    }
-    removeEventListener(type, listener, options) {
-        (_listeners1 = this.listeners)[_type1 = type] ?? (_listeners1[_type1] = []);
-        const indexToRemove = this.listeners[type]?.findIndex(([_type, thisListener])=>thisListener === listener);
-        if (typeof indexToRemove === 'number' && indexToRemove >= 0) {
-            this.listeners[type].splice(indexToRemove, 1);
-        }
-        this.es.removeEventListener(type, listener, options);
-    }
-    constructor(url, options){
-        this.listeners = {};
-        this.es = new EventSource(url, options);
-    }
-}
 
 export { unstable_httpSubscriptionLink };

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":"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"}
+{"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.560+137b085f8",
+  "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.560+137b085f8"
+    "@trpc/server": "11.0.0-rc.561+c50cd4308"
   },
   "devDependencies": {
-    "@trpc/server": "11.0.0-rc.560+137b085f8",
+    "@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": "137b085f86cb4ceb397b29c69ccbe38a93dbe79a"
+  "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