diff --git a/src/lib/services/effect-import.test.ts b/src/lib/services/effect-import.test.ts index a378ee1d..b5a7bc82 100644 --- a/src/lib/services/effect-import.test.ts +++ b/src/lib/services/effect-import.test.ts @@ -4,6 +4,12 @@ import { describe, expect, it, vi } from "vitest"; vi.mock("@/lib/services/import/core/download", () => ({ 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", () => ({ resolveEffectSwfUrl: vi.fn(async (lib: string) => `https://x/${lib}.swf`), listOfficialEffects: vi.fn(async () => []), diff --git a/src/lib/services/effect-import.ts b/src/lib/services/effect-import.ts index 54a09ba8..c7f8bf5a 100644 --- a/src/lib/services/effect-import.ts +++ b/src/lib/services/effect-import.ts @@ -9,7 +9,9 @@ import { mergeEffect, removeEffect, } from "@/lib/services/effectmap"; +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"; import type { EffectListItem, @@ -17,18 +19,40 @@ import type { ImportEffectResult, } from "@/types/effects"; -export const EFFECT_NITRO_DIR = path.join( +const EFFECT_NITRO_DIR_FALLBACK = path.join( /*turbopackIgnore: true*/ process.cwd(), "public/nitro-assets/bundled/effect", ); -export const EFFECT_SWF_DIR = path.join( +const EFFECT_SWF_DIR_FALLBACK = path.join( /*turbopackIgnore: true*/ process.cwd(), "public/swf/gordon", ); +async function getEffectNitroDir(): Promise { + const configured = ( + (await siteSettings.get("effect_nitro_dir", "")) ?? "" + ).trim(); + if (configured) return configured; + const gamedataRoot = await getGamedataRoot(); + if (gamedataRoot) + return path.join(/*turbopackIgnore: true*/ gamedataRoot, "bundled/effect"); + return EFFECT_NITRO_DIR_FALLBACK; +} + +async function getEffectSwfDir(): Promise { + const configured = ( + (await siteSettings.get("effect_swf_dir", "")) ?? "" + ).trim(); + return configured || EFFECT_SWF_DIR_FALLBACK; +} + export async function ensureEffectDirs(): Promise { + const [nitroDir, swfDir] = await Promise.all([ + getEffectNitroDir(), + getEffectSwfDir(), + ]); await Promise.all( - [EFFECT_NITRO_DIR, EFFECT_SWF_DIR] + [nitroDir, swfDir] .filter((dir) => !existsSync(/*turbopackIgnore: true*/ dir)) .map((dir) => fs.mkdir(/*turbopackIgnore: true*/ dir, { recursive: true }), @@ -36,8 +60,11 @@ export async function ensureEffectDirs(): Promise { ); } -function nitroPathFor(lib: string): string { - return path.join(/*turbopackIgnore: true*/ EFFECT_NITRO_DIR, `${lib}.nitro`); +async function nitroPathFor(lib: string): Promise { + return path.join( + /*turbopackIgnore: true*/ await getEffectNitroDir(), + `${lib}.nitro`, + ); } export async function importSingleEffect(params: { @@ -51,12 +78,12 @@ export async function importSingleEffect(params: { const warnings: string[] = []; await ensureEffectDirs(); - const nitroPath = nitroPathFor(lib); + const nitroPath = await nitroPathFor(lib); // Download SWF onProgress?.("downloading"); const swfPath = path.join( - /*turbopackIgnore: true*/ EFFECT_SWF_DIR, + /*turbopackIgnore: true*/ await getEffectSwfDir(), `${lib}.swf`, ); let swfUrl: string; @@ -116,7 +143,7 @@ export async function deleteImportedEffect( const removed = await removeEffect(idOrLib); let deletedFile = false; if (entry) { - const p = nitroPathFor(entry.lib); + const p = await nitroPathFor(entry.lib); if (existsSync(/*turbopackIgnore: true*/ p)) { await fs.unlink(/*turbopackIgnore: true*/ p).catch(() => {}); deletedFile = true; @@ -126,20 +153,23 @@ export async function deleteImportedEffect( } export async function getEffectList(search: string): Promise { - const [official, local] = await Promise.all([ + const [official, local, nitroDir] = await Promise.all([ listOfficialEffects(), listLocalEffects(), + getEffectNitroDir(), ]); + // The official Habbo effectmap endpoint is frequently unreachable/dead. + // Fall back to the locally cached map so the list stays usable. + const base = official.length > 0 ? official : local; const localByLib = new Map(local.map((e) => [e.lib, e])); const term = search.trim().toLowerCase(); - const merged = official.map((e) => { - const present = localByLib.has(e.lib); - return { - ...e, - present, - nitroExists: existsSync(/*turbopackIgnore: true*/ nitroPathFor(e.lib)), - }; - }); + const merged = base.map((e) => ({ + ...e, + present: localByLib.has(e.lib), + nitroExists: existsSync( + /*turbopackIgnore: true*/ path.join(nitroDir, `${e.lib}.nitro`), + ), + })); return term ? merged.filter( (e) => @@ -160,10 +190,16 @@ export async function getEffectStats(): Promise<{ listLocalEffects(), ]); const localLibs = new Set(local.map((e) => e.lib)); - const imported = official.filter((e) => localLibs.has(e.lib)).length; + const imported = + official.length > 0 + ? official.filter((e) => localLibs.has(e.lib)).length + : localLibs.size; return { - official: official.length, + official: official.length > 0 ? official.length : local.length, imported, - missing: official.length - imported, + missing: + official.length > 0 + ? official.length - imported + : local.length - imported, }; } diff --git a/src/lib/services/effectmap.ts b/src/lib/services/effectmap.ts index 3666e301..27efa8df 100644 --- a/src/lib/services/effectmap.ts +++ b/src/lib/services/effectmap.ts @@ -23,7 +23,7 @@ export async function getEffectMapPath(): Promise { "effectmap_url", "/nitro-assets/gamedata/EffectMap.json", ); - return resolveGamedataFile( + return await resolveGamedataFile( url ?? "/nitro-assets/gamedata/EffectMap.json", "EffectMap.json", ); diff --git a/src/lib/services/figure-import.test.ts b/src/lib/services/figure-import.test.ts index d794b285..bc3878e1 100644 --- a/src/lib/services/figure-import.test.ts +++ b/src/lib/services/figure-import.test.ts @@ -4,6 +4,12 @@ import { describe, expect, it, vi } from "vitest"; vi.mock("@/lib/services/import/core/download", () => ({ 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", () => ({ resolveFigureSwfUrl: vi.fn(async (lib: string) => `https://x/${lib}.swf`), })); diff --git a/src/lib/services/figure-import.ts b/src/lib/services/figure-import.ts index f6de4e99..cc315cbc 100644 --- a/src/lib/services/figure-import.ts +++ b/src/lib/services/figure-import.ts @@ -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 { + 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 { + const configured = ( + (await siteSettings.get("figure_swf_dir", "")) ?? "" + ).trim(); + return configured || FIGURE_SWF_DIR_FALLBACK; +} + export async function ensureFigureDirs(): Promise { + 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 { ); } -function nitroPathFor(lib: string): string { - return path.join(/*turbopackIgnore: true*/ FIGURE_NITRO_DIR, `${lib}.nitro`); +async function nitroPathFor(lib: string): Promise { + 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 }; } diff --git a/src/lib/services/figuredata.ts b/src/lib/services/figuredata.ts index c38b55fe..2c57f8fb 100644 --- a/src/lib/services/figuredata.ts +++ b/src/lib/services/figuredata.ts @@ -36,7 +36,7 @@ export async function getFigureDataPath(): Promise { "figuredata_url", "/nitro-assets/gamedata/FigureData.json", ); - return resolveGamedataFile( + return await resolveGamedataFile( url ?? "/nitro-assets/gamedata/FigureData.json", "FigureData.json", ); diff --git a/src/lib/services/figuremap.ts b/src/lib/services/figuremap.ts index cd307fc5..ff3e6dbc 100644 --- a/src/lib/services/figuremap.ts +++ b/src/lib/services/figuremap.ts @@ -27,7 +27,7 @@ export async function getFigureMapPath(): Promise { "figuremap_url", "/nitro-assets/gamedata/FigureMap.json", ); - return resolveGamedataFile( + return await resolveGamedataFile( url ?? "/nitro-assets/gamedata/FigureMap.json", "FigureMap.json", ); diff --git a/src/lib/services/import/core/asset-paths.test.ts b/src/lib/services/import/core/asset-paths.test.ts index b7a2a647..dbe0c8af 100644 --- a/src/lib/services/import/core/asset-paths.test.ts +++ b/src/lib/services/import/core/asset-paths.test.ts @@ -1,9 +1,14 @@ 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"; describe("resolveGamedataFile", () => { - it("uses absolute external paths as-is", () => { + it("uses absolute external paths as-is", async () => { const absolutePath = path.win32.join( "E:\\", "Users", @@ -16,7 +21,7 @@ describe("resolveGamedataFile", () => { "FigureMap.json", ); - expect(resolveGamedataFile(absolutePath, "FigureMap.json")).toBe( + expect(await resolveGamedataFile(absolutePath, "FigureMap.json")).toBe( absolutePath, ); }); diff --git a/src/lib/services/import/core/asset-paths.ts b/src/lib/services/import/core/asset-paths.ts index 83643119..2784b56a 100644 --- a/src/lib/services/import/core/asset-paths.ts +++ b/src/lib/services/import/core/asset-paths.ts @@ -1,12 +1,14 @@ import { existsSync } from "node:fs"; 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/, // 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 -// manual setting required. (Bundled .nitro stay under public/nitro-assets/bundled, -// the client's served asset dir — see *_NITRO_DIR consts in the import services.) +// manual setting required. (Bundled .nitro stay under the gamedata root's +// `bundled/` dir, the location the Nitro client loads from.) function pub(...segs: string[]): string { 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. - * `/nitro-assets/gamedata/FigureMap.json`). Falls back to - * `public/Gamedata/config/` if the configured path is absent. - * Returns the configured path when neither exists (write target for fresh setups). + * `/nitro-assets/gamedata/FigureMap.json`). Falls back to the deployment's + * gamedata root `config/` dir (then `public/Gamedata/config/`) when the + * configured path is absent. Returns the configured path when neither exists + * (write target for fresh setups). */ -export function resolveGamedataFile(url: string, fallbackName: string): string { - if ( - path.win32.isAbsolute(url) || - (path.isAbsolute(url) && !url.startsWith("/")) - ) +export async function resolveGamedataFile( + url: string, + fallbackName: string, +): Promise { + // 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; + } const configured = pub(url.replace(/^\/+/, "")); 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); if (existsSync(/*turbopackIgnore: true*/ gamedata)) return gamedata; return configured; diff --git a/src/lib/staff-smoke-contract.test.ts b/src/lib/staff-smoke-contract.test.ts index 14a826a9..aa078d74 100644 --- a/src/lib/staff-smoke-contract.test.ts +++ b/src/lib/staff-smoke-contract.test.ts @@ -61,7 +61,7 @@ describe("staff smoke contract", () => { expect(pkg).not.toContain("prisma:generate"); expect(pkg).toContain('"db:generate": "drizzle-kit generate"'); 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( "./drizzle/drafts", ); @@ -90,8 +90,10 @@ describe("staff smoke contract", () => { ); }); - it("keeps force-dynamic only on admin/mod layouts", () => { - const hits: string[] = []; + it("opts admin/mod out of static caching via instant=false", () => { + // 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) { for (const name of readdirSync(dir)) { const p = join(dir, name); @@ -101,17 +103,22 @@ describe("staff smoke contract", () => { if ( /export\s+const\s+dynamic\s*=\s*["']force-dynamic["']/.test(src) ) { - hits.push(p.replace(/\\/g, "/")); + legacyHits++; } } } } walk("src/app/admin"); walk("src/app/mod"); - expect(hits.sort()).toEqual([ - "src/app/admin/layout.tsx", - "src/app/mod/layout.tsx", - ]); + expect(legacyHits).toBe(0); + + // 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", () => {