elysia 2.0.0-exp.33 → 2.0.0-exp.34

package/dist/compile/handler/jit.js

@@ -165,6 +165,8 @@ function compileHandlerJit({ method, path, handler, root, hook, adapter, buildVa
 	const traceHandlers = hook?.trace ?? void 0;
 	const hasTrace = !!traceHandlers?.length;
 	const traceCount = hasTrace ? traceHandlers.length : 0;
+	const hasLifecycleHook = parseLength > 0 || !!hook?.transform?.length || hasBeforeHandle || hasAfterHandle || hasMapResponse || hasErrorHook || hasAfterResponse;
+	const abortCheck = hasLifecycleHook ? `if(aborted)return emp.clone()\n` : "";
 	const tracePhases = hasTrace ? require_trace.unionTracePhases(traceHandlers) : /* @__PURE__ */ new Set();
 	const phaseOn = (phase) => hasTrace && (tracePhases === null || tracePhases.has(phase));
 	const hasAnyPhase = hasTrace && (tracePhases === null || tracePhases.size > 0);
@@ -217,6 +219,10 @@ function compileHandlerJit({ method, path, handler, root, hook, adapter, buildVa
 	const syncAfterResponse = hasAfterResponse && !isAsync && !hasTrace && !hasErrorHook;
 	const callHandler = isHandleFunction ? callHandlerSyncOnAsync ? `_r=h(c)\nif(_r instanceof Promise)_r=await _r\n` : `_r=${isAsync ? "await " : ""}h(c)\n` : isStaticResponse ? `_r=cr(h)\n` : isPromiseHandler ? `_r=h.then(cr)\n` : `_r=h\n`;
 	let code = `${isAsync ? "async " : ""}function route(c){\n`;
+	if (hasLifecycleHook) {
+		link(require_handler_utils.emptyResponse, "emp");
+		code += "let aborted=c.request.signal.aborted\nif(!aborted)c.request.signal.addEventListener('abort',()=>{aborted=true},{once:true})\n" + abortCheck;
+	}
 	if ((hasAfterResponse || hasTrace) && !syncAfterResponse) code += "let _stl\n";
 	if (asyncCookieSign) code += "let _sg\n";
 	if (hasTrace) {
@@ -265,6 +271,7 @@ function compileHandlerJit({ method, path, handler, root, hook, adapter, buildVa
 		link(require_error.ParseError, "pe");
 		code += "try{\n" + parseCode + "}catch(e){throw new pe(e)}\n";
 		if (hasTrace) code += endTrace("parse");
+		if (hasLifecycleHook) code += abortCheck;
 	} else if (hasTrace) code += beginTrace("parse", 0) + endTrace("parse");
 	if (hook?.transform?.length || hasTrace) {
 		const transformLen = hook?.transform?.length ?? 0;
@@ -272,9 +279,10 @@ function compileHandlerJit({ method, path, handler, root, hook, adapter, buildVa
 		if (transformLen) {
 			link(hook.transform, "tf");
 			if (isAsync) code += "let _tf\n";
-			code += require_compile_handler_utils.mapTransform(hook.transform, [isAsync, buildReport("transform")]);
+			code += require_compile_handler_utils.mapTransform(hook.transform, [isAsync, buildReport("transform")], "aborted");
 		}
 		code += endTrace("transform");
+		if (transformLen) code += abortCheck;
 	}
 	if (vali?.body) {
 		link(vali, "va");
@@ -344,9 +352,10 @@ function compileHandlerJit({ method, path, handler, root, hook, adapter, buildVa
 			if (hasBeforeHandle) {
 				link(hook.beforeHandle, "bf");
 				const deriveEntries = hook["~deriveEntries"];
-				code += require_compile_handler_utils.mapBeforeHandle(hook.beforeHandle, deriveEntries?.length ? new Set(deriveEntries) : void 0, link, isAsync, buildReport("beforeHandle"));
+				code += require_compile_handler_utils.mapBeforeHandle(hook.beforeHandle, deriveEntries?.length ? new Set(deriveEntries) : void 0, link, isAsync, buildReport("beforeHandle"), "aborted");
 			}
 			code += endTrace("beforeHandle");
+			if (hasBeforeHandle) code += abortCheck;
 		}
 		if (hasAfterResponse || traceHandleOn) link(require_adapter_utils.tee, "tee");
 		const teeConsumers = (hasAfterResponse ? 1 : 0) + (traceHandleOn ? 1 : 0);
@@ -367,6 +376,7 @@ function compileHandlerJit({ method, path, handler, root, hook, adapter, buildVa
 			code += `}\n`;
 		} else if (hasBeforeHandle) code += `if(_r===undefined){\n${callHandler}${teeBlock}}\n`;
 		else code += callHandler + teeBlock;
+		if (hasLifecycleHook) code += abortCheck;
 		if (syncAfterResponse) {
 			link(require_handler_utils.forwardError, "fe");
 			factoryHelpers += `function _fin(c,_r){
@@ -386,18 +396,20 @@ const _s=tee(_r,${teeCount})\nreturn _fin2(c,_s[0],_s[1])\n}\nreturn _fin2(c,_r,
 				code += beginTrace("afterHandle", afLen);
 				if (hasAfterHandle) {
 					link(hook.afterHandle, "af");
-					code += require_compile_handler_utils.mapAfterHandle(hook.afterHandle, isAsync, buildReport("afterHandle"));
+					code += require_compile_handler_utils.mapAfterHandle(hook.afterHandle, isAsync, buildReport("afterHandle"), "aborted");
 				}
 				code += endTrace("afterHandle");
+				if (hasAfterHandle) code += abortCheck;
 			}
 			if (hasMapResponse || hasTrace) {
 				const mrLen = hook?.mapResponse?.length ?? 0;
 				code += beginTrace("mapResponse", mrLen);
 				if (hasMapResponse) {
 					link(hook.mapResponse, "mr");
-					code += require_compile_handler_utils.mapMapResponse(hook.mapResponse, isAsync, buildReport("mapResponse"));
+					code += require_compile_handler_utils.mapMapResponse(hook.mapResponse, isAsync, buildReport("mapResponse"), "aborted");
 				}
 				code += endTrace("mapResponse");
+				if (hasMapResponse) code += abortCheck;
 			}
 			if (hasResponseValidator) {
 				link(vali, "va");
@@ -406,17 +418,18 @@ const _s=tee(_r,${teeCount})\nreturn _fin2(c,_s[0],_s[1])\n}\nreturn _fin2(c,_r,
 				code += `if(_r instanceof es){
 const _vr=va.response[_r.code]
 if(_vr)_r.response=${awaitStr}_vr.EncodeFrom(_r.response,'response')\n}else if(!(_r instanceof Response)&&!(_r instanceof ReadableStream)&&typeof _r?.next!=='function'){\nconst _vr=va.response[c.set.status??200]\nif(_vr)_r=${awaitStr}_vr.EncodeFrom(_r,'response')\n}\n`;
+				if (hasLifecycleHook) code += abortCheck;
 			}
 			code += schedule;
 			code += signPrefix;
 			const finalMap = hasSet ? `${map}(_r,c.set,c.request)` : `${map}(_r,c.request)`;
-			if (syncErrorHook) code += `if(_r instanceof Promise)return ${finalMap}.catch((_e)=>_ce(_e,c))\n`;
+			if (syncErrorHook) code += `if(_r instanceof Promise)return ${finalMap}.catch((_e)=>_ce(_e,c,aborted))\n`;
 			code += `return ${finalMap}\n`;
 		}
 	} else if (isHandleFunction) {
 		if (!isAsync) link(require_handler_utils.forwardError, "fe");
 		const mapArgs = hasSet ? "c.set,c.request" : "c.request";
-		code += (callHandlerSyncOnAsync ? `let _r=h(c)\nif(_r instanceof Promise)_r=await _r\n` : `let _r=${isAsync ? "await " : ""}h(c)\n`) + `if(_r instanceof Error)throw _r\n` + (isAsync ? `return ${map}(_r,${mapArgs})\n` : syncErrorHook ? `if(_r instanceof Promise)return ${map}(_r.then(fe),${mapArgs}).catch((_e)=>_ce(_e,c))\nreturn ${map}(_r,${mapArgs})\n` : `if(_r instanceof Promise)_r=_r.then(fe)\nreturn ${map}(_r,${mapArgs})\n`);
+		code += (callHandlerSyncOnAsync ? `let _r=h(c)\nif(_r instanceof Promise)_r=await _r\n` : `let _r=${isAsync ? "await " : ""}h(c)\n`) + abortCheck + `if(_r instanceof Error)throw _r\n` + (isAsync ? `return ${map}(_r,${mapArgs})\n` : syncErrorHook ? `if(_r instanceof Promise)return ${map}(_r.then(fe),${mapArgs}).catch((_e)=>_ce(_e,c,aborted))\nreturn ${map}(_r,${mapArgs})\n` : `if(_r instanceof Promise)_r=_r.then(fe)\nreturn ${map}(_r,${mapArgs})\n`);
 	} else code += `return ${mapReturn}`;
 	if (hasErrorHook || hasTrace) {
 		let body = "";
@@ -438,9 +451,9 @@ let _r${hasMapResponse ? ",tmp" : ""}\n` + require_compile_handler_utils.mapErro
 				map,
 				link,
 				res.map,
-				(hasMapResponse ? `c.responseValue=_r\n` + require_compile_handler_utils.mapMapResponse(hook.mapResponse, isAsync, void 0) : "") + endTrace("error") + schedule,
+				(hasMapResponse ? `c.responseValue=_r\n` + require_compile_handler_utils.mapMapResponse(hook.mapResponse, isAsync, void 0, "aborted") : "") + endTrace("error") + abortCheck + schedule,
 				signPrefix
-			]) + endTrace("error") + schedule + `if(typeof e?.toResponse==='function')try{
+			], "aborted") + endTrace("error") + abortCheck + schedule + `if(typeof e?.toResponse==='function')try{
 const _er=e.toResponse()
 if(_er instanceof Promise)return _er.then(${asyncCookieSign ? "async " : ""}(_v)=>{if(_v instanceof Response){${signPrefix}return ${map}(_v,c.set,c.request)}return _efb(e,c)},()=>_efb(e,c))\nif(_er instanceof Response){${signPrefix}return ${map}(_er,c.set,c.request)}\n}catch{}\nreturn _efb(e,c)\n`;
 		} else {
@@ -448,8 +461,8 @@ if(_er instanceof Promise)return _er.then(${asyncCookieSign ? "async " : ""}(_v)
 			body += `throw e\n`;
 		}
 		if (syncErrorHook) {
-			factoryHelpers += `function _ce(e,c){\n${body}}\n`;
-			code += `}catch(e){return _ce(e,c)}\n`;
+			factoryHelpers += `function _ce(e,c,aborted){\n${body}}\n`;
+			code += `}catch(e){return _ce(e,c,aborted)}\n`;
 		} else code += `}catch(e){\n${body}}\n`;
 	}
 	code += "}";

package/dist/compile/handler/jit.mjs

@@ -8,7 +8,7 @@ import { Capture } from "../aot.mjs";
 import { compileCookieConfig } from "../../cookie/config.mjs";
 import { buildCookieJar, hasSyncHmac, parseCookieRaw, parseCookieRawSigned, parseCookieRawSync, signCookieValues, signCookieValuesSync } from "../../cookie/utils.mjs";
 import { isAsyncFunction, isAsyncLifecycle, mayReturnPromise } from "../utils.mjs";
-import { forwardError } from "../../handler/utils.mjs";
+import { emptyResponse, forwardError } from "../../handler/utils.mjs";
 import { cloneResponse, getQueryParseChannels, hasRequestBody, mapAfterHandle, mapAfterResponse, mapBeforeHandle, mapError, mapMapResponse, mapTransform } from "./utils.mjs";
 import { sucrose } from "../../sucrose.mjs";
 import { createTracer, unionTracePhases } from "../../trace.mjs";
@@ -164,6 +164,8 @@ function compileHandlerJit({ method, path, handler, root, hook, adapter, buildVa
 	const traceHandlers = hook?.trace ?? void 0;
 	const hasTrace = !!traceHandlers?.length;
 	const traceCount = hasTrace ? traceHandlers.length : 0;
+	const hasLifecycleHook = parseLength > 0 || !!hook?.transform?.length || hasBeforeHandle || hasAfterHandle || hasMapResponse || hasErrorHook || hasAfterResponse;
+	const abortCheck = hasLifecycleHook ? `if(aborted)return emp.clone()\n` : "";
 	const tracePhases = hasTrace ? unionTracePhases(traceHandlers) : /* @__PURE__ */ new Set();
 	const phaseOn = (phase) => hasTrace && (tracePhases === null || tracePhases.has(phase));
 	const hasAnyPhase = hasTrace && (tracePhases === null || tracePhases.size > 0);
@@ -216,6 +218,10 @@ function compileHandlerJit({ method, path, handler, root, hook, adapter, buildVa
 	const syncAfterResponse = hasAfterResponse && !isAsync && !hasTrace && !hasErrorHook;
 	const callHandler = isHandleFunction ? callHandlerSyncOnAsync ? `_r=h(c)\nif(_r instanceof Promise)_r=await _r\n` : `_r=${isAsync ? "await " : ""}h(c)\n` : isStaticResponse ? `_r=cr(h)\n` : isPromiseHandler ? `_r=h.then(cr)\n` : `_r=h\n`;
 	let code = `${isAsync ? "async " : ""}function route(c){\n`;
+	if (hasLifecycleHook) {
+		link(emptyResponse, "emp");
+		code += "let aborted=c.request.signal.aborted\nif(!aborted)c.request.signal.addEventListener('abort',()=>{aborted=true},{once:true})\n" + abortCheck;
+	}
 	if ((hasAfterResponse || hasTrace) && !syncAfterResponse) code += "let _stl\n";
 	if (asyncCookieSign) code += "let _sg\n";
 	if (hasTrace) {
@@ -264,6 +270,7 @@ function compileHandlerJit({ method, path, handler, root, hook, adapter, buildVa
 		link(ParseError, "pe");
 		code += "try{\n" + parseCode + "}catch(e){throw new pe(e)}\n";
 		if (hasTrace) code += endTrace("parse");
+		if (hasLifecycleHook) code += abortCheck;
 	} else if (hasTrace) code += beginTrace("parse", 0) + endTrace("parse");
 	if (hook?.transform?.length || hasTrace) {
 		const transformLen = hook?.transform?.length ?? 0;
@@ -271,9 +278,10 @@ function compileHandlerJit({ method, path, handler, root, hook, adapter, buildVa
 		if (transformLen) {
 			link(hook.transform, "tf");
 			if (isAsync) code += "let _tf\n";
-			code += mapTransform(hook.transform, [isAsync, buildReport("transform")]);
+			code += mapTransform(hook.transform, [isAsync, buildReport("transform")], "aborted");
 		}
 		code += endTrace("transform");
+		if (transformLen) code += abortCheck;
 	}
 	if (vali?.body) {
 		link(vali, "va");
@@ -343,9 +351,10 @@ function compileHandlerJit({ method, path, handler, root, hook, adapter, buildVa
 			if (hasBeforeHandle) {
 				link(hook.beforeHandle, "bf");
 				const deriveEntries = hook["~deriveEntries"];
-				code += mapBeforeHandle(hook.beforeHandle, deriveEntries?.length ? new Set(deriveEntries) : void 0, link, isAsync, buildReport("beforeHandle"));
+				code += mapBeforeHandle(hook.beforeHandle, deriveEntries?.length ? new Set(deriveEntries) : void 0, link, isAsync, buildReport("beforeHandle"), "aborted");
 			}
 			code += endTrace("beforeHandle");
+			if (hasBeforeHandle) code += abortCheck;
 		}
 		if (hasAfterResponse || traceHandleOn) link(tee, "tee");
 		const teeConsumers = (hasAfterResponse ? 1 : 0) + (traceHandleOn ? 1 : 0);
@@ -366,6 +375,7 @@ function compileHandlerJit({ method, path, handler, root, hook, adapter, buildVa
 			code += `}\n`;
 		} else if (hasBeforeHandle) code += `if(_r===undefined){\n${callHandler}${teeBlock}}\n`;
 		else code += callHandler + teeBlock;
+		if (hasLifecycleHook) code += abortCheck;
 		if (syncAfterResponse) {
 			link(forwardError, "fe");
 			factoryHelpers += `function _fin(c,_r){
@@ -385,18 +395,20 @@ const _s=tee(_r,${teeCount})\nreturn _fin2(c,_s[0],_s[1])\n}\nreturn _fin2(c,_r,
 				code += beginTrace("afterHandle", afLen);
 				if (hasAfterHandle) {
 					link(hook.afterHandle, "af");
-					code += mapAfterHandle(hook.afterHandle, isAsync, buildReport("afterHandle"));
+					code += mapAfterHandle(hook.afterHandle, isAsync, buildReport("afterHandle"), "aborted");
 				}
 				code += endTrace("afterHandle");
+				if (hasAfterHandle) code += abortCheck;
 			}
 			if (hasMapResponse || hasTrace) {
 				const mrLen = hook?.mapResponse?.length ?? 0;
 				code += beginTrace("mapResponse", mrLen);
 				if (hasMapResponse) {
 					link(hook.mapResponse, "mr");
-					code += mapMapResponse(hook.mapResponse, isAsync, buildReport("mapResponse"));
+					code += mapMapResponse(hook.mapResponse, isAsync, buildReport("mapResponse"), "aborted");
 				}
 				code += endTrace("mapResponse");
+				if (hasMapResponse) code += abortCheck;
 			}
 			if (hasResponseValidator) {
 				link(vali, "va");
@@ -405,17 +417,18 @@ const _s=tee(_r,${teeCount})\nreturn _fin2(c,_s[0],_s[1])\n}\nreturn _fin2(c,_r,
 				code += `if(_r instanceof es){
 const _vr=va.response[_r.code]
 if(_vr)_r.response=${awaitStr}_vr.EncodeFrom(_r.response,'response')\n}else if(!(_r instanceof Response)&&!(_r instanceof ReadableStream)&&typeof _r?.next!=='function'){\nconst _vr=va.response[c.set.status??200]\nif(_vr)_r=${awaitStr}_vr.EncodeFrom(_r,'response')\n}\n`;
+				if (hasLifecycleHook) code += abortCheck;
 			}
 			code += schedule;
 			code += signPrefix;
 			const finalMap = hasSet ? `${map}(_r,c.set,c.request)` : `${map}(_r,c.request)`;
-			if (syncErrorHook) code += `if(_r instanceof Promise)return ${finalMap}.catch((_e)=>_ce(_e,c))\n`;
+			if (syncErrorHook) code += `if(_r instanceof Promise)return ${finalMap}.catch((_e)=>_ce(_e,c,aborted))\n`;
 			code += `return ${finalMap}\n`;
 		}
 	} else if (isHandleFunction) {
 		if (!isAsync) link(forwardError, "fe");
 		const mapArgs = hasSet ? "c.set,c.request" : "c.request";
-		code += (callHandlerSyncOnAsync ? `let _r=h(c)\nif(_r instanceof Promise)_r=await _r\n` : `let _r=${isAsync ? "await " : ""}h(c)\n`) + `if(_r instanceof Error)throw _r\n` + (isAsync ? `return ${map}(_r,${mapArgs})\n` : syncErrorHook ? `if(_r instanceof Promise)return ${map}(_r.then(fe),${mapArgs}).catch((_e)=>_ce(_e,c))\nreturn ${map}(_r,${mapArgs})\n` : `if(_r instanceof Promise)_r=_r.then(fe)\nreturn ${map}(_r,${mapArgs})\n`);
+		code += (callHandlerSyncOnAsync ? `let _r=h(c)\nif(_r instanceof Promise)_r=await _r\n` : `let _r=${isAsync ? "await " : ""}h(c)\n`) + abortCheck + `if(_r instanceof Error)throw _r\n` + (isAsync ? `return ${map}(_r,${mapArgs})\n` : syncErrorHook ? `if(_r instanceof Promise)return ${map}(_r.then(fe),${mapArgs}).catch((_e)=>_ce(_e,c,aborted))\nreturn ${map}(_r,${mapArgs})\n` : `if(_r instanceof Promise)_r=_r.then(fe)\nreturn ${map}(_r,${mapArgs})\n`);
 	} else code += `return ${mapReturn}`;
 	if (hasErrorHook || hasTrace) {
 		let body = "";
@@ -437,9 +450,9 @@ let _r${hasMapResponse ? ",tmp" : ""}\n` + mapError(hook.error, [
 				map,
 				link,
 				res.map,
-				(hasMapResponse ? `c.responseValue=_r\n` + mapMapResponse(hook.mapResponse, isAsync, void 0) : "") + endTrace("error") + schedule,
+				(hasMapResponse ? `c.responseValue=_r\n` + mapMapResponse(hook.mapResponse, isAsync, void 0, "aborted") : "") + endTrace("error") + abortCheck + schedule,
 				signPrefix
-			]) + endTrace("error") + schedule + `if(typeof e?.toResponse==='function')try{
+			], "aborted") + endTrace("error") + abortCheck + schedule + `if(typeof e?.toResponse==='function')try{
 const _er=e.toResponse()
 if(_er instanceof Promise)return _er.then(${asyncCookieSign ? "async " : ""}(_v)=>{if(_v instanceof Response){${signPrefix}return ${map}(_v,c.set,c.request)}return _efb(e,c)},()=>_efb(e,c))\nif(_er instanceof Response){${signPrefix}return ${map}(_er,c.set,c.request)}\n}catch{}\nreturn _efb(e,c)\n`;
 		} else {
@@ -447,8 +460,8 @@ if(_er instanceof Promise)return _er.then(${asyncCookieSign ? "async " : ""}(_v)
 			body += `throw e\n`;
 		}
 		if (syncErrorHook) {
-			factoryHelpers += `function _ce(e,c){\n${body}}\n`;
-			code += `}catch(e){return _ce(e,c)}\n`;
+			factoryHelpers += `function _ce(e,c,aborted){\n${body}}\n`;
+			code += `}catch(e){return _ce(e,c,aborted)}\n`;
 		} else code += `}catch(e){\n${body}}\n`;
 	}
 	code += "}";

package/dist/compile/handler/params.js

@@ -25,6 +25,7 @@ const HANDLER_PARAMS = {
 	pe: () => require_error.ParseError,
 	es: () => require_error.ElysiaStatus,
 	ise: () => require_error.internalServerErrorResponse,
+	emp: () => require_handler_utils.emptyResponse,
 	isprod: () => require_error.isProduction,
 	verr: () => require_error.ValidationError,
 	tee: () => require_adapter_utils.tee,

package/dist/compile/handler/params.mjs

@@ -3,7 +3,7 @@ import { ElysiaStatus, ParseError, ValidationError, internalServerErrorResponse,
 import { tee } from "../../adapter/utils.mjs";
 import { parseQueryFromURL } from "../../parse-query.mjs";
 import { buildCookieJar, parseCookieRaw, parseCookieRawSigned, parseCookieRawSync, signCookieValues, signCookieValuesSync } from "../../cookie/utils.mjs";
-import { forwardError } from "../../handler/utils.mjs";
+import { emptyResponse, forwardError } from "../../handler/utils.mjs";
 import { cloneResponse, getQueryParseChannels, hasRequestBody } from "./utils.mjs";
 
 //#region src/compile/handler/params.ts
@@ -24,6 +24,7 @@ const HANDLER_PARAMS = {
 	pe: () => ParseError,
 	es: () => ElysiaStatus,
 	ise: () => internalServerErrorResponse,
+	emp: () => emptyResponse,
 	isprod: () => isProduction,
 	verr: () => ValidationError,
 	tee: () => tee,

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

@@ -1,5 +1,7 @@
 import { AfterResponseHandler, AppHook, ErrorHandler, MaybeArray, TransformHandler } from "../../types.js";
 import { Context } from "../../context.js";
+import { emptyResponse } from "../../handler/utils.js";
+
 //#region src/compile/handler/utils.d.ts
 type Link = (v: unknown, key: string) => void;
 interface TraceReporter {
@@ -10,17 +12,17 @@ interface TraceReporter {
 }
 declare function cloneResponse(r: unknown): unknown;
 declare function hasRequestBody(request: Request): boolean;
-declare const mapTransform: (event: MaybeArray<TransformHandler<any, any, undefined, "local">>, rest?: [isAsync: boolean, report?: TraceReporter | undefined] | undefined) => string;
+declare const mapTransform: (event: MaybeArray<TransformHandler<any, any, undefined, "local">>, rest?: [isAsync: boolean, report?: TraceReporter | undefined] | undefined, abortGuard?: string) => string;
 declare function extractDeriveKeys(fn: Function): string[] | null;
-declare function mapBeforeHandle(_hooks: AppHook['beforeHandle'] | AppHook['beforeHandle'][0], derive: Set<Function> | undefined, link: Link, isAsync: boolean, report?: TraceReporter): string;
-declare const mapAfterHandle: (_hooks: AppHook["afterHandle"] | AppHook["afterHandle"][0], isAsync: boolean, report?: TraceReporter) => string;
-declare const mapMapResponse: (_hooks: AppHook["mapResponse"] | AppHook["mapResponse"][0], isAsync: boolean, report?: TraceReporter) => string;
-declare const mapAfterResponse: (event: MaybeArray<AfterResponseHandler<any, any, undefined, "local">>, rest?: [report?: TraceReporter | undefined] | undefined) => string;
-declare const mapError: (event: MaybeArray<ErrorHandler<any, any, any>>, rest?: [map: string, link: Link, mapResponse: (response: unknown, set: Context["set"], ...params: unknown[]) => unknown, schedule: string, sign: string] | undefined) => string;
+declare function mapBeforeHandle(_hooks: AppHook['beforeHandle'] | AppHook['beforeHandle'][0], derive: Set<Function> | undefined, link: Link, isAsync: boolean, report?: TraceReporter, abortGuard?: string): string;
+declare const mapAfterHandle: (_hooks: AppHook["afterHandle"] | AppHook["afterHandle"][0], isAsync: boolean, report?: TraceReporter, abortGuard?: string) => string;
+declare const mapMapResponse: (_hooks: AppHook["mapResponse"] | AppHook["mapResponse"][0], isAsync: boolean, report?: TraceReporter, abortGuard?: string) => string;
+declare const mapAfterResponse: (event: MaybeArray<AfterResponseHandler<any, any, undefined, "local">>, rest?: [report?: TraceReporter | undefined] | undefined, abortGuard?: string) => string;
+declare const mapError: (event: MaybeArray<ErrorHandler<any, any, any>>, rest?: [map: string, link: Link, mapResponse: (response: unknown, set: Context["set"], ...params: unknown[]) => unknown, schedule: string, sign: string] | undefined, abortGuard?: string) => string;
 interface QueryWalkState {
   array: Record<string, 1> | undefined;
   object: Record<string, 1> | undefined;
 }
 declare function getQueryParseChannels(querySchema: any): QueryWalkState | undefined;
 //#endregion
-export { Link, TraceReporter, cloneResponse, extractDeriveKeys, getQueryParseChannels, hasRequestBody, mapAfterHandle, mapAfterResponse, mapBeforeHandle, mapError, mapMapResponse, mapTransform };
+export { Link, TraceReporter, cloneResponse, emptyResponse, extractDeriveKeys, getQueryParseChannels, hasRequestBody, mapAfterHandle, mapAfterResponse, mapBeforeHandle, mapError, mapMapResponse, mapTransform };

package/dist/compile/handler/utils.js

@@ -3,6 +3,7 @@ const require_type_constants = require('../../type/constants.js');
 const require_adapter_skip_clone = require('../../adapter/skip-clone.js');
 const require_error = require('../../error.js');
 const require_compile_utils = require('../utils.js');
+const require_handler_utils = require('../../handler/utils.js');
 const require_compile_lexer = require('../lexer.js');
 
 //#region src/compile/handler/utils.ts
@@ -242,7 +243,7 @@ function skipValue(src, i) {
 	}
 	return -1;
 }
-function mapBeforeHandle(_hooks, derive, link, isAsync, report) {
+function mapBeforeHandle(_hooks, derive, link, isAsync, report, abortGuard) {
 	const hooks = toArray(_hooks);
 	let code = "";
 	let depth = 0;
@@ -250,7 +251,7 @@ function mapBeforeHandle(_hooks, derive, link, isAsync, report) {
 	for (let i = 0; i < hooks.length; i++) {
 		const fn = hooks[i];
 		if (i > 0) {
-			code += `if(_r===undefined){\n`;
+			code += `if(${abortGuard ? `!${abortGuard}&&` : ""}_r===undefined){\n`;
 			depth++;
 		}
 		const t = trace(report, fn);
@@ -270,13 +271,13 @@ else if(tmp){${merge};tmp=undefined}\n`;
 	if (needsEs) link(require_error.ElysiaStatus, "es");
 	return code;
 }
-function mapChainHook(hooks, prefix, isAsync, report) {
+function mapChainHook(hooks, prefix, isAsync, report, abortGuard) {
 	let code = "";
 	let depth = 0;
 	for (let i = 0; i < hooks.length; i++) {
 		const fn = hooks[i];
 		if (i > 0) {
-			code += `if(tmp===undefined){\n`;
+			code += `if(${abortGuard ? `!${abortGuard}&&` : ""}tmp===undefined){\n`;
 			depth++;
 		}
 		const t = trace(report, fn);
@@ -289,8 +290,8 @@ function mapChainHook(hooks, prefix, isAsync, report) {
 	code += `if(tmp!==undefined)_r=c.responseValue=tmp\n`;
 	return code;
 }
-const mapAfterHandle = (_hooks, isAsync, report) => mapChainHook(toArray(_hooks), "af", isAsync, report);
-const mapMapResponse = (_hooks, isAsync, report) => mapChainHook(toArray(_hooks), "mr", isAsync, report);
+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 mapAfterResponse = /* @__PURE__ */ map((i, fn, [report]) => {
 	const t = trace(report, fn);
 	return `try{` + t.begin + `${Await(fn)}ar${at(i)}(c)\n` + t.end() + `}catch(_e){` + t.end("_e") + `}\n`;
@@ -300,10 +301,18 @@ const mapError = /* @__PURE__ */ map((i, fn, [map, link, mapResponse, schedule,
 	return `_r=${Await(fn)}er${at(i)}(c)\nif(_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 ${map}(_r,c.set,c.request)\n}\n`;
 });
 function map(map) {
-	return function(event, rest) {
+	return function(event, rest, abortGuard) {
 		if (Array.isArray(event)) {
 			let code = "";
-			for (let i = 0; i < event.length; i++) code += map(i, event[i], rest);
+			let depth = 0;
+			for (let i = 0; i < event.length; i++) {
+				if (i > 0 && abortGuard) {
+					code += `if(!${abortGuard}){\n`;
+					depth++;
+				}
+				code += map(i, event[i], rest);
+			}
+			code += "}".repeat(depth);
 			return code;
 		} else return map(void 0, event, rest);
 	};
@@ -376,6 +385,7 @@ const awaitGuard = (fn, isAsync, target) => isAsync && !require_compile_utils.is
 
 //#endregion
 exports.cloneResponse = cloneResponse;
+exports.emptyResponse = require_handler_utils.emptyResponse;
 exports.extractDeriveKeys = extractDeriveKeys;
 exports.getQueryParseChannels = getQueryParseChannels;
 exports.hasRequestBody = hasRequestBody;

package/dist/compile/handler/utils.mjs

@@ -2,6 +2,7 @@ import { ELYSIA_TYPES } from "../../type/constants.mjs";
 import { skipClone } from "../../adapter/skip-clone.mjs";
 import { ElysiaStatus } from "../../error.mjs";
 import { isAsyncFunction } from "../utils.mjs";
+import { emptyResponse } from "../../handler/utils.mjs";
 import { isIdentChar, isSpace, skipString } from "../lexer.mjs";
 
 //#region src/compile/handler/utils.ts
@@ -241,7 +242,7 @@ function skipValue(src, i) {
 	}
 	return -1;
 }
-function mapBeforeHandle(_hooks, derive, link, isAsync, report) {
+function mapBeforeHandle(_hooks, derive, link, isAsync, report, abortGuard) {
 	const hooks = toArray(_hooks);
 	let code = "";
 	let depth = 0;
@@ -249,7 +250,7 @@ function mapBeforeHandle(_hooks, derive, link, isAsync, report) {
 	for (let i = 0; i < hooks.length; i++) {
 		const fn = hooks[i];
 		if (i > 0) {
-			code += `if(_r===undefined){\n`;
+			code += `if(${abortGuard ? `!${abortGuard}&&` : ""}_r===undefined){\n`;
 			depth++;
 		}
 		const t = trace(report, fn);
@@ -269,13 +270,13 @@ else if(tmp){${merge};tmp=undefined}\n`;
 	if (needsEs) link(ElysiaStatus, "es");
 	return code;
 }
-function mapChainHook(hooks, prefix, isAsync, report) {
+function mapChainHook(hooks, prefix, isAsync, report, abortGuard) {
 	let code = "";
 	let depth = 0;
 	for (let i = 0; i < hooks.length; i++) {
 		const fn = hooks[i];
 		if (i > 0) {
-			code += `if(tmp===undefined){\n`;
+			code += `if(${abortGuard ? `!${abortGuard}&&` : ""}tmp===undefined){\n`;
 			depth++;
 		}
 		const t = trace(report, fn);
@@ -288,8 +289,8 @@ function mapChainHook(hooks, prefix, isAsync, report) {
 	code += `if(tmp!==undefined)_r=c.responseValue=tmp\n`;
 	return code;
 }
-const mapAfterHandle = (_hooks, isAsync, report) => mapChainHook(toArray(_hooks), "af", isAsync, report);
-const mapMapResponse = (_hooks, isAsync, report) => mapChainHook(toArray(_hooks), "mr", isAsync, report);
+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 mapAfterResponse = /* @__PURE__ */ map((i, fn, [report]) => {
 	const t = trace(report, fn);
 	return `try{` + t.begin + `${Await(fn)}ar${at(i)}(c)\n` + t.end() + `}catch(_e){` + t.end("_e") + `}\n`;
@@ -299,10 +300,18 @@ const mapError = /* @__PURE__ */ map((i, fn, [map, link, mapResponse, schedule,
 	return `_r=${Await(fn)}er${at(i)}(c)\nif(_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 ${map}(_r,c.set,c.request)\n}\n`;
 });
 function map(map) {
-	return function(event, rest) {
+	return function(event, rest, abortGuard) {
 		if (Array.isArray(event)) {
 			let code = "";
-			for (let i = 0; i < event.length; i++) code += map(i, event[i], rest);
+			let depth = 0;
+			for (let i = 0; i < event.length; i++) {
+				if (i > 0 && abortGuard) {
+					code += `if(!${abortGuard}){\n`;
+					depth++;
+				}
+				code += map(i, event[i], rest);
+			}
+			code += "}".repeat(depth);
 			return code;
 		} else return map(void 0, event, rest);
 	};
@@ -374,4 +383,4 @@ const Await = (fn) => isAsyncFunction(fn) ? "await " : "";
 const awaitGuard = (fn, isAsync, target) => isAsync && !isAsyncFunction(fn) ? `if(${target} instanceof Promise)${target}=await ${target}\n` : "";
 
 //#endregion
-export { cloneResponse, extractDeriveKeys, getQueryParseChannels, hasRequestBody, mapAfterHandle, mapAfterResponse, mapBeforeHandle, mapError, mapMapResponse, mapTransform };
+export { cloneResponse, emptyResponse, extractDeriveKeys, getQueryParseChannels, hasRequestBody, mapAfterHandle, mapAfterResponse, mapBeforeHandle, mapError, mapMapResponse, mapTransform };

package/dist/handler/fetch.js

@@ -175,6 +175,11 @@ function createFetchHandler(app) {
 		const asyncIndexes = onRequests.length ? require_handler_utils.getAsyncIndexes(onRequests) : void 0;
 		return async (request) => {
 			const context = new Context(request);
+			let aborted = request.signal.aborted;
+			if (!aborted) request.signal.addEventListener("abort", () => {
+				aborted = true;
+			}, { once: true });
+			if (aborted) return require_handler_utils.emptyResponse.clone();
 			const url = request.url, s = url.indexOf("/", pathStart);
 			context.path = url.substring(s, (context.qi = url.indexOf("?", s)) === -1 ? url.length : context.qi);
 			context.rid = require_utils.requestId();
@@ -201,6 +206,10 @@ function createFetchHandler(app) {
 					});
 					const result = asyncIndexes?.[i] ? await onRequests[i](context) : onRequests[i](context);
 					for (let i = 0; i < traceLength; i++) endReports[i]?.();
+					if (aborted) {
+						for (let j = 0; j < traceLength; j++) trace[j].r(requestReports[j]);
+						return require_handler_utils.emptyResponse.clone();
+					}
 					if (result !== void 0) {
 						for (let j = 0; j < traceLength; j++) trace[j].r(requestReports[j]);
 						const response = mapResponse(result, context.set);
@@ -221,11 +230,17 @@ function createFetchHandler(app) {
 		const asyncIndexes = require_handler_utils.getAsyncIndexes(onRequests);
 		if (asyncIndexes) return async (request) => {
 			const context = new Context(request);
+			let aborted = request.signal.aborted;
+			if (!aborted) request.signal.addEventListener("abort", () => {
+				aborted = true;
+			}, { once: true });
+			if (aborted) return require_handler_utils.emptyResponse.clone();
 			const url = request.url, s = url.indexOf("/", pathStart);
 			context.path = url.substring(s, (context.qi = url.indexOf("?", s)) === -1 ? url.length : context.qi);
 			try {
 				for (let i = 0; i < onRequests.length; i++) {
 					const result = asyncIndexes?.[i] ? await onRequests[i](context) : onRequests[i](context);
+					if (aborted) return require_handler_utils.emptyResponse.clone();
 					if (result !== void 0) {
 						const response = mapResponse(result, context.set);
 						afterResponse?.(context);
@@ -239,11 +254,17 @@ function createFetchHandler(app) {
 		};
 		return (request) => {
 			const context = new Context(request);
+			let aborted = request.signal.aborted;
+			if (!aborted) request.signal.addEventListener("abort", () => {
+				aborted = true;
+			}, { once: true });
+			if (aborted) return require_handler_utils.emptyResponse.clone();
 			const url = request.url, s = url.indexOf("/", pathStart);
 			context.path = url.substring(s, (context.qi = url.indexOf("?", s)) === -1 ? url.length : context.qi);
 			try {
 				for (let i = 0; i < onRequests.length; i++) {
 					const result = onRequests[i](context);
+					if (aborted) return require_handler_utils.emptyResponse.clone();
 					if (result !== void 0) {
 						const response = mapResponse(result, context.set);
 						afterResponse?.(context);

package/dist/handler/fetch.mjs

@@ -1,7 +1,7 @@
 import { flattenChain, isNotEmpty, nullObject, requestId } from "../utils.mjs";
 import { NotFound, PROBLEM_JSON, internalServerErrorResponse, isProduction } from "../error.mjs";
 import { handleSet } from "../adapter/utils.mjs";
-import { cachedResponse, getAsyncIndexes } from "./utils.mjs";
+import { cachedResponse, emptyResponse, getAsyncIndexes } from "./utils.mjs";
 import { createTracer, unionTracePhases } from "../trace.mjs";
 import { createContext } from "../context.mjs";
 import { defaultAdapter } from "../adapter/constants.mjs";
@@ -173,6 +173,11 @@ function createFetchHandler(app) {
 		const asyncIndexes = onRequests.length ? getAsyncIndexes(onRequests) : void 0;
 		return async (request) => {
 			const context = new Context(request);
+			let aborted = request.signal.aborted;
+			if (!aborted) request.signal.addEventListener("abort", () => {
+				aborted = true;
+			}, { once: true });
+			if (aborted) return emptyResponse.clone();
 			const url = request.url, s = url.indexOf("/", pathStart);
 			context.path = url.substring(s, (context.qi = url.indexOf("?", s)) === -1 ? url.length : context.qi);
 			context.rid = requestId();
@@ -199,6 +204,10 @@ function createFetchHandler(app) {
 					});
 					const result = asyncIndexes?.[i] ? await onRequests[i](context) : onRequests[i](context);
 					for (let i = 0; i < traceLength; i++) endReports[i]?.();
+					if (aborted) {
+						for (let j = 0; j < traceLength; j++) trace[j].r(requestReports[j]);
+						return emptyResponse.clone();
+					}
 					if (result !== void 0) {
 						for (let j = 0; j < traceLength; j++) trace[j].r(requestReports[j]);
 						const response = mapResponse(result, context.set);
@@ -219,11 +228,17 @@ function createFetchHandler(app) {
 		const asyncIndexes = getAsyncIndexes(onRequests);
 		if (asyncIndexes) return async (request) => {
 			const context = new Context(request);
+			let aborted = request.signal.aborted;
+			if (!aborted) request.signal.addEventListener("abort", () => {
+				aborted = true;
+			}, { once: true });
+			if (aborted) return emptyResponse.clone();
 			const url = request.url, s = url.indexOf("/", pathStart);
 			context.path = url.substring(s, (context.qi = url.indexOf("?", s)) === -1 ? url.length : context.qi);
 			try {
 				for (let i = 0; i < onRequests.length; i++) {
 					const result = asyncIndexes?.[i] ? await onRequests[i](context) : onRequests[i](context);
+					if (aborted) return emptyResponse.clone();
 					if (result !== void 0) {
 						const response = mapResponse(result, context.set);
 						afterResponse?.(context);
@@ -237,11 +252,17 @@ function createFetchHandler(app) {
 		};
 		return (request) => {
 			const context = new Context(request);
+			let aborted = request.signal.aborted;
+			if (!aborted) request.signal.addEventListener("abort", () => {
+				aborted = true;
+			}, { once: true });
+			if (aborted) return emptyResponse.clone();
 			const url = request.url, s = url.indexOf("/", pathStart);
 			context.path = url.substring(s, (context.qi = url.indexOf("?", s)) === -1 ? url.length : context.qi);
 			try {
 				for (let i = 0; i < onRequests.length; i++) {
 					const result = onRequests[i](context);
+					if (aborted) return emptyResponse.clone();
 					if (result !== void 0) {
 						const response = mapResponse(result, context.set);
 						afterResponse?.(context);

package/dist/handler/index.d.ts

@@ -1,4 +1,4 @@
+import { getAsyncIndexes } from "./utils.js";
 import { createErrorHandler } from "./error.js";
 import { applyHoc, createFetchHandler } from "./fetch.js";
-import { getAsyncIndexes } from "./utils.js";
 export { applyHoc, createErrorHandler, createFetchHandler, getAsyncIndexes };

package/dist/handler/utils.d.ts

@@ -1,6 +1,9 @@
 //#region src/handler/utils.d.ts
+declare const emptyResponse: Response | {
+  clone: () => Response;
+};
 declare function cachedResponse(body: string, status: number, headers?: Record<string, string>): () => Response;
 declare function forwardError<T>(value: T): T;
 declare function getAsyncIndexes(onRequests: Function[]): (true | undefined)[] | undefined;
 //#endregion
-export { cachedResponse, forwardError, getAsyncIndexes };
+export { cachedResponse, emptyResponse, forwardError, getAsyncIndexes };

package/dist/handler/utils.js

@@ -3,6 +3,7 @@ const require_universal_constants = require('../universal/constants.js');
 const require_compile_utils = require('../compile/utils.js');
 
 //#region src/handler/utils.ts
+const emptyResponse = require_universal_constants.isCloudflareWorker ? { clone: () => new Response(null) } : new Response(null);
 function cachedResponse(body, status, headers) {
 	let cached;
 	return () => require_universal_constants.isCloudflareWorker ? new Response(body, {
@@ -28,5 +29,6 @@ function getAsyncIndexes(onRequests) {
 
 //#endregion
 exports.cachedResponse = cachedResponse;
+exports.emptyResponse = emptyResponse;
 exports.forwardError = forwardError;
 exports.getAsyncIndexes = getAsyncIndexes;

package/dist/handler/utils.mjs

@@ -2,6 +2,7 @@ import { isCloudflareWorker } from "../universal/constants.mjs";
 import { isAsyncFunction } from "../compile/utils.mjs";
 
 //#region src/handler/utils.ts
+const emptyResponse = isCloudflareWorker ? { clone: () => new Response(null) } : new Response(null);
 function cachedResponse(body, status, headers) {
 	let cached;
 	return () => isCloudflareWorker ? new Response(body, {
@@ -26,4 +27,4 @@ function getAsyncIndexes(onRequests) {
 }
 
 //#endregion
-export { cachedResponse, forwardError, getAsyncIndexes };
+export { cachedResponse, emptyResponse, forwardError, getAsyncIndexes };

package/dist/type/constants.d.ts

@@ -17,7 +17,7 @@ declare const ELYSIA_TYPES: {
   readonly NoValidate: 15;
 };
 type ELYSIA_TYPES = typeof ELYSIA_TYPES;
-declare const primitiveElysiaTypes: Set<1 | 2 | 3 | 6 | 10 | 11 | 13 | 14>;
+declare const primitiveElysiaTypes: Set<3 | 1 | 2 | 6 | 10 | 11 | 13 | 14>;
 declare const noEnumerable: {
   readonly enumerable: false;
 };

package/dist/type/types.d.ts

@@ -1,9 +1,9 @@
 import { ELYSIA_TYPES } from "./constants.js";
 import { CookieOptions } from "../cookie/types.js";
 import { MaybeArray } from "../types.js";
-import { Validator } from "typebox/schema";
 import { TObjectOptions, TSchemaOptions } from "typebox";
 import { TLocalizedValidationError } from "typebox/error";
+import { Validator } from "typebox/schema";
 
 //#region src/type/types.d.ts
 type FileUnit = number | `${number}${'k' | 'm'}`;

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "elysia",
 	"description": "Ergonomic Framework for Human",
-	"version": "2.0.0-exp.33",
+	"version": "2.0.0-exp.34",
 	"author": {
 		"name": "saltyAom",
 		"url": "https://github.com/SaltyAom",