mirror of
https://github.com/openfrontio/OpenFrontIO.git
synced 2026-07-10 22:54:17 +00:00
a7f992e9b0
Restructure the single src/ tree into an npm-workspaces monorepo under
packages/, rename core -> engine, extract a types-only core-public layer,
and break the pre-existing engine -> client dependency cycle.
Structure (packages/):
core-public public API/wire schemas + shared enums (clean leaf)
shared framework-agnostic helpers (clean leaf)
engine deterministic simulation (was src/core)
client rendering/UI (was src/client)
server coordination (was src/server)
Dependency DAG: engine -> {core-public, shared}; client -> {core-public,
shared, engine}; server -> {core-public, engine}.
- npm workspaces: root package.json workspaces + per-package package.json;
tsconfig.base.json holds shared options + path aliases
(core-public/* shared/* engine/* client/* server/*) resolved uniformly by
tsc, Vite (resolve.tsconfigPaths), Vitest, and tsx. Lockfile regenerated.
- core-public: moved Schemas/ApiSchemas/CosmeticSchemas/StatsSchemas/
ClanApiSchemas/WorkerSchemas/Base64/PatternDecoder; extracted the enums
(GameTypes), GameEvent type, emoji table, and GraphicsOverrides schema.
Engine re-exports the moved enums/types so existing imports keep working.
- Broke engine -> client cycle:
- renderNumber/renderTroops -> shared/format
- NameBoxCalculator moved into engine
- username validation returns translation key + params; client translates
- applyStateUpdate moved to client (operates on the render-only PlayerState)
- Config/UnitGrid/execution-Util/GameImpl now use structural read
interfaces (engine/game/ReadViews: PlayerLike/UnitLike/GameLike) instead
of importing client view classes; client imports view classes from a new
client/view barrel; deleted the engine/game/GameView re-export shim.
- Build/deploy updated: vite.config, index.html, eslint, Dockerfile
(copies packages/ + tsconfig.base.json before npm ci), .vscode, tests.
Verified: tsc --noEmit clean; 1364 + 65 tests pass; production vite build
succeeds; engine has zero client/server imports; core-public and shared are
dependency leaves.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
153 lines
5.4 KiB
TypeScript
153 lines
5.4 KiB
TypeScript
import { describe, expect, test } from "vitest";
|
|
import { buildAssetUrl, rewriteAssetsForCdn } from "engine/AssetUrls";
|
|
|
|
describe("AssetUrls", () => {
|
|
test("returns hashed URLs for direct asset matches", () => {
|
|
expect(
|
|
buildAssetUrl("images/Favicon.svg", {
|
|
"images/Favicon.svg": "/_assets/images/Favicon.hash.svg",
|
|
}),
|
|
).toBe("/_assets/images/Favicon.hash.svg");
|
|
});
|
|
|
|
test("falls back to the unversioned path when manifest has no match", () => {
|
|
expect(buildAssetUrl("images/unknown.svg", {})).toBe("/images/unknown.svg");
|
|
});
|
|
|
|
test("falls back to the unversioned path for directory-like paths", () => {
|
|
const manifest = {
|
|
"maps/britanniaclassic/manifest.json":
|
|
"/_assets/maps/britanniaclassic/manifest.hash.json",
|
|
"maps/britanniaclassic/map.bin":
|
|
"/_assets/maps/britanniaclassic/map.hash.bin",
|
|
};
|
|
|
|
expect(buildAssetUrl("maps", manifest)).toBe("/maps");
|
|
expect(buildAssetUrl("maps/britanniaclassic", manifest)).toBe(
|
|
"/maps/britanniaclassic",
|
|
);
|
|
});
|
|
|
|
test("rejects dot segments in asset paths", () => {
|
|
expect(() => buildAssetUrl("../api/instance", {})).toThrow(
|
|
"Invalid asset path segment: ..",
|
|
);
|
|
expect(() => buildAssetUrl("images/%2e%2e/secret.svg", {})).toThrow(
|
|
"Invalid asset path segment: %2e%2e",
|
|
);
|
|
});
|
|
|
|
test("rejects empty asset paths", () => {
|
|
expect(() => buildAssetUrl("", {})).toThrow("Asset path must not be empty");
|
|
expect(() => buildAssetUrl("///", {})).toThrow(
|
|
"Asset path must not be empty",
|
|
);
|
|
});
|
|
|
|
test("prefixes baseUrl onto hashed URLs when provided", () => {
|
|
expect(
|
|
buildAssetUrl(
|
|
"images/Favicon.svg",
|
|
{ "images/Favicon.svg": "/_assets/images/Favicon.hash.svg" },
|
|
"https://cdn.example.com",
|
|
),
|
|
).toBe("https://cdn.example.com/_assets/images/Favicon.hash.svg");
|
|
});
|
|
|
|
test("preserves direct URL when baseUrl is empty string", () => {
|
|
expect(
|
|
buildAssetUrl(
|
|
"images/Favicon.svg",
|
|
{ "images/Favicon.svg": "/_assets/images/Favicon.hash.svg" },
|
|
"",
|
|
),
|
|
).toBe("/_assets/images/Favicon.hash.svg");
|
|
});
|
|
|
|
test("returns absolute http(s) URLs unchanged and ignores baseUrl", () => {
|
|
expect(
|
|
buildAssetUrl(
|
|
"https://example.com/foo.png",
|
|
{},
|
|
"https://cdn.example.com",
|
|
),
|
|
).toBe("https://example.com/foo.png");
|
|
expect(buildAssetUrl("HTTP://example.com/foo.png", {})).toBe(
|
|
"HTTP://example.com/foo.png",
|
|
);
|
|
});
|
|
|
|
// Manifest miss → keep same-origin; the CDN only serves what was explicitly
|
|
// hashed and uploaded, so unknown paths must not be prefixed.
|
|
test("does not prefix baseUrl on manifest misses", () => {
|
|
expect(
|
|
buildAssetUrl("images/unknown.svg", {}, "https://cdn.example.com"),
|
|
).toBe("/images/unknown.svg");
|
|
});
|
|
|
|
test("strips trailing slashes on baseUrl to avoid double slash", () => {
|
|
const manifest = {
|
|
"images/Favicon.svg": "/_assets/images/Favicon.hash.svg",
|
|
};
|
|
expect(
|
|
buildAssetUrl("images/Favicon.svg", manifest, "https://cdn.example.com/"),
|
|
).toBe("https://cdn.example.com/_assets/images/Favicon.hash.svg");
|
|
expect(
|
|
buildAssetUrl(
|
|
"images/Favicon.svg",
|
|
manifest,
|
|
"https://cdn.example.com///",
|
|
),
|
|
).toBe("https://cdn.example.com/_assets/images/Favicon.hash.svg");
|
|
});
|
|
});
|
|
|
|
describe("rewriteAssetsForCdn", () => {
|
|
test("rewrites src=/assets/ to EJS placeholder", () => {
|
|
const out = rewriteAssetsForCdn(
|
|
`<script type="module" crossorigin src="/assets/index-XXX.js"></script>`,
|
|
);
|
|
expect(out).toBe(
|
|
`<script type="module" crossorigin src="<%- locals.cdnBaseRaw || "" %>/assets/index-XXX.js"></script>`,
|
|
);
|
|
});
|
|
|
|
test("rewrites href=/assets/ for modulepreload and stylesheet links", () => {
|
|
const out = rewriteAssetsForCdn(
|
|
`<link rel="modulepreload" href="/assets/vendor-XXX.js">\n<link rel="stylesheet" href="/assets/index-XXX.css">`,
|
|
);
|
|
expect(out).toBe(
|
|
`<link rel="modulepreload" href="<%- locals.cdnBaseRaw || "" %>/assets/vendor-XXX.js">\n<link rel="stylesheet" href="<%- locals.cdnBaseRaw || "" %>/assets/index-XXX.css">`,
|
|
);
|
|
});
|
|
|
|
test("supports single-quoted attribute values", () => {
|
|
expect(rewriteAssetsForCdn(`<script src='/assets/x.js'></script>`)).toBe(
|
|
`<script src='<%- locals.cdnBaseRaw || "" %>/assets/x.js'></script>`,
|
|
);
|
|
});
|
|
|
|
test("does not rewrite /_assets/ (underscore manifest paths)", () => {
|
|
const html = `<link rel="icon" href="/_assets/images/Favicon.hash.svg">`;
|
|
expect(rewriteAssetsForCdn(html)).toBe(html);
|
|
});
|
|
|
|
test("does not rewrite already-absolute asset URLs", () => {
|
|
const html = `<script src="https://example.com/assets/foo.js"></script>`;
|
|
expect(rewriteAssetsForCdn(html)).toBe(html);
|
|
});
|
|
|
|
// Inline scripts containing the literal "/assets/..." string must survive
|
|
// unrewrite — the regex requires whitespace before src=/href=, and inside a
|
|
// JS string literal there's no preceding `src=`/`href=` token at all.
|
|
test("does not mangle /assets/ inside inline script string literals", () => {
|
|
const html = `<script>const url = "/assets/foo";</script>`;
|
|
expect(rewriteAssetsForCdn(html)).toBe(html);
|
|
});
|
|
|
|
test("does not match data-src or other custom attributes", () => {
|
|
const html = `<img data-src="/assets/foo.png">`;
|
|
expect(rewriteAssetsForCdn(html)).toBe(html);
|
|
});
|
|
});
|