mirror of
https://github.com/openfrontio/OpenFrontIO.git
synced 2026-07-10 15:04: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>
226 lines
7.3 KiB
TypeScript
226 lines
7.3 KiB
TypeScript
vi.mock("lit", () => ({
|
|
html: (strings: TemplateStringsArray, ...values: unknown[]) => ({
|
|
strings,
|
|
values,
|
|
}),
|
|
LitElement: class extends EventTarget {
|
|
requestUpdate() {}
|
|
},
|
|
}));
|
|
|
|
vi.mock("lit/decorators.js", () => ({
|
|
customElement: () => (clazz: unknown) => clazz,
|
|
state: () => () => {},
|
|
property: () => () => {},
|
|
query: () => () => {},
|
|
}));
|
|
|
|
vi.mock("client/Utils", () => ({
|
|
translateText: vi.fn((key: string) => key),
|
|
renderDuration: vi.fn(),
|
|
renderNumber: vi.fn(),
|
|
renderTroops: vi.fn(),
|
|
}));
|
|
|
|
vi.mock("client/components/ui/ActionButton", () => ({
|
|
actionButton: vi.fn((props: unknown) => props),
|
|
}));
|
|
|
|
import { actionButton } from "client/components/ui/ActionButton";
|
|
import { PlayerModerationModal } from "client/hud/layers/PlayerModerationModal";
|
|
import { PlayerPanel } from "client/hud/layers/PlayerPanel";
|
|
import { SendKickPlayerIntentEvent } from "client/Transport";
|
|
import { PlayerType } from "engine/game/Game";
|
|
import { PlayerView } from "client/view";
|
|
|
|
describe("PlayerPanel - kick player moderation", () => {
|
|
let panel: PlayerPanel;
|
|
const originalConfirm = globalThis.confirm;
|
|
|
|
beforeEach(() => {
|
|
panel = new PlayerPanel();
|
|
(panel as any).requestUpdate = vi.fn();
|
|
(panel as any).isVisible = true;
|
|
});
|
|
|
|
afterEach(() => {
|
|
vi.clearAllMocks();
|
|
globalThis.confirm = originalConfirm;
|
|
});
|
|
|
|
test("renders moderation action only when allowed or already kicked", () => {
|
|
const my = { isLobbyCreator: () => true } as unknown as PlayerView;
|
|
const other = {
|
|
id: () => 2,
|
|
name: () => "Other",
|
|
displayName: () => "[TAG] Other",
|
|
type: () => PlayerType.Human,
|
|
clientID: () => "client-2",
|
|
} as unknown as PlayerView;
|
|
|
|
(actionButton as unknown as ReturnType<typeof vi.fn>).mockClear();
|
|
(panel as any).renderModeration(my, other, false);
|
|
expect(actionButton).toHaveBeenCalledTimes(1);
|
|
expect(
|
|
(actionButton as unknown as ReturnType<typeof vi.fn>).mock.calls[0][0],
|
|
).toMatchObject({
|
|
label: "player_panel.moderation",
|
|
title: "player_panel.moderation",
|
|
type: "red",
|
|
});
|
|
|
|
(actionButton as unknown as ReturnType<typeof vi.fn>).mockClear();
|
|
(panel as any).kickedPlayerIDs.add("2");
|
|
(panel as any).renderModeration(my, other, false);
|
|
expect(actionButton).toHaveBeenCalledTimes(1);
|
|
|
|
const notCreator = { isLobbyCreator: () => false } as unknown as PlayerView;
|
|
(actionButton as unknown as ReturnType<typeof vi.fn>).mockClear();
|
|
(panel as any).kickedPlayerIDs.clear();
|
|
(panel as any).renderModeration(notCreator, other, false);
|
|
expect(actionButton).not.toHaveBeenCalled();
|
|
});
|
|
|
|
test("renders moderation action when isAdmin=true even if not lobby creator", () => {
|
|
const notCreator = { isLobbyCreator: () => false } as unknown as PlayerView;
|
|
const other = {
|
|
id: () => 2,
|
|
name: () => "Other",
|
|
displayName: () => "[TAG] Other",
|
|
type: () => PlayerType.Human,
|
|
clientID: () => "client-2",
|
|
} as unknown as PlayerView;
|
|
|
|
(actionButton as unknown as ReturnType<typeof vi.fn>).mockClear();
|
|
(panel as any).renderModeration(notCreator, other, true);
|
|
expect(actionButton).toHaveBeenCalledTimes(1);
|
|
});
|
|
|
|
test("opens moderation modal and hides after a kick", () => {
|
|
const other = {
|
|
id: () => 2,
|
|
name: () => "Other",
|
|
displayName: () => "[TAG] Other",
|
|
type: () => PlayerType.Human,
|
|
clientID: () => "client-2",
|
|
} as unknown as PlayerView;
|
|
|
|
(panel as any).openModeration({ stopPropagation: vi.fn() }, other);
|
|
expect((panel as any).moderationTarget).toBe(other);
|
|
expect((panel as any).suppressNextHide).toBe(true);
|
|
|
|
(panel as any).handleModerationKicked(
|
|
new CustomEvent("kicked", { detail: { playerId: "2" } }),
|
|
);
|
|
|
|
expect((panel as any).kickedPlayerIDs.has("2")).toBe(true);
|
|
expect((panel as any).moderationTarget).toBe(null);
|
|
expect((panel as any).isVisible).toBe(false);
|
|
});
|
|
});
|
|
|
|
describe("PlayerModerationModal - kick confirmation", () => {
|
|
const originalConfirm = globalThis.confirm;
|
|
|
|
afterEach(() => {
|
|
vi.clearAllMocks();
|
|
globalThis.confirm = originalConfirm;
|
|
});
|
|
|
|
test("emits SendKickPlayerIntentEvent and dispatches kicked when confirmed", () => {
|
|
(globalThis as any).confirm = vi.fn(() => true);
|
|
|
|
const modal = new PlayerModerationModal();
|
|
const eventBus = { emit: vi.fn() };
|
|
const my = { isLobbyCreator: () => true } as unknown as PlayerView;
|
|
const other = {
|
|
id: () => 2,
|
|
name: () => "Other",
|
|
displayName: () => "[TAG] Other",
|
|
type: () => PlayerType.Human,
|
|
clientID: () => "client-2",
|
|
} as unknown as PlayerView;
|
|
|
|
modal.eventBus = eventBus as any;
|
|
modal.myPlayer = my;
|
|
modal.target = other;
|
|
|
|
const kickedListener = vi.fn();
|
|
modal.addEventListener("kicked", kickedListener as any);
|
|
|
|
(modal as any).handleKickClick({ stopPropagation: vi.fn() });
|
|
|
|
expect(eventBus.emit).toHaveBeenCalledTimes(1);
|
|
const event = eventBus.emit.mock.calls[0][0] as SendKickPlayerIntentEvent;
|
|
expect(event).toBeInstanceOf(SendKickPlayerIntentEvent);
|
|
expect(event.target).toBe("client-2");
|
|
|
|
expect(kickedListener).toHaveBeenCalledTimes(1);
|
|
const kickedEvent = kickedListener.mock.calls[0][0] as CustomEvent;
|
|
expect(kickedEvent.detail).toEqual({ playerId: "2" });
|
|
});
|
|
|
|
test("does not emit when confirmation is cancelled", () => {
|
|
(globalThis as any).confirm = vi.fn(() => false);
|
|
|
|
const modal = new PlayerModerationModal();
|
|
const eventBus = { emit: vi.fn() };
|
|
const my = { isLobbyCreator: () => true } as unknown as PlayerView;
|
|
const other = {
|
|
id: () => 2,
|
|
name: () => "Other",
|
|
displayName: () => "[TAG] Other",
|
|
type: () => PlayerType.Human,
|
|
clientID: () => "client-2",
|
|
} as unknown as PlayerView;
|
|
|
|
modal.eventBus = eventBus as any;
|
|
modal.myPlayer = my;
|
|
modal.target = other;
|
|
|
|
const kickedListener = vi.fn();
|
|
modal.addEventListener("kicked", kickedListener as any);
|
|
|
|
(modal as any).handleKickClick({ stopPropagation: vi.fn() });
|
|
|
|
expect(eventBus.emit).not.toHaveBeenCalled();
|
|
expect(kickedListener).not.toHaveBeenCalled();
|
|
});
|
|
|
|
describe("canKick", () => {
|
|
function makeModal(isAdmin: boolean) {
|
|
const modal = new PlayerModerationModal();
|
|
modal.isAdmin = isAdmin;
|
|
return modal;
|
|
}
|
|
|
|
const nonCreator = { isLobbyCreator: () => false } as unknown as PlayerView;
|
|
const creator = { isLobbyCreator: () => true } as unknown as PlayerView;
|
|
const humanOther = {
|
|
type: () => PlayerType.Human,
|
|
clientID: () => "client-other",
|
|
} as unknown as PlayerView;
|
|
|
|
test("admin non-creator can kick a valid other player", () => {
|
|
const modal = makeModal(true);
|
|
expect((modal as any).canKick(nonCreator, humanOther)).toBe(true);
|
|
});
|
|
|
|
test("non-admin non-creator cannot kick", () => {
|
|
const modal = makeModal(false);
|
|
expect((modal as any).canKick(nonCreator, humanOther)).toBe(false);
|
|
});
|
|
|
|
test("admin cannot kick themselves", () => {
|
|
const modal = makeModal(true);
|
|
// same object reference → other === my
|
|
expect((modal as any).canKick(nonCreator, nonCreator)).toBe(false);
|
|
});
|
|
|
|
test("lobby creator can kick a valid other player", () => {
|
|
const modal = makeModal(false);
|
|
expect((modal as any).canKick(creator, humanOther)).toBe(true);
|
|
});
|
|
});
|
|
});
|