fix(catalog): resolve classname candidates using public_name

src/lib/services/catalog-audit-live.test.ts

@@ -193,13 +193,15 @@ describe.skipIf(!runLive)("catalog audit live (read-only)", () => {
 			if (types.NO_ASSET_KINDS.has(kind)) continue;
 			if (
 				!types
-					.assetNameCandidates(r.item_name)
+					.assetNameCandidates(r.item_name, r.public_name)
 					.nitro.some((n) => nitroSet.has(n))
 			) {
 				missingNitro++;
 			}
 			if (
-				!types.assetNameCandidates(r.item_name).icon.some((n) => iconSet.has(n))
+				!types
+					.assetNameCandidates(r.item_name, r.public_name)
+					.icon.some((n) => iconSet.has(n))
 			) {
 				missingIcon++;
 			}

src/lib/services/catalog-audit.ts

@@ -320,9 +320,10 @@ export async function runCatalogAudit(
 				itemId: item.id,
 				message: `"${item.item_name}" (ID ${item.id}) has no catalog_items entry — not purchasable`,
 			});
-			const hasNitro = assetNameCandidates(item.item_name).nitro.some((n) =>
+			const hasNitro = assetNameCandidates(
-				nitroSet.has(n),
+				item.item_name,
-			);
+				item.public_name,
+			).nitro.some((n) => nitroSet.has(n));
 			// Pets ship their assets through the pet pipeline, not as furni
 			// .nitro bundles, so they can get a catalog entry regardless.
 			if (kind === "pet" || hasNitro) {
@@ -398,9 +399,10 @@ export async function runCatalogAudit(
 		// Badges, pets, effects, bots and sticky notes never ship a furni
 		// .nitro bundle — skip the asset check for them.
 		if (NO_ASSET_KINDS.has(kindOf(item.item_name))) continue;
-		const hasNitro = assetNameCandidates(item.item_name).nitro.some((n) =>
+		const hasNitro = assetNameCandidates(
-			nitroSet.has(n),
+			item.item_name,
-		);
+			item.public_name,
+		).nitro.some((n) => nitroSet.has(n));
 		if (!hasNitro) {
 			missingNitroClassnames.push(item.item_name);
 			issues.push({
@@ -429,9 +431,10 @@ export async function runCatalogAudit(
 		// Badges use album1584 .gif icons; pets, effects, bots and sticky notes
 		// never ship a furni icon file — skip the asset check for them.
 		if (NO_ASSET_KINDS.has(kindOf(item.item_name))) continue;
-		const hasIcon = assetNameCandidates(item.item_name).icon.some((n) =>
+		const hasIcon = assetNameCandidates(
-			iconSet.has(n),
+			item.item_name,
-		);
+			item.public_name,
+		).icon.some((n) => iconSet.has(n));
 		if (!hasIcon) {
 			missingIconClassnames.push(item.item_name);
 			issues.push({
@@ -493,9 +496,11 @@ export async function runCatalogAudit(
 			// left over cannot be restored from any source → legacy/broken.
 			const stillMissing: string[] = [];
 			for (const classname of missingIconClassnames) {
-				const hasIcon = assetNameCandidates(classname).icon.some((n) =>
+				const item = itemByName.get(classname);
-					iconSet.has(n),
+				const hasIcon = assetNameCandidates(
-				);
+					classname,
+					item?.public_name,
+				).icon.some((n) => iconSet.has(n));
 				if (!hasIcon) {
 					stillMissing.push(classname);
 				}
@@ -566,9 +571,11 @@ export async function runCatalogAudit(
 			// left over cannot be restored from any source → legacy/broken.
 			const stillMissing: string[] = [];
 			for (const classname of missingNitroClassnames) {
-				const hasNitro = assetNameCandidates(classname).nitro.some((n) =>
+				const item = itemByName.get(classname);
-					nitroSet.has(n),
+				const hasNitro = assetNameCandidates(
-				);
+					classname,
+					item?.public_name,
+				).nitro.some((n) => nitroSet.has(n));
 				if (!hasNitro) {
 					stillMissing.push(classname);
 				}
@@ -714,9 +721,10 @@ export async function runCatalogAudit(
 					}
 					if (NO_CATALOG_KINDS.has(kind)) continue;
 					if (postCatalogIds.has(item.id)) continue;
-					const hasNitro = assetNameCandidates(item.item_name).nitro.some((n) =>
+					const hasNitro = assetNameCandidates(
-						nitroSet.has(n),
+						item.item_name,
-					);
+						item.public_name,
+					).nitro.some((n) => nitroSet.has(n));
 					if (kind === "pet" || hasNitro) {
 						missingCatalogEntries.push({
 							classname: item.item_name,

src/lib/services/item-kind.ts

@@ -77,8 +77,15 @@ export const NO_CATALOG_KINDS: ReadonlySet<CatalogItemKind> = new Set([
  * files. Returns `.nitro` and icon candidates (most specific first):
  * the exact classname, the star-variant base, the star→underscore name and the
  * dot→underscore name (`post.it` → `post_it.nitro`).
+ *
+ * When `publicName` is provided it is treated as an alternative classname (many
+ * hotels store the real classname in `items_base.public_name` while `item_name`
+ * holds a display name). Candidates from both names are merged and deduplicated.
  */
-export function assetNameCandidates(classname: string): {
+export function assetNameCandidates(
+	classname: string,
+	publicName?: string,
+): {
 	nitro: string[];
 	icon: string[];
 } {
@@ -97,12 +104,24 @@ export function assetNameCandidates(classname: string): {
 	const starUnderscore = classname.replace(/\*/g, "_");
 	const dotUnderscore = classname.replace(/\./g, "_");
 
+	const bases = [classname, starBase, dotUnderscore, starUnderscore];
+
+	// Also try public_name when it looks like a real classname (no spaces,
+	// not empty, not "0" which some hotels use as a "no value" marker).
+	if (
+		publicName &&
+		publicName !== classname &&
+		!publicName.includes(" ") &&
+		publicName !== "0"
+	) {
+		const pnBase = publicName.split("*")[0];
+		const pnStar = publicName.replace(/\*/g, "_");
+		const pnDot = publicName.replace(/\./g, "_");
+		bases.push(publicName, pnBase, pnDot, pnStar);
+	}
+
 	return {
-		nitro: unique([classname, starBase, dotUnderscore, starUnderscore]).map(
+		nitro: unique(bases).map((n) => `${n}.nitro`),
-			(n) => `${n}.nitro`,
+		icon: unique(bases).map((n) => `${n}_icon.png`),
-		),
-		icon: unique([classname, starUnderscore, dotUnderscore, starBase]).map(
-			(n) => `${n}_icon.png`,
-		),
 	};
 }

src/lib/services/repair-icons.ts

@@ -169,16 +169,18 @@ export async function repairMissingIcons(
 	let items: Array<{
 		id: number;
 		item_name: string;
+		public_name: string;
 		type: string;
 		interaction_type: string;
 	}>;
 	try {
 		const [rows] = (await db.execute(sql`
-			SELECT id, item_name, type, interaction_type FROM items_base ORDER BY id
+			SELECT id, item_name, public_name, type, interaction_type FROM items_base ORDER BY id
 		`)) as unknown as [
 			Array<{
 				id: number;
 				item_name: string;
+				public_name: string;
 				type: string;
 				interaction_type: string;
 			}>,
@@ -207,18 +209,40 @@ export async function repairMissingIcons(
 	const total = items.length;
 	onEvent?.({ type: "started", total });
 
-	const processItem = async (classname: string) => {
+	// A row can have its real classname in either `item_name` or `public_name`
+	// (some hotels swap them or store a display name). Build the candidate
+	// classnames to try in order, most specific first.
+	const classnameCandidates = (item: (typeof items)[number]): string[] => {
+		const out: string[] = [];
+		const add = (n?: string | null) => {
+			if (n && !out.includes(n)) out.push(n);
+		};
+		add(item.item_name);
+		if (
+			item.public_name &&
+			item.public_name !== item.item_name &&
+			!item.public_name.includes(" ") &&
+			item.public_name !== "0"
+		) {
+			add(item.public_name);
+		}
+		return out;
+	};
+
+	const processItem = async (item: (typeof items)[number]) => {
+		const classname = item.item_name;
 		// Special items (badges, pets, effects, bots, sticky notes) don't have
 		// .png icon files to repair. Skip them.
 		if (dbSkipSet.has(classname)) {
 			return { status: "skipped" } as const;
 		}
-		const fileName = `${classname}_icon.png`;
+		const names = classnameCandidates(item);
+		const fileNameFor = (n: string) => `${n}_icon.png`;
+		const fileNames = names.map(fileNameFor);
 
-		// Badge items store icons as badge_<code>_icon.png (the classname already
+		// A file is present if ANY candidate name exists in every target.
-		// includes the `badge_` prefix, so fileName matches correctly).
 		const presentDirs = iconDirs.filter((dir) =>
-			existsSync(getRuntimePath(dir, fileName)),
+			fileNames.some((f) => existsSync(getRuntimePath(dir, f))),
 		);
 		const missingDirs = iconDirs.filter((dir) => !presentDirs.includes(dir));
 
@@ -230,28 +254,31 @@ export async function repairMissingIcons(
 		const warnings: string[] = [];
 
 		// 1) Copy across mirrors — the icon already exists in one target (e.g.
-		// gamedata), so just fill the ones that are missing it.
+		// gamedata), so just fill the ones that are missing it. Copy all matched
+		// files so whichever candidate forms exist are mirrored everywhere.
 		if (presentDirs.length > 0) {
+			for (const f of fileNames) {
+				const src = iconDirs.find((d) => existsSync(getRuntimePath(d, f)));
+				if (!src) continue;
+				const dst = missingDirs.filter((d) => d !== src);
+				if (dst.length === 0) continue;
 				try {
-				const copyErrors = await copyIconAcrossDirs(
+					const copyErrors = await copyIconAcrossDirs(src, dst, f);
-					presentDirs[0],
-					missingDirs,
-					fileName,
-				);
 					warnings.push(...copyErrors);
-				ok = copyErrors.length === 0;
 				} catch (err) {
 					warnings.push(
 						`copy across icon dirs failed: ${(err as Error).message}`,
 					);
 				}
 			}
+		}
 
 		// 2) Extract from a local .nitro bundle (checked across every target).
 		if (!ok) {
+			for (const n of names) {
 				let foundNitro = false;
 				for (const dir of nitroDirs) {
-				const nitroPath = getRuntimePath(dir, `${classname}.nitro`);
+					const nitroPath = getRuntimePath(dir, `${n}.nitro`);
 					if (!existsSync(nitroPath)) continue;
 					foundNitro = true;
 					try {
@@ -261,7 +288,7 @@ export async function repairMissingIcons(
 							const writeErrors = await writeIconToDirs(
 								icon,
 								missingDirs,
-							fileName,
+								fileNameFor(n),
 							);
 							warnings.push(...writeErrors);
 							ok = writeErrors.length === 0;
@@ -273,9 +300,12 @@ export async function repairMissingIcons(
 							`extract from .nitro failed: ${(err as Error).message}`,
 						);
 					}
+					if (ok) break;
 				}
+				if (ok) break;
 				if (!foundNitro) warnings.push(".nitro file not found on disk");
 			}
+		}
 
 		// 3) Download from configured or default public sources.
 		if (!ok) {
@@ -289,32 +319,27 @@ export async function repairMissingIcons(
 			}
 			if (sources.length === 0) sources = DEFAULT_ICON_SOURCES;
 
-			for (const source of sources) {
+			for (const n of names) {
 				const iconCandidates = [
-					`${classname}_icon.png`,
+					fileNameFor(n),
-					// Variant classnames (e.g. `table_silo_med*10`) often only exist
+					...(n.includes("*")
-					// on sources under their base name (e.g. `table_silo_med_icon.png`)
+						? [fileNameFor(n.split("*")[0]), fileNameFor(n.replace(/\*/g, "_"))]
-					// or with the `*` replaced by `_` (e.g. `table_silo_med_10_icon.png`).
-					...(classname.includes("*")
-						? [
-								`${classname.split("*")[0]}_icon.png`,
-								`${classname.replace(/\*/g, "_")}_icon.png`,
-							]
-						: []),
-					// Classnames with dots (`post.it`) are stored on disk with
-					// underscores (`post_it_icon.png`).
-					...(classname.includes(".")
-						? [`${classname.replace(/\./g, "_")}_icon.png`]
 						: []),
+					...(n.includes(".") ? [fileNameFor(n.replace(/\./g, "_"))] : []),
 				];
 
+				for (const source of sources) {
 					for (const iconName of iconCandidates) {
 						try {
 							const dl = await downloadFile(
-							`${source.iconBaseUrl}/${iconName}`,
+								templateUrl(
+									source.iconBaseUrl,
+									n,
+									iconName.replace(/_icon\.png$/, ""),
+								),
 								/*turbopackIgnore: true*/ getRuntimePath(
 									targets.iconDir,
-								fileName,
+									fileNameFor(n),
 								),
 								{ maxRetries: 1, validate: "png" },
 							);
@@ -322,13 +347,13 @@ export async function repairMissingIcons(
 								const icon = await fs.readFile(
 									/*turbopackIgnore: true*/ getRuntimePath(
 										targets.iconDir,
-									fileName,
+										fileNameFor(n),
 									),
 								);
 								const writeErrors = await writeIconToDirs(
 									icon,
 									missingDirs,
-								fileName,
+									fileNameFor(n),
 								);
 								warnings.push(...writeErrors);
 								ok = writeErrors.length === 0;
@@ -350,24 +375,28 @@ export async function repairMissingIcons(
 							os.tmpdir(),
 							`.repair_${classname}.nitro`,
 						);
+						let wroteTmp = false;
 						try {
 							const dl = await downloadFile(
-							`${source.nitroBaseUrl}/${classname}.nitro`,
+								templateUrl(source.nitroBaseUrl, n, n),
 								nitroTmp,
 								{ maxRetries: 1 },
 							);
+							wroteTmp = dl.ok;
 							if (dl.ok) {
 								const icon = extractFurniIconPng(await fs.readFile(nitroTmp));
 								if (icon) {
 									const writeErrors = await writeIconToDirs(
 										icon,
 										missingDirs,
-									fileName,
+										fileNameFor(n),
 									);
 									warnings.push(...writeErrors);
 									ok = writeErrors.length === 0;
 								} else {
-								warnings.push(`no icon asset in ${source.name} .nitro bundle`);
+									warnings.push(
+										`no icon asset in ${source.name} .nitro bundle`,
+									);
 								}
 							} else {
 								warnings.push(`.nitro not found on ${source.name}`);
@@ -377,15 +406,19 @@ export async function repairMissingIcons(
 								`extract from ${source.name} .nitro failed: ${(err as Error).message}`,
 							);
 						} finally {
+							if (wroteTmp) {
 								await fs
 									.unlink(nitroTmp)
 									.catch((error) =>
 										logServerError("repair_icons.cleanup_failed", error),
 									);
 							}
+						}
 						if (ok) break;
 					}
 				}
+				if (ok) break;
+			}
 		}
 
 		if (ok) {
@@ -399,7 +432,7 @@ export async function repairMissingIcons(
 
 	await runPool(items, REPAIR_CONCURRENCY, async (item, i) => {
 		const classname = item.item_name;
-		const result = await processItem(classname);
+		const result = await processItem(item);
 		if (result.status === "skipped") {
 			skipped++;
 			onEvent?.({
@@ -433,7 +466,6 @@ export async function repairMissingIcons(
 			message: result.message,
 		});
 	});
-
 	onEvent?.({
 		type: "batch_complete",
 		succeeded,
@@ -443,3 +475,11 @@ export async function repairMissingIcons(
 
 	return { succeeded, failed, skipped };
 }
+
+/** Expand %libname% / %param% templates used by some retro asset mirrors. */
+function templateUrl(base: string, libname: string, param: string): string {
+	if (!base) return "";
+	return base
+		.replace(/%libname%/g, encodeURIComponent(libname))
+		.replace(/%param%/g, encodeURIComponent(param));
+}

src/lib/services/repair-nitros.ts

@@ -162,16 +162,18 @@ export async function repairMissingNitros(
 	let items: Array<{
 		id: number;
 		item_name: string;
+		public_name: string;
 		type: string;
 		interaction_type: string;
 	}>;
 	try {
 		const [rows] = (await db.execute(sql`
-			SELECT id, item_name, type, interaction_type FROM items_base ORDER BY id
+			SELECT id, item_name, public_name, type, interaction_type FROM items_base ORDER BY id
 		`)) as unknown as [
 			Array<{
 				id: number;
 				item_name: string;
+				public_name: string;
 				type: string;
 				interaction_type: string;
 			}>,
@@ -200,16 +202,37 @@ export async function repairMissingNitros(
 	const total = items.length;
 	onEvent?.({ type: "started", total });
 
-	const processItem = async (classname: string) => {
+	// A row can have its real classname in either `item_name` or `public_name`.
+	const classnameCandidates = (item: (typeof items)[number]): string[] => {
+		const out: string[] = [];
+		const add = (n?: string | null) => {
+			if (n && !out.includes(n)) out.push(n);
+		};
+		add(item.item_name);
+		if (
+			item.public_name &&
+			item.public_name !== item.item_name &&
+			!item.public_name.includes(" ") &&
+			item.public_name !== "0"
+		) {
+			add(item.public_name);
+		}
+		return out;
+	};
+
+	const processItem = async (item: (typeof items)[number]) => {
+		const classname = item.item_name;
 		// Special items (badges, pets, effects, bots, sticky notes) don't have
 		// furni .nitro bundles to repair. Skip them.
 		if (skipSet.has(classname)) {
 			return { status: "skipped" } as const;
 		}
-		const fileName = `${classname}.nitro`;
+		const names = classnameCandidates(item);
+		const fileNameFor = (n: string) => `${n}.nitro`;
+		const fileNames = names.map(fileNameFor);
 
 		const presentDirs = nitroDirs.filter((dir) =>
-			existsSync(getRuntimePath(dir, fileName)),
+			fileNames.some((f) => existsSync(getRuntimePath(dir, f))),
 		);
 		const missingDirs = nitroDirs.filter((dir) => !presentDirs.includes(dir));
 
@@ -223,20 +246,21 @@ export async function repairMissingNitros(
 		// 1) Copy across mirrors — the .nitro already exists in one target (e.g.
 		// gamedata), so just fill the ones that are missing it.
 		if (presentDirs.length > 0) {
+			for (const f of fileNames) {
+				const src = nitroDirs.find((d) => existsSync(getRuntimePath(d, f)));
+				if (!src) continue;
+				const dst = missingDirs.filter((d) => d !== src);
+				if (dst.length === 0) continue;
 				try {
-				const copyErrors = await copyNitroAcrossDirs(
+					const copyErrors = await copyNitroAcrossDirs(src, dst, f);
-					presentDirs[0],
-					missingDirs,
-					fileName,
-				);
 					warnings.push(...copyErrors);
-				ok = copyErrors.length === 0;
 				} catch (err) {
 					warnings.push(
 						`copy across .nitro dirs failed: ${(err as Error).message}`,
 					);
 				}
 			}
+		}
 
 		// 2) Download from configured or default nitro sources.
 		if (!ok) {
@@ -248,22 +272,13 @@ export async function repairMissingNitros(
 			}
 			if (sources.length === 0) sources = DEFAULT_NITRO_SOURCES;
 
+			for (const n of names) {
 				const nitroCandidates = [
-				`${classname}.nitro`,
+					fileNameFor(n),
-				// Variant classnames (e.g. `table_silo_med*10`) often only exist
+					...(n.includes("*")
-				// on sources under their base name (e.g. `table_silo_med.nitro`)
+						? [fileNameFor(n.split("*")[0]), fileNameFor(n.replace(/\*/g, "_"))]
-				// or with the `*` replaced by `_` (e.g. `table_silo_med_10.nitro`).
-				...(classname.includes("*")
-					? [
-							`${classname.split("*")[0]}.nitro`,
-							`${classname.replace(/\*/g, "_")}.nitro`,
-						]
-					: []),
-				// Classnames with dots (`post.it`) are stored on disk with
-				// underscores (`post_it.nitro`).
-				...(classname.includes(".")
-					? [`${classname.replace(/\./g, "_")}.nitro`]
 						: []),
+					...(n.includes(".") ? [fileNameFor(n.replace(/\./g, "_"))] : []),
 				];
 
 				for (const source of sources) {
@@ -274,7 +289,7 @@ export async function repairMissingNitros(
 						);
 						try {
 							const dl = await downloadFile(
-							`${source.nitroBaseUrl}/${nitroName}`,
+								templateUrl(source.nitroBaseUrl, n, n),
 								tmpPath,
 								{ maxRetries: 1 },
 							);
@@ -286,7 +301,7 @@ export async function repairMissingNitros(
 								const writeErrors = await writeNitroToDirs(
 									buffer,
 									missingDirs,
-								fileName,
+									fileNameFor(n),
 								);
 								warnings.push(...writeErrors);
 								ok = writeErrors.length === 0;
@@ -303,6 +318,8 @@ export async function repairMissingNitros(
 					}
 					if (ok) break;
 				}
+				if (ok) break;
+			}
 		}
 
 		if (ok) {
@@ -316,7 +333,7 @@ export async function repairMissingNitros(
 
 	await runPool(items, REPAIR_CONCURRENCY, async (item, i) => {
 		const classname = item.item_name;
-		const result = await processItem(classname);
+		const result = await processItem(item);
 		if (result.status === "skipped") {
 			skipped++;
 			onEvent?.({
@@ -360,6 +377,14 @@ export async function repairMissingNitros(
 	return { succeeded, failed, skipped };
 }
 
+/** Expand %libname% / %param% templates used by some retro asset mirrors. */
+function templateUrl(base: string, libname: string, param: string): string {
+	if (!base) return "";
+	return base
+		.replace(/%libname%/g, encodeURIComponent(libname))
+		.replace(/%param%/g, encodeURIComponent(param));
+}
+
 /**
  * Re-convert every furniture `.nitro` we produced from a local SWF so the
  * bundles include size 32 (and every other visualization size the converter