mirror of
https://github.com/openfrontio/OpenFrontIO.git
synced 2026-07-10 13:54:36 +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>
249 lines
5.5 KiB
TypeScript
249 lines
5.5 KiB
TypeScript
import {
|
|
Game,
|
|
Player,
|
|
PlayerInfo,
|
|
PlayerType,
|
|
UnitType,
|
|
} from "engine/game/Game";
|
|
import { Stats } from "engine/game/Stats";
|
|
import { StatsImpl } from "engine/game/StatsImpl";
|
|
import { replacer } from "engine/Util";
|
|
import { setup } from "./util/Setup";
|
|
|
|
let stats: Stats;
|
|
let game: Game;
|
|
let player1: Player;
|
|
let player2: Player;
|
|
|
|
describe("Stats", () => {
|
|
beforeEach(async () => {
|
|
stats = new StatsImpl();
|
|
game = await setup("half_land_half_ocean", {}, [
|
|
new PlayerInfo("boat dude", PlayerType.Human, "client1", "player_1_id"),
|
|
new PlayerInfo("boat dude", PlayerType.Human, "client2", "player_2_id"),
|
|
]);
|
|
|
|
player1 = game.player("player_1_id");
|
|
player2 = game.player("player_2_id");
|
|
});
|
|
|
|
test("attack", () => {
|
|
stats.attack(player1, player2, 1);
|
|
expect(stats.stats()).toStrictEqual({
|
|
client1: {
|
|
attacks: [1n],
|
|
},
|
|
client2: {
|
|
attacks: [0n, 1n],
|
|
},
|
|
});
|
|
});
|
|
|
|
test("attackCancel", () => {
|
|
stats.attackCancel(player1, player2, 1);
|
|
expect(stats.stats()).toStrictEqual({
|
|
client1: {
|
|
attacks: [-1n, 0n, 1n],
|
|
},
|
|
client2: {
|
|
attacks: [0n, -1n],
|
|
},
|
|
});
|
|
});
|
|
|
|
test("betray", () => {
|
|
stats.betray(player1);
|
|
expect(stats.stats()).toStrictEqual({
|
|
client1: {
|
|
betrayals: 1n,
|
|
},
|
|
});
|
|
});
|
|
|
|
test("boatSendTrade", () => {
|
|
stats.boatSendTrade(player1, player2);
|
|
expect(stats.stats()).toStrictEqual({
|
|
client1: {
|
|
boats: {
|
|
trade: [1n],
|
|
},
|
|
},
|
|
});
|
|
});
|
|
|
|
test("boatArriveTrade", () => {
|
|
stats.boatArriveTrade(player1, player2, 1);
|
|
expect(stats.stats()).toStrictEqual({
|
|
client1: {
|
|
boats: { trade: [0n, 1n] },
|
|
gold: [0n, 0n, 1n],
|
|
},
|
|
client2: {
|
|
gold: [0n, 0n, 1n],
|
|
},
|
|
});
|
|
});
|
|
|
|
test("boatCapturedTrade", () => {
|
|
stats.boatCapturedTrade(player1, player2, 1);
|
|
expect(stats.stats()).toStrictEqual({
|
|
client1: {
|
|
boats: { trade: [0n, 0n, 1n] },
|
|
gold: [0n, 0n, 0n, 1n],
|
|
},
|
|
});
|
|
});
|
|
|
|
test("boatDestroyTrade", () => {
|
|
stats.boatDestroyTrade(player1, player2);
|
|
expect(stats.stats()).toStrictEqual({
|
|
client1: {
|
|
boats: { trade: [0n, 0n, 0n, 1n] },
|
|
},
|
|
});
|
|
});
|
|
|
|
test("boatSendTroops", () => {
|
|
stats.boatSendTroops(player1, player2, 1);
|
|
expect(stats.stats()).toStrictEqual({
|
|
client1: {
|
|
boats: {
|
|
trans: [1n],
|
|
},
|
|
},
|
|
});
|
|
});
|
|
|
|
test("boatArriveTroops", () => {
|
|
stats.boatArriveTroops(player1, player2, 1);
|
|
expect(stats.stats()).toStrictEqual({
|
|
client1: {
|
|
boats: { trans: [0n, 1n] },
|
|
},
|
|
});
|
|
});
|
|
|
|
test("boatDestroyTroops", () => {
|
|
stats.boatDestroyTroops(player1, player2, 1);
|
|
expect(stats.stats()).toStrictEqual({
|
|
client1: {
|
|
boats: { trans: [0n, 0n, 0n, 1n] },
|
|
},
|
|
});
|
|
});
|
|
|
|
test("bombLaunch", () => {
|
|
stats.bombLaunch(player1, player2, UnitType.AtomBomb);
|
|
expect(stats.stats()).toStrictEqual({
|
|
client1: { bombs: { abomb: [1n] } },
|
|
});
|
|
});
|
|
|
|
test("bombLand", () => {
|
|
stats.bombLand(player1, player2, UnitType.HydrogenBomb);
|
|
expect(stats.stats()).toStrictEqual({
|
|
client1: { bombs: { hbomb: [0n, 1n] } },
|
|
});
|
|
});
|
|
|
|
test("bombIntercept", () => {
|
|
stats.bombIntercept(player1, UnitType.MIRVWarhead, 1);
|
|
expect(stats.stats()).toStrictEqual({
|
|
client1: { bombs: { mirvw: [0n, 0n, 1n] } },
|
|
});
|
|
});
|
|
|
|
test("goldWar", () => {
|
|
stats.goldWar(player1, player2, 1);
|
|
expect(stats.stats()).toStrictEqual({
|
|
client1: {
|
|
gold: [0n, 1n],
|
|
conquests: [1n],
|
|
},
|
|
});
|
|
stats.goldWar(player1, player2, 1);
|
|
expect(stats.stats()).toStrictEqual({
|
|
client1: {
|
|
gold: [0n, 2n],
|
|
conquests: [2n],
|
|
},
|
|
});
|
|
});
|
|
|
|
test("goldWork", () => {
|
|
stats.goldWork(player1, 1);
|
|
expect(stats.stats()).toStrictEqual({
|
|
client1: { gold: [1n] },
|
|
});
|
|
});
|
|
|
|
test("train trade gold", () => {
|
|
stats.trainSelfTrade(player1, 2);
|
|
stats.trainExternalTrade(player2, 1);
|
|
expect(stats.stats()).toStrictEqual({
|
|
client1: { gold: [0n, 0n, 0n, 0n, 2n] },
|
|
client2: { gold: [0n, 0n, 0n, 0n, 0n, 1n] },
|
|
});
|
|
});
|
|
|
|
test("unitBuild", () => {
|
|
stats.unitBuild(player1, UnitType.City);
|
|
expect(stats.stats()).toStrictEqual({
|
|
client1: { units: { city: [1n] } },
|
|
});
|
|
});
|
|
|
|
test("unitCapture", () => {
|
|
stats.unitCapture(player1, UnitType.DefensePost);
|
|
expect(stats.stats()).toStrictEqual({
|
|
client1: {
|
|
units: {
|
|
defp: [0n, 0n, 1n],
|
|
},
|
|
},
|
|
});
|
|
});
|
|
|
|
test("unitDestroy", () => {
|
|
stats.unitDestroy(player1, UnitType.MissileSilo);
|
|
expect(stats.stats()).toStrictEqual({
|
|
client1: {
|
|
units: {
|
|
silo: [0n, 1n],
|
|
},
|
|
},
|
|
});
|
|
});
|
|
|
|
test("unitLose", () => {
|
|
stats.unitLose(player1, UnitType.Port);
|
|
expect(stats.stats()).toStrictEqual({
|
|
client1: {
|
|
units: {
|
|
port: [0n, 0n, 0n, 1n],
|
|
},
|
|
},
|
|
});
|
|
});
|
|
|
|
test("playerKilled", () => {
|
|
stats.playerKilled(player1, 10);
|
|
stats.playerKilled(player2, 40);
|
|
expect(stats.stats()).toStrictEqual({
|
|
client1: {
|
|
killedAt: 10n,
|
|
},
|
|
client2: {
|
|
killedAt: 40n,
|
|
},
|
|
});
|
|
});
|
|
|
|
test("stringify", () => {
|
|
stats.unitLose(player1, UnitType.Port);
|
|
expect(JSON.stringify(stats.stats(), replacer)).toBe(
|
|
'{"client1":{"units":{"port":["0","0","0","1"]}}}',
|
|
);
|
|
});
|
|
});
|