mirror of
https://github.com/openfrontio/OpenFrontIO.git
synced 2026-06-21 21:04:14 +00:00
aa4b490e68
## Summary The WebGL renderer was adapted from an external extension and carried a lot of machinery this integration never uses (replay playback, its own input/event system, a GL radial menu). This PR is two mechanical cleanup passes with **no behavior change**: delete the dead code, then untangle the `GameView` naming collision. **78 files, +142 / −2,197.** ### Pass 1 — remove dead extension baggage - **Replay/copy mode**: `FrameData.tileMode` was hard-coded `"live"`; the copy branches in `frame/Upload.ts`, `UploadOptions` (never passed), `applyFullFrame`/`applyFullTiles`/`applyDelta` on the facade and `GPURenderer`, `HeatManager.resetForSeek`, and the seek-upload methods on `TerritoryPass`/`TrailPass` were all unreachable. Also deletes `types/Replay.ts`, `types/FrameSource.ts`, `types/GameUpdates.ts`, `types/Game.ts` (imported only by the types barrel). - **FrameEvents**: trimmed from 14 fields to the 3 actually populated and read (`deadUnits`, `conquestEvents`, `bonusEvents`). The other 11 fed the extension's stats system and were never written or read here. - **GL radial menu**: `RadialMenuPass`, its 4 shaders, and ~10 API methods on facade + renderer had zero callers — the game uses the DOM/d3 radial menu in `hud/layers/RadialMenu.ts`. The pass was constructed and drawn every frame for nothing. - **Facade event system**: `GameViewEventMap` defined 10 event types (`click`, `hover`, `scroll`, …) but only `contextrestored` was ever emitted — input actually flows through `InputHandler` → EventBus → controllers. Replaced the listener map with a single `onContextRestored` callback and deleted `Events.ts`. Also fixed the stale header comment claiming the facade handles user interaction. - **Unused API surface**: removed ~20 facade/renderer methods with zero callers (camera passthroughs like `panTo`/`zoomTo`/`fitMap`/`screenToWorld`, hit-testing queries, SAM replay setters, `setSelectedUnit`, `clearFx`/`setFxTimeFn`, `onFrame`/`afterRender`/fps tracking). Deliberately left alone: `Camera`'s pan/zoom primitives (building blocks for a possible future camera unification) and the `timeFn` plumbing inside the FX passes (deeply embedded as defaults; only the dead renderer-level wrappers were removed). ### Pass 2 — untangle the three GameViews - `render/gl/GameView.ts` → **`MapRenderer.ts`** (class `MapRenderer`). Every importer was already aliasing it as `WebGLGameView` to dodge the collision with the simulation-mirror `GameView` in `client/view/`, so this removes aliasing rather than adding churn. `render/CLAUDE.md` updated. - Deleted the `src/core/game/GameView.ts` back-compat shim (its own TODO asked for this). All 51 importers now import from `src/client/view/` directly via a new 3-line barrel `view/index.ts`. ## Test plan - `tsc --noEmit` clean, `eslint` clean - Full test suite passes (1,385 + 65 server tests) - Manual verification via headless Chromium: started a singleplayer game and confirmed the renderer works end-to-end — terrain draws, spawn-phase overlay shows, territories fill with borders after spawning, player names/flags render, no renderer console errors 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
226 lines
7.4 KiB
TypeScript
226 lines
7.4 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("../../../../src/client/Utils", () => ({
|
|
translateText: vi.fn((key: string) => key),
|
|
renderDuration: vi.fn(),
|
|
renderNumber: vi.fn(),
|
|
renderTroops: vi.fn(),
|
|
}));
|
|
|
|
vi.mock("../../../../src/client/components/ui/ActionButton", () => ({
|
|
actionButton: vi.fn((props: unknown) => props),
|
|
}));
|
|
|
|
import { actionButton } from "../../../../src/client/components/ui/ActionButton";
|
|
import { PlayerModerationModal } from "../../../../src/client/hud/layers/PlayerModerationModal";
|
|
import { PlayerPanel } from "../../../../src/client/hud/layers/PlayerPanel";
|
|
import { SendKickPlayerIntentEvent } from "../../../../src/client/Transport";
|
|
import { PlayerView } from "../../../../src/client/view";
|
|
import { PlayerType } from "../../../../src/core/game/Game";
|
|
|
|
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);
|
|
});
|
|
});
|
|
});
|