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

+6
View File
@@ -4,6 +4,12 @@ import { describe, expect, it, vi } from "vitest";
vi.mock("@/lib/services/import/core/download", () => ({ vi.mock("@/lib/services/import/core/download", () => ({
downloadFile: vi.fn(async () => ({ ok: true, size: 100 })), downloadFile: vi.fn(async () => ({ ok: true, size: 100 })),
})); }));
vi.mock("@/lib/services/site-settings", () => ({
siteSettings: { get: vi.fn(async () => "") },
}));
vi.mock("@/lib/services/furni-asset-dirs", () => ({
getGamedataRoot: vi.fn(async () => ""),
}));
vi.mock("@/lib/services/effect-source", () => ({ vi.mock("@/lib/services/effect-source", () => ({
resolveEffectSwfUrl: vi.fn(async (lib: string) => `https://x/${lib}.swf`), resolveEffectSwfUrl: vi.fn(async (lib: string) => `https://x/${lib}.swf`),
listOfficialEffects: vi.fn(async () => []), listOfficialEffects: vi.fn(async () => []),
File diff suppressed because it is too large. Load diff
+1 -1
View File
@@ -23,7 +23,7 @@ export async function getEffectMapPath(): Promise<string> {
"effectmap_url", "effectmap_url",
"/nitro-assets/gamedata/EffectMap.json", "/nitro-assets/gamedata/EffectMap.json",
); );
return resolveGamedataFile( return await resolveGamedataFile(
url ?? "/nitro-assets/gamedata/EffectMap.json", url ?? "/nitro-assets/gamedata/EffectMap.json",
"EffectMap.json", "EffectMap.json",
); );
+6
View File
@@ -4,6 +4,12 @@ import { describe, expect, it, vi } from "vitest";
vi.mock("@/lib/services/import/core/download", () => ({ vi.mock("@/lib/services/import/core/download", () => ({
downloadFile: vi.fn(async () => ({ ok: true, size: 100 })), downloadFile: vi.fn(async () => ({ ok: true, size: 100 })),
})); }));
vi.mock("@/lib/services/site-settings", () => ({
siteSettings: { get: vi.fn(async () => "") },
}));
vi.mock("@/lib/services/furni-asset-dirs", () => ({
getGamedataRoot: vi.fn(async () => ""),
}));
vi.mock("@/lib/services/figure-source", () => ({ vi.mock("@/lib/services/figure-source", () => ({
resolveFigureSwfUrl: vi.fn(async (lib: string) => `https://x/${lib}.swf`), resolveFigureSwfUrl: vi.fn(async (lib: string) => `https://x/${lib}.swf`),
})); }));
File diff suppressed because it is too large. Load diff
+1 -1
View File
@@ -36,7 +36,7 @@ export async function getFigureDataPath(): Promise<string> {
"figuredata_url", "figuredata_url",
"/nitro-assets/gamedata/FigureData.json", "/nitro-assets/gamedata/FigureData.json",
); );
return resolveGamedataFile( return await resolveGamedataFile(
url ?? "/nitro-assets/gamedata/FigureData.json", url ?? "/nitro-assets/gamedata/FigureData.json",
"FigureData.json", "FigureData.json",
); );
+1 -1
View File
@@ -27,7 +27,7 @@ export async function getFigureMapPath(): Promise<string> {
"figuremap_url", "figuremap_url",
"/nitro-assets/gamedata/FigureMap.json", "/nitro-assets/gamedata/FigureMap.json",
); );
return resolveGamedataFile( return await resolveGamedataFile(
url ?? "/nitro-assets/gamedata/FigureMap.json", url ?? "/nitro-assets/gamedata/FigureMap.json",
"FigureMap.json", "FigureMap.json",
); );
@@ -1,9 +1,14 @@
import path from "node:path"; import path from "node:path";
import { describe, expect, it } from "vitest"; import { describe, expect, it, vi } from "vitest";
vi.mock("@/lib/services/furni-asset-dirs", () => ({
getGamedataRoot: vi.fn(async () => ""),
}));
import { resolveGamedataFile } from "./asset-paths"; import { resolveGamedataFile } from "./asset-paths";
describe("resolveGamedataFile", () => { describe("resolveGamedataFile", () => {
it("uses absolute external paths as-is", () => { it("uses absolute external paths as-is", async () => {
const absolutePath = path.win32.join( const absolutePath = path.win32.join(
"E:\\", "E:\\",
"Users", "Users",
@@ -16,7 +21,7 @@ describe("resolveGamedataFile", () => {
"FigureMap.json", "FigureMap.json",
); );
expect(resolveGamedataFile(absolutePath, "FigureMap.json")).toBe( expect(await resolveGamedataFile(absolutePath, "FigureMap.json")).toBe(
absolutePath, absolutePath,
); );
}); });
+34 -11
View File
@@ -1,12 +1,14 @@
import { existsSync } from "node:fs"; import { existsSync } from "node:fs";
import path from "node:path"; import path from "node:path";
import { getGamedataRoot } from "@/lib/services/furni-asset-dirs";
// The CMS default gamedata JSON paths point under public/nitro-assets/gamedata/, // The CMS default gamedata JSON paths point under public/nitro-assets/gamedata/,
// but this deployment keeps the gamedata JSON (FigureMap/FigureData/EffectMap…) // but this deployment keeps the gamedata JSON (FigureMap/FigureData/EffectMap…)
// under public/Gamedata/config/. `resolveGamedataFile` falls back there when the // under the gamedata root (public/Gamedata/config/ or the deployment's
// `/var/www/Gamedata/config/`). `resolveGamedataFile` falls back there when the
// configured path is absent, so importers read AND write the real file — no // configured path is absent, so importers read AND write the real file — no
// manual setting required. (Bundled .nitro stay under public/nitro-assets/bundled, // manual setting required. (Bundled .nitro stay under the gamedata root's
// the client's served asset dir — see *_NITRO_DIR consts in the import services.) // `bundled/` dir, the location the Nitro client loads from.)
function pub(...segs: string[]): string { function pub(...segs: string[]): string {
return path.join(/*turbopackIgnore: true*/ process.cwd(), "public", ...segs); return path.join(/*turbopackIgnore: true*/ process.cwd(), "public", ...segs);
@@ -14,18 +16,39 @@ function pub(...segs: string[]): string {
/** /**
* Resolve a gamedata JSON file from a `*_url` setting value (e.g. * Resolve a gamedata JSON file from a `*_url` setting value (e.g.
* `/nitro-assets/gamedata/FigureMap.json`). Falls back to * `/nitro-assets/gamedata/FigureMap.json`). Falls back to the deployment's
* `public/Gamedata/config/<fallbackName>` if the configured path is absent. * gamedata root `config/` dir (then `public/Gamedata/config/`) when the
* Returns the configured path when neither exists (write target for fresh setups). * configured path is absent. Returns the configured path when neither exists
* (write target for fresh setups).
*/ */
export function resolveGamedataFile(url: string, fallbackName: string): string { export async function resolveGamedataFile(
if ( url: string,
path.win32.isAbsolute(url) || fallbackName: string,
(path.isAbsolute(url) && !url.startsWith("/")) ): Promise<string> {
) // A Windows drive/UNC path (e.g. configured on a Windows dev machine) is
// used as-is. Note: path.win32.isAbsolute('/foo') is true on Linux, so we
// match the drive/UNC prefix explicitly instead of delegating to it —
// otherwise web paths like `/nitro-assets/gamedata/FigureMap.json` would be
// mistaken for absolute filesystem paths and returned verbatim.
if (/^[a-zA-Z]:[\\/]/.test(url) || url.startsWith("\\\\")) return url;
// A real, existing absolute filesystem path is used as-is.
if (path.isAbsolute(url) && existsSync(/*turbopackIgnore: true*/ url)) {
return url; return url;
}
const configured = pub(url.replace(/^\/+/, "")); const configured = pub(url.replace(/^\/+/, ""));
if (existsSync(/*turbopackIgnore: true*/ configured)) return configured; if (existsSync(/*turbopackIgnore: true*/ configured)) return configured;
// Deployment gamedata root (e.g. /var/www/Gamedata/config/…).
const gamedataRoot = await getGamedataRoot();
if (gamedataRoot) {
const rootConfig = path.join(
/*turbopackIgnore: true*/ gamedataRoot,
"config",
fallbackName,
);
if (existsSync(/*turbopackIgnore: true*/ rootConfig)) return rootConfig;
}
const gamedata = pub("Gamedata", "config", fallbackName); const gamedata = pub("Gamedata", "config", fallbackName);
if (existsSync(/*turbopackIgnore: true*/ gamedata)) return gamedata; if (existsSync(/*turbopackIgnore: true*/ gamedata)) return gamedata;
return configured; return configured;
+15 -8
View File
@@ -61,7 +61,7 @@ describe("staff smoke contract", () => {
expect(pkg).not.toContain("prisma:generate"); expect(pkg).not.toContain("prisma:generate");
expect(pkg).toContain('"db:generate": "drizzle-kit generate"'); expect(pkg).toContain('"db:generate": "drizzle-kit generate"');
expect(pkg).toContain('"db:studio": "drizzle-kit studio"'); expect(pkg).toContain('"db:studio": "drizzle-kit studio"');
expect(pkg).toContain('"db:introspect": "drizzle-kit introspect"'); expect(pkg).toContain('"db:migrate": "drizzle-kit migrate"');
expect(readFileSync("drizzle.config.ts", "utf8")).toContain( expect(readFileSync("drizzle.config.ts", "utf8")).toContain(
"./drizzle/drafts", "./drizzle/drafts",
); );
@@ -90,8 +90,10 @@ describe("staff smoke contract", () => {
); );
}); });
it("keeps force-dynamic only on admin/mod layouts", () => { it("opts admin/mod out of static caching via instant=false", () => {
const hits: string[] = []; // The Cache Components migration replaced `force-dynamic` with
// `export const instant = false` — the legacy export must not survive.
let legacyHits = 0;
function walk(dir: string) { function walk(dir: string) {
for (const name of readdirSync(dir)) { for (const name of readdirSync(dir)) {
const p = join(dir, name); const p = join(dir, name);
@@ -101,17 +103,22 @@ describe("staff smoke contract", () => {
if ( if (
/export\s+const\s+dynamic\s*=\s*["']force-dynamic["']/.test(src) /export\s+const\s+dynamic\s*=\s*["']force-dynamic["']/.test(src)
) { ) {
hits.push(p.replace(/\\/g, "/")); legacyHits++;
} }
} }
} }
} }
walk("src/app/admin"); walk("src/app/admin");
walk("src/app/mod"); walk("src/app/mod");
expect(hits.sort()).toEqual([ expect(legacyHits).toBe(0);
"src/app/admin/layout.tsx",
"src/app/mod/layout.tsx", // Both staff layouts opt out of Cache Components (was force-dynamic).
]); expect(readFileSync("src/app/admin/layout.tsx", "utf8")).toContain(
"export const instant = false",
);
expect(readFileSync("src/app/mod/layout.tsx", "utf8")).toContain(
"export const instant = false",
);
}); });
it("caches analytics via redisCache", () => { it("caches analytics via redisCache", () => {