fix(rerouting): attempt without middleware

packages/astro/src/core/app/index.ts

@@ -41,6 +41,7 @@ export interface RenderErrorOptions {
 	routeData?: RouteData;
 	response?: Response;
 	status: 404 | 500;
+	runMiddleware?: boolean;
 }
 
 export class App {
@@ -252,7 +253,7 @@ export class App {
 	 * If it is a known error code, try sending the according page (e.g. 404.astro / 500.astro).
 	 * This also handles pre-rendered /404 or /500 routes
 	 */
-	async #renderError(request: Request, { status, response: originalResponse }: RenderErrorOptions) {
+	async #renderError(request: Request, { status, response: originalResponse, runMiddleware = true }: RenderErrorOptions): Promise<Response> {
 		const errorRouteData = matchRoute('/' + status, this.#manifestData);
 		const url = new URL(request.url);
 		if (errorRouteData) {
@@ -271,6 +272,7 @@ export class App {
 				return this.#mergeResponses(response, originalResponse, override);
 			}
 			const mod = await this.#getModuleForRoute(errorRouteData);
+			let usedMiddleware = false;
 			try {
 				const newRenderContext = await this.#createRenderContext(
 					url,
@@ -280,12 +282,21 @@ export class App {
 					status
 				);
 				const page = (await mod.page()) as any;
-				if (mod.onRequest) {
+				if (runMiddleware && mod.onRequest) {
 					this.#pipeline.setMiddlewareFunction(mod.onRequest as MiddlewareEndpointHandler);
+					usedMiddleware = true;
+				}
+				if (!runMiddleware) {
+					this.#pipeline.unsetMiddlewareFunction();
 				}
 				const response = await this.#pipeline.renderRoute(newRenderContext, page);
 				return this.#mergeResponses(response, originalResponse);
-			} catch {}
+			} catch {
+				// Middleware may be the cause of the error, so we try rendering 404/500.astro without it.
+				if (runMiddleware && usedMiddleware) {
+					return this.#renderError(request, { status, response: originalResponse, runMiddleware: false });
+				}
+			}
 		}
 
 		const response = this.#mergeResponses(new Response(null, { status }), originalResponse);

packages/astro/src/core/pipeline.ts

@@ -55,6 +55,12 @@ export class Pipeline {
 		this.#onRequest = onRequest;
 	}
 
+	/**
+	 * Ensure that a route is rendered without its corresponding middleware.
+	 */
+	unsetMiddlewareFunction() {
+		this.#onRequest = undefined;
+	}
 	/**
 	 * Returns the current environment
 	 */