@trpc/server 11.8.0 → 11.8.1-canary.10

package/dist/{resolveResponse-BGrZsJDx.cjs → resolveResponse-ByfQ6olt.cjs}

@@ -1,13 +1,13 @@
-const require_getErrorShape = require('./getErrorShape-BRalpqpM.cjs');
-const require_tracked = require('./tracked-BJKHs06u.cjs');
-const require_utils = require('./utils-BqXzm3RP.cjs');
+const require_getErrorShape = require('./getErrorShape-MR4DZeb7.cjs');
+const require_codes = require('./codes-BfZsPdy-.cjs');
+const require_tracked = require('./tracked-D4WGA_Z-.cjs');
 const require_observable = require('./observable-B1Nk6r1H.cjs');
 
 //#region src/unstable-core-do-not-import/http/parseConnectionParams.ts
 function parseConnectionParamsFromUnknown(parsed) {
 	try {
 		if (parsed === null) return null;
-		if (!require_utils.isObject(parsed)) throw new Error("Expected object");
+		if (!require_codes.isObject(parsed)) throw new Error("Expected object");
 		const nonStringValues = Object.entries(parsed).filter(([_key, value]) => typeof value !== "string");
 		if (nonStringValues.length > 0) throw new Error(`Expected connectionParams to be string values. Got ${nonStringValues.map(([key, value]) => `${key}: ${typeof value}`).join(", ")}`);
 		return parsed;
@@ -81,13 +81,17 @@ const jsonContentTypeHandler = {
 				const queryInput = opts.searchParams.get("input");
 				if (queryInput) inputs = JSON.parse(queryInput);
 			} else inputs = await req.json();
-			if (inputs === void 0) return {};
-			if (!isBatchCall) return { 0: opts.router._def._config.transformer.input.deserialize(inputs) };
-			if (!require_utils.isObject(inputs)) throw new require_tracked.TRPCError({
+			if (inputs === void 0) return require_codes.emptyObject();
+			if (!isBatchCall) {
+				const result = require_codes.emptyObject();
+				result[0] = opts.router._def._config.transformer.input.deserialize(inputs);
+				return result;
+			}
+			if (!require_codes.isObject(inputs)) throw new require_tracked.TRPCError({
 				code: "BAD_REQUEST",
 				message: "\"input\" needs to be an object when doing a batch call"
 			});
-			const acc = {};
+			const acc = require_codes.emptyObject();
 			for (const index of paths.keys()) {
 				const input = inputs[index];
 				if (input !== void 0) acc[index] = opts.router._def._config.transformer.input.deserialize(input);
@@ -105,7 +109,7 @@ const jsonContentTypeHandler = {
 					if ((procedure === null || procedure === void 0 ? void 0 : procedure._def.type) === "subscription") {
 						var _ref, _opts$headers$get;
 						const lastEventId = (_ref = (_opts$headers$get = opts.headers.get("last-event-id")) !== null && _opts$headers$get !== void 0 ? _opts$headers$get : opts.searchParams.get("lastEventId")) !== null && _ref !== void 0 ? _ref : opts.searchParams.get("Last-Event-Id");
-						if (lastEventId) if (require_utils.isObject(input)) input = (0, import_objectSpread2$1.default)((0, import_objectSpread2$1.default)({}, input), {}, { lastEventId });
+						if (lastEventId) if (require_codes.isObject(input)) input = (0, import_objectSpread2$1.default)((0, import_objectSpread2$1.default)({}, input), {}, { lastEventId });
 						else {
 							var _input;
 							(_input = input) !== null && _input !== void 0 || (input = { lastEventId });
@@ -226,7 +230,7 @@ async function getRequestInfo(opts) {
 //#endregion
 //#region src/unstable-core-do-not-import/http/abortError.ts
 function isAbortError(error) {
-	return require_utils.isObject(error) && error["name"] === "AbortError";
+	return require_codes.isObject(error) && error["name"] === "AbortError";
 }
 function throwAbortError(message = "AbortError") {
 	throw new DOMException(message, "AbortError");
@@ -708,49 +712,20 @@ function iteratorResource(iterable) {
 	});
 }
 /**
-* Derives a new {@link AsyncGenerator} based on {@link iterable}, that automatically aborts after the specified duration.
-*/
-function withMaxDuration(_x, _x2) {
-	return _withMaxDuration.apply(this, arguments);
-}
-function _withMaxDuration() {
-	_withMaxDuration = (0, import_wrapAsyncGenerator$5.default)(function* (iterable, opts) {
-		try {
-			var _usingCtx$1 = (0, import_usingCtx$4.default)();
-			const iterator = _usingCtx$1.a(iteratorResource(iterable));
-			const timer = _usingCtx$1.u(timerResource(opts.maxDurationMs));
-			const timerPromise = timer.start();
-			let result;
-			while (true) {
-				result = yield (0, import_awaitAsyncGenerator$4.default)(Unpromise.race([iterator.next(), timerPromise]));
-				if (result === disposablePromiseTimerResult) throwAbortError();
-				if (result.done) return result;
-				yield result.value;
-				result = null;
-			}
-		} catch (_) {
-			_usingCtx$1.e = _;
-		} finally {
-			yield (0, import_awaitAsyncGenerator$4.default)(_usingCtx$1.d());
-		}
-	});
-	return _withMaxDuration.apply(this, arguments);
-}
-/**
 * 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 aborts.
 */
-function takeWithGrace(_x3, _x4) {
+function takeWithGrace(_x, _x2) {
 	return _takeWithGrace.apply(this, arguments);
 }
 function _takeWithGrace() {
 	_takeWithGrace = (0, import_wrapAsyncGenerator$5.default)(function* (iterable, opts) {
 		try {
-			var _usingCtx3 = (0, import_usingCtx$4.default)();
-			const iterator = _usingCtx3.a(iteratorResource(iterable));
+			var _usingCtx$1 = (0, import_usingCtx$4.default)();
+			const iterator = _usingCtx$1.a(iteratorResource(iterable));
 			let result;
-			const timer = _usingCtx3.u(timerResource(opts.gracePeriodMs));
+			const timer = _usingCtx$1.u(timerResource(opts.gracePeriodMs));
 			let count = opts.count;
 			let timerPromise = new Promise(() => {});
 			while (true) {
@@ -762,9 +737,9 @@ function _takeWithGrace() {
 				result = null;
 			}
 		} catch (_) {
-			_usingCtx3.e = _;
+			_usingCtx$1.e = _;
 		} finally {
-			yield (0, import_awaitAsyncGenerator$4.default)(_usingCtx3.d());
+			yield (0, import_awaitAsyncGenerator$4.default)(_usingCtx$1.d());
 		}
 	});
 	return _takeWithGrace.apply(this, arguments);
@@ -1069,7 +1044,7 @@ const ASYNC_ITERABLE_STATUS_RETURN = 0;
 const ASYNC_ITERABLE_STATUS_YIELD = 1;
 const ASYNC_ITERABLE_STATUS_ERROR = 2;
 function isPromise(value) {
-	return (require_utils.isObject(value) || require_utils.isFunction(value)) && typeof (value === null || value === void 0 ? void 0 : value["then"]) === "function" && typeof (value === null || value === void 0 ? void 0 : value["catch"]) === "function";
+	return (require_codes.isObject(value) || require_codes.isFunction(value)) && typeof (value === null || value === void 0 ? void 0 : value["then"]) === "function" && typeof (value === null || value === void 0 ? void 0 : value["catch"]) === "function";
 }
 var MaxDepthError = class extends Error {
 	constructor(path) {
@@ -1191,7 +1166,7 @@ function _createBatchStreamProducer() {
 		}
 		function encodeAsync(value, path) {
 			if (isPromise(value)) return [CHUNK_VALUE_TYPE_PROMISE, encodePromise(value, path)];
-			if (require_utils.isAsyncIterable(value)) {
+			if (require_codes.isAsyncIterable(value)) {
 				if (opts.maxDepth && path.length >= opts.maxDepth) throw new Error("Max depth reached");
 				return [CHUNK_VALUE_TYPE_ASYNC_ITERABLE, encodeAsyncIterable(value, path)];
 			}
@@ -1202,7 +1177,7 @@ function _createBatchStreamProducer() {
 			const reg = encodeAsync(value, path);
 			if (reg) return [[placeholder], [null, ...reg]];
 			if (!isPlainObject(value)) return [[value]];
-			const newObj = {};
+			const newObj = require_codes.emptyObject();
 			const asyncValues = [];
 			for (const [key, item] of Object.entries(value)) {
 				const transformed = encodeAsync(item, [...path, key]);
@@ -1215,7 +1190,7 @@ function _createBatchStreamProducer() {
 			}
 			return [[newObj], ...asyncValues];
 		}
-		const newHead = {};
+		const newHead = require_codes.emptyObject();
 		for (const [key, item] of Object.entries(data)) newHead[key] = encode(item, [key]);
 		yield newHead;
 		let iterable = mergedIterables;
@@ -1401,7 +1376,7 @@ async function jsonlStreamConsumer(opts) {
 		const [_path, type, chunkId] = value;
 		const controller = streamManager.getOrCreate(chunkId);
 		switch (type) {
-			case CHUNK_VALUE_TYPE_PROMISE: return require_utils.run(async () => {
+			case CHUNK_VALUE_TYPE_PROMISE: return require_codes.run(async () => {
 				try {
 					var _usingCtx3 = (0, import_usingCtx$1.default)();
 					const reader = _usingCtx3.u(controller.getReaderResource());
@@ -1419,7 +1394,7 @@ async function jsonlStreamConsumer(opts) {
 					_usingCtx3.d();
 				}
 			});
-			case CHUNK_VALUE_TYPE_ASYNC_ITERABLE: return require_utils.run((0, import_wrapAsyncGenerator$2.default)(function* () {
+			case CHUNK_VALUE_TYPE_ASYNC_ITERABLE: return require_codes.run((0, import_wrapAsyncGenerator$2.default)(function* () {
 				try {
 					var _usingCtx4 = (0, import_usingCtx$1.default)();
 					const reader = _usingCtx4.u(controller.getReaderResource());
@@ -1530,7 +1505,7 @@ const RETURN_EVENT = "return";
 */
 function sseStreamProducer(opts) {
 	var _opts$ping$enabled, _opts$ping, _opts$ping$intervalMs, _opts$ping2, _opts$client;
-	const { serialize = require_utils.identity } = opts;
+	const { serialize = require_codes.identity } = opts;
 	const ping = {
 		enabled: (_opts$ping$enabled = (_opts$ping = opts.ping) === null || _opts$ping === void 0 ? void 0 : _opts$ping.enabled) !== null && _opts$ping$enabled !== void 0 ? _opts$ping$enabled : false,
 		intervalMs: (_opts$ping$intervalMs = (_opts$ping2 = opts.ping) === null || _opts$ping2 === void 0 ? void 0 : _opts$ping2.intervalMs) !== null && _opts$ping$intervalMs !== void 0 ? _opts$ping$intervalMs : 1e3
@@ -1551,7 +1526,6 @@ function sseStreamProducer(opts) {
 				count: 1,
 				gracePeriodMs: 1
 			});
-			if (opts.maxDurationMs && opts.maxDurationMs > 0 && opts.maxDurationMs !== Infinity) iterable = withMaxDuration(iterable, { maxDurationMs: opts.maxDurationMs });
 			if (ping.enabled && ping.intervalMs !== Infinity && ping.intervalMs > 0) iterable = withPing(iterable, ping.intervalMs);
 			let value;
 			let chunk;
@@ -1643,7 +1617,7 @@ async function withTimeout(opts) {
 */
 function sseStreamConsumer(opts) {
 	const { deserialize = (v) => v } = opts;
-	let clientOptions = {};
+	let clientOptions = require_codes.emptyObject();
 	const signal = opts.signal;
 	let _es = null;
 	const createStream = () => new ReadableStream({
@@ -1734,7 +1708,7 @@ function sseStreamConsumer(opts) {
 			}
 		}, dispose);
 	};
-	return require_utils.run((0, import_wrapAsyncGenerator$1.default)(function* () {
+	return require_codes.run((0, import_wrapAsyncGenerator$1.default)(function* () {
 		try {
 			var _usingCtx3 = (0, import_usingCtx.default)();
 			const stream = _usingCtx3.a(getStreamResource());
@@ -1780,10 +1754,18 @@ const sseHeaders = {
 var import_wrapAsyncGenerator = require_getErrorShape.__toESM(require_wrapAsyncGenerator(), 1);
 var import_objectSpread2 = require_getErrorShape.__toESM(require_getErrorShape.require_objectSpread2(), 1);
 function errorToAsyncIterable(err) {
-	return require_utils.run((0, import_wrapAsyncGenerator.default)(function* () {
+	return require_codes.run((0, import_wrapAsyncGenerator.default)(function* () {
 		throw err;
 	}));
 }
+function combinedAbortController(signal) {
+	const controller = new AbortController();
+	const combinedSignal = require_codes.abortSignalsAnyPonyfill([signal, controller.signal]);
+	return {
+		signal: combinedSignal,
+		controller
+	};
+}
 const TYPE_ACCEPTED_METHOD_MAP = {
 	mutation: ["POST"],
 	query: ["GET"],
@@ -1857,9 +1839,9 @@ function caughtErrorToData(cause, errorOpts) {
 * - if it's an object with async iterables or promises
 */
 function isDataStream(v) {
-	if (!require_utils.isObject(v)) return false;
-	if (require_utils.isAsyncIterable(v)) return true;
-	return Object.values(v).some(isPromise) || Object.values(v).some(require_utils.isAsyncIterable);
+	if (!require_codes.isObject(v)) return false;
+	if (require_codes.isAsyncIterable(v)) return true;
+	return Object.values(v).some(isPromise) || Object.values(v).some(require_codes.isAsyncIterable);
 }
 async function resolveResponse(opts) {
 	var _ref, _opts$allowBatching, _opts$batching, _opts$allowMethodOver, _config$sse$enabled, _config$sse;
@@ -1870,7 +1852,7 @@ async function resolveResponse(opts) {
 	if (req.method === "HEAD") return new Response(null, { status: 204 });
 	const allowBatching = (_ref = (_opts$allowBatching = opts.allowBatching) !== null && _opts$allowBatching !== void 0 ? _opts$allowBatching : (_opts$batching = opts.batching) === null || _opts$batching === void 0 ? void 0 : _opts$batching.enabled) !== null && _ref !== void 0 ? _ref : true;
 	const allowMethodOverride = ((_opts$allowMethodOver = opts.allowMethodOverride) !== null && _opts$allowMethodOver !== void 0 ? _opts$allowMethodOver : false) && req.method === "POST";
-	const infoTuple = await require_utils.run(async () => {
+	const infoTuple = await require_codes.run(async () => {
 		try {
 			return [void 0, await getRequestInfo({
 				req,
@@ -1884,7 +1866,7 @@ async function resolveResponse(opts) {
 			return [require_tracked.getTRPCErrorFromUnknown(cause), void 0];
 		}
 	});
-	const ctxManager = require_utils.run(() => {
+	const ctxManager = require_codes.run(() => {
 		let result = void 0;
 		return {
 			valueOrUndefined: () => {
@@ -1928,6 +1910,7 @@ async function resolveResponse(opts) {
 		await ctxManager.create(info);
 		const rpcCalls = info.calls.map(async (call) => {
 			const proc = call.procedure;
+			const combinedAbort = combinedAbortController(opts.req.signal);
 			try {
 				if (opts.error) throw opts.error;
 				if (!proc) throw new require_tracked.TRPCError({
@@ -1939,18 +1922,28 @@ async function resolveResponse(opts) {
 					message: `Unsupported ${req.method}-request to ${proc._def.type} procedure at path "${call.path}"`
 				});
 				if (proc._def.type === "subscription") {
+					var _config$sse2;
 					/* istanbul ignore if -- @preserve */
 					if (info.isBatchCall) throw new require_tracked.TRPCError({
 						code: "BAD_REQUEST",
 						message: `Cannot batch subscription calls`
 					});
+					if ((_config$sse2 = config.sse) === null || _config$sse2 === void 0 ? void 0 : _config$sse2.maxDurationMs) {
+						function cleanup() {
+							clearTimeout(timer);
+							combinedAbort.signal.removeEventListener("abort", cleanup);
+							combinedAbort.controller.abort();
+						}
+						const timer = setTimeout(cleanup, config.sse.maxDurationMs);
+						combinedAbort.signal.addEventListener("abort", cleanup);
+					}
 				}
 				const data = await proc({
 					path: call.path,
 					getRawInput: call.getRawInput,
 					ctx: ctxManager.value(),
 					type: proc._def.type,
-					signal: opts.req.signal
+					signal: combinedAbort.signal
 				});
 				return [void 0, { data }];
 			} catch (cause) {
@@ -2002,13 +1995,13 @@ async function resolveResponse(opts) {
 					});
 				}
 				case "subscription": {
-					const iterable = require_utils.run(() => {
+					const iterable = require_codes.run(() => {
 						if (error) return errorToAsyncIterable(error);
 						if (!experimentalSSE) return errorToAsyncIterable(new require_tracked.TRPCError({
 							code: "METHOD_NOT_SUPPORTED",
 							message: "Missing experimental flag \"sseSubscriptions\""
 						}));
-						if (!require_observable.isObservable(result.data) && !require_utils.isAsyncIterable(result.data)) return errorToAsyncIterable(new require_tracked.TRPCError({
+						if (!require_observable.isObservable(result.data) && !require_codes.isAsyncIterable(result.data)) return errorToAsyncIterable(new require_tracked.TRPCError({
 							message: `Subscription ${call.path} did not return an observable or a AsyncGenerator`,
 							code: "INTERNAL_SERVER_ERROR"
 						}));
@@ -2310,10 +2303,4 @@ Object.defineProperty(exports, 'throwAbortError', {
   get: function () {
     return throwAbortError;
   }
-});
-Object.defineProperty(exports, 'withMaxDuration', {
-  enumerable: true,
-  get: function () {
-    return withMaxDuration;
-  }
 });

package/dist/{resolveResponse-D7zvnoIM.mjs → resolveResponse-C7AcnFLN.mjs}

@@ -1,6 +1,6 @@
-import { __commonJS, __toESM, getErrorShape, getHTTPStatusCode, require_defineProperty, require_objectSpread2 } from "./getErrorShape-BH60iMC2.mjs";
-import { TRPCError, getProcedureAtPath, getTRPCErrorFromUnknown, isTrackedEnvelope, transformTRPCResponse } from "./tracked-DBSMdVzR.mjs";
-import { identity, isAsyncIterable, isFunction, isObject, run } from "./utils-CLZnJdb_.mjs";
+import { __commonJS, __toESM, getErrorShape, getHTTPStatusCode, require_defineProperty, require_objectSpread2 } from "./getErrorShape-vC8mUXJD.mjs";
+import { abortSignalsAnyPonyfill, emptyObject, identity, isAsyncIterable, isFunction, isObject, run } from "./codes-DagpWZLc.mjs";
+import { TRPCError, getProcedureAtPath, getTRPCErrorFromUnknown, isTrackedEnvelope, transformTRPCResponse } from "./tracked-D4V22yc5.mjs";
 import { isObservable, observableToAsyncIterable } from "./observable-UMO3vUa_.mjs";
 
 //#region src/unstable-core-do-not-import/http/parseConnectionParams.ts
@@ -81,13 +81,17 @@ const jsonContentTypeHandler = {
 				const queryInput = opts.searchParams.get("input");
 				if (queryInput) inputs = JSON.parse(queryInput);
 			} else inputs = await req.json();
-			if (inputs === void 0) return {};
-			if (!isBatchCall) return { 0: opts.router._def._config.transformer.input.deserialize(inputs) };
+			if (inputs === void 0) return emptyObject();
+			if (!isBatchCall) {
+				const result = emptyObject();
+				result[0] = opts.router._def._config.transformer.input.deserialize(inputs);
+				return result;
+			}
 			if (!isObject(inputs)) throw new TRPCError({
 				code: "BAD_REQUEST",
 				message: "\"input\" needs to be an object when doing a batch call"
 			});
-			const acc = {};
+			const acc = emptyObject();
 			for (const index of paths.keys()) {
 				const input = inputs[index];
 				if (input !== void 0) acc[index] = opts.router._def._config.transformer.input.deserialize(input);
@@ -708,49 +712,20 @@ function iteratorResource(iterable) {
 	});
 }
 /**
-* Derives a new {@link AsyncGenerator} based on {@link iterable}, that automatically aborts after the specified duration.
-*/
-function withMaxDuration(_x, _x2) {
-	return _withMaxDuration.apply(this, arguments);
-}
-function _withMaxDuration() {
-	_withMaxDuration = (0, import_wrapAsyncGenerator$5.default)(function* (iterable, opts) {
-		try {
-			var _usingCtx$1 = (0, import_usingCtx$4.default)();
-			const iterator = _usingCtx$1.a(iteratorResource(iterable));
-			const timer = _usingCtx$1.u(timerResource(opts.maxDurationMs));
-			const timerPromise = timer.start();
-			let result;
-			while (true) {
-				result = yield (0, import_awaitAsyncGenerator$4.default)(Unpromise.race([iterator.next(), timerPromise]));
-				if (result === disposablePromiseTimerResult) throwAbortError();
-				if (result.done) return result;
-				yield result.value;
-				result = null;
-			}
-		} catch (_) {
-			_usingCtx$1.e = _;
-		} finally {
-			yield (0, import_awaitAsyncGenerator$4.default)(_usingCtx$1.d());
-		}
-	});
-	return _withMaxDuration.apply(this, arguments);
-}
-/**
 * 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 aborts.
 */
-function takeWithGrace(_x3, _x4) {
+function takeWithGrace(_x, _x2) {
 	return _takeWithGrace.apply(this, arguments);
 }
 function _takeWithGrace() {
 	_takeWithGrace = (0, import_wrapAsyncGenerator$5.default)(function* (iterable, opts) {
 		try {
-			var _usingCtx3 = (0, import_usingCtx$4.default)();
-			const iterator = _usingCtx3.a(iteratorResource(iterable));
+			var _usingCtx$1 = (0, import_usingCtx$4.default)();
+			const iterator = _usingCtx$1.a(iteratorResource(iterable));
 			let result;
-			const timer = _usingCtx3.u(timerResource(opts.gracePeriodMs));
+			const timer = _usingCtx$1.u(timerResource(opts.gracePeriodMs));
 			let count = opts.count;
 			let timerPromise = new Promise(() => {});
 			while (true) {
@@ -762,9 +737,9 @@ function _takeWithGrace() {
 				result = null;
 			}
 		} catch (_) {
-			_usingCtx3.e = _;
+			_usingCtx$1.e = _;
 		} finally {
-			yield (0, import_awaitAsyncGenerator$4.default)(_usingCtx3.d());
+			yield (0, import_awaitAsyncGenerator$4.default)(_usingCtx$1.d());
 		}
 	});
 	return _takeWithGrace.apply(this, arguments);
@@ -1202,7 +1177,7 @@ function _createBatchStreamProducer() {
 			const reg = encodeAsync(value, path);
 			if (reg) return [[placeholder], [null, ...reg]];
 			if (!isPlainObject(value)) return [[value]];
-			const newObj = {};
+			const newObj = emptyObject();
 			const asyncValues = [];
 			for (const [key, item] of Object.entries(value)) {
 				const transformed = encodeAsync(item, [...path, key]);
@@ -1215,7 +1190,7 @@ function _createBatchStreamProducer() {
 			}
 			return [[newObj], ...asyncValues];
 		}
-		const newHead = {};
+		const newHead = emptyObject();
 		for (const [key, item] of Object.entries(data)) newHead[key] = encode(item, [key]);
 		yield newHead;
 		let iterable = mergedIterables;
@@ -1551,7 +1526,6 @@ function sseStreamProducer(opts) {
 				count: 1,
 				gracePeriodMs: 1
 			});
-			if (opts.maxDurationMs && opts.maxDurationMs > 0 && opts.maxDurationMs !== Infinity) iterable = withMaxDuration(iterable, { maxDurationMs: opts.maxDurationMs });
 			if (ping.enabled && ping.intervalMs !== Infinity && ping.intervalMs > 0) iterable = withPing(iterable, ping.intervalMs);
 			let value;
 			let chunk;
@@ -1643,7 +1617,7 @@ async function withTimeout(opts) {
 */
 function sseStreamConsumer(opts) {
 	const { deserialize = (v) => v } = opts;
-	let clientOptions = {};
+	let clientOptions = emptyObject();
 	const signal = opts.signal;
 	let _es = null;
 	const createStream = () => new ReadableStream({
@@ -1784,6 +1758,14 @@ function errorToAsyncIterable(err) {
 		throw err;
 	}));
 }
+function combinedAbortController(signal) {
+	const controller = new AbortController();
+	const combinedSignal = abortSignalsAnyPonyfill([signal, controller.signal]);
+	return {
+		signal: combinedSignal,
+		controller
+	};
+}
 const TYPE_ACCEPTED_METHOD_MAP = {
 	mutation: ["POST"],
 	query: ["GET"],
@@ -1928,6 +1910,7 @@ async function resolveResponse(opts) {
 		await ctxManager.create(info);
 		const rpcCalls = info.calls.map(async (call) => {
 			const proc = call.procedure;
+			const combinedAbort = combinedAbortController(opts.req.signal);
 			try {
 				if (opts.error) throw opts.error;
 				if (!proc) throw new TRPCError({
@@ -1939,18 +1922,28 @@ async function resolveResponse(opts) {
 					message: `Unsupported ${req.method}-request to ${proc._def.type} procedure at path "${call.path}"`
 				});
 				if (proc._def.type === "subscription") {
+					var _config$sse2;
 					/* istanbul ignore if -- @preserve */
 					if (info.isBatchCall) throw new TRPCError({
 						code: "BAD_REQUEST",
 						message: `Cannot batch subscription calls`
 					});
+					if ((_config$sse2 = config.sse) === null || _config$sse2 === void 0 ? void 0 : _config$sse2.maxDurationMs) {
+						function cleanup() {
+							clearTimeout(timer);
+							combinedAbort.signal.removeEventListener("abort", cleanup);
+							combinedAbort.controller.abort();
+						}
+						const timer = setTimeout(cleanup, config.sse.maxDurationMs);
+						combinedAbort.signal.addEventListener("abort", cleanup);
+					}
 				}
 				const data = await proc({
 					path: call.path,
 					getRawInput: call.getRawInput,
 					ctx: ctxManager.value(),
 					type: proc._def.type,
-					signal: opts.req.signal
+					signal: combinedAbort.signal
 				});
 				return [void 0, { data }];
 			} catch (cause) {
@@ -2197,5 +2190,5 @@ async function resolveResponse(opts) {
 }
 
 //#endregion
-export { Unpromise, createDeferred, getRequestInfo, isAbortError, isPromise, iteratorResource, jsonlStreamConsumer, jsonlStreamProducer, makeAsyncResource, makeResource, parseConnectionParamsFromString, parseConnectionParamsFromUnknown, require_usingCtx, resolveResponse, sseHeaders, sseStreamConsumer, sseStreamProducer, takeWithGrace, throwAbortError, withMaxDuration };
-//# sourceMappingURL=resolveResponse-D7zvnoIM.mjs.map
+export { Unpromise, createDeferred, getRequestInfo, isAbortError, isPromise, iteratorResource, jsonlStreamConsumer, jsonlStreamProducer, makeAsyncResource, makeResource, parseConnectionParamsFromString, parseConnectionParamsFromUnknown, require_usingCtx, resolveResponse, sseHeaders, sseStreamConsumer, sseStreamProducer, takeWithGrace, throwAbortError };
+//# sourceMappingURL=resolveResponse-C7AcnFLN.mjs.map