kosmos/substr
kosmos/substr
8
0
Fork 0
Code Issues 5 Pull Requests Actions Releases Activity

Refactor/fix error handling, add query timeouts

Browse Source
This commit is contained in:
Râu Cao 2024-10-25 14:25:41 +02:00
parent ec7c775e25
commit 5f5f024ae7
Signed by: raucao
GPG Key ID: 37036C356E56CC51
12 changed files with 168 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
config.ts
View File

@ -45,6 +45,7 @@ const config = {
password: Deno.env.get("LDAP_PASSWORD"),
searchDN: Deno.env.get("LDAP_SEARCH_DN"),
},
query_timeout: parseInt(Deno.env.get("RELAY_TIMEOUT_MS") || "5000"),
njump_url: Deno.env.get("NJUMP_URL") || "https://njump.me",
};

20
handlers/errors.ts Normal file
View File

@ -0,0 +1,20 @@
import { Context } from "@oak/oak";
import { errorPageHtml } from "../html.ts";
export const notFoundHandler = function (ctx: Context) {
const html = errorPageHtml(404, "Not found");
ctx.response.body = html;
ctx.response.status = 404;
};
export const badGatewayHandler = function (ctx: Context) {
const html = errorPageHtml(502, "Bad gateway");
ctx.response.body = html;
ctx.response.status = 502;
};
export const internalServerErrorHandler = function (ctx: Context) {
const html = errorPageHtml(500, "Internal server error");
ctx.response.body = html;
ctx.response.status = 500;
};

13
handlers/naddr.ts
View File

@ -1,13 +1,19 @@
import { Context } from "@oak/oak";
import { nip19 } from "@nostr/tools";
import { lookupUsernameByPubkey } from "../directory.ts";
import notFoundHandler from "../handlers/not-found.ts";
import { notFoundHandler } from "../handlers/errors.ts";
const naddrHandler = async function (ctx: Context) {
const naddr = ctx.state.path;
let data: nip19.AddressPointer;
try {
const data = nip19.decode(naddr).data as nip19.AddressPointer;
data = nip19.decode(naddr).data as nip19.AddressPointer;
} catch (_e) {
notFoundHandler(ctx);
return;
}
const username = await lookupUsernameByPubkey(data.pubkey);
if (username && data.identifier) {
@ -15,9 +21,6 @@ const naddrHandler = async function (ctx: Context) {
} else {
notFoundHandler(ctx);
}
} catch (_e) {
notFoundHandler(ctx);
}
};
export default naddrHandler;

10
handlers/not-found.ts
View File

@ -1,10 +0,0 @@
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;

14
handlers/nprofile.ts
View File

@ -1,13 +1,20 @@
import { Context } from "@oak/oak";
import { nip19 } from "@nostr/tools";
import { lookupUsernameByPubkey } from "../directory.ts";
import notFoundHandler from "../handlers/not-found.ts";
import { notFoundHandler } from "../handlers/errors.ts";
const nprofileHandler = async function (ctx: Context) {
const nprofile = ctx.state.path;
let data: nip19.ProfilePointer;
try {
const data = nip19.decode(nprofile).data as nip19.ProfilePointer;
data = nip19.decode(nprofile).data as nip19.ProfilePointer;
console.log(data);
} catch (_e) {
notFoundHandler(ctx);
return;
}
const username = await lookupUsernameByPubkey(data.pubkey);
if (username) {
@ -15,9 +22,6 @@ const nprofileHandler = async function (ctx: Context) {
} else {
notFoundHandler(ctx);
}
} catch (_e) {
notFoundHandler(ctx);
}
};
export default nprofileHandler;

13
handlers/npub.ts
View File

@ -1,13 +1,19 @@
import { Context } from "@oak/oak";
import { nip19 } from "@nostr/tools";
import { lookupUsernameByPubkey } from "../directory.ts";
import notFoundHandler from "../handlers/not-found.ts";
import { notFoundHandler } from "../handlers/errors.ts";
const npubHandler = async function (ctx: Context) {
const npub = ctx.state.path;
let pubkey: string;
try {
const pubkey = nip19.decode(npub).data as string;
pubkey = nip19.decode(npub).data as string;
} catch (_e) {
notFoundHandler(ctx);
return;
}
const username = await lookupUsernameByPubkey(pubkey);
if (username) {
@ -15,9 +21,6 @@ const npubHandler = async function (ctx: Context) {
} else {
notFoundHandler(ctx);
}
} catch (_e) {
notFoundHandler(ctx);
}
};
export default npubHandler;

6
handlers/user-atom-feed.ts
View File

@ -4,7 +4,7 @@ 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";
import { notFoundHandler } from "../handlers/errors.ts";
const userAtomFeedHandler = async function (ctx: Context) {
const username = ctx.state.username;
@ -15,7 +15,6 @@ const userAtomFeedHandler = async function (ctx: Context) {
return;
}
try {
const profileEvent = await fetchProfileEvent(pubkey);
if (profileEvent) {
@ -32,9 +31,6 @@ const userAtomFeedHandler = async function (ctx: Context) {
}
}
notFoundHandler(ctx);
} catch (_e) {
notFoundHandler(ctx);
}
};
export default userAtomFeedHandler;

6
handlers/user-event.ts
View File

@ -4,7 +4,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";
import { notFoundHandler } from "../handlers/errors.ts";
import { generateOgProfileImage } from "../magick.ts";
const userEventHandler = async function (ctx: Context) {
@ -17,7 +17,6 @@ const userEventHandler = async function (ctx: Context) {
return;
}
try {
const articleEvent = await fetchReplaceableEvent(
pubkey,
identifier,
@ -34,9 +33,6 @@ const userEventHandler = async function (ctx: Context) {
} else {
notFoundHandler(ctx);
}
} catch (_e) {
notFoundHandler(ctx);
}
};
export default userEventHandler;

6
handlers/user-profile.ts
View File

@ -4,7 +4,7 @@ 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";
import { notFoundHandler } from "../handlers/errors.ts";
import { generateOgProfileImage } from "../magick.ts";
const userProfileHandler = async function (ctx: Context) {
@ -16,7 +16,6 @@ const userProfileHandler = async function (ctx: Context) {
return;
}
try {
const profileEvent = await fetchProfileEvent(pubkey);
if (profileEvent) {
@ -30,9 +29,6 @@ const userProfileHandler = async function (ctx: Context) {
} else {
notFoundHandler(ctx);
}
} catch (_e) {
notFoundHandler(ctx);
}
};
export default userProfileHandler;

10
ldap.ts
View File

@ -25,10 +25,11 @@ export async function lookupPubkeyByUsername(username: string) {
) {
pubkey = searchEntries[0].nostrKey;
}
} catch (e) {
console.error(e);
} finally {
await client.unbind();
} catch (e) {
await client.unbind();
throw e;
}
return pubkey;
@ -49,9 +50,8 @@ export async function lookupUsernameByPubkey(pubkey: string) {
username = searchEntries[0].cn;
}
} catch (e) {
console.error(e);
} finally {
await client.unbind();
throw e;
}
return username;

28
nostr.ts
View File

@ -1,4 +1,4 @@
import { NPool, NRelay1 } from "@nostrify/nostrify";
import { NostrEvent, NostrFilter, NPool, NRelay1 } from "@nostrify/nostrify";
import { nip19 } from "@nostr/tools";
import { lookupUsernameByPubkey } from "./directory.ts";
import config from "./config.ts";
@ -14,47 +14,57 @@ const relayPool = new NPool({
eventRouter: async (_event) => [],
});
async function fetchWithTimeout(filters: NostrFilter[]) {
const timeoutPromise = new Promise((_, reject) =>
setTimeout(() => reject(new Error("relay timeout")), config.query_timeout)
);
const eventsPromise = relayPool.query(filters);
const events = await Promise.race([eventsPromise, timeoutPromise]);
return events;
}
export async function fetchReplaceableEvent(
pubkey: string,
identifier: string,
) {
let events = await relayPool.query([{
let events = await fetchWithTimeout([{
authors: [pubkey],
kinds: [30023],
"#d": [identifier],
limit: 1,
}]);
}]) as NostrEvent[];
if (events.length > 0) {
return events[0];
} else {
events = await relayPool.query([{
events = await fetchWithTimeout([{
authors: [pubkey],
kinds: [30024],
"#d": [identifier],
limit: 1,
}]);
}]) as NostrEvent[];
return events.length > 0 ? events[0] : null;
}
}
export async function fetchArticlesByAuthor(pubkey: string) {
const events = await relayPool.query([{
const events = await fetchWithTimeout([{
authors: [pubkey],
kinds: [30023],
limit: 10,
}]);
}]) as NostrEvent[];
return events;
}
export async function fetchProfileEvent(pubkey: string) {
const events = await relayPool.query([{
const events = await fetchWithTimeout([{
authors: [pubkey],
kinds: [0],
limit: 1,
}]);
}]) as NostrEvent[];
return events.length > 0 ? events[0] : null;
}

40
server.ts
View File

@ -7,13 +7,18 @@ 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";
import {
badGatewayHandler,
internalServerErrorHandler,
notFoundHandler,
} from "./handlers/errors.ts";
const router = new Router();
router.get("/:path", async (ctx) => {
const path = ctx.state.path = ctx.params.path;
try {
if (path.startsWith("naddr")) {
await naddrHandler(ctx);
} else if (path.startsWith("nprofile")) {
@ -25,6 +30,14 @@ router.get("/:path", async (ctx) => {
} else {
notFoundHandler(ctx);
}
} catch (e) {
console.error(e);
if (e instanceof Error && e.message.match(/^connect|relay timeout/)) {
badGatewayHandler(ctx);
} else {
internalServerErrorHandler(ctx);
}
}
});
router.get("/:username/:kind.atom", async (ctx) => {
@ -36,7 +49,16 @@ router.get("/:username/:kind.atom", async (ctx) => {
(ctx.params.username.startsWith("@") ||
ctx.params.username.startsWith("~"))
) {
try {
await userAtomFeedHandler(ctx);
} catch (e) {
console.error(e);
if (e instanceof Error && e.message.match(/^connect|relay timeout/)) {
badGatewayHandler(ctx);
} else {
internalServerErrorHandler(ctx);
}
}
} else {
notFoundHandler(ctx);
}
@ -47,7 +69,16 @@ router.get("/:username/:identifier", async (ctx) => {
ctx.state.identifier = ctx.params.identifier;
if (username.startsWith("@") || username.startsWith("~")) {
try {
await userEventHandler(ctx);
} catch (e) {
console.error(e);
if (e instanceof Error && e.message.match(/^connect|relay timeout/)) {
badGatewayHandler(ctx);
} else {
internalServerErrorHandler(ctx);
}
}
} else {
notFoundHandler(ctx);
}
@ -66,8 +97,13 @@ router.get("/assets/:path*", async (ctx) => {
}
await send(ctx, filePath, { root });
} catch (_e) {
} catch (e) {
if (e instanceof Error && e.name === "NotFoundError") {
notFoundHandler(ctx);
} else {
console.error(e);
badGatewayHandler(ctx);
}
}
});