elysia 2.0.0-beta.12 → 2.0.0-beta.13

package/dist/compile/handler/utils.mjs

@@ -24,7 +24,9 @@ function cloneResponse(r) {
 }
 function cloneStaticValue(value) {
 	try {
-		return structuredClone(value);
+		const cloned = structuredClone(value);
+		if (Object.getPrototypeOf(value) === ElysiaStatus.prototype) Object.setPrototypeOf(cloned, ElysiaStatus.prototype);
+		return cloned;
 	} catch {
 		return value;
 	}
@@ -50,10 +52,9 @@ function armEntryAbort(context) {
 }
 const trace = (report, fn) => report?.resolveChild(childName(fn)) ?? noTrace;
 const toArray = (v) => Array.isArray(v) ? v : [v];
-const mapTransform = /* @__PURE__ */ map((i, fn, [isAsync, report]) => {
+const mapTransform = /* @__PURE__ */ map((i, fn, [isAsync, report, arm]) => {
 	const t = trace(report, fn);
-	const guard = awaitGuard(fn, isAsync, "_tf");
-	const call = guard ? `_tf=tf${at(i)}(c)\n${guard}` : `${Await(fn)}tf${at(i)}(c)\n`;
+	const call = isAsync ? `_tf=tf${at(i)}(c)\n${awaitGuard(fn, isAsync, "_tf", arm)}` : `tf${at(i)}(c)\n`;
 	return t.begin + call + t.end();
 });
 const deriveKeyCache = /* @__PURE__ */ new WeakMap();
@@ -317,7 +318,7 @@ function skipValue(src, i) {
 	}
 	return -1;
 }
-function mapBeforeHandle(_hooks, derive, link, isAsync, report, abortGuard) {
+function mapBeforeHandle(_hooks, derive, link, isAsync, report, abortGuard, arm) {
 	const hooks = toArray(_hooks);
 	const modes = deriveModes(hooks, derive);
 	let code = "";
@@ -331,8 +332,8 @@ function mapBeforeHandle(_hooks, derive, link, isAsync, report, abortGuard) {
 		}
 		const t = trace(report, fn);
 		code += t.begin;
-		code += `tmp=${Await(fn)}bf${at(i)}(c)\n`;
-		code += awaitGuard(fn, isAsync, "tmp");
+		code += `tmp=bf${at(i)}(c)\n`;
+		code += awaitGuard(fn, isAsync, "tmp", arm);
 		if (modes?.[i] !== void 0) {
 			needsEs = true;
 			if (modes[i]) {
@@ -378,7 +379,7 @@ async function runBeforeHandlePrefixAsync(prefix, context, abort) {
 			if (!first && abort && context["~sig"]?.aborted) return;
 			first = false;
 			let result = values[j](context);
-			if (result instanceof Promise) {
+			if (typeof result?.then === "function") {
 				result = await result;
 				if (abort) context["~sig"] ??= context.request.signal;
 			}
@@ -386,7 +387,7 @@ async function runBeforeHandlePrefixAsync(prefix, context, abort) {
 		}
 	}
 }
-function mapChainHook(hooks, prefix, isAsync, report, abortGuard) {
+function mapChainHook(hooks, prefix, isAsync, report, abortGuard, arm) {
 	let code = "";
 	let depth = 0;
 	for (let i = 0; i < hooks.length; i++) {
@@ -397,25 +398,25 @@ function mapChainHook(hooks, prefix, isAsync, report, abortGuard) {
 		}
 		const t = trace(report, fn);
 		code += t.begin;
-		code += `tmp=${Await(fn)}${prefix}${at(i)}(c)\n`;
-		code += awaitGuard(fn, isAsync, "tmp");
+		code += `tmp=${prefix}${at(i)}(c)\n`;
+		code += awaitGuard(fn, isAsync, "tmp", arm);
 		code += t.end("tmp");
 	}
 	code += "}".repeat(depth);
 	code += `if(tmp!==undefined)_r=c.responseValue=tmp\n`;
 	return code;
 }
-const mapAfterHandle = (_hooks, isAsync, report, abortGuard) => mapChainHook(toArray(_hooks), "af", isAsync, report, abortGuard);
-const mapMapResponse = (_hooks, isAsync, report, abortGuard) => mapChainHook(toArray(_hooks), "mr", isAsync, report, abortGuard);
+const mapAfterHandle = (_hooks, isAsync, report, abortGuard, arm) => mapChainHook(toArray(_hooks), "af", isAsync, report, abortGuard, arm);
+const mapMapResponse = (_hooks, isAsync, report, abortGuard, arm) => mapChainHook(toArray(_hooks), "mr", isAsync, report, abortGuard, arm);
 const mapAfterResponse = /* @__PURE__ */ map((i, fn, [report]) => {
 	const t = trace(report, fn);
-	const call = isAsyncFunction(fn) ? `await ar${at(i)}(c)\n` : `let _ar=ar${at(i)}(c)\nif(_ar instanceof Promise)await _ar\n`;
+	const call = isAsyncFunction(fn) ? `await ar${at(i)}(c)\n` : `let _ar=ar${at(i)}(c)\nif(typeof _ar?.then==='function')await _ar\n`;
 	return `try{${t.begin}${call}${t.end()}}catch(_e){${t.end("_e")}console.error(_e)}\n`;
 });
-const mapError = /* @__PURE__ */ map((i, fn, [map, link, mapResponse, schedule, sign, isAsync]) => {
+const mapError = /* @__PURE__ */ map((i, fn, [map, link, mapResponse, schedule, sign, isAsync, arm]) => {
 	link(mapResponse, "rm");
 	link(adoptErrorType, "aet");
-	return `_r=${Await(fn)}er${at(i)}(c)\n` + awaitGuard(fn, isAsync, "_r") + "if(_r!==undefined){\nif(_r instanceof Response)c.set.status=_r.status\nelse if(c.set.status===undefined||c.set.status===200)c.set.status=500\n" + schedule + sign + `return _em(c,${map}(aet(_r,e),c.set,c.request,true))\n}\n`;
+	return `_r=er${at(i)}(c)\n` + awaitGuard(fn, isAsync, "_r", arm) + "if(_r!==undefined){\nif(_r instanceof Response)c.set.status=_r.status\nelse if(c.set.status===undefined||c.set.status===200)c.set.status=500\n" + schedule + sign + `return _em(c,${map}(aet(_r,e),c.set,c.request,true))\n}\n`;
 });
 function map(map) {
 	return function(event, rest, abortGuard) {
@@ -501,8 +502,11 @@ function getQueryParseChannels(querySchema) {
 	queryParseChannelsCache.set(querySchema, result);
 	return result ?? void 0;
 }
-const Await = (fn) => isAsyncFunction(fn) ? "await " : "";
-const awaitGuard = (fn, isAsync, target) => isAsync && !isAsyncFunction(fn) ? `if(${target} instanceof Promise)${target}=await ${target}\n` : "";
+function awaitGuard(fn, isAsync, target, arm = "") {
+	if (!isAsync) return "";
+	const code = `${arm ? `;${arm}\n` : ""}${target}=await ${target}\n`;
+	return isAsyncFunction(fn) ? code : `if(typeof ${target}?.then==='function'){${code}}\n`;
+}
 
 //#endregion
-export { armEntryAbort, cloneResponse, cloneStaticValue, deriveModes, emptyResponse, getQueryParseChannels, hasRequestBody, mapAfterHandle, mapAfterResponse, mapBeforeHandle, mapError, mapMapResponse, mapTransform, replaceDeriveContext, runBeforeHandlePrefix, runBeforeHandlePrefixAsync };
+export { armEntryAbort, awaitGuard, cloneResponse, cloneStaticValue, deriveModes, emptyResponse, getQueryParseChannels, hasRequestBody, mapAfterHandle, mapAfterResponse, mapBeforeHandle, mapError, mapMapResponse, mapTransform, replaceDeriveContext, runBeforeHandlePrefix, runBeforeHandlePrefixAsync };

package/dist/compile/utils.js

@@ -4,14 +4,17 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 function isAsyncFunction(fn) {
 	return fn.constructor.name === "AsyncFunction" || fn.constructor.name === "AsyncGeneratorFunction";
 }
-const matchResponseClone = /=>\s*response\.clone\(/;
-const matchFnReturn = /(?:return|=>)\s*(?:new\s+)?[\w$.][\w$.]*\s*\(|a(?:sync|wait)/;
+const matchArrow = /^(?:[\w$]+|\([\w$\s,.[\]{}:]*\))\s*=>([\s\S]*)$/;
+const matchFunction = /^(?:function(?:\s+[\w$]+)?|[\w$]+)\s*\([\w$\s,.[\]{}:]*\)\s*(\{[\s\S]*\})$/;
+const matchLiteral = /^(?:true|false|null|-?\d+(?:\.\d+)?|'[^'\\]*'|"[^"\\]*")$/;
 const mayReturnPromiseCache = /* @__PURE__ */ new WeakMap();
 function mayReturnPromise(fn) {
 	let result = mayReturnPromiseCache.get(fn);
 	if (result !== void 0) return result;
-	const literal = fn.toString();
-	result = matchResponseClone.test(literal) ? false : matchFnReturn.test(literal);
+	const literal = Function.prototype.toString.call(fn).trim();
+	const arrow = matchArrow.exec(literal);
+	const body = (arrow?.[1] ?? matchFunction.exec(literal)?.[1])?.trimStart();
+	result = literal.includes("[native code]") || !(body?.startsWith("{") && body.endsWith("}") && !/\breturn\b/.test(body) || arrow && matchLiteral.test(body));
 	mayReturnPromiseCache.set(fn, result);
 	return result;
 }

package/dist/compile/utils.mjs

@@ -2,14 +2,17 @@
 function isAsyncFunction(fn) {
 	return fn.constructor.name === "AsyncFunction" || fn.constructor.name === "AsyncGeneratorFunction";
 }
-const matchResponseClone = /=>\s*response\.clone\(/;
-const matchFnReturn = /(?:return|=>)\s*(?:new\s+)?[\w$.][\w$.]*\s*\(|a(?:sync|wait)/;
+const matchArrow = /^(?:[\w$]+|\([\w$\s,.[\]{}:]*\))\s*=>([\s\S]*)$/;
+const matchFunction = /^(?:function(?:\s+[\w$]+)?|[\w$]+)\s*\([\w$\s,.[\]{}:]*\)\s*(\{[\s\S]*\})$/;
+const matchLiteral = /^(?:true|false|null|-?\d+(?:\.\d+)?|'[^'\\]*'|"[^"\\]*")$/;
 const mayReturnPromiseCache = /* @__PURE__ */ new WeakMap();
 function mayReturnPromise(fn) {
 	let result = mayReturnPromiseCache.get(fn);
 	if (result !== void 0) return result;
-	const literal = fn.toString();
-	result = matchResponseClone.test(literal) ? false : matchFnReturn.test(literal);
+	const literal = Function.prototype.toString.call(fn).trim();
+	const arrow = matchArrow.exec(literal);
+	const body = (arrow?.[1] ?? matchFunction.exec(literal)?.[1])?.trimStart();
+	result = literal.includes("[native code]") || !(body?.startsWith("{") && body.endsWith("}") && !/\breturn\b/.test(body) || arrow && matchLiteral.test(body));
 	mayReturnPromiseCache.set(fn, result);
 	return result;
 }

package/dist/cookie/lib.js

@@ -1,4 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
+const require_constants = require('../constants.js');
 const require_utils = require('../utils.js');
 const require_cookie_error = require('./error.js');
 
@@ -21,7 +22,7 @@ function parse(str) {
 		while (ks < ke && ((c = str.charCodeAt(ks)) === 32 || c === 9)) ks++;
 		while (ke > ks && ((c = str.charCodeAt(ke - 1)) === 32 || c === 9)) ke--;
 		const key = str.slice(ks, ke);
-		if (obj[key] === void 0) {
+		if (obj[key] === void 0 && !require_constants.dangerousKeys.has(key)) {
 			let vs = eq + 1, ve = semi;
 			while (vs < ve && ((c = str.charCodeAt(vs)) === 32 || c === 9)) vs++;
 			while (ve > vs && ((c = str.charCodeAt(ve - 1)) === 32 || c === 9)) ve--;

package/dist/cookie/lib.mjs

@@ -1,3 +1,4 @@
+import { dangerousKeys } from "../constants.mjs";
 import { nullObject } from "../utils.mjs";
 import { InvalidCookie } from "./error.mjs";
 
@@ -20,7 +21,7 @@ function parse(str) {
 		while (ks < ke && ((c = str.charCodeAt(ks)) === 32 || c === 9)) ks++;
 		while (ke > ks && ((c = str.charCodeAt(ke - 1)) === 32 || c === 9)) ke--;
 		const key = str.slice(ks, ke);
-		if (obj[key] === void 0) {
+		if (obj[key] === void 0 && !dangerousKeys.has(key)) {
 			let vs = eq + 1, ve = semi;
 			while (vs < ve && ((c = str.charCodeAt(vs)) === 32 || c === 9)) vs++;
 			while (ve > vs && ((c = str.charCodeAt(ve - 1)) === 32 || c === 9)) ve--;

package/dist/cookie/utils.d.ts

@@ -4,7 +4,7 @@ import { hasSyncHmac } from "./crypto.js";
 import { CompiledCookieConfig } from "./config.js";
 
 //#region src/cookie/utils.d.ts
-declare function parseCookieRawSync(cookieString: string | null | undefined, _config: CompiledCookieConfig): Record<string, unknown>;
+declare function parseCookieRawSync(cookieString: string | null | undefined, _config: CompiledCookieConfig): any;
 /**
  * Unsigned + unvalidated lane only
  *

package/dist/cookie/utils.js

@@ -1,6 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 const require_runtime = require('../_virtual/_rolldown/runtime.js');
-const require_constants = require('../constants.js');
 const require_utils = require('../utils.js');
 const require_cookie_lib = require('./lib.js');
 const require_cookie_crypto = require('./crypto.js');
@@ -11,11 +10,10 @@ deuri = require_runtime.__toESM(deuri);
 
 //#region src/cookie/utils.ts
 function parseCookieRawSync(cookieString, _config) {
-	const out = require_utils.nullObject();
-	if (!cookieString) return out;
+	if (!cookieString) return require_utils.nullObject();
 	const cookies = require_cookie_lib.parse(cookieString);
+	const out = cookies;
 	for (const name in cookies) {
-		if (require_constants.dangerousKeys.has(name)) continue;
 		const v = cookies[name];
 		if (v === void 0) continue;
 		out[name] = require_cookie_crypto.maybeJsonDecode((0, deuri.default)(v) ?? v);
@@ -29,23 +27,13 @@ function parseCookieRawSync(cookieString, _config) {
 * the raw record before the handler touches a name.
 */
 function parseCookieRawDeferred(cookieString, _config) {
-	const out = require_utils.nullObject();
-	if (!cookieString) return out;
-	const cookies = require_cookie_lib.parse(cookieString);
-	for (const name in cookies) {
-		if (require_constants.dangerousKeys.has(name)) continue;
-		const v = cookies[name];
-		if (v === void 0) continue;
-		out[name] = v;
-	}
-	return out;
+	return cookieString ? require_cookie_lib.parse(cookieString) : require_utils.nullObject();
 }
 function parseCookieRawLazy(cookieString, config) {
-	const out = require_utils.nullObject();
-	if (!cookieString) return out;
+	if (!cookieString) return require_utils.nullObject();
 	const cookies = require_cookie_lib.parse(cookieString);
+	const out = cookies;
 	for (const name in cookies) {
-		if (require_constants.dangerousKeys.has(name)) continue;
 		const v = cookies[name];
 		if (v === void 0) continue;
 		const decoded = (0, deuri.default)(v) ?? v;
@@ -56,11 +44,10 @@ function parseCookieRawLazy(cookieString, config) {
 async function parseCookieRaw(cookieString, config) {
 	if (!config.hasSign) return parseCookieRawSync(cookieString, config);
 	if (require_cookie_crypto.hasSyncHmac) return parseCookieRawSigned(cookieString, config);
-	const out = require_utils.nullObject();
-	if (!cookieString) return out;
+	if (!cookieString) return require_utils.nullObject();
 	const cookies = require_cookie_lib.parse(cookieString);
+	const out = cookies;
 	for (const name in cookies) {
-		if (require_constants.dangerousKeys.has(name)) continue;
 		const v = cookies[name];
 		if (v === void 0) continue;
 		let value = (0, deuri.default)(v) ?? v;
@@ -72,11 +59,10 @@ async function parseCookieRaw(cookieString, config) {
 }
 function parseCookieRawSigned(cookieString, config) {
 	if (!config.hasSign) return parseCookieRawSync(cookieString, config);
-	const out = require_utils.nullObject();
-	if (!cookieString) return out;
+	if (!cookieString) return require_utils.nullObject();
 	const cookies = require_cookie_lib.parse(cookieString);
+	const out = cookies;
 	for (const name in cookies) {
-		if (require_constants.dangerousKeys.has(name)) continue;
 		const v = cookies[name];
 		if (v === void 0) continue;
 		let value = (0, deuri.default)(v) ?? v;

package/dist/cookie/utils.mjs

@@ -1,4 +1,3 @@
-import { dangerousKeys } from "../constants.mjs";
 import { nullObject } from "../utils.mjs";
 import { parse } from "./lib.mjs";
 import { deriveSignKey, hasSyncHmac, maybeJsonDecode, rawJsonValue, resolvePendingCookie, signCookie, signCookieSyncImpl, unsignWithSecrets, unsignWithSecretsSync } from "./crypto.mjs";
@@ -8,11 +7,10 @@ import decodeComponent from "deuri";
 
 //#region src/cookie/utils.ts
 function parseCookieRawSync(cookieString, _config) {
-	const out = nullObject();
-	if (!cookieString) return out;
+	if (!cookieString) return nullObject();
 	const cookies = parse(cookieString);
+	const out = cookies;
 	for (const name in cookies) {
-		if (dangerousKeys.has(name)) continue;
 		const v = cookies[name];
 		if (v === void 0) continue;
 		out[name] = maybeJsonDecode(decodeComponent(v) ?? v);
@@ -26,23 +24,13 @@ function parseCookieRawSync(cookieString, _config) {
 * the raw record before the handler touches a name.
 */
 function parseCookieRawDeferred(cookieString, _config) {
-	const out = nullObject();
-	if (!cookieString) return out;
-	const cookies = parse(cookieString);
-	for (const name in cookies) {
-		if (dangerousKeys.has(name)) continue;
-		const v = cookies[name];
-		if (v === void 0) continue;
-		out[name] = v;
-	}
-	return out;
+	return cookieString ? parse(cookieString) : nullObject();
 }
 function parseCookieRawLazy(cookieString, config) {
-	const out = nullObject();
-	if (!cookieString) return out;
+	if (!cookieString) return nullObject();
 	const cookies = parse(cookieString);
+	const out = cookies;
 	for (const name in cookies) {
-		if (dangerousKeys.has(name)) continue;
 		const v = cookies[name];
 		if (v === void 0) continue;
 		const decoded = decodeComponent(v) ?? v;
@@ -53,11 +41,10 @@ function parseCookieRawLazy(cookieString, config) {
 async function parseCookieRaw(cookieString, config) {
 	if (!config.hasSign) return parseCookieRawSync(cookieString, config);
 	if (hasSyncHmac) return parseCookieRawSigned(cookieString, config);
-	const out = nullObject();
-	if (!cookieString) return out;
+	if (!cookieString) return nullObject();
 	const cookies = parse(cookieString);
+	const out = cookies;
 	for (const name in cookies) {
-		if (dangerousKeys.has(name)) continue;
 		const v = cookies[name];
 		if (v === void 0) continue;
 		let value = decodeComponent(v) ?? v;
@@ -69,11 +56,10 @@ async function parseCookieRaw(cookieString, config) {
 }
 function parseCookieRawSigned(cookieString, config) {
 	if (!config.hasSign) return parseCookieRawSync(cookieString, config);
-	const out = nullObject();
-	if (!cookieString) return out;
+	if (!cookieString) return nullObject();
 	const cookies = parse(cookieString);
+	const out = cookies;
 	for (const name in cookies) {
-		if (dangerousKeys.has(name)) continue;
 		const v = cookies[name];
 		if (v === void 0) continue;
 		let value = decodeComponent(v) ?? v;

package/dist/handler/error.js

@@ -174,16 +174,15 @@ function createErrorHandler(onErrors, mapResponse, defaultError, allowUnsafe = f
 		parseQuery(context);
 		return fallbackResponse(context, error, mapResponse, defaultError);
 	};
-	const asyncIndexes = require_handler_utils.getAsyncIndexes(onErrors);
-	if (asyncIndexes) return async (context, error) => {
+	if (require_handler_utils.getAsyncIndexes(onErrors)) return async (context, error) => {
 		require_adapter_utils.materializeSetHeaders(context.set);
 		context.error = error;
 		if (allowUnsafe && error instanceof require_error.ValidationError) error.allowUnsafeValidationDetails = true;
 		applyErrorStatus(context, error);
 		parseQuery(context);
 		for (let i = 0; i < onErrors.length; i++) {
-			let result = asyncIndexes?.[i] ? await onErrors[i](context) : onErrors[i](context);
-			if (result instanceof Promise) result = await result;
+			let result = onErrors[i](context);
+			if (typeof result?.then === "function") result = await result;
 			if (result !== void 0) {
 				if (result instanceof require_error.ElysiaStatus || result instanceof Response) context.set.status = result.status;
 				else if (context.set.status === void 0 || context.set.status === 200) context.set.status = 500;

package/dist/handler/error.mjs

@@ -173,16 +173,15 @@ function createErrorHandler(onErrors, mapResponse, defaultError, allowUnsafe = f
 		parseQuery(context);
 		return fallbackResponse(context, error, mapResponse, defaultError);
 	};
-	const asyncIndexes = getAsyncIndexes(onErrors);
-	if (asyncIndexes) return async (context, error) => {
+	if (getAsyncIndexes(onErrors)) return async (context, error) => {
 		materializeSetHeaders(context.set);
 		context.error = error;
 		if (allowUnsafe && error instanceof ValidationError) error.allowUnsafeValidationDetails = true;
 		applyErrorStatus(context, error);
 		parseQuery(context);
 		for (let i = 0; i < onErrors.length; i++) {
-			let result = asyncIndexes?.[i] ? await onErrors[i](context) : onErrors[i](context);
-			if (result instanceof Promise) result = await result;
+			let result = onErrors[i](context);
+			if (typeof result?.then === "function") result = await result;
 			if (result !== void 0) {
 				if (result instanceof ElysiaStatus || result instanceof Response) context.set.status = result.status;
 				else if (context.set.status === void 0 || context.set.status === 200) context.set.status = 500;

package/dist/handler/fetch.js

@@ -136,11 +136,10 @@ function createFetchHandler(app) {
 		return (context["~sig"] = request.signal).aborted;
 	};
 	/**
-	* Post-suspension check: arm if nobody has yet, then read. Only emitted on
-	* lanes that actually awaited, so a deferred request that never suspends
-	* never reaches it.
+	* Peek after each callback. The actual await branch arms deferred requests;
+	* immediate callbacks must not materialize a signal just for this check.
 	*/
-	const armedAbort = (request, context) => abortSignal && (context["~sig"] ??= request.signal).aborted === true;
+	const armedAbort = (context) => abortSignal && context["~sig"]?.aborted === true;
 	const baseMapResponse = (app["~config"]?.adapter ?? require_adapter_constants.defaultAdapter).response.map;
 	const mapResponseHooks = hook?.mapResponse;
 	const mapResponse = mapResponseHooks?.length ? (response, set, context) => {
@@ -150,7 +149,7 @@ function createFetchHandler(app) {
 		const run = (i) => {
 			for (; i < mapResponseHooks.length; i++) {
 				const result = mapResponseHooks[i](context);
-				if (result instanceof Promise) return result.then((resolved) => {
+				if (typeof result?.then === "function") return Promise.resolve(result).then((resolved) => {
 					if (resolved !== void 0) return baseMapResponse(resolved, set, request, true);
 					return run(i + 1);
 				});
@@ -218,7 +217,6 @@ function createFetchHandler(app) {
 	app["~finalizeError"] = (context, error) => finalizeError(context, handleError, afterResponse, error);
 	if (traceRequestPhase) {
 		const onRequests = hook?.request ?? [];
-		const asyncIndexes = onRequests.length ? require_handler_utils.getAsyncIndexes(onRequests) : void 0;
 		return async (request, server) => {
 			const context = new Context(request);
 			require_adapter_utils.materializeSetHeaders(context.set);
@@ -247,10 +245,14 @@ function createFetchHandler(app) {
 						name: onRequests[i].name || "anonymous",
 						begin: performance.now()
 					});
-					const result = asyncIndexes?.[i] ? await onRequests[i](context) : onRequests[i](context);
+					let result = onRequests[i](context);
+					if (typeof result?.then === "function") {
+						if (abortSignal) context["~sig"] ??= request.signal;
+						result = await result;
+					}
 					if (watchPath && context.path !== path) warnPathMutation(app);
 					for (let i = 0; i < traceLength; i++) endReports[i]?.();
-					if (armedAbort(request, context)) {
+					if (armedAbort(context)) {
 						for (let j = 0; j < traceLength; j++) trace[j].r(requestReports[j]);
 						return require_handler_utils.emptyResponse.clone();
 					}
@@ -271,8 +273,7 @@ function createFetchHandler(app) {
 	}
 	if (hook?.request) {
 		const onRequests = hook.request;
-		const asyncIndexes = require_handler_utils.getAsyncIndexes(onRequests);
-		if (asyncIndexes) return async (request, server) => {
+		if (require_handler_utils.getAsyncIndexes(onRequests)) return async (request, server) => {
 			const context = new Context(request);
 			require_adapter_utils.materializeSetHeaders(context.set);
 			if (armEager(request, context)) return require_handler_utils.emptyResponse.clone();
@@ -280,10 +281,13 @@ function createFetchHandler(app) {
 			context.server = server ?? null;
 			try {
 				for (let i = 0; i < onRequests.length; i++) {
-					let result = asyncIndexes?.[i] ? await onRequests[i](context) : onRequests[i](context);
-					if (result instanceof Promise) result = await result;
+					let result = onRequests[i](context);
+					if (typeof result?.then === "function") {
+						if (abortSignal) context["~sig"] ??= request.signal;
+						result = await result;
+					}
 					if (watchPath && context.path !== path) warnPathMutation(app);
-					if (armedAbort(request, context)) return require_handler_utils.emptyResponse.clone();
+					if (armedAbort(context)) return require_handler_utils.emptyResponse.clone();
 					if (result !== void 0) {
 						const response = await mapResponse(result, context.set, context);
 						afterResponse?.(context);

package/dist/handler/fetch.mjs

@@ -133,11 +133,10 @@ function createFetchHandler(app) {
 		return (context["~sig"] = request.signal).aborted;
 	};
 	/**
-	* Post-suspension check: arm if nobody has yet, then read. Only emitted on
-	* lanes that actually awaited, so a deferred request that never suspends
-	* never reaches it.
+	* Peek after each callback. The actual await branch arms deferred requests;
+	* immediate callbacks must not materialize a signal just for this check.
 	*/
-	const armedAbort = (request, context) => abortSignal && (context["~sig"] ??= request.signal).aborted === true;
+	const armedAbort = (context) => abortSignal && context["~sig"]?.aborted === true;
 	const baseMapResponse = (app["~config"]?.adapter ?? defaultAdapter).response.map;
 	const mapResponseHooks = hook?.mapResponse;
 	const mapResponse = mapResponseHooks?.length ? (response, set, context) => {
@@ -147,7 +146,7 @@ function createFetchHandler(app) {
 		const run = (i) => {
 			for (; i < mapResponseHooks.length; i++) {
 				const result = mapResponseHooks[i](context);
-				if (result instanceof Promise) return result.then((resolved) => {
+				if (typeof result?.then === "function") return Promise.resolve(result).then((resolved) => {
 					if (resolved !== void 0) return baseMapResponse(resolved, set, request, true);
 					return run(i + 1);
 				});
@@ -215,7 +214,6 @@ function createFetchHandler(app) {
 	app["~finalizeError"] = (context, error) => finalizeError(context, handleError, afterResponse, error);
 	if (traceRequestPhase) {
 		const onRequests = hook?.request ?? [];
-		const asyncIndexes = onRequests.length ? getAsyncIndexes(onRequests) : void 0;
 		return async (request, server) => {
 			const context = new Context(request);
 			materializeSetHeaders(context.set);
@@ -244,10 +242,14 @@ function createFetchHandler(app) {
 						name: onRequests[i].name || "anonymous",
 						begin: performance.now()
 					});
-					const result = asyncIndexes?.[i] ? await onRequests[i](context) : onRequests[i](context);
+					let result = onRequests[i](context);
+					if (typeof result?.then === "function") {
+						if (abortSignal) context["~sig"] ??= request.signal;
+						result = await result;
+					}
 					if (watchPath && context.path !== path) warnPathMutation(app);
 					for (let i = 0; i < traceLength; i++) endReports[i]?.();
-					if (armedAbort(request, context)) {
+					if (armedAbort(context)) {
 						for (let j = 0; j < traceLength; j++) trace[j].r(requestReports[j]);
 						return emptyResponse.clone();
 					}
@@ -268,8 +270,7 @@ function createFetchHandler(app) {
 	}
 	if (hook?.request) {
 		const onRequests = hook.request;
-		const asyncIndexes = getAsyncIndexes(onRequests);
-		if (asyncIndexes) return async (request, server) => {
+		if (getAsyncIndexes(onRequests)) return async (request, server) => {
 			const context = new Context(request);
 			materializeSetHeaders(context.set);
 			if (armEager(request, context)) return emptyResponse.clone();
@@ -277,10 +278,13 @@ function createFetchHandler(app) {
 			context.server = server ?? null;
 			try {
 				for (let i = 0; i < onRequests.length; i++) {
-					let result = asyncIndexes?.[i] ? await onRequests[i](context) : onRequests[i](context);
-					if (result instanceof Promise) result = await result;
+					let result = onRequests[i](context);
+					if (typeof result?.then === "function") {
+						if (abortSignal) context["~sig"] ??= request.signal;
+						result = await result;
+					}
 					if (watchPath && context.path !== path) warnPathMutation(app);
-					if (armedAbort(request, context)) return emptyResponse.clone();
+					if (armedAbort(context)) return emptyResponse.clone();
 					if (result !== void 0) {
 						const response = await mapResponse(result, context.set, context);
 						afterResponse?.(context);

package/dist/package.js

@@ -1,6 +1,6 @@
 
 //#region package.json
-var version = "2.0.0-beta.12";
+var version = "2.0.0-beta.13";
 
 //#endregion
 Object.defineProperty(exports, 'version', {

package/dist/package.mjs

@@ -1,5 +1,5 @@
 //#region package.json
-var version = "2.0.0-beta.12";
+var version = "2.0.0-beta.13";
 
 //#endregion
 export { version };

package/dist/plugin/aot/core.d.ts

@@ -100,6 +100,8 @@ declare const resolveEntryModuleKind: (entry: string) => "cjs" | "esm";
 interface StubPlan {
   /** Stub the internal handler codegen module. */
   jit: boolean;
+  /** Omit the static-clone resolver when no captured handler aliases scl. */
+  staticClone: boolean;
   /** Stub internal WS route builders when the app declares no WS routes. */
   ws: boolean;
   /**

package/dist/plugin/aot/core.js

@@ -44,6 +44,7 @@ const resolveEntryModuleKind = (entry) => {
 };
 const NO_STUB = {
 	jit: false,
+	staticClone: false,
 	ws: false,
 	reconstruct: false,
 	cookie: false,
@@ -81,6 +82,7 @@ function planFromReport(strip, report, hasWS, mayTrace, aliases, allBridgeFree,
 	return {
 		plan: {
 			jit,
+			staticClone: jit && !aliases.has("scl"),
 			ws: !hasWS,
 			reconstruct: jit && !aliases.has("va") && !aliases.has("cc") && !aliases.has("tr"),
 			cookie: jit && !aliases.has("cc") && !wsCookie,
@@ -129,6 +131,10 @@ function makeIsElysiaModule(elysiaRoot) {
 const rewriteIsProductionCalls = (code) => code.replace(/(?<![.?])\bisProduction\(\)/g, "true");
 const bunAdapterStubSource = "const e=(t)=>{throw new Error(`[elysia-aot] Bun adapter was stripped for target 'web-standard' .listen() is unavailable; use the exported fetch handler or rebuild with a different target.`)}\nexport const BunAdapter={name:'bun',runtime:'bun',isWebStandard:true,parse:{},response:{},listen:e}\nexport function collectStaticRoutes(){}\n";
 const STUB_SOURCES = {
+	staticClone: [{
+		filter: /[\\/]elysia[\\/](dist|src)[\\/]compile[\\/]handler[\\/]static-clone-resolver\.(m?js|ts)$/,
+		source: `export const staticCloneResolver = undefined\n`
+	}],
 	jit: [{
 		filter: /[\\/]elysia[\\/](dist|src)[\\/]compile[\\/]handler[\\/]jit\.(m?js|ts)$/,
 		source: "const e=()=>{throw new Error(\"[elysia-aot] handler compiler JIT was stripped (strip mode) but a route needed runtime compilation. Rebuild with strip:false.\")}\nexport function compileHandlerJit(){return e()}\nexport function createInlineHandler(){return e()}\nexport function setCaptureHeaderShorthand(){}\n"

package/dist/plugin/aot/core.mjs

@@ -42,6 +42,7 @@ const resolveEntryModuleKind = (entry) => {
 };
 const NO_STUB = {
 	jit: false,
+	staticClone: false,
 	ws: false,
 	reconstruct: false,
 	cookie: false,
@@ -79,6 +80,7 @@ function planFromReport(strip, report, hasWS, mayTrace, aliases, allBridgeFree,
 	return {
 		plan: {
 			jit,
+			staticClone: jit && !aliases.has("scl"),
 			ws: !hasWS,
 			reconstruct: jit && !aliases.has("va") && !aliases.has("cc") && !aliases.has("tr"),
 			cookie: jit && !aliases.has("cc") && !wsCookie,
@@ -127,6 +129,10 @@ function makeIsElysiaModule(elysiaRoot) {
 const rewriteIsProductionCalls = (code) => code.replace(/(?<![.?])\bisProduction\(\)/g, "true");
 const bunAdapterStubSource = "const e=(t)=>{throw new Error(`[elysia-aot] Bun adapter was stripped for target 'web-standard' .listen() is unavailable; use the exported fetch handler or rebuild with a different target.`)}\nexport const BunAdapter={name:'bun',runtime:'bun',isWebStandard:true,parse:{},response:{},listen:e}\nexport function collectStaticRoutes(){}\n";
 const STUB_SOURCES = {
+	staticClone: [{
+		filter: /[\\/]elysia[\\/](dist|src)[\\/]compile[\\/]handler[\\/]static-clone-resolver\.(m?js|ts)$/,
+		source: `export const staticCloneResolver = undefined\n`
+	}],
 	jit: [{
 		filter: /[\\/]elysia[\\/](dist|src)[\\/]compile[\\/]handler[\\/]jit\.(m?js|ts)$/,
 		source: "const e=()=>{throw new Error(\"[elysia-aot] handler compiler JIT was stripped (strip mode) but a route needed runtime compilation. Rebuild with strip:false.\")}\nexport function compileHandlerJit(){return e()}\nexport function createInlineHandler(){return e()}\nexport function setCaptureHeaderShorthand(){}\n"