fix(import): make effects and figure/clothing import work on deployment

- resolveGamedataFile: detect Windows drive/UNC paths explicitly instead of
  path.win32.isAbsolute (which is true for any /-prefixed path on Linux), so
  /nitro-assets URLs are no longer returned verbatim; add deployment gamedata
  root fallback (/var/www/Gamedata/config) and keep public/Gamedata/config.
- effect/figure import dirs now resolve via site settings then the gamedata
  root bundled dir, instead of hardcoded public paths.
- effect list falls back to the local EffectMap when the official habbo.com
  endpoint is unreachable, keeping the admin import page usable.
- update staff smoke contract for db:migrate and instant=false (Cache
  Components migration).
This commit is contained in:
openhands committed 2026-08-05 11:10:16 +02:00
1 parent 694a24c791
commit dd708a64fb
10 files changed
+172 -56

No files matched your search

+44 -11
View File
@@ -2,7 +2,9 @@ import { existsSync, promises as fs } from "node:fs";
import path from "node:path";
import { resolveFigureSwfUrl } from "@/lib/services/figure-source";
import { listFigureLibraries } from "@/lib/services/figuremap";
import { getGamedataRoot } from "@/lib/services/furni-asset-dirs";
import { downloadFile } from "@/lib/services/import/core/download";
import { siteSettings } from "@/lib/services/site-settings";
import { convertSwfToNitro } from "@/lib/services/swf-to-nitro";
export interface FigureListItem {
@@ -22,18 +24,40 @@ export interface ImportFigureResult {
error?: string;
}
export const FIGURE_NITRO_DIR = path.join(
const FIGURE_NITRO_DIR_FALLBACK = path.join(
/*turbopackIgnore: true*/ process.cwd(),
"public/nitro-assets/bundled/figure",
);
export const FIGURE_SWF_DIR = path.join(
const FIGURE_SWF_DIR_FALLBACK = path.join(
/*turbopackIgnore: true*/ process.cwd(),
"public/swf/gordon",
);
async function getFigureNitroDir(): Promise<string> {
const configured = (
(await siteSettings.get("figure_nitro_dir", "")) ?? ""
).trim();
if (configured) return configured;
const gamedataRoot = await getGamedataRoot();
if (gamedataRoot)
return path.join(/*turbopackIgnore: true*/ gamedataRoot, "bundled/figure");
return FIGURE_NITRO_DIR_FALLBACK;
}
async function getFigureSwfDir(): Promise<string> {
const configured = (
(await siteSettings.get("figure_swf_dir", "")) ?? ""
).trim();
return configured || FIGURE_SWF_DIR_FALLBACK;
}
export async function ensureFigureDirs(): Promise<void> {
const [nitroDir, swfDir] = await Promise.all([
getFigureNitroDir(),
getFigureSwfDir(),
]);
await Promise.all(
[FIGURE_NITRO_DIR, FIGURE_SWF_DIR]
[nitroDir, swfDir]
.filter((dir) => !existsSync(/*turbopackIgnore: true*/ dir))
.map((dir) =>
fs.mkdir(/*turbopackIgnore: true*/ dir, { recursive: true }),
@@ -41,8 +65,11 @@ export async function ensureFigureDirs(): Promise<void> {
);
}
function nitroPathFor(lib: string): string {
return path.join(/*turbopackIgnore: true*/ FIGURE_NITRO_DIR, `${lib}.nitro`);
async function nitroPathFor(lib: string): Promise<string> {
return path.join(
/*turbopackIgnore: true*/ await getFigureNitroDir(),
`${lib}.nitro`,
);
}
export async function importSingleFigure(params: {
@@ -55,7 +82,7 @@ export async function importSingleFigure(params: {
onProgress?.("downloading");
const swfPath = path.join(
/*turbopackIgnore: true*/ FIGURE_SWF_DIR,
/*turbopackIgnore: true*/ await getFigureSwfDir(),
`${lib}.swf`,
);
let swfUrl: string;
@@ -83,7 +110,7 @@ export async function importSingleFigure(params: {
const swfBuffer = await fs.readFile(/*turbopackIgnore: true*/ swfPath);
const result = convertSwfToNitro(swfBuffer, lib);
await fs.writeFile(
/*turbopackIgnore: true*/ nitroPathFor(lib),
/*turbopackIgnore: true*/ await nitroPathFor(lib),
result.bundle,
);
if (result.warnings?.length) warnings.push(...result.warnings);
@@ -102,7 +129,7 @@ export async function importSingleFigure(params: {
export async function deleteImportedFigure(
lib: string,
): Promise<{ deletedFile: boolean }> {
const p = nitroPathFor(lib);
const p = await nitroPathFor(lib);
if (existsSync(/*turbopackIgnore: true*/ p)) {
await fs.unlink(/*turbopackIgnore: true*/ p).catch(() => {});
return { deletedFile: true };
@@ -126,10 +153,13 @@ export async function getFigureList(params: {
: libs;
const total = filtered.length;
const start = (Math.max(page, 1) - 1) * perPage;
const nitroDir = await getFigureNitroDir();
const items = filtered.slice(start, start + perPage).map((l) => ({
lib: l.id,
revision: l.revision,
nitroExists: existsSync(/*turbopackIgnore: true*/ nitroPathFor(l.id)),
nitroExists: existsSync(
/*turbopackIgnore: true*/ path.join(nitroDir, `${l.id}.nitro`),
),
previewType: l.parts?.[0]?.type,
previewId: l.parts?.[0]?.id,
}));
@@ -141,9 +171,12 @@ export async function getFigureStats(): Promise<{
imported: number;
missing: number;
}> {
const libs = await listFigureLibraries();
const [libs, nitroDir] = await Promise.all([
listFigureLibraries(),
getFigureNitroDir(),
]);
const imported = libs.filter((l) =>
existsSync(/*turbopackIgnore: true*/ nitroPathFor(l.id)),
existsSync(/*turbopackIgnore: true*/ path.join(nitroDir, `${l.id}.nitro`)),
).length;
return { total: libs.length, imported, missing: libs.length - imported };
}