elysia 2.0.0-beta.11 → 2.0.0-beta.13

package/dist/error.d.ts

@@ -20,6 +20,12 @@ declare class ElysiaError<Status extends number = number, Response extends strin
   constructor(message: string, cause?: Error);
   toResponse(headers?: Record<string, any>): globalThis.Response;
 }
+/**
+ * `type` an error slug resolves to: the slug verbatim, or `<typeBase>/<slug>`
+ * once {@link HTTPError.typeBase} is set. Shared by `ElysiaError` and every
+ * class {@link HTTPError.id} makes, so both lanes derive `type` identically
+ */
+declare function problemTypeOf(code: string | undefined): string | undefined;
 /**
  * Problem members an `ElysiaError` serves. `title` is left to `problemBody`,
  * which derives it from the status — so `response` is only worth serving as
@@ -56,7 +62,8 @@ declare class ValidationError extends ElysiaError {
   #private;
   type: string | undefined;
   value: unknown;
-  status: 422;
+  /** Response validation is a server error; other validation is a client error. */
+  status: 422 | 500;
   schema?: unknown;
   message: string;
   allowUnsafeValidationDetails: boolean;
@@ -86,39 +93,43 @@ declare class ValidationError extends ElysiaError {
     errors: any[];
   };
   get payload(): {
-    type: string;
+    type: string | undefined;
+    code: string;
     title: string;
     status: number;
-    on?: undefined;
-    property?: undefined;
-    detail?: undefined;
-    found?: undefined;
-    expected?: undefined;
-    errors?: undefined;
   } | {
     type: string;
     title: string;
     status: number;
     on: string | undefined;
     property: string;
-    detail?: undefined;
-    found?: undefined;
-    expected?: undefined;
-    errors?: undefined;
   } | {
-    type: string;
+    detail: any;
+    on: string | undefined;
+    property: string;
+    found: any;
+    expected: unknown;
+    errors: any[];
+    type: string | undefined;
+    code: string;
     title: string;
     status: number;
+  } | {
     detail: any;
     on: string | undefined;
     property: string;
     found: any;
     expected: unknown;
     errors: any[];
+    type: string;
+    title: string;
+    status: 422;
   };
   toResponse(headers?: Record<string, any>): Response;
 }
-declare class ElysiaStatus<const in out Code extends number | keyof StatusMap, T = (Code extends keyof StatusMapBack ? StatusMapBack[Code] : Code), const in out Status extends (Code extends keyof StatusMap ? StatusMap[Code] : Code) = (Code extends keyof StatusMap ? StatusMap[Code] : Code)> {
+/** Default body for a status with no response. Named to keep emitted types small. */
+type StatusResponse<Code extends number | keyof StatusMap> = Code extends keyof StatusMapBack ? StatusMapBack[Code] : Code;
+declare class ElysiaStatus<const in out Code extends number | keyof StatusMap, T = StatusResponse<Code>, const in out Status extends NumericStatus<Code> = NumericStatus<Code>> {
   /**
    * Type-only brand, erased at runtime.
    *
@@ -132,69 +143,7 @@ declare class ElysiaStatus<const in out Code extends number | keyof StatusMap, T
   headers?: Record<string, string>;
   constructor(code: Code, res: T, headers?: Record<string, string>);
 }
-declare const status: <const Code extends number | keyof StatusMap, const T = (Code extends keyof StatusMapBack ? StatusMapBack[Code] : Code)>(code: Code, response?: T) => ElysiaStatus<Code, T, Code extends "Continue" | "Switching Protocols" | "Processing" | "Early Hints" | "OK" | "Created" | "Accepted" | "Non-Authoritative Information" | "No Content" | "Reset Content" | "Partial Content" | "Multi-Status" | "Already Reported" | "Multiple Choices" | "Moved Permanently" | "Found" | "See Other" | "Not Modified" | "Temporary Redirect" | "Permanent Redirect" | "Bad Request" | "Unauthorized" | "Payment Required" | "Forbidden" | "Not Found" | "Method Not Allowed" | "Not Acceptable" | "Proxy Authentication Required" | "Request Timeout" | "Conflict" | "Gone" | "Length Required" | "Precondition Failed" | "Payload Too Large" | "URI Too Long" | "Unsupported Media Type" | "Range Not Satisfiable" | "Expectation Failed" | "I'm a teapot" | "Enhance Your Calm" | "Misdirected Request" | "Unprocessable Content" | "Locked" | "Failed Dependency" | "Too Early" | "Upgrade Required" | "Precondition Required" | "Too Many Requests" | "Request Header Fields Too Large" | "Unavailable For Legal Reasons" | "Internal Server Error" | "Not Implemented" | "Bad Gateway" | "Service Unavailable" | "Gateway Timeout" | "HTTP Version Not Supported" | "Variant Also Negotiates" | "Insufficient Storage" | "Loop Detected" | "Not Extended" | "Network Authentication Required" ? {
-  readonly Continue: 100;
-  readonly 'Switching Protocols': 101;
-  readonly Processing: 102;
-  readonly 'Early Hints': 103;
-  readonly OK: 200;
-  readonly Created: 201;
-  readonly Accepted: 202;
-  readonly 'Non-Authoritative Information': 203;
-  readonly 'No Content': 204;
-  readonly 'Reset Content': 205;
-  readonly 'Partial Content': 206;
-  readonly 'Multi-Status': 207;
-  readonly 'Already Reported': 208;
-  readonly 'Multiple Choices': 300;
-  readonly 'Moved Permanently': 301;
-  readonly Found: 302;
-  readonly 'See Other': 303;
-  readonly 'Not Modified': 304;
-  readonly 'Temporary Redirect': 307;
-  readonly 'Permanent Redirect': 308;
-  readonly 'Bad Request': 400;
-  readonly Unauthorized: 401;
-  readonly 'Payment Required': 402;
-  readonly Forbidden: 403;
-  readonly 'Not Found': 404;
-  readonly 'Method Not Allowed': 405;
-  readonly 'Not Acceptable': 406;
-  readonly 'Proxy Authentication Required': 407;
-  readonly 'Request Timeout': 408;
-  readonly Conflict: 409;
-  readonly Gone: 410;
-  readonly 'Length Required': 411;
-  readonly 'Precondition Failed': 412;
-  readonly 'Payload Too Large': 413;
-  readonly 'URI Too Long': 414;
-  readonly 'Unsupported Media Type': 415;
-  readonly 'Range Not Satisfiable': 416;
-  readonly 'Expectation Failed': 417;
-  readonly "I'm a teapot": 418;
-  readonly 'Enhance Your Calm': 420;
-  readonly 'Misdirected Request': 421;
-  readonly 'Unprocessable Content': 422;
-  readonly Locked: 423;
-  readonly 'Failed Dependency': 424;
-  readonly 'Too Early': 425;
-  readonly 'Upgrade Required': 426;
-  readonly 'Precondition Required': 428;
-  readonly 'Too Many Requests': 429;
-  readonly 'Request Header Fields Too Large': 431;
-  readonly 'Unavailable For Legal Reasons': 451;
-  readonly 'Internal Server Error': 500;
-  readonly 'Not Implemented': 501;
-  readonly 'Bad Gateway': 502;
-  readonly 'Service Unavailable': 503;
-  readonly 'Gateway Timeout': 504;
-  readonly 'HTTP Version Not Supported': 505;
-  readonly 'Variant Also Negotiates': 506;
-  readonly 'Insufficient Storage': 507;
-  readonly 'Loop Detected': 508;
-  readonly 'Not Extended': 510;
-  readonly 'Network Authentication Required': 511;
-}[Code] : Code>;
+declare const status: <const Code extends number | keyof StatusMap, const T = StatusResponse<Code>>(code: Code, response?: T) => ElysiaStatus<Code, T, NumericStatus<Code>>;
 declare const PROBLEM_JSON = "application/problem+json";
 /**
  * RFC 9457 Problem Details shape.
@@ -215,10 +164,22 @@ type Problem<Code extends number | keyof StatusMap = number | keyof StatusMap, E
   detail?: string; /** URI identifying the specific occurrence of the problem */
   instance?: string;
 } & Extension;
+/** Numeric form of a status name or code. */
 type NumericStatus<Code extends number | keyof StatusMap> = Code extends keyof StatusMap ? StatusMap[Code] : Code;
 type ProblemStatus<P> = P extends {
   status: infer S extends number | keyof StatusMap;
 } ? NumericStatus<S> : 500;
+/** Request validation problem. Diagnostic fields are development-only. */
+type ValidationErrorResponse = {
+  type: 'validation';
+  title: 'Validation Error';
+  status: 422;
+  detail?: string;
+  on: string;
+  found?: unknown;
+  property?: string;
+  expected?: string;
+};
 type ProblemResponseBody<Status extends number, P> = Omit<{
   type: string;
   title: string;
@@ -347,11 +308,7 @@ declare abstract class HTTPError<const in out T extends string = string> extends
   /**
    * Absolute base for the RFC 9457 `type` URI, applied to every class made
    * by {@link HTTPError.id} and to every built-in `ElysiaError`
-   * (`NotFound`, `ParseError`, …) — both derive `type` from the same slug
-   *
-   * Unset, `type` mirrors `code` verbatim. Set, `type` resolves to
-   * `<typeBase>/<code>` with the code carried through as written — no
-   * casing or separator rewrite — while `code` keeps serving the bare token
+   * (`NotFound`, `ParseError`, …) both derive `type` from the same slug
    *
    * @example
    * ```ts
@@ -422,4 +379,4 @@ declare abstract class HTTPError<const in out T extends string = string> extends
   }>;
 }
 //#endregion
-export { ElysiaError, ElysiaStatus, HTTPError, InternalServerError, MAX_ERRORS, NotFound, PROBLEM_JSON, ParseError, Problem, ProblemResponseBody, SelectiveStatus, TaggedHTTPError, ValidationError, elysiaErrorProblem, internalServerErrorBody, internalServerErrorBodyString, internalServerErrorResponse, isProduction, problem, problemBody, problemResponse, status, subValueAt, validationDetail };
+export { ElysiaError, ElysiaStatus, HTTPError, InternalServerError, MAX_ERRORS, NotFound, NumericStatus, PROBLEM_JSON, ParseError, Problem, ProblemResponseBody, SelectiveStatus, StatusResponse, TaggedHTTPError, ValidationError, ValidationErrorResponse, elysiaErrorProblem, internalServerErrorBody, internalServerErrorBodyString, internalServerErrorResponse, isProduction, problem, problemBody, problemResponse, problemTypeOf, status, subValueAt, validationDetail };

package/dist/error.js

@@ -278,6 +278,7 @@ var ValidationError = class extends ElysiaError {
 		this.value = value;
 		this.status = 422;
 		this.allowUnsafeValidationDetails = false;
+		if (type === "response") this.status = 500;
 		this.schema = schema;
 		this.#thunk = typeof errors === "function" ? errors : () => errors;
 		this.#findCustomError = findCustomError;
@@ -437,12 +438,9 @@ var ValidationError = class extends ElysiaError {
 		};
 	}
 	get payload() {
+		const server = this.type === "response";
 		if (this.#productionDetail) {
-			if (this.type === "response") return {
-				type: "internal-server-error",
-				title: "Internal Server Error",
-				status: 500
-			};
+			if (server) return internalServerErrorProblem();
 			const first = (this.errors ?? []).find(Boolean);
 			return {
 				type: "validation",
@@ -471,9 +469,11 @@ var ValidationError = class extends ElysiaError {
 			else expected = created;
 		} catch {}
 		return {
-			type: "validation",
-			title: "Validation Error",
-			status: 422,
+			...server ? internalServerErrorProblem() : {
+				type: "validation",
+				title: "Validation Error",
+				status: 422
+			},
 			detail,
 			on: this.type,
 			property,
@@ -487,7 +487,7 @@ var ValidationError = class extends ElysiaError {
 		if (this.customError !== void 0) {
 			const isString = typeof this.customError === "string";
 			const response = new Response(isString ? this.customError : JSON.stringify(this.customError), {
-				status: this.status ?? 422,
+				status: this.type === "response" ? 500 : this.status ?? 422,
 				headers: {
 					...headers,
 					"content-type": isString ? "text/plain" : "application/json"
@@ -555,12 +555,14 @@ function problemResponse(p, headers) {
 	require_adapter_skip_clone.skipClone.add(response);
 	return response;
 }
+const internalServerErrorProblem = () => ({
+	type: problemTypeOf("internal-server-error"),
+	code: "internal-server-error",
+	title: "Internal Server Error",
+	status: 500
+});
 function internalServerErrorBody(error) {
-	const body = {
-		type: "internal-server-error",
-		title: "Internal Server Error",
-		status: 500
-	};
+	const body = internalServerErrorProblem();
 	if (!require_universal_is_production.isProduction()) {
 		if (error?.message != null) body.detail = error.message;
 		if (error?.name) body.name = error.name;
@@ -577,11 +579,7 @@ function internalServerErrorBodyString(error) {
 			delete safe.cause;
 			return JSON.stringify(safe);
 		} catch {
-			return JSON.stringify({
-				type: "internal-server-error",
-				title: "Internal Server Error",
-				status: 500
-			});
+			return JSON.stringify(internalServerErrorProblem());
 		}
 	}
 }
@@ -696,6 +694,7 @@ exports.isProduction = require_universal_is_production.isProduction;
 exports.problem = problem;
 exports.problemBody = problemBody;
 exports.problemResponse = problemResponse;
+exports.problemTypeOf = problemTypeOf;
 exports.status = status;
 exports.subValueAt = subValueAt;
 exports.validationDetail = validationDetail;

package/dist/error.mjs

@@ -277,6 +277,7 @@ var ValidationError = class extends ElysiaError {
 		this.value = value;
 		this.status = 422;
 		this.allowUnsafeValidationDetails = false;
+		if (type === "response") this.status = 500;
 		this.schema = schema;
 		this.#thunk = typeof errors === "function" ? errors : () => errors;
 		this.#findCustomError = findCustomError;
@@ -436,12 +437,9 @@ var ValidationError = class extends ElysiaError {
 		};
 	}
 	get payload() {
+		const server = this.type === "response";
 		if (this.#productionDetail) {
-			if (this.type === "response") return {
-				type: "internal-server-error",
-				title: "Internal Server Error",
-				status: 500
-			};
+			if (server) return internalServerErrorProblem();
 			const first = (this.errors ?? []).find(Boolean);
 			return {
 				type: "validation",
@@ -470,9 +468,11 @@ var ValidationError = class extends ElysiaError {
 			else expected = created;
 		} catch {}
 		return {
-			type: "validation",
-			title: "Validation Error",
-			status: 422,
+			...server ? internalServerErrorProblem() : {
+				type: "validation",
+				title: "Validation Error",
+				status: 422
+			},
 			detail,
 			on: this.type,
 			property,
@@ -486,7 +486,7 @@ var ValidationError = class extends ElysiaError {
 		if (this.customError !== void 0) {
 			const isString = typeof this.customError === "string";
 			const response = new Response(isString ? this.customError : JSON.stringify(this.customError), {
-				status: this.status ?? 422,
+				status: this.type === "response" ? 500 : this.status ?? 422,
 				headers: {
 					...headers,
 					"content-type": isString ? "text/plain" : "application/json"
@@ -554,12 +554,14 @@ function problemResponse(p, headers) {
 	skipClone.add(response);
 	return response;
 }
+const internalServerErrorProblem = () => ({
+	type: problemTypeOf("internal-server-error"),
+	code: "internal-server-error",
+	title: "Internal Server Error",
+	status: 500
+});
 function internalServerErrorBody(error) {
-	const body = {
-		type: "internal-server-error",
-		title: "Internal Server Error",
-		status: 500
-	};
+	const body = internalServerErrorProblem();
 	if (!isProduction()) {
 		if (error?.message != null) body.detail = error.message;
 		if (error?.name) body.name = error.name;
@@ -576,11 +578,7 @@ function internalServerErrorBodyString(error) {
 			delete safe.cause;
 			return JSON.stringify(safe);
 		} catch {
-			return JSON.stringify({
-				type: "internal-server-error",
-				title: "Internal Server Error",
-				status: 500
-			});
+			return JSON.stringify(internalServerErrorProblem());
 		}
 	}
 }
@@ -678,4 +676,4 @@ var HTTPError = class HTTPError extends Error {
 };
 
 //#endregion
-export { ElysiaError, ElysiaStatus, HTTPError, InternalServerError, MAX_ERRORS, NotFound, PROBLEM_JSON, ParseError, ValidationError, elysiaErrorProblem, internalServerErrorBody, internalServerErrorBodyString, internalServerErrorResponse, isProduction, problem, problemBody, problemResponse, status, subValueAt, validationDetail };
+export { ElysiaError, ElysiaStatus, HTTPError, InternalServerError, MAX_ERRORS, NotFound, PROBLEM_JSON, ParseError, ValidationError, elysiaErrorProblem, internalServerErrorBody, internalServerErrorBodyString, internalServerErrorResponse, isProduction, problem, problemBody, problemResponse, problemTypeOf, status, subValueAt, validationDetail };

package/dist/handler/error.js

@@ -98,7 +98,7 @@ const readAnnotation = (self, key, claimsProblem) => {
 };
 function fallbackErrorResponse(context, error, mapResponse, defaultError) {
 	if (error instanceof require_error.ElysiaStatus) return mapResponse(error, context.set, context);
-	const self = error;
+	const self = error ?? {};
 	const status = resolveStatus(self.status);
 	const owned = error instanceof require_error.HTTPError;
 	const claimsProblem = claimsProblemType(error);
@@ -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

@@ -97,7 +97,7 @@ const readAnnotation = (self, key, claimsProblem) => {
 };
 function fallbackErrorResponse(context, error, mapResponse, defaultError) {
 	if (error instanceof ElysiaStatus) return mapResponse(error, context.set, context);
-	const self = error;
+	const self = error ?? {};
 	const status = resolveStatus(self.status);
 	const owned = error instanceof HTTPError;
 	const claimsProblem = claimsProblemType(error);
@@ -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

@@ -23,7 +23,7 @@ function notFound(context) {
 	if (set.cookie || require_utils.isNotEmpty(set.headers)) {
 		require_adapter_utils.handleSet(set);
 		if (!set.headers["content-type"]) require_adapter_utils.materializeSetHeaders(set)["content-type"] = require_error.PROBLEM_JSON;
-		return new Response(require_handler_utils.NOT_FOUND_BODY, {
+		return new Response(require_handler_utils.getNotFoundBody(), {
 			status: 404,
 			headers: set.headers
 		});
@@ -38,6 +38,12 @@ function decodeParams(params) {
 	return params;
 }
 const notFoundBody = Object.freeze({ code: "NOT_FOUND" });
+const warnedPathMutation = /* @__PURE__ */ new WeakSet();
+function warnPathMutation(app) {
+	if (warnedPathMutation.has(app)) return;
+	warnedPathMutation.add(app);
+	console.warn("[elysia] context.path is readonly; request-hook rerouting will stop working in a future release.");
+}
 function finalizeError(context, handleError, afterResponse, error) {
 	if (error === notFoundBody) error = new require_error.NotFound();
 	let resp;
@@ -114,6 +120,7 @@ function createFetchHandler(app) {
 	const hook = require_utils.flattenChain(app["~hookChain"]);
 	const hasError = !!hook?.error;
 	const abortSignal = app["~config"]?.abortSignal !== false;
+	const watchPath = !require_universal_is_production.isProduction();
 	/**
 	* Arm `context['~sig']` unless this request is provably the untouched
 	* `Request` the Bun adapter received, in which case materializing
@@ -129,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) => {
@@ -143,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);
 				});
@@ -211,12 +217,11 @@ 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);
 			if (armEager(request, context)) return require_handler_utils.emptyResponse.clone();
-			extractPath(request.url, context);
+			const path = extractPath(request.url, context);
 			context.server = server ?? null;
 			context.rid = require_utils.requestId();
 			const traceLength = tracerFactories.length;
@@ -240,9 +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();
 					}
@@ -263,18 +273,21 @@ 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();
-			extractPath(request.url, context);
+			const path = extractPath(request.url, context);
 			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;
-					if (armedAbort(request, context)) return require_handler_utils.emptyResponse.clone();
+					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(context)) return require_handler_utils.emptyResponse.clone();
 					if (result !== void 0) {
 						const response = await mapResponse(result, context.set, context);
 						afterResponse?.(context);
@@ -290,11 +303,12 @@ function createFetchHandler(app) {
 			const context = new Context(request);
 			require_adapter_utils.materializeSetHeaders(context.set);
 			if (armEager(request, context)) return require_handler_utils.emptyResponse.clone();
-			extractPath(request.url, context);
+			const path = extractPath(request.url, context);
 			context.server = server ?? null;
 			try {
 				for (let i = 0; i < onRequests.length; i++) {
 					const result = onRequests[i](context);
+					if (watchPath && context.path !== path) warnPathMutation(app);
 					if (abortSignal && context["~sig"]?.aborted) return require_handler_utils.emptyResponse.clone();
 					if (result !== void 0) {
 						const response = mapResponse(result, context.set, context);