⚡️⚡️⚡️ Self-hosted collaborative bookmark manager to collect, read, annotate, and fully preserve what matters, all in one place.
TypeScript bookmarkbookmark-managercollaborationnextjsreact-nativeread-it-laterself-hostedtypescript
fix: get title from HTML with monolith
Spyfbafa3df4ee5
diff --git a/apps/web/lib/api/controllers/links/postLink.ts b/apps/web/lib/api/controllers/links/postLink.tsindex 044c091b..c9cff768 100644--- a/apps/web/lib/api/controllers/links/postLink.ts+++ b/apps/web/lib/api/controllers/links/postLink.ts@@ -72,7 +72,7 @@ export default async function postLink(}const { title = "", headers = new Headers() } = link.url- ? await fetchTitleAndHeaders(link.url)+ ? await fetchTitleAndHeaders(link.url, null): {};const name =diff --git a/apps/web/lib/shared/fetchTitleAndHeaders.ts b/apps/web/lib/shared/fetchTitleAndHeaders.tsindex 8a7bcefc..d0662591 100644--- a/apps/web/lib/shared/fetchTitleAndHeaders.ts+++ b/apps/web/lib/shared/fetchTitleAndHeaders.ts@@ -3,7 +3,7 @@ import https from "https";import { HttpsProxyAgent } from "https-proxy-agent";import { SocksProxyAgent } from "socks-proxy-agent";-export default async function fetchTitleAndHeaders(url: string) {+export default async function fetchTitleAndHeaders(url: string, content: string | null) {if (!url?.startsWith("http://") && !url?.startsWith("https://"))return { title: "", headers: null };@@ -45,15 +45,17 @@ export default async function fetchTitleAndHeaders(url: string) {const response = await Promise.race([responsePromise, timeoutPromise]);if ((response as any)?.status) {- const text = await (response as any).text();+ let text: string;- // regular expression to find the <title> tag- let match = text.match(/<title.*>([^<]*)<\/title>/);+ if (content) {+ text = content+ } else {+ text = await (response as any).text()+ }- const title = match?.[1] || "";const headers = (response as Response)?.headers || null;- return { title, headers };+ return await fetchTitleAndHeadersFromContent(text, headers);} else {return { title: "", headers: null };}@@ -62,3 +64,12 @@ export default async function fetchTitleAndHeaders(url: string) {return { title: "", headers: null };}}++export async function fetchTitleAndHeadersFromContent(content: string, headers: Headers) {+ // regular expression to find the <title> tag+ let match = content.match(/<title.*>([^<]*)<\/title>/);++ const title = match?.[1] || "";++ return { title, headers };+}\ No newline at end of filediff --git a/apps/web/pages/api/v1/archives/index.ts b/apps/web/pages/api/v1/archives/index.tsindex a51ea633..ba00cd93 100644--- a/apps/web/pages/api/v1/archives/index.ts+++ b/apps/web/pages/api/v1/archives/index.ts@@ -146,7 +146,14 @@ async function handlePost(req: NextApiRequest, res: NextApiResponse) {if (!collection) {throw new Error("Collection not found.");}- const { title = "" } = url ? await fetchTitleAndHeaders(url) : {};++ // Generate a preview if it's an image+ const { mimetype } = files.file[0];+ const isPDF = mimetype?.includes("pdf");+ const isImage = mimetype?.includes("image");+ const isHTML = mimetype === "text/html";++ const { title = "" } = url ? await fetchTitleAndHeaders(url, isHTML && !isPreview ? fileBuffer.toString("utf-8") : null) : {};const link = await prisma.link.create({data: {@@ -165,12 +172,6 @@ async function handlePost(req: NextApiRequest, res: NextApiResponse) {},});- // Generate a preview if it's an image- const { mimetype } = files.file[0];- const isPDF = mimetype?.includes("pdf");- const isImage = mimetype?.includes("image");- const isHTML = mimetype === "text/html";-if (isImage) {const collectionId = collection.id;createFolder({ filePath: `archives/preview/${collectionId}` });