mirror of
https://github.com/openfrontio/OpenFrontIO.git
synced 2026-07-10 21:24:14 +00:00
Evan Pelle
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>
75 lines
2.2 KiB
TypeScript
75 lines
2.2 KiB
TypeScript
import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
|
|
import { JoinLobbyModal } from "client/JoinLobbyModal";
|
|
|
|
describe("JoinLobbyModal server time offset", () => {
|
|
let nowMs = 0;
|
|
|
|
beforeEach(() => {
|
|
vi.spyOn(Date, "now").mockImplementation(() => nowMs);
|
|
});
|
|
|
|
afterEach(() => {
|
|
vi.restoreAllMocks();
|
|
});
|
|
|
|
it("updates serverTimeOffset from lobby serverTime", () => {
|
|
const modal = new JoinLobbyModal();
|
|
(modal as any).syncCountdownTimer = vi.fn();
|
|
|
|
nowMs = 220_000;
|
|
(modal as any).updateFromLobby({
|
|
gameID: "g1",
|
|
serverTime: 200_000,
|
|
startsAt: 230_000,
|
|
clients: [],
|
|
});
|
|
|
|
expect((modal as any).serverTimeOffset).toBe(-20_000);
|
|
expect((modal as any).lobbyStartAt).toBe(230_000);
|
|
});
|
|
|
|
it("does not trigger join timeout early when local clock is ahead", () => {
|
|
const modal = new JoinLobbyModal();
|
|
const closeSpy = vi
|
|
.spyOn(modal, "closeAndLeave")
|
|
.mockImplementation(() => undefined);
|
|
const dispatchSpy = vi.spyOn(window, "dispatchEvent");
|
|
|
|
(modal as any).isModalOpen = true;
|
|
(modal as any).isConnecting = true;
|
|
(modal as any).handledJoinTimeout = false;
|
|
|
|
// Local clock is +60s ahead of server clock.
|
|
nowMs = 160_000;
|
|
(modal as any).lobbyStartAt = 105_000;
|
|
(modal as any).serverTimeOffset = -60_000;
|
|
|
|
(modal as any).checkForJoinTimeout();
|
|
|
|
expect(closeSpy).not.toHaveBeenCalled();
|
|
expect(dispatchSpy).not.toHaveBeenCalled();
|
|
expect((modal as any).handledJoinTimeout).toBe(false);
|
|
});
|
|
|
|
it("triggers join timeout once adjusted server time reaches lobbyStartAt", () => {
|
|
const modal = new JoinLobbyModal();
|
|
const closeSpy = vi
|
|
.spyOn(modal, "closeAndLeave")
|
|
.mockImplementation(() => undefined);
|
|
const dispatchSpy = vi.spyOn(window, "dispatchEvent");
|
|
|
|
(modal as any).isModalOpen = true;
|
|
(modal as any).isConnecting = true;
|
|
(modal as any).handledJoinTimeout = false;
|
|
(modal as any).lobbyStartAt = 105_000;
|
|
(modal as any).serverTimeOffset = -60_000;
|
|
|
|
nowMs = 165_000;
|
|
(modal as any).checkForJoinTimeout();
|
|
|
|
expect(closeSpy).toHaveBeenCalledTimes(1);
|
|
expect(dispatchSpy).toHaveBeenCalledTimes(1);
|
|
expect((modal as any).handledJoinTimeout).toBe(true);
|
|
});
|
|
});
|