[fix] match regex against route only once

sveltejs · Aug 14, 2021 · 1c279fb · 1c279fb
1 parent c5efbf3
commit 1c279fb
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 12 deletions.
diff --git a/packages/kit/src/runtime/server/endpoint.js b/packages/kit/src/runtime/server/endpoint.js
@@ -18,9 +18,10 @@ function is_string(s) {
 /**
  * @param {import('types/hooks').ServerRequest} request
  * @param {import('types/internal').SSREndpoint} route
+ * @param {RegExpExecArray} match
  * @returns {Promise<import('types/hooks').ServerResponse | undefined>}
  */
-export async function render_endpoint(request, route) {
+export async function render_endpoint(request, route, match) {
 	const mod = await route.load();
 
 	/** @type {import('types/endpoint').RequestHandler} */
@@ -30,11 +31,6 @@ export async function render_endpoint(request, route) {
 		return;
 	}
 
-	const match = route.pattern.exec(request.path);
-	if (!match) {
-		return error('could not parse parameters from request path');
-	}
-
 	const params = route.params(match);
 
 	const response = await handler({ ...request, params });

diff --git a/packages/kit/src/runtime/server/index.js b/packages/kit/src/runtime/server/index.js
@@ -59,12 +59,13 @@ export async function respond(incoming, options, state = {}) {
 
 				const decoded = decodeURI(request.path);
 				for (const route of options.manifest.routes) {
-					if (!route.pattern.test(decoded)) continue;
+					const match = route.pattern.test(decoded);
+					if (!match) continue;
 
 					const response =
 						route.type === 'endpoint'
-							? await render_endpoint(request, route)
-							: await render_page(request, route, options, state);
+							? await render_endpoint(request, route, match)
+							: await render_page(request, route, match, options, state);
 
 					if (response) {
 						// inject ETags for 200 responses

diff --git a/packages/kit/src/runtime/server/page/index.js b/packages/kit/src/runtime/server/page/index.js
@@ -3,11 +3,12 @@ import { respond } from './respond.js';
 /**
  * @param {import('types/hooks').ServerRequest} request
  * @param {import('types/internal').SSRPage} route
+ * @param {RegExpExecArray} match
  * @param {import('types/internal').SSRRenderOptions} options
  * @param {import('types/internal').SSRRenderState} state
  * @returns {Promise<import('types/hooks').ServerResponse | undefined>}
  */
-export async function render_page(request, route, options, state) {
+export async function render_page(request, route, match, options, state) {
 	if (state.initiator === route) {
 		// infinite request cycle detected
 		return {
@@ -17,8 +18,6 @@ export async function render_page(request, route, options, state) {
 		};
 	}
 
-	const match = route.pattern.exec(request.path);
-	// @ts-expect-error we already know there's a match
 	const params = route.params(match);
 
 	const page = {