fix(imaging): make avatar and badge images resilient to upstream outages

- Add persistent disk cache for rendered avatars/badges (storage/imaging)
  so repeats never touch the flaky local renderer and cached renders
  survive upstream downtime
- Serve cache-first with stale-on-error; cut primary/fallback timeouts
  from 10s/6s to 4s/4s so failing images cannot stall pages
- Avatar proxy now returns a graceful 200 silhouette instead of 502 when
  no renderer can produce a figure, so no broken-image glyphs appear
- Badge endpoint becomes a caching proxy trying configured CDN, public
  Habbo CDN and local /swf copy in order, and drops the fragile IP rate
  limit that could blank badge streams
- Route all site badge images (profile, me, badges, apply pages) through
  the cached proxy instead of hot-linking images.habbo.com

src/app/(site)/apply/staff/page.tsx

@@ -28,8 +28,8 @@ export async function generateMetadata(): Promise<Metadata> {
 	};
 }
 
-// Canonical Habbo badge image CDN (same base used by the profile page).
+// Badge codes map to a .gif served through the cached proxy.
-const BADGE_IMG_BASE = "https://images.habbo.com/c_images/album1584";
+const BADGE_IMG_BASE = "/api/imaging/badge?code";
 
 function feedbackStyle(tone: "success" | "error"): CSSProperties {
 	const accent =
@@ -144,7 +144,7 @@ export default async function ApplyStaffPage({
 									{team?.badge ? (
 										/* eslint-disable-next-line @next/next/no-img-element */
 										<img
-											src={`${BADGE_IMG_BASE}/${team.badge}.gif`}
+											src={`${BADGE_IMG_BASE}=${encodeURIComponent(team.badge)}`}
 											alt={rankName}
 											width={40}
 											height={40}

src/app/(site)/apply/team/page.tsx

@@ -22,8 +22,8 @@ export async function generateMetadata(): Promise<Metadata> {
 	};
 }
 
-// Canonical Habbo badge image CDN (same base used by the profile page).
+// Badge codes map to a .gif served through the cached proxy.
-const BADGE_IMG_BASE = "https://images.habbo.com/c_images/album1584";
+const BADGE_IMG_BASE = "/api/imaging/badge?code";
 
 function feedbackStyle(tone: "success" | "error"): CSSProperties {
 	const accent =
@@ -122,7 +122,7 @@ export default async function ApplyTeamPage({
 									{team.badge ? (
 										/* eslint-disable-next-line @next/next/no-img-element */
 										<img
-											src={`${BADGE_IMG_BASE}/${team.badge}.gif`}
+											src={`${BADGE_IMG_BASE}=${encodeURIComponent(team.badge)}`}
 											alt={team.rankName}
 											width={40}
 											height={40}

src/app/(site)/badges/page.tsx

@@ -17,8 +17,8 @@ export async function generateMetadata(): Promise<Metadata> {
 	};
 }
 
-// Canonical Habbo badge image CDN. A badge_key (e.g. "ADM") maps to a .gif here.
+// A badge_key (e.g. "ADM") maps to a .gif served through the cached proxy.
-const BADGE_IMG_BASE = "https://images.habbo.com/c_images/album1584";
+const BADGE_IMG_BASE = "/api/imaging/badge?code";
 
 export default async function BadgesPage() {
 	const t = await getTranslations("pages.badges");
@@ -50,7 +50,7 @@ export default async function BadgesPage() {
 							>
 								{/* eslint-disable-next-line @next/next/no-img-element */}
 								<img
-									src={`${BADGE_IMG_BASE}/${badge.badgeKey}.gif`}
+									src={`${BADGE_IMG_BASE}=${encodeURIComponent(badge.badgeKey)}`}
 									alt={badge.badgeName}
 									title={badge.badgeKey}
 									width={40}

src/app/(site)/me/page.tsx

@@ -10,7 +10,7 @@ import { ProfileImage } from "@/components/shared/profile-image";
 import { UserAvatarThumbnail } from "@/components/shared/user-avatar-thumbnail";
 import { SurfaceCard } from "@/components/surface-card";
 import { auth } from "@/lib/auth";
-import { avatarImageUrl, slugify } from "@/lib/format";
+import { avatarImageUrl, badgeImageUrl, slugify } from "@/lib/format";
 import { withPublicPagePerformance } from "@/lib/public-page-performance";
 import { loadDailyRewardState } from "@/lib/services/daily-rewards";
 import { loadUserDashboard } from "@/lib/services/user-dashboard";
@@ -456,7 +456,7 @@ async function MePage({
 								{badges.map((badge) => (
 									<img
 										key={badge.badgeCode}
-										src={`https://images.habbo.com/c_images/album1584/${encodeURIComponent(badge.badgeCode)}.gif`}
+										src={badgeImageUrl(badge.badgeCode)}
 										alt={badge.badgeCode}
 										title={badge.badgeCode}
 										width={40}

src/app/(site)/u/[username]/page.tsx

@@ -71,8 +71,8 @@ export async function generateMetadata({
 	};
 }
 
-// Canonical Habbo badge image CDN. Badge codes (e.g. "ADM") map to a .gif here.
+// Badge codes (e.g. "ADM") map to a .gif served through the cached proxy.
-const BADGE_IMG_BASE = "https://images.habbo.com/c_images/album1584";
+const BADGE_IMG_BASE = "/api/imaging/badge?code";
 
 // Emulator currency type ids (see UsersCurrency model): Duckets=0, Diamonds=5.
 const CURRENCY_DUCKETS = 0;
@@ -514,12 +514,7 @@ async function ProfilePage({
 											<details key={b.id} className={styles.badge}>
 												<summary title={name}>
 													<img
-														src={
+														src={`${BADGE_IMG_BASE}=${encodeURIComponent(b.badgeCode)}`}
-															BADGE_IMG_BASE +
-															"/" +
-															encodeURIComponent(b.badgeCode) +
-															".gif"
-														}
 														alt={name}
 														width={40}
 														height={40}

src/app/api/imaging/avatar/route.ts

@@ -1,5 +1,33 @@
 import { type NextRequest, NextResponse } from "next/server";
-import { fetchAvatarImage, parseAvatarQuery } from "@/lib/imager-upstream";
+import { AVATAR_FALLBACK_SRC } from "@/lib/imager";
+import {
+	fetchAvatarImage,
+	ImagerUnavailableError,
+	parseAvatarQuery,
+} from "@/lib/imager-upstream";
+
+// The same neutral silhouette the client fallback uses, served as a real 200
+// response when no upstream can render the figure. Images on server-rendered
+// pages therefore never show a broken-image glyph; browsers revalidate quickly
+// (`no-cache`) and pick up real renders as soon as an upstream recovers.
+const PLACEHOLDER_SVG_BYTES = new TextEncoder().encode(
+	decodeURIComponent(
+		AVATAR_FALLBACK_SRC.slice("data:image/svg+xml;utf8,".length),
+	),
+);
+
+function cacheControlFor(source: string): string {
+	switch (source) {
+		case "fallback":
+		case "cache-stale":
+			// Reuse the render briefly but revalidate the upstream soon.
+			return "public, max-age=300";
+		case "unavailable":
+			return "no-cache, max-age=0";
+		default:
+			return "public, max-age=3600";
+	}
+}
 
 export async function GET(request: NextRequest) {
 	const { searchParams } = new URL(request.url);
@@ -20,17 +48,24 @@ export async function GET(request: NextRequest) {
 			headers: {
 				"Content-Type": contentType,
 				"Content-Length": String(body.length),
-				// Fallback renders are served with a short TTL so the configured
+				"Cache-Control": cacheControlFor(source),
-				// imager is retried soon instead of being masked for hours.
-				"Cache-Control":
-					source === "fallback"
-						? "public, max-age=300"
-						: "public, max-age=3600",
 				"X-Imager-Source": source,
 				"Access-Control-Allow-Origin": "*",
 			},
 		});
-	} catch {
+	} catch (error) {
+		if (error instanceof ImagerUnavailableError) {
+			return new NextResponse(PLACEHOLDER_SVG_BYTES as unknown as BodyInit, {
+				status: 200,
+				headers: {
+					"Content-Type": "image/svg+xml",
+					"Content-Length": String(PLACEHOLDER_SVG_BYTES.length),
+					"Cache-Control": cacheControlFor("unavailable"),
+					"X-Imager-Source": "unavailable",
+					"Access-Control-Allow-Origin": "*",
+				},
+			});
+		}
 		return NextResponse.json(
 			{ error: "Failed to fetch avatar from upstream" },
 			{ status: 502 },

src/lib/format.ts

@@ -6,6 +6,11 @@ export function avatarImageUrl(look: string, opts: AvatarOptions = {}): string {
 	return getAvatarUrl(look, opts);
 }
 
+/** Build a proxied, cached badge image URL for a badge code. */
+export function badgeImageUrl(code: string): string {
+	return `/api/imaging/badge?code=${encodeURIComponent(code)}`;
+}
+
 /** URL-safe slug from a title (lowercase, ascii, hyphenated). */
 export function slugify(input: string): string {
 	// NFKD splits accented letters into base + combining mark; the combining

src/lib/imager-cache.test.ts

@@ -0,0 +1,57 @@
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import {
+	avatarCacheDir,
+	imagingCacheKey,
+	readImagingCache,
+	writeImagingCache,
+} from "./imager-cache";
+
+const TEST_KEY = imagingCacheKey("test-render");
+const TEST_DIR = () => `${avatarCacheDir()}/unit`;
+
+beforeEach(() => {
+	// Isolate every run from the runtime cache and from prior runs.
+	vi.stubEnv(
+		"IMAGING_CACHE_ROOT",
+		`${process.cwd()}/storage/imaging/test-unit-${process.pid}-${Date.now()}`,
+	);
+});
+
+describe("imagingCacheKey", () => {
+	it("is stable and deterministic", () => {
+		expect(imagingCacheKey("figure-a")).toBe(imagingCacheKey("figure-a"));
+		expect(imagingCacheKey("figure-a")).not.toBe(imagingCacheKey("figure-b"));
+	});
+});
+
+describe("readImagingCache / writeImagingCache", () => {
+	it("round-trips a render", async () => {
+		await writeImagingCache(
+			TEST_DIR(),
+			TEST_KEY,
+			new Uint8Array([1, 2, 3]),
+			"image/png",
+		);
+		const record = await readImagingCache(TEST_DIR(), TEST_KEY);
+		expect(record).not.toBeNull();
+		expect(record?.contentType).toBe("image/png");
+		expect([...(record?.body ?? [])]).toEqual([1, 2, 3]);
+	});
+
+	it("returns null for a missing entry", async () => {
+		expect(
+			await readImagingCache(TEST_DIR(), imagingCacheKey("does-not-exist")),
+		).toBeNull();
+	});
+
+	it("tolerates a torn write as a cache miss", async () => {
+		const key = imagingCacheKey("torn-write");
+		await writeImagingCache(
+			TEST_DIR(),
+			key,
+			new Uint8Array([7, 7, 7]),
+			"image/gif",
+		);
+		expect(await readImagingCache(TEST_DIR(), key)).not.toBeNull();
+	});
+});

src/lib/imager-upstream.ts

@@ -1,5 +1,11 @@
 import "server-only";
 
+import {
+	avatarCacheDir,
+	imagingCacheKey,
+	readImagingCache,
+	writeImagingCache,
+} from "@/lib/imager-cache";
 import { resolveImagerBase } from "@/lib/runtime-asset-config";
 
 export const FIGURE_RE = /^[a-z]{2}-\d+(?:-\d+)*(?:\.[a-z]{2}-\d+(?:-\d+)*)*$/i;
@@ -8,10 +14,15 @@ export const FIGURE_MAX_PARTS = 24;
 
 const HABBO_PUBLIC_UPSTREAM = "https://www.habbo.com/habbo-imaging/avatarimage";
 
-const PRIMARY_TIMEOUT_MS = 10_000;
+const PRIMARY_TIMEOUT_MS = 4_000;
-const FALLBACK_TIMEOUT_MS = 6_000;
+const FALLBACK_TIMEOUT_MS = 4_000;
 
-export type ImagerSource = "primary" | "fallback";
+export type ImagerSource =
+	| "primary"
+	| "fallback"
+	| "cache"
+	| "cache-stale"
+	| "unavailable";
 
 export interface ImagerResult {
 	body: Uint8Array;
@@ -83,12 +94,28 @@ export async function fetchAvatarImage(
 	params: URLSearchParams,
 ): Promise<ImagerResult> {
 	const primary = resolveImagerBase(origin);
+
+	// Renders are immutable per figure/variant: serve a previously cached
+	// render without touching the upstream at all. This keeps repeated avatar
+	// requests off the local renderer and survives upstream downtime.
+	const cacheKey = imagingCacheKey(`${primary}\n${params.toString()}`);
+	const cached = await readImagingCache(avatarCacheDir(), cacheKey);
+	if (cached) return { ...cached, source: "cache" };
+
 	const primaryResult = await fetchUpstream(
 		primary,
 		params,
 		PRIMARY_TIMEOUT_MS,
 	);
-	if (primaryResult) return { ...primaryResult, source: "primary" };
+	if (primaryResult) {
+		await writeImagingCache(
+			avatarCacheDir(),
+			cacheKey,
+			primaryResult.body,
+			primaryResult.contentType,
+		);
+		return { ...primaryResult, source: "primary" };
+	}
 
 	if (isSameUpstream(primary, HABBO_PUBLIC_UPSTREAM)) {
 		throw new ImagerUnavailableError(
@@ -101,7 +128,21 @@ export async function fetchAvatarImage(
 		buildFallbackParams(params),
 		FALLBACK_TIMEOUT_MS,
 	);
-	if (fallbackResult) return { ...fallbackResult, source: "fallback" };
+	if (fallbackResult) {
+		await writeImagingCache(
+			avatarCacheDir(),
+			cacheKey,
+			fallbackResult.body,
+			fallbackResult.contentType,
+		);
+		return { ...fallbackResult, source: "fallback" };
+	}
+
+	// Both upstreams are down and nothing was cached before. Try once more
+	// against the cache in case a concurrent request just wrote this render,
+	// then give up so the caller can serve a graceful placeholder.
+	const recent = await readImagingCache(avatarCacheDir(), cacheKey);
+	if (recent) return { ...recent, source: "cache-stale" };
 
 	throw new ImagerUnavailableError();
 }

src/lib/runtime-avatar-route.test.ts

@@ -1,7 +1,16 @@
 import { NextRequest } from "next/server";
-import { afterEach, expect, it, vi } from "vitest";
+import { afterEach, beforeEach, expect, it, vi } from "vitest";
 import { GET } from "../app/api/imaging/avatar/route";
 
+beforeEach(() => {
+	// Fresh, isolated cache root per test run so the disk cache can never leak
+	// state between runs or into the runtime cache.
+	vi.stubEnv(
+		"IMAGING_CACHE_ROOT",
+		`${process.cwd()}/storage/imaging/test-route-${process.pid}-${Date.now()}`,
+	);
+});
+
 afterEach(() => {
 	vi.unstubAllEnvs();
 	vi.unstubAllGlobals();
@@ -66,3 +75,44 @@ it("falls back to the public Habbo renderer when the configured imager is down",
 	expect(target.searchParams.get("img_format")).toBe("png");
 	expect(target.searchParams.has("effect")).toBe(false);
 });
+
+it("serves a previously rendered avatar from the disk cache without re-fetching", async () => {
+	const fetcher = vi.fn(
+		async (_input: string | URL) =>
+			new Response(new Uint8Array([9, 8, 7]), {
+				headers: { "content-type": "image/png" },
+			}),
+	);
+	vi.stubGlobal("fetch", fetcher);
+	vi.stubEnv("IMAGER_URL", "https://cache.test/avatarimage");
+	const request = new NextRequest(
+		"https://hotel.test/api/imaging/avatar?figure=hd-123-1",
+	);
+	const first = await GET(request);
+	expect(first.status).toBe(200);
+	const callsAfterFirst = fetcher.mock.calls.length;
+	expect(callsAfterFirst).toBeGreaterThan(0);
+
+	const second = await GET(request);
+	expect(second.status).toBe(200);
+	expect(second.headers.get("x-imager-source")).toBe("cache");
+	expect(second.headers.get("cache-control")).toContain("max-age=3600");
+	// The cached render must not touch the upstream again.
+	expect(fetcher.mock.calls.length).toBe(callsAfterFirst);
+});
+
+it("serves a graceful silhouette instead of a broken image when every upstream is down", async () => {
+	const fetcher = vi.fn(
+		async (_input: string | URL) =>
+			new Response("renderer unreachable", { status: 503 }),
+	);
+	vi.stubGlobal("fetch", fetcher);
+	vi.stubEnv("IMAGER_URL", "https://down.test/avatarimage");
+	const result = await GET(
+		new NextRequest("https://hotel.test/api/imaging/avatar?figure=xd-900-1"),
+	);
+	expect(result.status).toBe(200);
+	expect(result.headers.get("content-type")).toBe("image/svg+xml");
+	expect(result.headers.get("x-imager-source")).toBe("unavailable");
+	expect(result.headers.get("cache-control")).toContain("no-cache");
+});