fix: add request timeouts and fix stale routes causing 500s

ewanc26 · ewanc26 · commit b71b7ee7d2cb · 2026-05-02T18:31:19.000+01:00
- Add 8s timeout wrappers to homepage and layout fetch calls
- Remove stale /src/app.css link from app.html
- Add /nodeinfo/2.0 redirect to ap.ewancroft.uk
diff --git a/src/app.html b/src/app.html
@@ -1,7 +1,6 @@
 <!doctype html>
 <html lang="en">
 	<head>
-		<link rel="stylesheet" href="/src/app.css" />
 		<link rel="preload" href="/fonts/InterVariable.woff2" as="font" type="font/woff2" crossorigin />
 		<link rel="preload" href="/fonts/InterVariable-Italic.woff2" as="font" type="font/woff2" crossorigin />
 		<meta charset="utf-8" />
diff --git a/src/routes/+layout.ts b/src/routes/+layout.ts
@@ -2,6 +2,27 @@ import type { LayoutLoad } from './$types';
 import { createSiteMeta, type SiteMetadata, defaultSiteMeta } from '$lib/helper/siteMeta';
 import { fetchProfile } from '$lib/services/atproto';
 
+/**
+ * Wraps a promise with a timeout. Returns null on timeout or rejection.
+ */
+function withTimeout<T>(promise: Promise<T>, ms: number): Promise<T | null> {
+	return new Promise((resolve) => {
+		const timer = setTimeout(() => resolve(null), ms);
+		promise.then(
+			(value) => {
+				clearTimeout(timer);
+				resolve(value);
+			},
+			() => {
+				clearTimeout(timer);
+				resolve(null);
+			}
+		);
+	});
+}
+
+const REQUEST_TIMEOUT = 8_000;
+
 /**
  * Layout load function - fetches profile data and provides base site metadata
  */
@@ -15,7 +36,7 @@ export const load: LayoutLoad = async ({ url, fetch }) => {
 	// Fetch profile data (needed by Header and page components)
 	let profile = null;
 	try {
-		profile = await fetchProfile(fetch);
+		profile = await withTimeout(fetchProfile(fetch), REQUEST_TIMEOUT);
 	} catch (error) {
 		console.error('[Layout] Failed to load profile:', error);
 	}
diff --git a/src/routes/+page.ts b/src/routes/+page.ts
@@ -10,17 +10,40 @@ import {
 	fetchRecentPopfeedReviews
 } from '$lib/services/atproto';
 
+/**
+ * Wraps a promise with a timeout. Returns null on timeout or rejection,
+ * so it's safe to use with Promise.allSettled.
+ */
+function withTimeout<T>(promise: Promise<T>, ms: number): Promise<T | null> {
+	return new Promise((resolve) => {
+		const timer = setTimeout(() => resolve(null), ms);
+		promise.then(
+			(value) => {
+				clearTimeout(timer);
+				resolve(value);
+			},
+			() => {
+				clearTimeout(timer);
+				resolve(null);
+			}
+		);
+	});
+}
+
+/** Per-request timeout — keeps Vercel serverless functions under the 10s limit. */
+const REQUEST_TIMEOUT = 8_000;
+
 export const load: PageLoad = async ({ fetch, parent }) => {
 	const { profile } = await parent();
 
 	const [musicStatus, kibunStatus, latestPost, documents, supporters, popfeedReview] =
 		await Promise.allSettled([
-			fetchMusicStatus(fetch),
-			fetchKibunStatus(fetch),
-			fetchLatestBlueskyPost(fetch),
-			fetchRecentDocuments(5, fetch),
-			fetchAllSupporters(),
-			fetchRecentPopfeedReviews(fetch)
+			withTimeout(fetchMusicStatus(fetch), REQUEST_TIMEOUT),
+			withTimeout(fetchKibunStatus(fetch), REQUEST_TIMEOUT),
+			withTimeout(fetchLatestBlueskyPost(fetch), REQUEST_TIMEOUT),
+			withTimeout(fetchRecentDocuments(5, fetch), REQUEST_TIMEOUT),
+			withTimeout(fetchAllSupporters(), REQUEST_TIMEOUT),
+			withTimeout(fetchRecentPopfeedReviews(fetch), REQUEST_TIMEOUT)
 		]);
 
 	// Create page metadata with dynamic OG
diff --git a/vercel.json b/vercel.json
@@ -57,16 +57,21 @@
 		}
 	],
 	"rewrites": [],
-  "redirects": [
-    {
-      "source": "/.well-known/nodeinfo",
-      "destination": "https://ap.ewancroft.uk/.well-known/nodeinfo",
-      "permanent": false
-    },
-    {
-      "source": "/.well-known/host-meta",
-      "destination": "https://ap.ewancroft.uk/.well-known/host-meta",
-      "permanent": false
-    }
-  ]
+	"redirects": [
+		{
+			"source": "/.well-known/nodeinfo",
+			"destination": "https://ap.ewancroft.uk/.well-known/nodeinfo",
+			"permanent": false
+		},
+		{
+			"source": "/.well-known/host-meta",
+			"destination": "https://ap.ewancroft.uk/.well-known/host-meta",
+			"permanent": false
+		},
+		{
+			"source": "/nodeinfo/2.0",
+			"destination": "https://ap.ewancroft.uk/nodeinfo/2.0",
+			"permanent": false
+		}
+	]
 }
