Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(rerouting): attempt without middleware #8814

Merged
merged 9 commits into from
Oct 18, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
fix(rerouting): attempt without middleware
  • Loading branch information
lilnasy committed Oct 17, 2023
commit 9339ea3d3f1dae58e8f815172d330b36643aaa6b
17 changes: 14 additions & 3 deletions packages/astro/src/core/app/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ export interface RenderErrorOptions {
routeData?: RouteData;
response?: Response;
status: 404 | 500;
runMiddleware?: boolean;
}

export class App {
Expand Down Expand Up @@ -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) {
Expand All @@ -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,
Expand All @@ -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);
Expand Down
6 changes: 6 additions & 0 deletions packages/astro/src/core/pipeline.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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
*/
Expand Down