remove try-catch around server.respond (#4738)

sveltejs · Apr 27, 2022 · f9c3030 · f9c3030
1 parent 2afb8ef
commit f9c3030
Show file tree

Hide file tree

Showing 4 changed files with 77 additions and 89 deletions.
diff --git a/.changeset/brave-rabbits-provide.md b/.changeset/brave-rabbits-provide.md
@@ -0,0 +1,7 @@
+---
+'@sveltejs/adapter-cloudflare': patch
+'@sveltejs/adapter-cloudflare-workers': patch
+'@sveltejs/adapter-netlify': patch
+---
+
+[breaking] Remove try-catch around server.respond
diff --git a/packages/adapter-cloudflare-workers/files/entry.js b/packages/adapter-cloudflare-workers/files/entry.js
@@ -60,16 +60,12 @@ export default {
 		}
 
 		// dynamically-generated pages
-		try {
-			return await server.respond(req, {
-				platform: { env, context },
-				getClientAddress() {
-					return req.headers.get('cf-connecting-ip');
-				}
-			});
-		} catch (e) {
-			return new Response('Error rendering route: ' + (e.message || e.toString()), { status: 500 });
-		}
+		return await server.respond(req, {
+			platform: { env, context },
+			getClientAddress() {
+				return req.headers.get('cf-connecting-ip');
+			}
+		});
 	}
 };
 
@@ -79,24 +75,19 @@ export default {
  * @param {any} context
  */
 async function get_asset_from_kv(req, env, context, map = mapRequestToAsset) {
-	try {
-		return await getAssetFromKV(
-			{
-				request: req,
-				waitUntil(promise) {
-					return context.waitUntil(promise);
-				}
-			},
-			{
-				ASSET_NAMESPACE: env.__STATIC_CONTENT,
-				ASSET_MANIFEST: static_asset_manifest,
-				mapRequestToAsset: map
+	return await getAssetFromKV(
+		{
+			request: req,
+			waitUntil(promise) {
+				return context.waitUntil(promise);
 			}
-		);
-	} catch (e) {
-		const status = is_error(e.status) ? e.status : 500;
-		return new Response(e.message || e.toString(), { status });
-	}
+		},
+		{
+			ASSET_NAMESPACE: env.__STATIC_CONTENT,
+			ASSET_MANIFEST: static_asset_manifest,
+			mapRequestToAsset: map
+		}
+	);
 }
 
 /**

diff --git a/packages/adapter-cloudflare/src/worker.js b/packages/adapter-cloudflare/src/worker.js
@@ -9,62 +9,58 @@ const prefix = `/${manifest.appDir}/`;
 /** @type {import('worktop/cfw').Module.Worker<{ ASSETS: import('worktop/cfw.durable').Durable.Object }>} */
 const worker = {
 	async fetch(req, env, context) {
-		try {
-			// skip cache if "cache-control: no-cache" in request
-			let pragma = req.headers.get('cache-control') || '';
-			let res = !pragma.includes('no-cache') && (await Cache.lookup(req));
-			if (res) return res;
+		// skip cache if "cache-control: no-cache" in request
+		let pragma = req.headers.get('cache-control') || '';
+		let res = !pragma.includes('no-cache') && (await Cache.lookup(req));
+		if (res) return res;
 
-			let { pathname } = new URL(req.url);
+		let { pathname } = new URL(req.url);
 
-			// static assets
-			if (pathname.startsWith(prefix)) {
-				res = await env.ASSETS.fetch(req);
+		// static assets
+		if (pathname.startsWith(prefix)) {
+			res = await env.ASSETS.fetch(req);
 
-				res = new Response(res.body, {
-					headers: {
-						// include original cache headers, minus cache-control which
-						// is overridden, and etag which is no longer useful
-						'cache-control': 'public, immutable, max-age=31536000',
-						'content-type': res.headers.get('content-type'),
-						'x-robots-tag': 'noindex'
-					}
-				});
-			} else {
-				// prerendered pages and index.html files
-				pathname = pathname.replace(/\/$/, '') || '/';
-
-				let file = pathname.substring(1);
-
-				try {
-					file = decodeURIComponent(file);
-				} catch (err) {
-					// ignore
+			res = new Response(res.body, {
+				headers: {
+					// include original cache headers, minus cache-control which
+					// is overridden, and etag which is no longer useful
+					'cache-control': 'public, immutable, max-age=31536000',
+					'content-type': res.headers.get('content-type'),
+					'x-robots-tag': 'noindex'
 				}
+			});
+		} else {
+			// prerendered pages and index.html files
+			pathname = pathname.replace(/\/$/, '') || '/';
 
-				if (
-					manifest.assets.has(file) ||
-					manifest.assets.has(file + '/index.html') ||
-					prerendered.has(pathname)
-				) {
-					res = await env.ASSETS.fetch(req);
-				} else {
-					// dynamically-generated pages
-					res = await server.respond(req, {
-						platform: { env, context },
-						getClientAddress() {
-							return req.headers.get('cf-connecting-ip');
-						}
-					});
-				}
+			let file = pathname.substring(1);
+
+			try {
+				file = decodeURIComponent(file);
+			} catch (err) {
+				// ignore
 			}
 
-			// Writes to Cache only if allowed & specified
-			pragma = res.headers.get('cache-control');
-			return pragma ? Cache.save(req, res, context) : res;
-		} catch (e) {
-			return new Response('Error rendering route: ' + (e.message || e.toString()), { status: 500 });
+			if (
+				manifest.assets.has(file) ||
+				manifest.assets.has(file + '/index.html') ||
+				prerendered.has(pathname)
+			) {
+				res = await env.ASSETS.fetch(req);
+			} else {
+				// dynamically-generated pages
+				res = await server.respond(req, {
+					platform: { env, context },
+					getClientAddress() {
+						return req.headers.get('cf-connecting-ip');
+					}
+				});
+			}
 		}
+
+		// Writes to Cache only if allowed & specified
+		pragma = res.headers.get('cache-control');
+		return pragma ? Cache.save(req, res, context) : res;
 	}
 };
 

diff --git a/packages/adapter-netlify/src/edge.js b/packages/adapter-netlify/src/edge.js
@@ -9,24 +9,18 @@ const prefix = `/${manifest.appDir}/`;
  * @param { any } context
  * @returns { Promise<Response> }
  */
-export default async function handler(request, context) {
+export default function handler(request, context) {
 	if (is_static_file(request)) {
 		// Static files can skip the handler
 		return;
 	}
-	try {
-		const response = await server.respond(request, {
-			platform: { context },
-			getClientAddress() {
-				return request.headers.get('x-nf-client-connection-ip');
-			}
-		});
-		return response;
-	} catch (error) {
-		return new Response('Error rendering route:' + (error.message || error.toString()), {
-			status: 500
-		});
-	}
+
+	return server.respond(request, {
+		platform: { context },
+		getClientAddress() {
+			return request.headers.get('x-nf-client-connection-ip');
+		}
+	});
 }
 
 /**