More informational error handling

MarkSuckerberg · Mar 12, 2024 · ce44679 · ce44679
1 parent eb10923
commit ce44679
Show file tree

Hide file tree

Showing 2 changed files with 50 additions and 3 deletions.
diff --git a/package.json b/package.json
@@ -25,7 +25,7 @@
 		"wrangler": "^3.0.0"
 	},
 	"dependencies": {
-		"typeble": "^0.3.1"
+		"typeble": "^0.5.0"
 	},
 	"homepage": "https://github.com/MarkSuckerberg/typeble",
 	"bugs": {

diff --git a/src/index.ts b/src/index.ts
@@ -1,9 +1,9 @@
 import {
 	FetchPost,
 	GetNotes,
+	TumblrAPIError,
 	TumblrBlocksPost,
 	TumblrNeueAudioBlock,
-	TumblrNeueAudioBlockBase,
 	TumblrNeueImageBlock,
 	TumblrNeueTextBlock,
 	TumblrNeueVideoBlock,
@@ -48,7 +48,9 @@ export default {
 				true
 			);
 		} catch (error) {
-			return new Response('Error retrieving post', { status: 404 });
+			const tumblrUrl = new URL(`https://www.tumblr.com/${username}/${postID}`);
+
+			return errorPage(error, tumblrUrl);
 		}
 
 		const originalPost = post.trail[0] as TumblrBlocksPost;
@@ -209,3 +211,48 @@ async function mainPage(
 		},
 	});
 }
+
+async function errorPage(error: unknown, url: URL) {
+	if (!(error instanceof TumblrAPIError)) {
+		return new Response('Unknown error fetching post', { status: 500 });
+	}
+
+	const errorDescription =
+		error.response.meta.status === 303
+			? "Login required to view this account's posts"
+			: error.response.meta.msg;
+
+	const html = `<!DOCTYPE html>
+	<head>
+		<title>txTumblr</title>
+		<meta name="description" content="Unable to retrieve post from this link.\n\nTumblr Error: ${errorDescription}." />
+		<link rel="canonical" href="${url}" />
+		<!-- OpenGraph embed tags -->
+		<meta property="og:type" content="website" />
+		<meta property="og:title" content="txTumblr" />
+		<meta property="og:url" content="${url}" />
+		<meta property="og:description" content="Unable to retrieve post from this link.\n\nTumblr Error: ${errorDescription}" />
+
+		<!-- Twitter embed tags -->
+		<meta name="twitter:card" content="summary">
+		<meta property="twitter:domain" content="tumblr.com">
+		<meta property="twitter:title" content="txTumblr" />
+		<meta property="twitter:url" content="${url}" />
+		<meta property="twitter:description" content="Unable to retrieve post from this link.\n\nTumblr Error: ${errorDescription}" />
+
+		<meta http-equiv="refresh" content="0;url=${url}" />
+	</head>
+
+	<body>
+		<h1>Error ${error.response.meta.status}: ${error.response.meta.msg}</h1>
+		<p>${error.response.errors?.at(0)?.detail}</p>
+	</body>
+	`;
+
+	return new Response(html, {
+		headers: {
+			'content-type': 'text/html;charset=UTF-8',
+			'status': error.response.meta.status.toString(),
+		},
+	});
+}