fix: correctly check URL pathname with Cloudflare adapter (#8733)

* add trailing slash check for prerendered files * check URI decoded prerendered pathname * correctly add placeholders.ts to tsconfig.json * correct changeset * cleanup * rename generated files comment Co-authored-by: Rich Harris <[email protected]> * rewrite changeset * add redirect to counterpart route * add check for empty counterpart route string * change redirect status to 308 to match adapter-vercel --------- Co-authored-by: Simon H <[email protected]> Co-authored-by: Rich Harris <[email protected]>
sveltejs · Jan 30, 2023 · 32cbe07 · 32cbe07
1 parent a5f9f41
commit 32cbe07
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 14 deletions.
diff --git a/.changeset/chilly-bears-change.md b/.changeset/chilly-bears-change.md
@@ -0,0 +1,5 @@
+---
+'@sveltejs/adapter-cloudflare': patch
+---
+
+fix: correctly check URL pathname with Cloudflare adapter
diff --git a/packages/adapter-cloudflare/src/worker.js b/packages/adapter-cloudflare/src/worker.js
@@ -9,6 +9,7 @@ const app_path = `/${manifest.appPath}/`;
 /** @type {import('worktop/cfw').Module.Worker<{ ASSETS: import('worktop/cfw.durable').Durable.Object }>} */
 const worker = {
 	async fetch(req, env, context) {
+		// @ts-ignore
 		await server.init({ env });
 		// skip cache if "cache-control: no-cache" in request
 		let pragma = req.headers.get('cache-control') || '';
@@ -17,7 +18,7 @@ const worker = {
 
 		let { pathname } = new URL(req.url);
 
-		// static assets
+		// generated files
 		if (pathname.startsWith(app_path)) {
 			res = await env.ASSETS.fetch(req);
 			if (!res.ok) return res;
@@ -36,26 +37,38 @@ const worker = {
 				}
 			});
 		} else {
-			// prerendered pages and index.html files
-			pathname = pathname.replace(/\/$/, '') || '/';
-
-			let file = pathname.substring(1);
+			// prerendered pages and /static files
 
 			try {
-				file = decodeURIComponent(file);
-			} catch (err) {
-				// ignore
+				pathname = decodeURIComponent(pathname);
+			} catch {
+				// ignore invalid URI
+			}
+
+			const stripped_pathname = pathname.replace(/\/$/, '');
+
+			let is_static_asset = false;
+			const filename = stripped_pathname.substring(1);
+			if (filename) {
+				is_static_asset =
+					manifest.assets.has(filename) || manifest.assets.has(filename + '/index.html');
 			}
 
-			if (
-				manifest.assets.has(file) ||
-				manifest.assets.has(file + '/index.html') ||
-				prerendered.has(pathname)
-			) {
+			const counterpart_route = pathname.at(-1) === '/' ? stripped_pathname : pathname + '/';
+
+			if (is_static_asset || prerendered.has(pathname)) {
 				res = await env.ASSETS.fetch(req);
+			} else if (counterpart_route && prerendered.has(counterpart_route)) {
+				res = new Response('', {
+					status: 308,
+					headers: {
+						location: counterpart_route
+					}
+				});
 			} else {
 				// dynamically-generated pages
 				res = await server.respond(req, {
+					// @ts-ignore
 					platform: { env, context, caches },
 					getClientAddress() {
 						return req.headers.get('cf-connecting-ip');

diff --git a/packages/adapter-cloudflare/tsconfig.json b/packages/adapter-cloudflare/tsconfig.json
@@ -11,5 +11,5 @@
 			"@sveltejs/kit": ["../kit/types/index"]
 		}
 	},
-	"include": ["index.js", "placeholders.ts", "src/worker.ts"]
+	"include": ["index.js", "placeholders.ts", "src/worker.js"]
 }