@oh-my-pi/pi-coding-agent 12.18.3 → 12.19.2

package/src/web/scrapers/firefox-addons.ts

@@ -1,7 +1,5 @@
-import type { RenderResult, SpecialHandler } from "./types";
-import { finalizeOutput, formatCount, htmlToBasicMarkdown, loadPage } from "./types";
-
-type LocalizedText = string | Record<string, string | null | undefined> | null | undefined;
+import type { LocalizedText, RenderResult, SpecialHandler } from "./types";
+import { buildResult, formatNumber, getLocalizedText, htmlToBasicMarkdown, loadPage, tryParseJson } from "./types";
 
 type AddonFile = {
 	permissions?: string[];
@@ -42,21 +40,6 @@ type AddonData = {
 	url?: string;
 };
 
-function getLocalizedText(value: LocalizedText, defaultLocale?: string): string | undefined {
-	if (!value) return undefined;
-	if (typeof value === "string") return value;
-
-	const localized = value as Record<string, string | null | undefined>;
-	if (defaultLocale && localized[defaultLocale]) return localized[defaultLocale] ?? undefined;
-	if (localized["en-US"]) return localized["en-US"] ?? undefined;
-
-	for (const entry of Object.values(localized)) {
-		if (entry) return entry;
-	}
-
-	return undefined;
-}
-
 function normalizeCategories(categories?: string[] | Record<string, string[]>): string[] {
 	if (!categories) return [];
 	if (Array.isArray(categories)) return categories.filter(Boolean);
@@ -119,12 +102,8 @@ export const handleFirefoxAddons: SpecialHandler = async (
 		const result = await loadPage(apiUrl, { timeout, headers: { Accept: "application/json" }, signal });
 		if (!result.ok) return null;
 
-		let data: AddonData;
-		try {
-			data = JSON.parse(result.content) as AddonData;
-		} catch {
-			return null;
-		}
+		const data = tryParseJson<AddonData>(result.content);
+		if (!data) return null;
 
 		const fetchedAt = new Date().toISOString();
 		const defaultLocale = data.default_locale || "en-US";
@@ -164,11 +143,11 @@ export const handleFirefoxAddons: SpecialHandler = async (
 
 		if (ratingAverage !== undefined) {
 			md += `**Rating:** ${ratingAverage.toFixed(2)}`;
-			if (ratingCount !== undefined) md += ` (${formatCount(ratingCount)} reviews)`;
+			if (ratingCount !== undefined) md += ` (${formatNumber(ratingCount)} reviews)`;
 			md += "\n";
 		}
 
-		if (users !== undefined) md += `**Users:** ${formatCount(users)}\n`;
+		if (users !== undefined) md += `**Users:** ${formatNumber(users)}\n`;
 		if (version) md += `**Version:** ${version}\n`;
 		if (categories.length > 0) md += `**Categories:** ${categories.join(", ")}\n`;
 
@@ -197,17 +176,14 @@ export const handleFirefoxAddons: SpecialHandler = async (
 			}
 		}
 
-		const output = finalizeOutput(md);
-		return {
+		const finalUrl = data.url ?? result.finalUrl ?? url;
+		return buildResult(md, {
 			url,
-			finalUrl: data.url ?? result.finalUrl ?? url,
-			contentType: "text/markdown",
+			finalUrl,
 			method: "firefox-addons",
-			content: output.content,
 			fetchedAt,
-			truncated: output.truncated,
 			notes: ["Fetched via Firefox Add-ons API"],
-		};
+		});
 	} catch {}
 
 	return null;

package/src/web/scrapers/flathub.ts

@@ -1,5 +1,5 @@
 import type { RenderResult, SpecialHandler } from "./types";
-import { finalizeOutput, formatCount, htmlToBasicMarkdown, loadPage } from "./types";
+import { buildResult, formatIsoDate, formatNumber, htmlToBasicMarkdown, loadPage, tryParseJson } from "./types";
 
 interface FlathubScreenshotSize {
 	src?: string;
@@ -129,15 +129,6 @@ function bestScreenshotUrl(sizes?: FlathubScreenshotSize[]): string | null {
 	return best.src ?? sizes[0].src ?? null;
 }
 
-function formatReleaseDate(timestamp?: string | null): string | null {
-	if (!timestamp) return null;
-	const seconds = Number(timestamp);
-	if (!Number.isFinite(seconds)) return null;
-	const date = new Date(seconds * 1000);
-	if (Number.isNaN(date.getTime())) return null;
-	return date.toISOString().split("T")[0] ?? null;
-}
-
 export const handleFlathub: SpecialHandler = async (
 	url: string,
 	timeout: number,
@@ -154,12 +145,8 @@ export const handleFlathub: SpecialHandler = async (
 		const result = await loadPage(apiUrl, { timeout, signal, headers: { Accept: "application/json" } });
 		if (!result.ok) return null;
 
-		let app: FlathubAppStream;
-		try {
-			app = JSON.parse(result.content) as FlathubAppStream;
-		} catch {
-			return null;
-		}
+		const app = tryParseJson<FlathubAppStream>(result.content);
+		if (!app) return null;
 
 		const fetchedAt = new Date().toISOString();
 		const name = app.name ?? app.id ?? appId;
@@ -172,7 +159,7 @@ export const handleFlathub: SpecialHandler = async (
 		if (app.developer_name) md += `**Developer:** ${app.developer_name}\n`;
 
 		const installs = extractInstalls(app);
-		if (installs !== null) md += `**Installs:** ${formatCount(installs)}\n`;
+		if (installs !== null) md += `**Installs:** ${formatNumber(installs)}\n`;
 
 		if (app.categories?.length) {
 			md += "\n## Categories\n\n";
@@ -209,7 +196,7 @@ export const handleFlathub: SpecialHandler = async (
 			for (const release of app.releases.slice(0, 5)) {
 				const version = release.version ?? "unknown";
 				let line = `- **${version}**`;
-				const date = formatReleaseDate(release.timestamp);
+				const date = release.timestamp ? formatIsoDate(Number(release.timestamp) * 1000) : "";
 				if (date) line += ` (${date})`;
 				if (release.type) line += ` · ${release.type}`;
 				if (release.url) line += ` · ${release.url}`;
@@ -222,17 +209,13 @@ export const handleFlathub: SpecialHandler = async (
 			}
 		}
 
-		const output = finalizeOutput(md);
-		return {
+		return buildResult(md, {
 			url,
 			finalUrl: result.finalUrl,
-			contentType: "text/markdown",
 			method: "flathub-appstream",
-			content: output.content,
 			fetchedAt,
-			truncated: output.truncated,
 			notes: ["Fetched via Flathub Appstream API"],
-		};
+		});
 	} catch {}
 
 	return null;

package/src/web/scrapers/github-gist.ts

@@ -1,6 +1,6 @@
 import { fetchGitHubApi } from "./github";
 import type { RenderResult, SpecialHandler } from "./types";
-import { finalizeOutput } from "./types";
+import { buildResult } from "./types";
 
 /**
  * Handle GitHub Gist URLs via GitHub API
@@ -51,17 +51,7 @@ export const handleGitHubGist: SpecialHandler = async (
 			md += `\`\`\`${lang}\n${file.content}\n\`\`\`\n\n`;
 		}
 
-		const output = finalizeOutput(md);
-		return {
-			url,
-			finalUrl: url,
-			contentType: "text/markdown",
-			method: "github-gist",
-			content: output.content,
-			fetchedAt,
-			truncated: output.truncated,
-			notes: ["Fetched via GitHub API"],
-		};
+		return buildResult(md, { url, method: "github-gist", fetchedAt, notes: ["Fetched via GitHub API"] });
 	} catch {}
 
 	return null;

package/src/web/scrapers/github.ts

@@ -1,6 +1,6 @@
 import { $env, ptree } from "@oh-my-pi/pi-utils";
 import type { RenderResult, SpecialHandler } from "./types";
-import { finalizeOutput, loadPage } from "./types";
+import { buildResult, loadPage } from "./types";
 
 interface GitHubUrl {
 	type: "blob" | "tree" | "repo" | "issue" | "issues" | "pull" | "pulls" | "discussion" | "discussions" | "other";
@@ -392,17 +392,14 @@ export const handleGitHub: SpecialHandler = async (
 			notes.push(`Fetched raw: ${rawUrl}`);
 			const result = await loadPage(rawUrl, { timeout, signal });
 			if (result.ok) {
-				const output = finalizeOutput(result.content);
-				return {
+				return buildResult(result.content, {
 					url,
 					finalUrl: rawUrl,
-					contentType: "text/plain",
 					method: "github-raw",
-					content: output.content,
 					fetchedAt,
-					truncated: output.truncated,
 					notes,
-				};
+					contentType: "text/plain",
+				});
 			}
 			break;
 		}
@@ -411,17 +408,7 @@ export const handleGitHub: SpecialHandler = async (
 			notes.push(`Fetched via GitHub API`);
 			const result = await renderGitHubTree(gh, timeout, signal);
 			if (result.ok) {
-				const output = finalizeOutput(result.content);
-				return {
-					url,
-					finalUrl: url,
-					contentType: "text/markdown",
-					method: "github-tree",
-					content: output.content,
-					fetchedAt,
-					truncated: output.truncated,
-					notes,
-				};
+				return buildResult(result.content, { url, method: "github-tree", fetchedAt, notes });
 			}
 			break;
 		}
@@ -431,17 +418,12 @@ export const handleGitHub: SpecialHandler = async (
 			notes.push(`Fetched via GitHub API`);
 			const result = await renderGitHubIssue(gh, timeout, signal);
 			if (result.ok) {
-				const output = finalizeOutput(result.content);
-				return {
+				return buildResult(result.content, {
 					url,
-					finalUrl: url,
-					contentType: "text/markdown",
 					method: gh.type === "pull" ? "github-pr" : "github-issue",
-					content: output.content,
 					fetchedAt,
-					truncated: output.truncated,
 					notes,
-				};
+				});
 			}
 			break;
 		}
@@ -450,17 +432,7 @@ export const handleGitHub: SpecialHandler = async (
 			notes.push(`Fetched via GitHub API`);
 			const result = await renderGitHubIssuesList(gh, timeout, signal);
 			if (result.ok) {
-				const output = finalizeOutput(result.content);
-				return {
-					url,
-					finalUrl: url,
-					contentType: "text/markdown",
-					method: "github-issues",
-					content: output.content,
-					fetchedAt,
-					truncated: output.truncated,
-					notes,
-				};
+				return buildResult(result.content, { url, method: "github-issues", fetchedAt, notes });
 			}
 			break;
 		}
@@ -469,17 +441,7 @@ export const handleGitHub: SpecialHandler = async (
 			notes.push(`Fetched via GitHub API`);
 			const result = await renderGitHubRepo(gh, timeout, signal);
 			if (result.ok) {
-				const output = finalizeOutput(result.content);
-				return {
-					url,
-					finalUrl: url,
-					contentType: "text/markdown",
-					method: "github-repo",
-					content: output.content,
-					fetchedAt,
-					truncated: output.truncated,
-					notes,
-				};
+				return buildResult(result.content, { url, method: "github-repo", fetchedAt, notes });
 			}
 			break;
 		}