elysia 2.0.0-beta.13 → 2.0.0-beta.15

package/dist/compile/handler/jit.js

@@ -65,7 +65,7 @@ function parse(adapter, parsers, bodyVali, hasHeaders, link, report, arm) {
 			break;
 		}
 	}
-	const bodyKind = hasFn ? void 0 : bodyMediaKind(bodyVali);
+	const bodyKind = hasFn ? void 0 : schemaMediaKind(bodyVali?.schema);
 	let code = `let ct=((${hasHeaders ? "c.headers['content-type']" : "c.request.headers.get('content-type')"})||'')\nlet cti=ct.indexOf(";")
 if(cti!==-1)ct=ct.slice(0,cti)
 ` + (hasFn ? "c.contentType=ct\n" : "");
@@ -111,7 +111,6 @@ if(cti!==-1)ct=ct.slice(0,cti)
 	}
 	return hasFn ? "let hasBody=false,_bp\n" + code : code;
 }
-const bodyMediaKind = (bodyVali) => schemaMediaKind(bodyVali?.schema);
 function schemaMediaKind(schema) {
 	if (!schema || typeof schema !== "object" || "~standard" in schema) return;
 	const elyType = schema["~elyTyp"];
@@ -144,23 +143,11 @@ const createInlineHandler = (map, h) => ((c) => {
 	if (typeof r?.then === "function") return Promise.resolve(r).then((v) => map(require_handler_utils.forwardError(v), c.request, true));
 	return map(r, c.request, true);
 });
-const createInlineHandlerWithSet = (map, h) => ((c) => {
-	const r = h(c);
-	if (r instanceof Error) throw r;
-	if (typeof r?.then === "function") return Promise.resolve(r).then((v) => map(require_handler_utils.forwardError(v), c.set, c.request, true));
-	return map(r, c.set, c.request, true);
-});
-const createInlineHandlerWithDefaultHeaders = (map, h) => ((c) => {
-	require_adapter_utils.materializeSetHeaders(c.set);
-	const r = h(c);
-	if (r instanceof Error) throw r;
-	if (typeof r?.then === "function") return Promise.resolve(r).then((v) => map(require_handler_utils.forwardError(v), c.set, c.request, true));
-	return map(r, c.set, c.request, true);
-});
 function compileHandlerJit({ method, path, handler, root, errorRoot, hook, adapter, isHandleFunction, isStaticResponse, isPromiseHandler, state }) {
 	const { vali, inference, cookieConfig, beforeHandlePrefix, traceHandlers, tracePhases, hasAnyPhase, traceHandleOn, descriptor: { async: isAsync, responseMode, hasBody, bodyValiIsAsync, headersValiIsAsync, paramsValiIsAsync, queryValiIsAsync, cookieValiIsAsync: cookieValidIsAsync, responseValiAsync, hasCookieSign, syncCookieSign, asyncCookieSign, lazyCookieVerify, hasErrorHook, hasAfterResponse, hasBeforeHandle, hasAfterHandle, hasMapResponse, hasResponseValidator, hasTrace, traceCount, hasLifecycleHook, syncErrorHook, syncAfterResponse } } = state;
 	const hasStaticAfterResponse = !!hook?.afterResponse?.length;
-	const hasDynamicAfterResponse = !!inference.afterResponse;
+	const hasDeriveDispose = !!hook?.["~deriveEntries"]?.length;
+	const hasDynamicAfterResponse = !!inference.afterResponse || hasDeriveDispose;
 	const seenKeys = new Set(["rt", "fre"]);
 	const paramValues = [errorRoot, require_handler_utils.finalizeRouteError];
 	const aliasKeys = [];
@@ -182,7 +169,8 @@ function compileHandlerJit({ method, path, handler, root, errorRoot, hook, adapt
 	const abortOn = hasLifecycleHook && root["~config"]?.abortSignal !== false;
 	const abortPeek = "c['~sig']?.aborted";
 	const arm = abortOn ? "_as??=(c['~sig']??=c.request.signal)" : "";
-	const abortCheck = () => abortOn ? `if(${abortPeek})return emp.clone()\n` : "";
+	let abortSchedule = "";
+	const abortCheck = () => abortOn ? abortSchedule ? `if(${abortPeek}){${abortSchedule}return emp.clone()}\n` : `if(${abortPeek})return emp.clone()\n` : "";
 	const abortChainGuard = () => abortOn ? abortPeek : void 0;
 	const abortCatch = abortOn ? `if((${arm}).aborted)return emp.clone()\n` : "";
 	const phaseOn = (phase) => hasTrace && (tracePhases === null || tracePhases.has(phase));
@@ -224,7 +212,7 @@ function compileHandlerJit({ method, path, handler, root, errorRoot, hook, adapt
 		link(require_compile_handler_utils.armEntryAbort, "ea");
 		code += `if(ea(c))return emp.clone()\n`;
 	}
-	if ((hasAfterResponse || hasTrace) && !syncAfterResponse) code += "let _stl\n";
+	if ((hasAfterResponse || hasTrace || hasDeriveDispose) && !syncAfterResponse) code += "let _stl\n";
 	if (asyncCookieSign) code += "let _sg\n";
 	if (hasTrace) {
 		const traceProvider = require_generation.resolvedTraceOf(root) ?? require_generation.resolvedTraceOf(errorRoot);
@@ -371,18 +359,22 @@ function compileHandlerJit({ method, path, handler, root, errorRoot, hook, adapt
 		return s;
 	})() : "";
 	const traceNeedsSchedule = traceHandleOn || phaseOn("afterResponse");
-	const scheduleAfterResponse = hasAfterResponse || traceNeedsSchedule ? "c._arf=true\nqueueMicrotask(async()=>{if(_stl){try{for await(const v of _stl){}}catch{}}\n" + drainTraceStream + resolveHandlePostDrain + beginTrace("afterResponse", hook?.afterResponse?.length ?? 0) + (hasStaticAfterResponse ? require_compile_handler_utils.mapAfterResponse(hook.afterResponse, [buildReport("afterResponse")]) : "") + (hasDynamicAfterResponse ? "let _q=c['~afterResponse']\nif(_q){let _l=_q.length\nfor(let _i=0;_i<_l;_i++){try{await _q[_i](c)}catch(_e){console.error(_e)}}\n" + (!require_universal_is_production.isProduction() ? `if(_q.length!==_l)console.warn('[elysia] defer() called from inside the afterResponse drain is ignored')\n` : "") + `}\n` : "") + endTrace("afterResponse") + `})\n` : "";
+	if (hasDeriveDispose) link(require_handler_utils.drainDisposables, "dds");
+	const deriveDisposeOnly = hasDeriveDispose && !hasAfterResponse && !hasTrace;
+	const disposeGuard = deriveDisposeOnly ? "c['~dispose']&&" : "";
+	const scheduleAfterResponse = hasAfterResponse || traceNeedsSchedule || hasDeriveDispose ? (deriveDisposeOnly ? `if(c['~dispose']){\n` : "") + "c._arf=true\nqueueMicrotask(async()=>{if(_stl){try{for await(const v of _stl){}}catch{}}\n" + drainTraceStream + resolveHandlePostDrain + beginTrace("afterResponse", hook?.afterResponse?.length ?? 0) + (hasStaticAfterResponse ? require_compile_handler_utils.mapAfterResponse(hook.afterResponse, [buildReport("afterResponse")]) : "") + (hasDynamicAfterResponse ? "let _q=c['~afterResponse']\nif(_q){let _l=_q.length\nfor(let _i=0;_i<_l;_i++){try{await _q[_i](c)}catch(_e){console.error(_e)}}\n" + (!require_universal_is_production.isProduction() ? `if(_q.length!==_l)console.warn('[elysia] defer() called from inside the afterResponse drain is ignored')\n` : "") + `}\n` : "") + (hasDeriveDispose ? `await dds(c)\n` : "") + endTrace("afterResponse") + `})\n` + (deriveDisposeOnly ? `}\n` : "") : "";
 	const dedupSchedule = !!scheduleAfterResponse && !syncAfterResponse && !syncErrorHook;
 	const scheduleDecl = dedupSchedule ? `function _sc(){\n${scheduleAfterResponse}}\n` : "";
 	const schedule = dedupSchedule ? `_sc()\n` : scheduleAfterResponse;
 	const syncScheduleDecl = syncAfterResponse && scheduleAfterResponse ? `function _scf(c,_stl){\n${scheduleAfterResponse}}\n` : "";
 	const catchSchedule = dedupSchedule ? `_sc()\n` : syncScheduleDecl ? `_scf(c)\n` : "";
-	const freThenSchedule = (arg) => catchSchedule ? `if(c._arf)return fre(rt,c,${arg})\nc._arf=true\nconst _fr=fre(rt,c,${arg})\nreturn typeof _fr?.then==='function'?_fr.then((_v)=>{${catchSchedule}return _v\n}):(${catchSchedule.trim()},_fr)\n` : `return fre(rt,c,${arg})\n`;
+	abortSchedule = hasDeriveDispose ? syncAfterResponse ? catchSchedule : schedule : "";
+	const freThenSchedule = (arg) => catchSchedule ? `if(c._arf)return fre(rt,c,${arg})\n${deriveDisposeOnly ? `if(c['~dispose'])` : ""}c._arf=true\nconst _fr=fre(rt,c,${arg})\nreturn typeof _fr?.then==='function'?_fr.then((_v)=>{${catchSchedule}return _v\n}):(${catchSchedule.trim()},_fr)\n` : `return fre(rt,c,${arg})\n`;
 	const signPrefix = syncCookieSign ? `scv(c.set.cookie,cc)\n` : asyncCookieSign ? `_sg=scv(c.set.cookie,cc)\nif(_sg){${arm ? `${arm}\n` : ""}await _sg}\n` : "";
 	if (syncCookieSign || asyncCookieSign) link(require_cookie_utils.signCookieValues, "scv");
 	let factoryHelpers = "";
 	if (hasBeforeHandle || hasAfterHandle || hasMapResponse || hasAfterResponse || hasResponseValidator || hasCookieSign || hasTrace) {
-		code += `let _r,tmp\n`;
+		code += `let _r,tmp${hasDeriveDispose ? ",_v" : ""}\n`;
 		if (hasBeforeHandle || hasTrace) {
 			const bfLen = (beforeHandlePrefix?.length ?? 0) + (hook?.beforeHandle?.length ?? 0);
 			code += beginTrace("beforeHandle", bfLen);
@@ -410,8 +402,8 @@ function compileHandlerJit({ method, path, handler, root, errorRoot, hook, adapt
 			code += endTrace("beforeHandle");
 			if (hasBeforeHandle) code += abortCheck();
 		}
-		if (hasAfterResponse || traceHandleOn) link(require_adapter_utils.tee, "tee");
-		const teeBlock = (hasAfterResponse || traceHandleOn) && !syncAfterResponse ? "if(_r&&(_r[Symbol.iterator]||_r[Symbol.asyncIterator])&&typeof _r.next==='function'){\nconst _s=tee(_r,2)\n_r=_s[0]\n" + (traceHandleOn ? `_trs=_s[1]\n` : `_stl=_s[1]\n`) + `}\n` : "";
+		if (hasAfterResponse || traceHandleOn || hasDeriveDispose) link(require_adapter_utils.tee, "tee");
+		const teeBlock = (hasAfterResponse || traceHandleOn || hasDeriveDispose) && !syncAfterResponse ? `if(${disposeGuard}_r&&(_r[Symbol.iterator]||_r[Symbol.asyncIterator])&&typeof _r.next==='function'){\nconst _s=tee(_r,2)\n_r=_s[0]\n` + (traceHandleOn ? `_trs=_s[1]\n` : `_stl=_s[1]\n`) + `}\n` : "";
 		if (traceHandleOn) {
 			const handleName = handler?.name && typeof handler.name === "string" ? handler.name : "anonymous";
 			code += beginTrace("handle", 1, handleName);
@@ -503,11 +495,11 @@ let _r${hasMapResponse ? ",tmp" : ""}\n` + require_compile_handler_utils.mapErro
 				map,
 				link,
 				responseMap,
-				(hasMapResponse ? `c.responseValue=_r\n` + require_compile_handler_utils.mapMapResponse(hook.mapResponse, isAsync, void 0, abortChainGuard(), arm) : "") + endTrace("error") + abortCatch + schedule,
+				(hasMapResponse ? `c.responseValue=_r\n` + require_compile_handler_utils.mapMapResponse(hook.mapResponse, isAsync, void 0, abortChainGuard(), arm) : "") + endTrace("error") + (hasDeriveDispose ? schedule + abortCatch : abortCatch + schedule),
 				signPrefix,
 				isAsync,
 				arm
-			], abortChainGuard()) + endTrace("error") + abortCatch + schedule + `return _efb(e,c)\n`;
+			], abortChainGuard()) + endTrace("error") + (hasDeriveDispose ? schedule + abortCatch : abortCatch + schedule) + `return _efb(e,c)\n`;
 		} else body += endTrace("error") + freThenSchedule("e");
 		if (syncErrorHook) {
 			factoryHelpers += `function _ce(e,c){${abortOn ? "let _as\n" : ""}try{\n${body}}catch(_ee){return fre(rt,c,_ee)}}\n`;
@@ -528,7 +520,25 @@ let _r${hasMapResponse ? ",tmp" : ""}\n` + require_compile_handler_utils.mapErro
 	const isGeneratorHandler = isHandleFunction && handler.constructor.name.endsWith("GeneratorFunction");
 	if (!hasTrace && isHandleFunction && !isGeneratorHandler && !inlineUnsafe) {
 		if (alias === "rc" || !isAsync && !syncErrorHook && alias === "rc,fe") return createInlineHandler(responseCompact, handler);
-		else if (alias === "rm" || alias === "msh,rm" || !isAsync && !syncErrorHook && (alias === "rm,fe" || alias === "msh,rm,fe")) return responseMode === "set-with-default-headers" && inference.set ? createInlineHandlerWithDefaultHeaders(responseMap, handler) : createInlineHandlerWithSet(responseMap, handler);
+		else if (alias === "rm" || alias === "msh,rm" || !isAsync && !syncErrorHook && (alias === "rm,fe" || alias === "msh,rm,fe")) {
+			const rmap = responseMap;
+			const h = handler;
+			let inlineHandler;
+			if (responseMode === "set-with-default-headers" && inference.set) inlineHandler = ((c) => {
+				require_adapter_utils.materializeSetHeaders(c.set);
+				const r = h(c);
+				if (r instanceof Error) throw r;
+				if (typeof r?.then === "function") return Promise.resolve(r).then((v) => rmap(require_handler_utils.forwardError(v), c.set, c.request, true));
+				return rmap(r, c.set, c.request, true);
+			});
+			else inlineHandler = ((c) => {
+				const r = h(c);
+				if (r instanceof Error) throw r;
+				if (typeof r?.then === "function") return Promise.resolve(r).then((v) => rmap(require_handler_utils.forwardError(v), c.set, c.request, true));
+				return rmap(r, c.set, c.request, true);
+			});
+			return inlineHandler;
+		}
 	}
 	require_compile_jit_probe.JITProbe.record("handler:new-function");
 	return new Function("h", fullAlias, `return ${code}`)(handler, ...paramValues);

package/dist/compile/handler/jit.mjs

@@ -9,7 +9,7 @@ import { parseQueryFromURL } from "../../parse-query.mjs";
 import { Capture } from "../aot.mjs";
 import { resolvedTraceOf, traceCapabilityRequired } from "../../generation.mjs";
 import { buildCookieJar, parseCookieRaw, parseCookieRawDeferred, parseCookieRawLazy, parseCookieRawSigned, parseCookieRawSync, signCookieValues } from "../../cookie/utils.mjs";
-import { emptyResponse, finalizeRouteError, forwardError } from "../../handler/utils.mjs";
+import { drainDisposables, emptyResponse, finalizeRouteError, forwardError } from "../../handler/utils.mjs";
 import { fallbackResponse } from "../../handler/error.mjs";
 import { armEntryAbort, awaitGuard, cloneResponse, cloneStaticValue, getQueryParseChannels, hasRequestBody, mapAfterHandle, mapAfterResponse, mapBeforeHandle, mapError, mapMapResponse, mapTransform, runBeforeHandlePrefix, runBeforeHandlePrefixAsync } from "./utils.mjs";
 import { JITProbe } from "../jit-probe.mjs";
@@ -64,7 +64,7 @@ function parse(adapter, parsers, bodyVali, hasHeaders, link, report, arm) {
 			break;
 		}
 	}
-	const bodyKind = hasFn ? void 0 : bodyMediaKind(bodyVali);
+	const bodyKind = hasFn ? void 0 : schemaMediaKind(bodyVali?.schema);
 	let code = `let ct=((${hasHeaders ? "c.headers['content-type']" : "c.request.headers.get('content-type')"})||'')\nlet cti=ct.indexOf(";")
 if(cti!==-1)ct=ct.slice(0,cti)
 ` + (hasFn ? "c.contentType=ct\n" : "");
@@ -110,7 +110,6 @@ if(cti!==-1)ct=ct.slice(0,cti)
 	}
 	return hasFn ? "let hasBody=false,_bp\n" + code : code;
 }
-const bodyMediaKind = (bodyVali) => schemaMediaKind(bodyVali?.schema);
 function schemaMediaKind(schema) {
 	if (!schema || typeof schema !== "object" || "~standard" in schema) return;
 	const elyType = schema["~elyTyp"];
@@ -143,23 +142,11 @@ const createInlineHandler = (map, h) => ((c) => {
 	if (typeof r?.then === "function") return Promise.resolve(r).then((v) => map(forwardError(v), c.request, true));
 	return map(r, c.request, true);
 });
-const createInlineHandlerWithSet = (map, h) => ((c) => {
-	const r = h(c);
-	if (r instanceof Error) throw r;
-	if (typeof r?.then === "function") return Promise.resolve(r).then((v) => map(forwardError(v), c.set, c.request, true));
-	return map(r, c.set, c.request, true);
-});
-const createInlineHandlerWithDefaultHeaders = (map, h) => ((c) => {
-	materializeSetHeaders(c.set);
-	const r = h(c);
-	if (r instanceof Error) throw r;
-	if (typeof r?.then === "function") return Promise.resolve(r).then((v) => map(forwardError(v), c.set, c.request, true));
-	return map(r, c.set, c.request, true);
-});
 function compileHandlerJit({ method, path, handler, root, errorRoot, hook, adapter, isHandleFunction, isStaticResponse, isPromiseHandler, state }) {
 	const { vali, inference, cookieConfig, beforeHandlePrefix, traceHandlers, tracePhases, hasAnyPhase, traceHandleOn, descriptor: { async: isAsync, responseMode, hasBody, bodyValiIsAsync, headersValiIsAsync, paramsValiIsAsync, queryValiIsAsync, cookieValiIsAsync: cookieValidIsAsync, responseValiAsync, hasCookieSign, syncCookieSign, asyncCookieSign, lazyCookieVerify, hasErrorHook, hasAfterResponse, hasBeforeHandle, hasAfterHandle, hasMapResponse, hasResponseValidator, hasTrace, traceCount, hasLifecycleHook, syncErrorHook, syncAfterResponse } } = state;
 	const hasStaticAfterResponse = !!hook?.afterResponse?.length;
-	const hasDynamicAfterResponse = !!inference.afterResponse;
+	const hasDeriveDispose = !!hook?.["~deriveEntries"]?.length;
+	const hasDynamicAfterResponse = !!inference.afterResponse || hasDeriveDispose;
 	const seenKeys = new Set(["rt", "fre"]);
 	const paramValues = [errorRoot, finalizeRouteError];
 	const aliasKeys = [];
@@ -181,7 +168,8 @@ function compileHandlerJit({ method, path, handler, root, errorRoot, hook, adapt
 	const abortOn = hasLifecycleHook && root["~config"]?.abortSignal !== false;
 	const abortPeek = "c['~sig']?.aborted";
 	const arm = abortOn ? "_as??=(c['~sig']??=c.request.signal)" : "";
-	const abortCheck = () => abortOn ? `if(${abortPeek})return emp.clone()\n` : "";
+	let abortSchedule = "";
+	const abortCheck = () => abortOn ? abortSchedule ? `if(${abortPeek}){${abortSchedule}return emp.clone()}\n` : `if(${abortPeek})return emp.clone()\n` : "";
 	const abortChainGuard = () => abortOn ? abortPeek : void 0;
 	const abortCatch = abortOn ? `if((${arm}).aborted)return emp.clone()\n` : "";
 	const phaseOn = (phase) => hasTrace && (tracePhases === null || tracePhases.has(phase));
@@ -223,7 +211,7 @@ function compileHandlerJit({ method, path, handler, root, errorRoot, hook, adapt
 		link(armEntryAbort, "ea");
 		code += `if(ea(c))return emp.clone()\n`;
 	}
-	if ((hasAfterResponse || hasTrace) && !syncAfterResponse) code += "let _stl\n";
+	if ((hasAfterResponse || hasTrace || hasDeriveDispose) && !syncAfterResponse) code += "let _stl\n";
 	if (asyncCookieSign) code += "let _sg\n";
 	if (hasTrace) {
 		const traceProvider = resolvedTraceOf(root) ?? resolvedTraceOf(errorRoot);
@@ -370,18 +358,22 @@ function compileHandlerJit({ method, path, handler, root, errorRoot, hook, adapt
 		return s;
 	})() : "";
 	const traceNeedsSchedule = traceHandleOn || phaseOn("afterResponse");
-	const scheduleAfterResponse = hasAfterResponse || traceNeedsSchedule ? "c._arf=true\nqueueMicrotask(async()=>{if(_stl){try{for await(const v of _stl){}}catch{}}\n" + drainTraceStream + resolveHandlePostDrain + beginTrace("afterResponse", hook?.afterResponse?.length ?? 0) + (hasStaticAfterResponse ? mapAfterResponse(hook.afterResponse, [buildReport("afterResponse")]) : "") + (hasDynamicAfterResponse ? "let _q=c['~afterResponse']\nif(_q){let _l=_q.length\nfor(let _i=0;_i<_l;_i++){try{await _q[_i](c)}catch(_e){console.error(_e)}}\n" + (!isProduction() ? `if(_q.length!==_l)console.warn('[elysia] defer() called from inside the afterResponse drain is ignored')\n` : "") + `}\n` : "") + endTrace("afterResponse") + `})\n` : "";
+	if (hasDeriveDispose) link(drainDisposables, "dds");
+	const deriveDisposeOnly = hasDeriveDispose && !hasAfterResponse && !hasTrace;
+	const disposeGuard = deriveDisposeOnly ? "c['~dispose']&&" : "";
+	const scheduleAfterResponse = hasAfterResponse || traceNeedsSchedule || hasDeriveDispose ? (deriveDisposeOnly ? `if(c['~dispose']){\n` : "") + "c._arf=true\nqueueMicrotask(async()=>{if(_stl){try{for await(const v of _stl){}}catch{}}\n" + drainTraceStream + resolveHandlePostDrain + beginTrace("afterResponse", hook?.afterResponse?.length ?? 0) + (hasStaticAfterResponse ? mapAfterResponse(hook.afterResponse, [buildReport("afterResponse")]) : "") + (hasDynamicAfterResponse ? "let _q=c['~afterResponse']\nif(_q){let _l=_q.length\nfor(let _i=0;_i<_l;_i++){try{await _q[_i](c)}catch(_e){console.error(_e)}}\n" + (!isProduction() ? `if(_q.length!==_l)console.warn('[elysia] defer() called from inside the afterResponse drain is ignored')\n` : "") + `}\n` : "") + (hasDeriveDispose ? `await dds(c)\n` : "") + endTrace("afterResponse") + `})\n` + (deriveDisposeOnly ? `}\n` : "") : "";
 	const dedupSchedule = !!scheduleAfterResponse && !syncAfterResponse && !syncErrorHook;
 	const scheduleDecl = dedupSchedule ? `function _sc(){\n${scheduleAfterResponse}}\n` : "";
 	const schedule = dedupSchedule ? `_sc()\n` : scheduleAfterResponse;
 	const syncScheduleDecl = syncAfterResponse && scheduleAfterResponse ? `function _scf(c,_stl){\n${scheduleAfterResponse}}\n` : "";
 	const catchSchedule = dedupSchedule ? `_sc()\n` : syncScheduleDecl ? `_scf(c)\n` : "";
-	const freThenSchedule = (arg) => catchSchedule ? `if(c._arf)return fre(rt,c,${arg})\nc._arf=true\nconst _fr=fre(rt,c,${arg})\nreturn typeof _fr?.then==='function'?_fr.then((_v)=>{${catchSchedule}return _v\n}):(${catchSchedule.trim()},_fr)\n` : `return fre(rt,c,${arg})\n`;
+	abortSchedule = hasDeriveDispose ? syncAfterResponse ? catchSchedule : schedule : "";
+	const freThenSchedule = (arg) => catchSchedule ? `if(c._arf)return fre(rt,c,${arg})\n${deriveDisposeOnly ? `if(c['~dispose'])` : ""}c._arf=true\nconst _fr=fre(rt,c,${arg})\nreturn typeof _fr?.then==='function'?_fr.then((_v)=>{${catchSchedule}return _v\n}):(${catchSchedule.trim()},_fr)\n` : `return fre(rt,c,${arg})\n`;
 	const signPrefix = syncCookieSign ? `scv(c.set.cookie,cc)\n` : asyncCookieSign ? `_sg=scv(c.set.cookie,cc)\nif(_sg){${arm ? `${arm}\n` : ""}await _sg}\n` : "";
 	if (syncCookieSign || asyncCookieSign) link(signCookieValues, "scv");
 	let factoryHelpers = "";
 	if (hasBeforeHandle || hasAfterHandle || hasMapResponse || hasAfterResponse || hasResponseValidator || hasCookieSign || hasTrace) {
-		code += `let _r,tmp\n`;
+		code += `let _r,tmp${hasDeriveDispose ? ",_v" : ""}\n`;
 		if (hasBeforeHandle || hasTrace) {
 			const bfLen = (beforeHandlePrefix?.length ?? 0) + (hook?.beforeHandle?.length ?? 0);
 			code += beginTrace("beforeHandle", bfLen);
@@ -409,8 +401,8 @@ function compileHandlerJit({ method, path, handler, root, errorRoot, hook, adapt
 			code += endTrace("beforeHandle");
 			if (hasBeforeHandle) code += abortCheck();
 		}
-		if (hasAfterResponse || traceHandleOn) link(tee, "tee");
-		const teeBlock = (hasAfterResponse || traceHandleOn) && !syncAfterResponse ? "if(_r&&(_r[Symbol.iterator]||_r[Symbol.asyncIterator])&&typeof _r.next==='function'){\nconst _s=tee(_r,2)\n_r=_s[0]\n" + (traceHandleOn ? `_trs=_s[1]\n` : `_stl=_s[1]\n`) + `}\n` : "";
+		if (hasAfterResponse || traceHandleOn || hasDeriveDispose) link(tee, "tee");
+		const teeBlock = (hasAfterResponse || traceHandleOn || hasDeriveDispose) && !syncAfterResponse ? `if(${disposeGuard}_r&&(_r[Symbol.iterator]||_r[Symbol.asyncIterator])&&typeof _r.next==='function'){\nconst _s=tee(_r,2)\n_r=_s[0]\n` + (traceHandleOn ? `_trs=_s[1]\n` : `_stl=_s[1]\n`) + `}\n` : "";
 		if (traceHandleOn) {
 			const handleName = handler?.name && typeof handler.name === "string" ? handler.name : "anonymous";
 			code += beginTrace("handle", 1, handleName);
@@ -502,11 +494,11 @@ let _r${hasMapResponse ? ",tmp" : ""}\n` + mapError(hook.error, [
 				map,
 				link,
 				responseMap,
-				(hasMapResponse ? `c.responseValue=_r\n` + mapMapResponse(hook.mapResponse, isAsync, void 0, abortChainGuard(), arm) : "") + endTrace("error") + abortCatch + schedule,
+				(hasMapResponse ? `c.responseValue=_r\n` + mapMapResponse(hook.mapResponse, isAsync, void 0, abortChainGuard(), arm) : "") + endTrace("error") + (hasDeriveDispose ? schedule + abortCatch : abortCatch + schedule),
 				signPrefix,
 				isAsync,
 				arm
-			], abortChainGuard()) + endTrace("error") + abortCatch + schedule + `return _efb(e,c)\n`;
+			], abortChainGuard()) + endTrace("error") + (hasDeriveDispose ? schedule + abortCatch : abortCatch + schedule) + `return _efb(e,c)\n`;
 		} else body += endTrace("error") + freThenSchedule("e");
 		if (syncErrorHook) {
 			factoryHelpers += `function _ce(e,c){${abortOn ? "let _as\n" : ""}try{\n${body}}catch(_ee){return fre(rt,c,_ee)}}\n`;
@@ -527,7 +519,25 @@ let _r${hasMapResponse ? ",tmp" : ""}\n` + mapError(hook.error, [
 	const isGeneratorHandler = isHandleFunction && handler.constructor.name.endsWith("GeneratorFunction");
 	if (!hasTrace && isHandleFunction && !isGeneratorHandler && !inlineUnsafe) {
 		if (alias === "rc" || !isAsync && !syncErrorHook && alias === "rc,fe") return createInlineHandler(responseCompact, handler);
-		else if (alias === "rm" || alias === "msh,rm" || !isAsync && !syncErrorHook && (alias === "rm,fe" || alias === "msh,rm,fe")) return responseMode === "set-with-default-headers" && inference.set ? createInlineHandlerWithDefaultHeaders(responseMap, handler) : createInlineHandlerWithSet(responseMap, handler);
+		else if (alias === "rm" || alias === "msh,rm" || !isAsync && !syncErrorHook && (alias === "rm,fe" || alias === "msh,rm,fe")) {
+			const rmap = responseMap;
+			const h = handler;
+			let inlineHandler;
+			if (responseMode === "set-with-default-headers" && inference.set) inlineHandler = ((c) => {
+				materializeSetHeaders(c.set);
+				const r = h(c);
+				if (r instanceof Error) throw r;
+				if (typeof r?.then === "function") return Promise.resolve(r).then((v) => rmap(forwardError(v), c.set, c.request, true));
+				return rmap(r, c.set, c.request, true);
+			});
+			else inlineHandler = ((c) => {
+				const r = h(c);
+				if (r instanceof Error) throw r;
+				if (typeof r?.then === "function") return Promise.resolve(r).then((v) => rmap(forwardError(v), c.set, c.request, true));
+				return rmap(r, c.set, c.request, true);
+			});
+			return inlineHandler;
+		}
 	}
 	JITProbe.record("handler:new-function");
 	return new Function("h", fullAlias, `return ${code}`)(handler, ...paramValues);

package/dist/compile/handler/params.js

@@ -29,6 +29,8 @@ const handlerParams = () => _handlerParams ??= {
 	pe: () => require_error.ParseError,
 	es: () => require_error.ElysiaStatus,
 	rdc: () => require_compile_handler_utils.replaceDeriveContext,
+	dsp: () => require_handler_utils.registerDeriveDisposable,
+	dds: () => require_handler_utils.drainDisposables,
 	emp: () => require_handler_utils.emptyResponse,
 	ea: () => require_compile_handler_utils.armEntryAbort,
 	verr: () => require_error.ValidationError,

package/dist/compile/handler/params.mjs

@@ -3,7 +3,7 @@ import { ElysiaStatus, ParseError, ValidationError } from "../../error.mjs";
 import { materializeSetHeaders, normalizeContentType, tee } from "../../adapter/utils.mjs";
 import { parseQueryFromURL } from "../../parse-query.mjs";
 import { buildCookieJar, parseCookieRaw, parseCookieRawDeferred, parseCookieRawLazy, parseCookieRawSigned, parseCookieRawSync, signCookieValues } from "../../cookie/utils.mjs";
-import { emptyResponse, finalizeRouteError, forwardError } from "../../handler/utils.mjs";
+import { drainDisposables, emptyResponse, finalizeRouteError, forwardError, registerDeriveDisposable } from "../../handler/utils.mjs";
 import { adoptErrorType, fallbackResponse } from "../../handler/error.mjs";
 import { armEntryAbort, cloneResponse, getQueryParseChannels, hasRequestBody, replaceDeriveContext, runBeforeHandlePrefix } from "./utils.mjs";
 import { staticCloneResolver } from "./static-clone-resolver.mjs";
@@ -28,6 +28,8 @@ const handlerParams = () => _handlerParams ??= {
 	pe: () => ParseError,
 	es: () => ElysiaStatus,
 	rdc: () => replaceDeriveContext,
+	dsp: () => registerDeriveDisposable,
+	dds: () => drainDisposables,
 	emp: () => emptyResponse,
 	ea: () => armEntryAbort,
 	verr: () => ValidationError,

package/dist/compile/handler/utils.d.ts

@@ -1,7 +1,7 @@
 import { CompactBeforeHandlePrefix, DeriveEntry } from "../../utils.js";
 import { AfterResponseHandler, AppHook, ErrorHandler, MaybeArray, TransformHandler } from "../../types.js";
 import { Context } from "../../context.js";
-import { emptyResponse } from "../../handler/utils.js";
+import { drainDisposables, emptyResponse, registerDeriveDisposable } from "../../handler/utils.js";
 
 //#region src/compile/handler/utils.d.ts
 type Link = (v: unknown, key: string) => void;
@@ -43,4 +43,4 @@ interface QueryWalkState {
 declare function getQueryParseChannels(querySchema: any): QueryWalkState | undefined;
 declare function awaitGuard(fn: Function, isAsync: boolean, target: string, arm?: string): string;
 //#endregion
-export { Link, TraceReporter, armEntryAbort, awaitGuard, cloneResponse, cloneStaticValue, deriveModes, emptyResponse, getQueryParseChannels, hasRequestBody, mapAfterHandle, mapAfterResponse, mapBeforeHandle, mapError, mapMapResponse, mapTransform, replaceDeriveContext, runBeforeHandlePrefix, runBeforeHandlePrefixAsync };
+export { Link, TraceReporter, armEntryAbort, awaitGuard, cloneResponse, cloneStaticValue, deriveModes, drainDisposables, emptyResponse, getQueryParseChannels, hasRequestBody, mapAfterHandle, mapAfterResponse, mapBeforeHandle, mapError, mapMapResponse, mapTransform, registerDeriveDisposable, replaceDeriveContext, runBeforeHandlePrefix, runBeforeHandlePrefixAsync };