diff --git a/api/services/providers/generic.ts b/api/services/providers/generic.ts
index 7278822..3bced69 100644
--- a/api/services/providers/generic.ts
+++ b/api/services/providers/generic.ts
@@ -1,6 +1,14 @@
import type { RichContent } from "../../model/interfaces.ts";
import type { RichContentProvider } from "../rich-content-service.ts";
-import { extractOgTag, fetchWithTimeout } from "../rich-content-service.ts";
+import {
+ extractBestIcon,
+ extractJsonLd,
+ extractLargeImage,
+ extractMetaName,
+ extractOgTag,
+ extractPageTitle,
+ fetchWithTimeout,
+} from "../rich-content-service.ts";
export const genericProvider: RichContentProvider = {
name: "generic",
@@ -18,14 +26,39 @@ export const genericProvider: RichContentProvider = {
}
const html = await res.text();
+ const ld = extractJsonLd(html);
+
+ // Title: og:title → twitter:title → JSON-LD →
+ const title = extractOgTag(html, "title") ??
+ extractMetaName(html, "twitter:title") ??
+ ld.title ??
+ extractPageTitle(html);
+
+ // Description: og:description → twitter:description → JSON-LD → <meta name="description">
+ const description = extractOgTag(html, "description") ??
+ extractMetaName(html, "twitter:description") ??
+ ld.description ??
+ extractMetaName(html, "description");
+
+ // Image: og:image → twitter:image → JSON-LD → first large <img> → best icon → /favicon.ico
+ const thumbnailUrl = extractOgTag(html, "image") ??
+ extractMetaName(html, "twitter:image") ??
+ ld.thumbnailUrl ??
+ extractLargeImage(html, url) ??
+ extractBestIcon(html, url) ??
+ `${new URL(url).origin}/favicon.ico`;
+
+ // Site name: og:site_name → hostname
+ const siteName = extractOgTag(html, "site_name") ??
+ new URL(url).hostname.replace(/^www\./, "");
return {
type: "generic",
url,
- title: extractOgTag(html, "title"),
- description: extractOgTag(html, "description"),
- thumbnailUrl: extractOgTag(html, "image"),
- siteName: extractOgTag(html, "site_name"),
+ title,
+ description,
+ thumbnailUrl,
+ siteName,
};
},
};
diff --git a/api/services/rich-content-service.ts b/api/services/rich-content-service.ts
index 6682332..85f882b 100644
--- a/api/services/rich-content-service.ts
+++ b/api/services/rich-content-service.ts
@@ -83,6 +83,199 @@ export function extractOgTag(
return undefined;
}
+/** Extract content from `<meta name="…" content="…">` (both attribute orderings). */
+export function extractMetaName(
+ html: string,
+ name: string,
+): string | undefined {
+ const escaped = name.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+ const patterns = [
+ new RegExp(
+ `<meta[^>]+name=["']${escaped}["'][^>]+content=["']([^"']+)["']`,
+ "i",
+ ),
+ new RegExp(
+ `<meta[^>]+content=["']([^"']+)["'][^>]+name=["']${escaped}["']`,
+ "i",
+ ),
+ ];
+ for (const pattern of patterns) {
+ const match = html.match(pattern);
+ if (match) return decodeHtmlEntities(match[1]);
+ }
+ return undefined;
+}
+
+/** Extract the text content of the `<title>` element. */
+export function extractPageTitle(html: string): string | undefined {
+ const match = html.match(/<title[^>]*>([^<]+)<\/title>/i);
+ return match ? decodeHtmlEntities(match[1].trim()) : undefined;
+}
+
+// ── JSON-LD helpers (file-private) ────────────────────────────────────────────
+
+type JsonLdResult = {
+ title?: string;
+ description?: string;
+ thumbnailUrl?: string;
+};
+
+function ldString(v: unknown): string | undefined {
+ if (typeof v === "string" && v.trim()) return v.trim();
+ if (Array.isArray(v) && typeof v[0] === "string" && v[0].trim()) {
+ return v[0].trim();
+ }
+ return undefined;
+}
+
+function ldImage(v: unknown): string | undefined {
+ if (
+ typeof v === "string" &&
+ (v.startsWith("http://") || v.startsWith("https://"))
+ ) return v;
+ if (Array.isArray(v)) return ldImage(v[0]);
+ if (v && typeof v === "object") {
+ const o = v as Record<string, unknown>;
+ return ldImage(o.url ?? o.contentUrl);
+ }
+ return undefined;
+}
+
+function ldExtractNode(data: unknown): JsonLdResult {
+ if (Array.isArray(data)) {
+ for (const item of data) {
+ const r = ldExtractNode(item);
+ if (r.title || r.thumbnailUrl) return r;
+ }
+ return {};
+ }
+ if (!data || typeof data !== "object") return {};
+ const o = data as Record<string, unknown>;
+ if (o["@graph"]) return ldExtractNode(o["@graph"]);
+ return {
+ title: ldString(o.name ?? o.headline),
+ description: ldString(o.description),
+ thumbnailUrl: ldImage(o.image ?? o.thumbnailUrl ?? o.thumbnail),
+ };
+}
+
+/**
+ * Parse every `<script type="application/ld+json">` block and return the first
+ * node that yields a title or image. Handles `@graph`, arrays, and the common
+ * `image` shapes (string, string[], ImageObject).
+ */
+export function extractJsonLd(html: string): JsonLdResult {
+ const pattern =
+ /<script[^>]+type=["']application\/ld\+json["'][^>]*>([\s\S]*?)<\/script>/gi;
+ let match: RegExpExecArray | null;
+ while ((match = pattern.exec(html)) !== null) {
+ try {
+ const result = ldExtractNode(JSON.parse(match[1]));
+ if (result.title || result.thumbnailUrl) return result;
+ } catch { /* invalid JSON — skip */ }
+ }
+ return {};
+}
+
+/**
+ * Return the `src` of the first `<img>` whose declared width or height is at
+ * least `minSize` pixels (default 200). Skips data URIs. Resolves relative URLs.
+ */
+export function extractLargeImage(
+ html: string,
+ baseUrl: string,
+ minSize = 200,
+): string | undefined {
+ const imgPattern = /<img[^>]+>/gi;
+ let match: RegExpExecArray | null;
+ while ((match = imgPattern.exec(html)) !== null) {
+ const tag = match[0];
+ const src = /\bsrc=["']([^"']+)["']/i.exec(tag)?.[1];
+ if (!src || src.startsWith("data:")) continue;
+ const w = parseInt(/\bwidth=["']?(\d+)/i.exec(tag)?.[1] ?? "0");
+ const h = parseInt(/\bheight=["']?(\d+)/i.exec(tag)?.[1] ?? "0");
+ if (w >= minSize && h >= minSize) {
+ try {
+ return new URL(src, baseUrl).toString();
+ } catch {
+ continue;
+ }
+ }
+ }
+ return undefined;
+}
+
+/**
+ * Collect all `<link rel="icon">` / `<link rel="apple-touch-icon">` tags, rank
+ * them by declared size (largest wins), and return the best resolved URL.
+ * Falls back to the first match when no `sizes` attribute is present.
+ */
+export function extractBestIcon(
+ html: string,
+ baseUrl: string,
+): string | undefined {
+ const linkRe = /<link[^>]+>/gi;
+ const relRe = /\brel=["']([^"']+)["']/i;
+ const hrefRe = /\bhref=["']([^"']+)["']/i;
+ const sizesRe = /\bsizes=["']([^"']+)["']/i;
+
+ const candidates: { href: string; area: number }[] = [];
+
+ let m: RegExpExecArray | null;
+ while ((m = linkRe.exec(html)) !== null) {
+ const tag = m[0];
+ const rel = relRe.exec(tag)?.[1] ?? "";
+ if (!/\bicon\b/i.test(rel) && !/apple-touch-icon/i.test(rel)) continue;
+ const href = hrefRe.exec(tag)?.[1];
+ if (!href) continue;
+ const sizesStr = sizesRe.exec(tag)?.[1] ?? "";
+ const sm = sizesStr.match(/(\d+)x(\d+)/i);
+ const area = sm ? parseInt(sm[1]) * parseInt(sm[2]) : 0;
+ try {
+ candidates.push({ href: new URL(href, baseUrl).toString(), area });
+ } catch {
+ continue;
+ }
+ }
+
+ if (candidates.length === 0) return undefined;
+ candidates.sort((a, b) => b.area - a.area);
+ return candidates[0].href;
+}
+
+/**
+ * Extract `href` from the first `<link rel="…">` whose rel contains `relFragment`,
+ * resolved to an absolute URL using `baseUrl`.
+ */
+export function extractLinkHref(
+ html: string,
+ relFragment: string,
+ baseUrl: string,
+): string | undefined {
+ const escaped = relFragment.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+ const patterns = [
+ new RegExp(
+ `<link[^>]+rel=["'][^"']*${escaped}[^"']*["'][^>]+href=["']([^"']+)["']`,
+ "i",
+ ),
+ new RegExp(
+ `<link[^>]+href=["']([^"']+)["'][^>]+rel=["'][^"']*${escaped}[^"']*["']`,
+ "i",
+ ),
+ ];
+ for (const pattern of patterns) {
+ const match = html.match(pattern);
+ if (match) {
+ try {
+ return new URL(match[1], baseUrl).toString();
+ } catch {
+ return undefined;
+ }
+ }
+ }
+ return undefined;
+}
+
function isPrivateHost(hostname: string): boolean {
// Block loopback and RFC-1918 ranges. Note: DNS rebinding is not fully mitigated.
if (hostname === "localhost" || hostname === "::1") return true;
diff --git a/index.html b/index.html
index c79533d..3562585 100644
--- a/index.html
+++ b/index.html
@@ -7,10 +7,14 @@
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
<link href="https://fonts.googleapis.com/css2?family=Saira:ital,wght@0,100..900;1,100..900&display=swap" rel="stylesheet">
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
+ <meta name="theme-color" content="#111827" />
+ <link rel="manifest" href="/manifest.webmanifest" />
+ <link rel="apple-touch-icon" href="/favicon.svg" />
<title>Dumps
+