Render error pages as HTML

This commit is contained in:
Râu Cao 2024-10-22 12:49:14 +02:00
parent ea58c1f60b
commit ba7336b4ee
Signed by: raucao
GPG Key ID: 37036C356E56CC51
9 changed files with 53 additions and 38 deletions

View File

@ -2,6 +2,7 @@ import { Context } from "@oak/oak";
import { nip19 } from "@nostr/tools";
import { log } from "../log.ts";
import { lookupUsernameByPubkey } from "../ldap.ts";
import notFoundHandler from "../handlers/not-found.ts";
const naddrHandler = async function (ctx: Context) {
const naddr = ctx.params.path;
@ -13,13 +14,11 @@ const naddrHandler = async function (ctx: Context) {
if (username && r.data.identifier) {
ctx.response.redirect(`/@${username}/${r.data.identifier}`);
} else {
ctx.response.status = 404;
ctx.response.body = "Not Found";
notFoundHandler(ctx);
}
} catch (e) {
log(e, "yellow");
ctx.response.status = 404;
ctx.response.body = "Not Found";
notFoundHandler(ctx);
}
};

10
handlers/not-found.ts Normal file
View File

@ -0,0 +1,10 @@
import { Context } from "@oak/oak";
import { errorPageHtml } from "../html.ts";
const notFoundHandler = function (ctx: Context) {
const html = errorPageHtml(404, "Not found");
ctx.response.body = html;
ctx.response.status = 404;
};
export default notFoundHandler;

View File

@ -2,6 +2,7 @@ import { Context } from "@oak/oak";
import { nip19 } from "@nostr/tools";
import { log } from "../log.ts";
import { lookupUsernameByPubkey } from "../ldap.ts";
import notFoundHandler from "../handlers/not-found.ts";
const nprofileHandler = async function (ctx: Context) {
const nprofile = ctx.params.path;
@ -13,13 +14,11 @@ const nprofileHandler = async function (ctx: Context) {
if (username) {
ctx.response.redirect(`/@${username}`);
} else {
ctx.response.status = 404;
ctx.response.body = "Not Found";
notFoundHandler(ctx);
}
} catch (e) {
log(e, "yellow");
ctx.response.status = 404;
ctx.response.body = "Not Found";
notFoundHandler(ctx);
}
};

View File

@ -2,6 +2,7 @@ import { Context } from "@oak/oak";
import { nip19 } from "@nostr/tools";
import { log } from "../log.ts";
import { lookupUsernameByPubkey } from "../ldap.ts";
import notFoundHandler from "../handlers/not-found.ts";
const npubHandler = async function (ctx: Context) {
const npub = ctx.params.path;
@ -13,13 +14,11 @@ const npubHandler = async function (ctx: Context) {
if (username) {
ctx.response.redirect(`/@${username}`);
} else {
ctx.response.status = 404;
ctx.response.body = "Not Found";
notFoundHandler(ctx);
}
} catch (e) {
log(e, "yellow");
ctx.response.status = 404;
ctx.response.body = "Not Found";
notFoundHandler(ctx);
}
};

View File

@ -5,14 +5,14 @@ import { fetchArticlesByAuthor, fetchProfileEvent } from "../nostr.ts";
import { profileAtomFeed } from "../feeds.ts";
import Article from "../models/article.ts";
import Profile from "../models/profile.ts";
import notFoundHandler from "../handlers/not-found.ts";
const userAtomFeedHandler = async function (ctx: Context) {
const username = ctx.params.user.replace(/^(@|~)/, "");
const pubkey = await lookupPubkeyByUsername(username);
if (!pubkey) {
ctx.response.status = 404;
ctx.response.body = "Not Found";
notFoundHandler(ctx);
return;
}
@ -33,8 +33,7 @@ const userAtomFeedHandler = async function (ctx: Context) {
}
} catch (e) {
log(e, "yellow");
ctx.response.status = 404;
ctx.response.body = "Not Found";
notFoundHandler(ctx);
}
};

View File

@ -5,6 +5,7 @@ import { fetchProfileEvent, fetchReplaceableEvent } from "../nostr.ts";
import Article from "../models/article.ts";
import Profile from "../models/profile.ts";
import { articleHtml } from "../html.ts";
import notFoundHandler from "../handlers/not-found.ts";
const userEventHandler = async function (ctx: Context) {
const username = ctx.params.user.replace(/^(@|~)/, "");
@ -12,8 +13,7 @@ const userEventHandler = async function (ctx: Context) {
const pubkey = await lookupPubkeyByUsername(username);
if (!pubkey) {
ctx.response.status = 404;
ctx.response.body = "Not Found";
notFoundHandler(ctx);
return;
}
@ -31,13 +31,11 @@ const userEventHandler = async function (ctx: Context) {
ctx.response.body = html;
} else {
ctx.response.status = 404;
ctx.response.body = "Not Found";
notFoundHandler(ctx);
}
} catch (e) {
log(e, "yellow");
ctx.response.status = 404;
ctx.response.body = "Not Found";
notFoundHandler(ctx);
}
};

View File

@ -5,14 +5,14 @@ import { fetchArticlesByAuthor, fetchProfileEvent } from "../nostr.ts";
import Article from "../models/article.ts";
import Profile from "../models/profile.ts";
import { profilePageHtml } from "../html.ts";
import notFoundHandler from "../handlers/not-found.ts";
const userProfileHandler = async function (ctx: Context) {
const username = ctx.params.path.replace(/^(@|~)/, "");
const pubkey = await lookupPubkeyByUsername(username);
if (!pubkey) {
ctx.response.status = 404;
ctx.response.body = "Not Found";
notFoundHandler(ctx);
return;
}
@ -27,13 +27,11 @@ const userProfileHandler = async function (ctx: Context) {
ctx.response.body = html;
} else {
ctx.response.status = 404;
ctx.response.body = "Not Found";
notFoundHandler(ctx);
}
} catch (e) {
log(e, "yellow");
ctx.response.status = 404;
ctx.response.body = "Not Found";
notFoundHandler(ctx);
}
};

20
html.ts
View File

@ -2,7 +2,13 @@ import { localizeDate } from "./dates.ts";
import Article from "./models/article.ts";
import Profile from "./models/profile.ts";
function htmlLayout(title: string, body: string, profile: Profile): string {
function htmlLayout(title: string, body: string, profile?: Profile): string {
let feedLinksHtml = "";
if (profile) {
feedLinksHtml =
`<link rel="alternate" type="application/atom+xml" href="/@${profile.username}/articles.atom" title="Articles by ${profile.name}" />`;
}
return `
<!DOCTYPE html>
<html>
@ -11,7 +17,7 @@ function htmlLayout(title: string, body: string, profile: Profile): string {
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta http-equiv="X-UA-Compatible" content="ie=edge">
<title>${title}</title>
<link rel="alternate" type="application/atom+xml" href="/@${profile.username}/articles.atom" title="Articles by ${profile.name}" />
${feedLinksHtml}
<link rel="stylesheet" type="text/css" href="/assets/css/layout.css" />
<link rel="stylesheet" type="text/css" href="/assets/css/themes/default-light.css" />
</head>
@ -22,6 +28,16 @@ function htmlLayout(title: string, body: string, profile: Profile): string {
`;
}
export function errorPageHtml(statusCode: number, title: string): string {
const body = `
<main>
<h1>${statusCode} - ${title}</h1>
</main>
`;
return htmlLayout(title, body);
}
export function articleHtml(article: Article, profile: Profile): string {
const publishedAtFormatted = localizeDate(article.publishedAt);

View File

@ -6,6 +6,7 @@ import npubHandler from "./handlers/npub.ts";
import userProfileHandler from "./handlers/user-profile.ts";
import userEventHandler from "./handlers/user-event.ts";
import userAtomFeedHandler from "./handlers/user-atom-feed.ts";
import notFoundHandler from "./handlers/not-found.ts";
const router = new Router();
@ -21,8 +22,7 @@ router.get("/:path", async (ctx: ctx) => {
} else if (path.startsWith("@") || path.startsWith("~")) {
await userProfileHandler(ctx);
} else {
ctx.response.status = 404;
ctx.response.body = "Not Found";
notFoundHandler(ctx);
}
});
@ -35,8 +35,7 @@ router.get("/:user/:kind.atom", async (ctx: ctx) => {
) {
await userAtomFeedHandler(ctx);
} else {
ctx.response.status = 404;
ctx.response.body = "Not Found";
notFoundHandler(ctx);
}
});
@ -46,8 +45,7 @@ router.get("/:user/:identifier", async (ctx: ctx) => {
if (user.startsWith("@") || user.startsWith("~")) {
await userEventHandler(ctx);
} else {
ctx.response.status = 404;
ctx.response.body = "Not Found";
notFoundHandler(ctx);
}
});
@ -59,8 +57,7 @@ router.get("/assets/:path*", async (ctx) => {
root: `${Deno.cwd()}/assets`,
});
} catch (_e) {
ctx.response.status = 404;
ctx.response.body = "Not Found";
notFoundHandler(ctx);
}
});