@trpc/server 11.0.0-rc.589 → 11.0.0-rc.590

package/dist/unstable-core-do-not-import/http/resolveResponse.mjs

@@ -4,7 +4,7 @@ import { TRPCError, getTRPCErrorFromUnknown } from '../error/TRPCError.mjs';
 import { jsonlStreamProducer, isPromise } from '../stream/jsonl.mjs';
 import { sseStreamProducer, sseHeaders } from '../stream/sse.mjs';
 import { transformTRPCResponse } from '../transformer.mjs';
-import { isAsyncIterable, isObject } from '../utils.mjs';
+import { abortSignalsAnyPonyfill, assert, isAsyncIterable, isObject } from '../utils.mjs';
 import { getRequestInfo } from './contentType.mjs';
 import { getHTTPStatusCode } from './getHTTPStatusCode.mjs';
 
@@ -185,21 +185,31 @@ async function resolveResponse(opts) {
                         message: `Unsupported ${req.method}-request to ${proc._def.type} procedure at path "${call.path}"`
                     });
                 }
-                /* istanbul ignore if -- @preserve */ if (proc._def.type === 'subscription' && info.isBatchCall) {
-                    throw new TRPCError({
-                        code: 'BAD_REQUEST',
-                        message: `Cannot batch subscription calls`
-                    });
+                let abortCtrl;
+                if (proc._def.type === 'subscription') {
+                    /* istanbul ignore if -- @preserve */ if (info.isBatchCall) {
+                        throw new TRPCError({
+                            code: 'BAD_REQUEST',
+                            message: `Cannot batch subscription calls`
+                        });
+                    }
+                    abortCtrl = new AbortController();
                 }
                 const data = await proc({
                     path: call.path,
                     getRawInput: call.getRawInput,
                     ctx,
                     type: proc._def.type,
-                    signal: opts.req.signal
+                    signal: abortCtrl ? abortSignalsAnyPonyfill([
+                        opts.req.signal,
+                        abortCtrl.signal
+                    ]) : opts.req.signal
                 });
                 return [
-                    data
+                    {
+                        data,
+                        abortCtrl
+                    }
                 ];
             } catch (cause) {
                 const error = getTRPCErrorFromUnknown(cause);
@@ -221,7 +231,7 @@ async function resolveResponse(opts) {
         // ----------- response handlers -----------
         if (!info.isBatchCall) {
             const [call] = info.calls;
-            const [data, error] = await rpcCalls[0];
+            const [result, error] = await rpcCalls[0];
             switch(info.type){
                 case 'unknown':
                 case 'mutation':
@@ -229,7 +239,7 @@ async function resolveResponse(opts) {
                     {
                         // httpLink
                         headers.set('content-type', 'application/json');
-                        if (isDataStream(data)) {
+                        if (isDataStream(result?.data)) {
                             throw new TRPCError({
                                 code: 'UNSUPPORTED_MEDIA_TYPE',
                                 message: 'Cannot use stream-like response in non-streaming request - use httpBatchStreamLink'
@@ -246,7 +256,7 @@ async function resolveResponse(opts) {
                             })
                         } : {
                             result: {
-                                data
+                                data: result.data
                             }
                         };
                         const headResponse = initResponse({
@@ -278,6 +288,8 @@ async function resolveResponse(opts) {
                         if (error) {
                             throw error;
                         }
+                        const { data , abortCtrl  } = result;
+                        assert(abortCtrl !== undefined, 'subscription type must have an AbortController');
                         if (!isObservable(data) && !isAsyncIterable(data)) {
                             throw new TRPCError({
                                 message: `Subscription ${call.path} did not return an observable or a AsyncGenerator`,
@@ -288,6 +300,7 @@ async function resolveResponse(opts) {
                         const stream = sseStreamProducer({
                             ...config.experimental?.sseSubscriptions,
                             data: dataAsIterable,
+                            abortCtrl,
                             serialize: (v)=>config.transformer.output.serialize(v),
                             formatError (errorOpts) {
                                 const error = getTRPCErrorFromUnknown(errorOpts.error);
@@ -373,13 +386,14 @@ async function resolveResponse(opts) {
                             })
                         };
                     }
+                    const { data  } = result;
                     /**
            * Not very pretty, but we need to wrap nested data in promises
            * Our stream producer will only resolve top-level async values or async values that are directly nested in another async value
-           */ const data = isObservable(result) ? observableToAsyncIterable(result) : Promise.resolve(result);
+           */ const dataAsPromiseOrIterable = isObservable(data) ? observableToAsyncIterable(data) : Promise.resolve(data);
                     return {
                         result: Promise.resolve({
-                            data
+                            data: dataAsPromiseOrIterable
                         })
                     };
                 }),
@@ -420,11 +434,11 @@ async function resolveResponse(opts) {
      * - return a complete HTTPResponse
      */ headers.set('content-type', 'application/json');
         const results = (await Promise.all(rpcCalls)).map((res)=>{
-            const [data, error] = res;
+            const [result, error] = res;
             if (error) {
                 return res;
             }
-            if (isDataStream(data)) {
+            if (isDataStream(result.data)) {
                 return [
                     null,
                     new TRPCError({
@@ -435,7 +449,7 @@ async function resolveResponse(opts) {
             }
             return res;
         });
-        const resultAsRPCResponse = results.map(([data, error], index)=>{
+        const resultAsRPCResponse = results.map(([result, error], index)=>{
             const call = info.calls[index];
             if (error) {
                 return {
@@ -451,7 +465,7 @@ async function resolveResponse(opts) {
             }
             return {
                 result: {
-                    data
+                    data: result.data
                 }
             };
         });

package/dist/unstable-core-do-not-import/stream/sse.d.ts

@@ -20,6 +20,7 @@ export interface PingOptions {
 export interface SSEStreamProducerOptions<TValue = unknown> {
     serialize?: Serialize;
     data: AsyncIterable<TValue>;
+    abortCtrl: AbortController;
     maxDepth?: number;
     ping?: PingOptions;
     /**

package/dist/unstable-core-do-not-import/stream/sse.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sse.d.ts","sourceRoot":"","sources":["../../../src/unstable-core-do-not-import/stream/sse.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAE7C,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,WAAW,CAAC;AASpD,KAAK,SAAS,GAAG,CAAC,KAAK,EAAE,GAAG,KAAK,GAAG,CAAC;AACrC,KAAK,WAAW,GAAG,CAAC,KAAK,EAAE,GAAG,KAAK,GAAG,CAAC;AAEvC;;GAEG;AACH,MAAM,WAAW,WAAW;IAC1B;;;OAGG;IACH,OAAO,EAAE,OAAO,CAAC;IACjB;;;OAGG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,wBAAwB,CAAC,MAAM,GAAG,OAAO;IACxD,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,IAAI,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC;IAC5B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,IAAI,CAAC,EAAE,WAAW,CAAC;IACnB;;;;OAIG;IACH,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB;;;;OAIG;IACH,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,WAAW,CAAC,EAAE,CAAC,IAAI,EAAE;QAAE,KAAK,EAAE,OAAO,CAAA;KAAE,KAAK,OAAO,CAAC;CACrD;AAUD;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,MAAM,GAAG,OAAO,EAAE,IAAI,EAAE,wBAAwB,CAAC,MAAM,CAAC,0BA0FzF;AAED,UAAU,wBAAwB;IAChC,WAAW,EAAE,WAAW,CAAC;CAC1B;AAED,UAAU,wBAAwB,CAAC,KAAK,CAAE,SAAQ,wBAAwB;IACxE,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,kBAAkB,CAAC,KAAK,CAAC,CAAC;CACjC;AAED,UAAU,yBAA0B,SAAQ,wBAAwB;IAClE,IAAI,EAAE,OAAO,CAAC;IACd,KAAK,EAAE,OAAO,CAAC;CAChB;AAED,UAAU,0BAA2B,SAAQ,wBAAwB;IACnE,IAAI,EAAE,QAAQ,CAAC;CAChB;AAED,UAAU,8BAA+B,SAAQ,wBAAwB;IACvE,IAAI,EAAE,YAAY,CAAC;CACpB;AAED,KAAK,oBAAoB,CAAC,KAAK,IAC3B,wBAAwB,CAAC,KAAK,CAAC,GAC/B,yBAAyB,GACzB,0BAA0B,GAC1B,8BAA8B,CAAC;AAEnC,MAAM,WAAW,wBAAwB;IACvC,GAAG,EAAE,MAAM,YAAY,CAAC,MAAM,CAAC,CAAC;IAChC,IAAI,EAAE,MAAM,YAAY,CAAC,eAAe,CAAC,GAAG,SAAS,CAAC;IACtD,MAAM,EAAE,WAAW,CAAC;IACpB,qBAAqB,CAAC,EAAE,CACtB,IAAI,EACA;QACE,IAAI,EAAE,OAAO,CAAC;QACd,KAAK,EAAE,KAAK,CAAC;KACd,GACD;QACE,IAAI,EAAE,kBAAkB,CAAC;QACzB,KAAK,EAAE,OAAO,CAAC;KAChB,KACF,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAChC,WAAW,CAAC,EAAE,WAAW,CAAC;CAC3B;AACD;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,KAAK,EACrC,IAAI,EAAE,wBAAwB,GAC7B,aAAa,CAAC,oBAAoB,CAAC,KAAK,CAAC,CAAC,CAkL5C;AAED,eAAO,MAAM,UAAU;;;;;CAKb,CAAC"}
+{"version":3,"file":"sse.d.ts","sourceRoot":"","sources":["../../../src/unstable-core-do-not-import/stream/sse.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAE7C,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,WAAW,CAAC;AASpD,KAAK,SAAS,GAAG,CAAC,KAAK,EAAE,GAAG,KAAK,GAAG,CAAC;AACrC,KAAK,WAAW,GAAG,CAAC,KAAK,EAAE,GAAG,KAAK,GAAG,CAAC;AAEvC;;GAEG;AACH,MAAM,WAAW,WAAW;IAC1B;;;OAGG;IACH,OAAO,EAAE,OAAO,CAAC;IACjB;;;OAGG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,wBAAwB,CAAC,MAAM,GAAG,OAAO;IACxD,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,IAAI,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC;IAC5B,SAAS,EAAE,eAAe,CAAC;IAC3B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,IAAI,CAAC,EAAE,WAAW,CAAC;IACnB;;;;OAIG;IACH,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB;;;;OAIG;IACH,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,WAAW,CAAC,EAAE,CAAC,IAAI,EAAE;QAAE,KAAK,EAAE,OAAO,CAAA;KAAE,KAAK,OAAO,CAAC;CACrD;AAUD;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,MAAM,GAAG,OAAO,EAChD,IAAI,EAAE,wBAAwB,CAAC,MAAM,CAAC,0BAkGvC;AAED,UAAU,wBAAwB;IAChC,WAAW,EAAE,WAAW,CAAC;CAC1B;AAED,UAAU,wBAAwB,CAAC,KAAK,CAAE,SAAQ,wBAAwB;IACxE,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,kBAAkB,CAAC,KAAK,CAAC,CAAC;CACjC;AAED,UAAU,yBAA0B,SAAQ,wBAAwB;IAClE,IAAI,EAAE,OAAO,CAAC;IACd,KAAK,EAAE,OAAO,CAAC;CAChB;AAED,UAAU,0BAA2B,SAAQ,wBAAwB;IACnE,IAAI,EAAE,QAAQ,CAAC;CAChB;AAED,UAAU,8BAA+B,SAAQ,wBAAwB;IACvE,IAAI,EAAE,YAAY,CAAC;CACpB;AAED,KAAK,oBAAoB,CAAC,KAAK,IAC3B,wBAAwB,CAAC,KAAK,CAAC,GAC/B,yBAAyB,GACzB,0BAA0B,GAC1B,8BAA8B,CAAC;AAEnC,MAAM,WAAW,wBAAwB;IACvC,GAAG,EAAE,MAAM,YAAY,CAAC,MAAM,CAAC,CAAC;IAChC,IAAI,EAAE,MAAM,YAAY,CAAC,eAAe,CAAC,GAAG,SAAS,CAAC;IACtD,MAAM,EAAE,WAAW,CAAC;IACpB,qBAAqB,CAAC,EAAE,CACtB,IAAI,EACA;QACE,IAAI,EAAE,OAAO,CAAC;QACd,KAAK,EAAE,KAAK,CAAC;KACd,GACD;QACE,IAAI,EAAE,kBAAkB,CAAC;QACzB,KAAK,EAAE,OAAO,CAAC;KAChB,KACF,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAChC,WAAW,CAAC,EAAE,WAAW,CAAC;CAC3B;AACD;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,KAAK,EACrC,IAAI,EAAE,wBAAwB,GAC7B,aAAa,CAAC,oBAAoB,CAAC,KAAK,CAAC,CAAC,CAkL5C;AAED,eAAO,MAAM,UAAU;;;;;CAKb,CAAC"}

package/dist/unstable-core-do-not-import/stream/sse.js

@@ -29,13 +29,14 @@ const SERIALIZED_ERROR_EVENT = 'serialized-error';
         if (opts.emitAndEndImmediately) {
             iterable = asyncIterable.takeWithGrace(iterable, {
                 count: 1,
-                gracePeriodMs: 1
+                gracePeriodMs: 1,
+                onCancel: ()=>opts.abortCtrl.abort()
             });
         }
         let maxDurationTimer = null;
         if (opts.maxDurationMs != null && opts.maxDurationMs > 0 && opts.maxDurationMs !== Infinity) {
             maxDurationTimer = promiseTimer.createPromiseTimer(opts.maxDurationMs).start();
-            iterable = asyncIterable.withCancel(iterable, maxDurationTimer.promise);
+            iterable = asyncIterable.withCancel(iterable, maxDurationTimer.promise.then(()=>opts.abortCtrl.abort()));
         }
         if (ping.enabled && ping.intervalMs !== Infinity && ping.intervalMs > 0) {
             iterable = withPing.withPing(iterable, ping.intervalMs);

package/dist/unstable-core-do-not-import/stream/sse.mjs

@@ -27,13 +27,14 @@ const SERIALIZED_ERROR_EVENT = 'serialized-error';
         if (opts.emitAndEndImmediately) {
             iterable = takeWithGrace(iterable, {
                 count: 1,
-                gracePeriodMs: 1
+                gracePeriodMs: 1,
+                onCancel: ()=>opts.abortCtrl.abort()
             });
         }
         let maxDurationTimer = null;
         if (opts.maxDurationMs != null && opts.maxDurationMs > 0 && opts.maxDurationMs !== Infinity) {
             maxDurationTimer = createPromiseTimer(opts.maxDurationMs).start();
-            iterable = withCancel(iterable, maxDurationTimer.promise);
+            iterable = withCancel(iterable, maxDurationTimer.promise.then(()=>opts.abortCtrl.abort()));
         }
         if (ping.enabled && ping.intervalMs !== Infinity && ping.intervalMs > 0) {
             iterable = withPing(iterable, ping.intervalMs);

package/dist/unstable-core-do-not-import/stream/utils/asyncIterable.d.ts

@@ -6,12 +6,13 @@ export declare function withCancel<T>(iterable: AsyncIterable<T>, cancel: Promis
 interface TakeWithGraceOptions {
     count: number;
     gracePeriodMs: number;
+    onCancel?: () => void;
 }
 /**
  * Derives a new {@link AsyncGenerator} based of {@link iterable}, that yields its first
  * {@link count} values. Then, a grace period of {@link gracePeriodMs} is started in which further
  * values may still come through. After this period, the generator stops.
  */
-export declare function takeWithGrace<T>(iterable: AsyncIterable<T>, { count, gracePeriodMs }: TakeWithGraceOptions): AsyncGenerator<T>;
+export declare function takeWithGrace<T>(iterable: AsyncIterable<T>, { count, gracePeriodMs, onCancel }: TakeWithGraceOptions): AsyncGenerator<T>;
 export {};
 //# sourceMappingURL=asyncIterable.d.ts.map

package/dist/unstable-core-do-not-import/stream/utils/asyncIterable.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"asyncIterable.d.ts","sourceRoot":"","sources":["../../../../src/unstable-core-do-not-import/stream/utils/asyncIterable.ts"],"names":[],"mappings":"AAGA;;;GAGG;AACH,wBAAuB,UAAU,CAAC,CAAC,EACjC,QAAQ,EAAE,aAAa,CAAC,CAAC,CAAC,EAC1B,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,GACvB,cAAc,CAAC,CAAC,CAAC,CAcnB;AAED,UAAU,oBAAoB;IAC5B,KAAK,EAAE,MAAM,CAAC;IACd,aAAa,EAAE,MAAM,CAAC;CACvB;AAED;;;;GAIG;AACH,wBAAuB,aAAa,CAAC,CAAC,EACpC,QAAQ,EAAE,aAAa,CAAC,CAAC,CAAC,EAC1B,EAAE,KAAK,EAAE,aAAa,EAAE,EAAE,oBAAoB,GAC7C,cAAc,CAAC,CAAC,CAAC,CAsBnB"}
+{"version":3,"file":"asyncIterable.d.ts","sourceRoot":"","sources":["../../../../src/unstable-core-do-not-import/stream/utils/asyncIterable.ts"],"names":[],"mappings":"AAGA;;;GAGG;AACH,wBAAuB,UAAU,CAAC,CAAC,EACjC,QAAQ,EAAE,aAAa,CAAC,CAAC,CAAC,EAC1B,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,GACvB,cAAc,CAAC,CAAC,CAAC,CAcnB;AAED,UAAU,oBAAoB;IAC5B,KAAK,EAAE,MAAM,CAAC;IACd,aAAa,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,EAAE,MAAM,IAAI,CAAC;CACvB;AAED;;;;GAIG;AACH,wBAAuB,aAAa,CAAC,CAAC,EACpC,QAAQ,EAAE,aAAa,CAAC,CAAC,CAAC,EAC1B,EAAE,KAAK,EAAE,aAAa,EAAE,QAAQ,EAAE,EAAE,oBAAoB,GACvD,cAAc,CAAC,CAAC,CAAC,CAsBnB"}

package/dist/unstable-core-do-not-import/stream/utils/asyncIterable.js

@@ -28,7 +28,7 @@ var promiseTimer = require('./promiseTimer.js');
  * Derives a new {@link AsyncGenerator} based of {@link iterable}, that yields its first
  * {@link count} values. Then, a grace period of {@link gracePeriodMs} is started in which further
  * values may still come through. After this period, the generator stops.
- */ async function* takeWithGrace(iterable, { count , gracePeriodMs  }) {
+ */ async function* takeWithGrace(iterable, { count , gracePeriodMs , onCancel  }) {
     const iterator = iterable[Symbol.asyncIterator]();
     const timer = promiseTimer.createPromiseTimer(gracePeriodMs);
     try {
@@ -47,7 +47,7 @@ var promiseTimer = require('./promiseTimer.js');
             }
             yield result.value;
             if (--count === 0) {
-                timer.start();
+                timer.start().promise.then(onCancel, utils.noop);
             }
         }
     } finally{

package/dist/unstable-core-do-not-import/stream/utils/asyncIterable.mjs

@@ -26,7 +26,7 @@ import { createPromiseTimer } from './promiseTimer.mjs';
  * Derives a new {@link AsyncGenerator} based of {@link iterable}, that yields its first
  * {@link count} values. Then, a grace period of {@link gracePeriodMs} is started in which further
  * values may still come through. After this period, the generator stops.
- */ async function* takeWithGrace(iterable, { count , gracePeriodMs  }) {
+ */ async function* takeWithGrace(iterable, { count , gracePeriodMs , onCancel  }) {
     const iterator = iterable[Symbol.asyncIterator]();
     const timer = createPromiseTimer(gracePeriodMs);
     try {
@@ -45,7 +45,7 @@ import { createPromiseTimer } from './promiseTimer.mjs';
             }
             yield result.value;
             if (--count === 0) {
-                timer.start();
+                timer.start().promise.then(onCancel, noop);
             }
         }
     } finally{

package/dist/unstable-core-do-not-import/stream/utils/promiseTimer.js

@@ -16,7 +16,7 @@ function createPromiseTimer(ms) {
     return timer;
     function start() {
         if (timeout != null) {
-            throw new Error("PromiseTimer already started.");
+            throw new Error('PromiseTimer already started.');
         }
         timeout = setTimeout(deferred.resolve, ms);
         return timer;

package/dist/unstable-core-do-not-import/stream/utils/promiseTimer.mjs

@@ -14,7 +14,7 @@ function createPromiseTimer(ms) {
     return timer;
     function start() {
         if (timeout != null) {
-            throw new Error("PromiseTimer already started.");
+            throw new Error('PromiseTimer already started.');
         }
         timeout = setTimeout(deferred.resolve, ms);
         return timer;

package/dist/unstable-core-do-not-import/utils.d.ts

@@ -25,5 +25,18 @@ export declare function isAsyncIterable<TValue>(value: unknown): value is AsyncI
 export declare const run: <TValue>(fn: () => TValue) => TValue;
 export declare function noop(): void;
 export declare function identity<T>(it: T): T;
+/**
+ * Generic runtime assertion function. Throws, if the condition is not `true`.
+ *
+ * Can be used as a slightly less dangerous variant of type assertions. Code
+ * mistakes would be revealed at runtime then (hopefully during testing).
+ */
+export declare function assert(condition: boolean, msg?: string): asserts condition;
+export declare function sleep(ms?: number): Promise<void>;
+/**
+ * Ponyfill for
+ * [`AbortSignal.any`](https://developer.mozilla.org/en-US/docs/Web/API/AbortSignal/any_static).
+ */
+export declare function abortSignalsAnyPonyfill(signals: AbortSignal[]): AbortSignal;
 export {};
 //# sourceMappingURL=utils.d.ts.map

package/dist/unstable-core-do-not-import/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/unstable-core-do-not-import/utils.ts"],"names":[],"mappings":"AAAA,gBAAgB;AAChB,eAAO,MAAM,WAAW,eAAW,CAAC;AACpC,MAAM,MAAM,WAAW,GAAG,OAAO,WAAW,CAAC;AAE7C;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,KAAK,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACzE,IAAI,EAAE,KAAK,EACX,GAAG,IAAI,EAAE,OAAO,CAAC,KAAK,CAAC,EAAE,GACxB,KAAK,CAYP;AAED;;;GAGG;AACH,wBAAgB,QAAQ,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAEzE;AAED,KAAK,KAAK,GAAG,CAAC,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,GAAG,EAAE,OAAO,CAAC,CAAC;AACxE,wBAAgB,UAAU,CAAC,EAAE,EAAE,OAAO,GAAG,EAAE,IAAI,KAAK,CAEnD;AAED;;;GAGG;AACH,wBAAgB,aAAa,CAAC,IAAI,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAChE,GAAG,EAAE,IAAI,GACR,IAAI,CAEN;AAKD,wBAAgB,eAAe,CAAC,MAAM,EACpC,KAAK,EAAE,OAAO,GACb,KAAK,IAAI,aAAa,CAAC,MAAM,CAAC,CAIhC;AAED;;GAEG;AACH,eAAO,MAAM,GAAG,GAAI,MAAM,MAAM,MAAM,MAAM,KAAG,MAAc,CAAC;AAG9D,wBAAgB,IAAI,IAAI,IAAI,CAAG;AAE/B,wBAAgB,QAAQ,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,GAAG,CAAC,CAEpC"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/unstable-core-do-not-import/utils.ts"],"names":[],"mappings":"AAAA,gBAAgB;AAChB,eAAO,MAAM,WAAW,eAAW,CAAC;AACpC,MAAM,MAAM,WAAW,GAAG,OAAO,WAAW,CAAC;AAE7C;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,KAAK,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACzE,IAAI,EAAE,KAAK,EACX,GAAG,IAAI,EAAE,OAAO,CAAC,KAAK,CAAC,EAAE,GACxB,KAAK,CAYP;AAED;;;GAGG;AACH,wBAAgB,QAAQ,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAEzE;AAED,KAAK,KAAK,GAAG,CAAC,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,GAAG,EAAE,OAAO,CAAC,CAAC;AACxE,wBAAgB,UAAU,CAAC,EAAE,EAAE,OAAO,GAAG,EAAE,IAAI,KAAK,CAEnD;AAED;;;GAGG;AACH,wBAAgB,aAAa,CAAC,IAAI,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAChE,GAAG,EAAE,IAAI,GACR,IAAI,CAEN;AAKD,wBAAgB,eAAe,CAAC,MAAM,EACpC,KAAK,EAAE,OAAO,GACb,KAAK,IAAI,aAAa,CAAC,MAAM,CAAC,CAIhC;AAED;;GAEG;AACH,eAAO,MAAM,GAAG,GAAI,MAAM,MAAM,MAAM,MAAM,KAAG,MAAc,CAAC;AAG9D,wBAAgB,IAAI,IAAI,IAAI,CAAG;AAE/B,wBAAgB,QAAQ,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,GAAG,CAAC,CAEpC;AAED;;;;;GAKG;AACH,wBAAgB,MAAM,CACpB,SAAS,EAAE,OAAO,EAClB,GAAG,SAAuB,GACzB,OAAO,CAAC,SAAS,CAInB;AAED,wBAAgB,KAAK,CAAC,EAAE,SAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAE3C;AAED;;;GAGG;AACH,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,WAAW,EAAE,GAAG,WAAW,CAuB3E"}

package/dist/unstable-core-do-not-import/utils.js

@@ -43,7 +43,47 @@ function noop() {}
 function identity(it) {
     return it;
 }
+/**
+ * Generic runtime assertion function. Throws, if the condition is not `true`.
+ *
+ * Can be used as a slightly less dangerous variant of type assertions. Code
+ * mistakes would be revealed at runtime then (hopefully during testing).
+ */ function assert(condition, msg = 'no additional info') {
+    if (!condition) {
+        throw new Error(`AssertionError: ${msg}`);
+    }
+}
+function sleep(ms = 0) {
+    return new Promise((res)=>setTimeout(res, ms));
+}
+/**
+ * Ponyfill for
+ * [`AbortSignal.any`](https://developer.mozilla.org/en-US/docs/Web/API/AbortSignal/any_static).
+ */ function abortSignalsAnyPonyfill(signals) {
+    if (typeof AbortSignal.any === 'function') {
+        return AbortSignal.any(signals);
+    }
+    const ac = new AbortController();
+    for (const signal of signals){
+        if (signal.aborted) {
+            trigger();
+        } else if (!ac.signal.aborted) {
+            signal.addEventListener('abort', trigger, {
+                once: true
+            });
+        }
+    }
+    return ac.signal;
+    function trigger() {
+        ac.abort();
+        for (const signal of signals){
+            signal.removeEventListener('abort', trigger);
+        }
+    }
+}
 
+exports.abortSignalsAnyPonyfill = abortSignalsAnyPonyfill;
+exports.assert = assert;
 exports.identity = identity;
 exports.isAsyncIterable = isAsyncIterable;
 exports.isFunction = isFunction;
@@ -52,4 +92,5 @@ exports.mergeWithoutOverrides = mergeWithoutOverrides;
 exports.noop = noop;
 exports.omitPrototype = omitPrototype;
 exports.run = run;
+exports.sleep = sleep;
 exports.unsetMarker = unsetMarker;

package/dist/unstable-core-do-not-import/utils.mjs

@@ -41,5 +41,43 @@ function noop() {}
 function identity(it) {
     return it;
 }
+/**
+ * Generic runtime assertion function. Throws, if the condition is not `true`.
+ *
+ * Can be used as a slightly less dangerous variant of type assertions. Code
+ * mistakes would be revealed at runtime then (hopefully during testing).
+ */ function assert(condition, msg = 'no additional info') {
+    if (!condition) {
+        throw new Error(`AssertionError: ${msg}`);
+    }
+}
+function sleep(ms = 0) {
+    return new Promise((res)=>setTimeout(res, ms));
+}
+/**
+ * Ponyfill for
+ * [`AbortSignal.any`](https://developer.mozilla.org/en-US/docs/Web/API/AbortSignal/any_static).
+ */ function abortSignalsAnyPonyfill(signals) {
+    if (typeof AbortSignal.any === 'function') {
+        return AbortSignal.any(signals);
+    }
+    const ac = new AbortController();
+    for (const signal of signals){
+        if (signal.aborted) {
+            trigger();
+        } else if (!ac.signal.aborted) {
+            signal.addEventListener('abort', trigger, {
+                once: true
+            });
+        }
+    }
+    return ac.signal;
+    function trigger() {
+        ac.abort();
+        for (const signal of signals){
+            signal.removeEventListener('abort', trigger);
+        }
+    }
+}
 
-export { identity, isAsyncIterable, isFunction, isObject, mergeWithoutOverrides, noop, omitPrototype, run, unsetMarker };
+export { abortSignalsAnyPonyfill, assert, identity, isAsyncIterable, isFunction, isObject, mergeWithoutOverrides, noop, omitPrototype, run, sleep, unsetMarker };

package/dist/unstable-core-do-not-import.js

@@ -78,6 +78,8 @@ exports.defaultTransformer = transformer.defaultTransformer;
 exports.getDataTransformer = transformer.getDataTransformer;
 exports.transformResult = transformer.transformResult;
 exports.transformTRPCResponse = transformer.transformTRPCResponse;
+exports.abortSignalsAnyPonyfill = utils.abortSignalsAnyPonyfill;
+exports.assert = utils.assert;
 exports.identity = utils.identity;
 exports.isAsyncIterable = utils.isAsyncIterable;
 exports.isFunction = utils.isFunction;
@@ -86,4 +88,5 @@ exports.mergeWithoutOverrides = utils.mergeWithoutOverrides;
 exports.noop = utils.noop;
 exports.omitPrototype = utils.omitPrototype;
 exports.run = utils.run;
+exports.sleep = utils.sleep;
 exports.unsetMarker = utils.unsetMarker;

package/dist/unstable-core-do-not-import.mjs

@@ -24,4 +24,4 @@ export { sseHeaders, sseStreamConsumer, sseStreamProducer } from './unstable-cor
 export { isTrackedEnvelope, sse, tracked } from './unstable-core-do-not-import/stream/tracked.mjs';
 export { createDeferred } from './unstable-core-do-not-import/stream/utils/createDeferred.mjs';
 export { defaultTransformer, getDataTransformer, transformResult, transformTRPCResponse } from './unstable-core-do-not-import/transformer.mjs';
-export { identity, isAsyncIterable, isFunction, isObject, mergeWithoutOverrides, noop, omitPrototype, run, unsetMarker } from './unstable-core-do-not-import/utils.mjs';
+export { abortSignalsAnyPonyfill, assert, identity, isAsyncIterable, isFunction, isObject, mergeWithoutOverrides, noop, omitPrototype, run, sleep, unsetMarker } from './unstable-core-do-not-import/utils.mjs';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trpc/server",
-  "version": "11.0.0-rc.589+79fa074bd",
+  "version": "11.0.0-rc.590+3621497e1",
   "description": "The tRPC server library",
   "author": "KATT",
   "license": "MIT",
@@ -149,5 +149,5 @@
   "funding": [
     "https://trpc.io/sponsor"
   ],
-  "gitHead": "79fa074bd4ab01e2eebca47fe41fb1aeea87f24e"
+  "gitHead": "3621497e1a831537d3c864074656a09527cefba5"
 }

package/src/unstable-core-do-not-import/http/resolveResponse.ts

@@ -15,7 +15,7 @@ import type { TRPCResponse } from '../rpc';
 import { isPromise, jsonlStreamProducer } from '../stream/jsonl';
 import { sseHeaders, sseStreamProducer } from '../stream/sse';
 import { transformTRPCResponse } from '../transformer';
-import { isAsyncIterable, isObject } from '../utils';
+import { abortSignalsAnyPonyfill, assert, isAsyncIterable, isObject } from '../utils';
 import { getRequestInfo } from './contentType';
 import { getHTTPStatusCode } from './getHTTPStatusCode';
 import type {
@@ -260,9 +260,13 @@ export async function resolveResponse<TRouter extends AnyRouter>(
       });
     }
 
+    interface RPCResultOk {
+      data: unknown;
+      abortCtrl?: AbortController;
+    }
     type RPCResult =
       | [result: null, error: TRPCError]
-      | [result: unknown, error?: never];
+      | [result: RPCResultOk, error?: never];
     const rpcCalls = info.calls.map(async (call): Promise<RPCResult> => {
       const proc = call.procedure;
       try {
@@ -279,21 +283,28 @@ export async function resolveResponse<TRouter extends AnyRouter>(
             message: `Unsupported ${req.method}-request to ${proc._def.type} procedure at path "${call.path}"`,
           });
         }
-        /* istanbul ignore if -- @preserve */
-        if (proc._def.type === 'subscription' && info!.isBatchCall) {
-          throw new TRPCError({
-            code: 'BAD_REQUEST',
-            message: `Cannot batch subscription calls`,
-          });
+        let abortCtrl: AbortController | undefined;
+        if (proc._def.type === 'subscription') {
+          /* istanbul ignore if -- @preserve */
+          if (info!.isBatchCall) {
+            throw new TRPCError({
+              code: 'BAD_REQUEST',
+              message: `Cannot batch subscription calls`,
+            });
+          }
+          abortCtrl = new AbortController();
         }
+
         const data: unknown = await proc({
           path: call.path,
           getRawInput: call.getRawInput,
           ctx,
           type: proc._def.type,
-          signal: opts.req.signal,
+          signal: abortCtrl
+            ? abortSignalsAnyPonyfill([opts.req.signal, abortCtrl.signal])
+            : opts.req.signal,
         });
-        return [data];
+        return [{ data, abortCtrl }];
       } catch (cause) {
         const error = getTRPCErrorFromUnknown(cause);
         const input = call.result();
@@ -314,7 +325,7 @@ export async function resolveResponse<TRouter extends AnyRouter>(
     // ----------- response handlers -----------
     if (!info.isBatchCall) {
       const [call] = info.calls;
-      const [data, error] = await rpcCalls[0]!;
+      const [result, error] = await rpcCalls[0]!;
 
       switch (info.type) {
         case 'unknown':
@@ -323,7 +334,7 @@ export async function resolveResponse<TRouter extends AnyRouter>(
           // httpLink
           headers.set('content-type', 'application/json');
 
-          if (isDataStream(data)) {
+          if (isDataStream(result?.data)) {
             throw new TRPCError({
               code: 'UNSUPPORTED_MEDIA_TYPE',
               message:
@@ -341,7 +352,7 @@ export async function resolveResponse<TRouter extends AnyRouter>(
                   type: info.type,
                 }),
               }
-            : { result: { data } };
+            : { result: { data: result.data } };
 
           const headResponse = initResponse({
             ctx,
@@ -372,6 +383,11 @@ export async function resolveResponse<TRouter extends AnyRouter>(
           if (error) {
             throw error;
           }
+          const { data, abortCtrl } = result;
+          assert(
+            abortCtrl !== undefined,
+            'subscription type must have an AbortController',
+          );
 
           if (!isObservable(data) && !isAsyncIterable(data)) {
             throw new TRPCError({
@@ -388,6 +404,7 @@ export async function resolveResponse<TRouter extends AnyRouter>(
           const stream = sseStreamProducer({
             ...config.experimental?.sseSubscriptions,
             data: dataAsIterable,
+            abortCtrl,
             serialize: (v) => config.transformer.output.serialize(v),
             formatError(errorOpts) {
               const error = getTRPCErrorFromUnknown(errorOpts.error);
@@ -481,17 +498,18 @@ export async function resolveResponse<TRouter extends AnyRouter>(
               }),
             };
           }
+          const { data } = result;
 
           /**
            * Not very pretty, but we need to wrap nested data in promises
            * Our stream producer will only resolve top-level async values or async values that are directly nested in another async value
            */
-          const data = isObservable(result)
-            ? observableToAsyncIterable(result)
-            : Promise.resolve(result);
+          const dataAsPromiseOrIterable = isObservable(data)
+            ? observableToAsyncIterable(data)
+            : Promise.resolve(data);
           return {
             result: Promise.resolve({
-              data,
+              data: dataAsPromiseOrIterable,
             }),
           };
         }),
@@ -539,12 +557,12 @@ export async function resolveResponse<TRouter extends AnyRouter>(
     headers.set('content-type', 'application/json');
     const results: RPCResult[] = (await Promise.all(rpcCalls)).map(
       (res): RPCResult => {
-        const [data, error] = res;
+        const [result, error] = res;
         if (error) {
           return res;
         }
 
-        if (isDataStream(data)) {
+        if (isDataStream(result.data)) {
           return [
             null,
             new TRPCError({
@@ -559,7 +577,7 @@ export async function resolveResponse<TRouter extends AnyRouter>(
     );
     const resultAsRPCResponse = results.map(
       (
-        [data, error],
+        [result, error],
         index,
       ): TRPCResponse<unknown, inferRouterError<TRouter>> => {
         const call = info!.calls[index]!;
@@ -576,7 +594,7 @@ export async function resolveResponse<TRouter extends AnyRouter>(
           };
         }
         return {
-          result: { data },
+          result: { data: result.data },
         };
       },
     );

package/src/unstable-core-do-not-import/stream/sse.ts

@@ -32,6 +32,7 @@ export interface PingOptions {
 export interface SSEStreamProducerOptions<TValue = unknown> {
   serialize?: Serialize;
   data: AsyncIterable<TValue>;
+  abortCtrl: AbortController;
   maxDepth?: number;
   ping?: PingOptions;
   /**
@@ -61,7 +62,9 @@ type SSEvent = Partial<{
  *
  * @see https://html.spec.whatwg.org/multipage/server-sent-events.html
  */
-export function sseStreamProducer<TValue = unknown>(opts: SSEStreamProducerOptions<TValue>) {
+export function sseStreamProducer<TValue = unknown>(
+  opts: SSEStreamProducerOptions<TValue>,
+) {
   const stream = createReadableStream<SSEvent>();
   stream.controller.enqueue({ comment: 'connected' });
 
@@ -74,11 +77,15 @@ export function sseStreamProducer<TValue = unknown>(opts: SSEStreamProducerOptio
 
   run(async () => {
     let iterable: AsyncIterable<TValue | typeof PING_SYM> = opts.data;
-    
+
     iterable = withCancel(iterable, stream.cancelledPromise);
 
     if (opts.emitAndEndImmediately) {
-      iterable = takeWithGrace(iterable, { count: 1, gracePeriodMs: 1 });
+      iterable = takeWithGrace(iterable, {
+        count: 1,
+        gracePeriodMs: 1,
+        onCancel: () => opts.abortCtrl.abort(),
+      });
     }
 
     let maxDurationTimer: PromiseTimer | null = null;
@@ -88,7 +95,10 @@ export function sseStreamProducer<TValue = unknown>(opts: SSEStreamProducerOptio
       opts.maxDurationMs !== Infinity
     ) {
       maxDurationTimer = createPromiseTimer(opts.maxDurationMs).start();
-      iterable = withCancel(iterable, maxDurationTimer.promise);
+      iterable = withCancel(
+        iterable,
+        maxDurationTimer.promise.then(() => opts.abortCtrl.abort()),
+      );
     }
 
     if (ping.enabled && ping.intervalMs !== Infinity && ping.intervalMs > 0) {