mirror of
https://github.com/openfrontio/OpenFrontIO.git
synced 2026-06-22 05:23:48 +00:00
275fd0dccc
## Description: This is a refactor to simplify config handling. Replaces the per-environment DevConfig/PreprodConfig/ProdConfig class hierarchy with two static classes: ClientEnv (browser main thread, reads from window.BOOTSTRAP_CONFIG) and ServerEnv (Node server, reads from process.env). The four config classes are deleted, the abstract DefaultServerConfig is gone, and DefaultConfig is renamed to Config. The values that flow server → client (gameEnv, numWorkers, turnstileSiteKey, jwtAudience, instanceId) used to be baked into the hardcoded per-env classes. They're now real env vars on the server, embedded into a single window.BOOTSTRAP_CONFIG object in index.html at request time (alongside the existing gitCommit/assetManifest/cdnBase globals, which moved into the same object), and read back by ClientEnv on the client. The dev defaults previously hidden inside DevServerConfig are now explicit in start:server-dev (NUM_WORKERS=2, TURNSTILE_SITE_KEY=1x..., JWT_AUDIENCE=localhost, etc.) and in vite.config.ts's html plugin inject.data. Production deploys plumb NUM_WORKERS and TURNSTILE_SITE_KEY through deploy.yml (GitHub vars) into the remote env file; JWT_AUDIENCE is derived from DOMAIN in deploy.sh. The dynamic /api/instance endpoint is gone — INSTANCE_ID rides along in BOOTSTRAP_CONFIG now. ServerEnv is the only thing server code touches; ClientEnv is browser-only. The two classes have intentional overlap (env, numWorkers, jwtIssuer, gameCreationRate, workerIndex, etc.) since they derive identical logic from different sources — there's a TODO in each to consolidate via a shared helper later. The game-logic Config no longer stores a ServerConfig/ClientEnv reference and its serverConfig() getter is gone; the one caller (MultiTabModal) now reads ClientEnv.env() directly. Worker init no longer carries server-config values since nothing in the worker actually reads them. ## Please complete the following: - [x] I have added screenshots for all UI updates - [x] I process any text displayed to the user through translateText() and I've added it to the en.json file - [x] I have added relevant tests to the test directory - [x] I confirm I have thoroughly tested these changes and take full responsibility for any bugs introduced ## Please put your Discord username so you can be contacted if a bug or regression is found: evan
145 lines
3.5 KiB
TypeScript
145 lines
3.5 KiB
TypeScript
import { Logger } from "winston";
|
|
import WebSocket from "ws";
|
|
import {
|
|
Difficulty,
|
|
GameMapSize,
|
|
GameMapType,
|
|
GameMode,
|
|
GameType,
|
|
} from "../core/game/Game";
|
|
import { GameConfig, GameID, PublicGameType } from "../core/Schemas";
|
|
import { Client } from "./Client";
|
|
import { GamePhase, GameServer } from "./GameServer";
|
|
|
|
export class GameManager {
|
|
private games: Map<GameID, GameServer> = new Map();
|
|
|
|
constructor(private log: Logger) {
|
|
setInterval(() => this.tick(), 1000);
|
|
}
|
|
|
|
public game(id: GameID): GameServer | null {
|
|
return this.games.get(id) ?? null;
|
|
}
|
|
|
|
public publicLobbies(): GameServer[] {
|
|
return Array.from(this.games.values()).filter(
|
|
(g) => g.phase() === GamePhase.Lobby && g.isPublic(),
|
|
);
|
|
}
|
|
|
|
joinClient(
|
|
client: Client,
|
|
gameID: GameID,
|
|
): "joined" | "kicked" | "rejected" | "not_found" {
|
|
const game = this.games.get(gameID);
|
|
if (!game) return "not_found";
|
|
return game.joinClient(client);
|
|
}
|
|
|
|
rejoinClient(
|
|
ws: WebSocket,
|
|
persistentID: string,
|
|
gameID: GameID,
|
|
lastTurn: number = 0,
|
|
identityUpdate?: { username: string; clanTag: string | null },
|
|
): boolean {
|
|
const game = this.games.get(gameID);
|
|
if (!game) return false;
|
|
return game.rejoinClient(ws, persistentID, lastTurn, identityUpdate);
|
|
}
|
|
|
|
createGame(
|
|
id: GameID,
|
|
gameConfig: GameConfig | undefined,
|
|
creatorPersistentID?: string,
|
|
startsAt?: number,
|
|
publicGameType?: PublicGameType,
|
|
): GameServer | null {
|
|
if (this.games.has(id)) {
|
|
this.log.warn("cannot create game, id already exists", { gameID: id });
|
|
return null;
|
|
}
|
|
|
|
const game = new GameServer(
|
|
id,
|
|
this.log,
|
|
Date.now(),
|
|
{
|
|
donateGold: false,
|
|
donateTroops: false,
|
|
gameMap: GameMapType.World,
|
|
gameType: GameType.Private,
|
|
gameMapSize: GameMapSize.Normal,
|
|
difficulty: Difficulty.Easy,
|
|
nations: "default",
|
|
infiniteGold: false,
|
|
infiniteTroops: false,
|
|
maxTimerValue: undefined,
|
|
instantBuild: false,
|
|
randomSpawn: false,
|
|
gameMode: GameMode.FFA,
|
|
bots: 400,
|
|
disabledUnits: [],
|
|
...gameConfig,
|
|
},
|
|
creatorPersistentID,
|
|
startsAt,
|
|
publicGameType,
|
|
);
|
|
this.games.set(id, game);
|
|
return game;
|
|
}
|
|
|
|
activeGames(): number {
|
|
return this.games.size;
|
|
}
|
|
|
|
activeClients(): number {
|
|
let totalClients = 0;
|
|
this.games.forEach((game: GameServer) => {
|
|
totalClients += game.activeClients.length;
|
|
});
|
|
return totalClients;
|
|
}
|
|
|
|
desyncCount(): number {
|
|
return [...this.games.values()].reduce(
|
|
(acc, game) => acc + game.numDesyncedClients(),
|
|
0,
|
|
);
|
|
}
|
|
|
|
tick() {
|
|
const active = new Map<GameID, GameServer>();
|
|
for (const [id, game] of this.games) {
|
|
const phase = game.phase();
|
|
if (phase === GamePhase.Active) {
|
|
if (!game.hasStarted()) {
|
|
// Prestart tells clients to start loading the game.
|
|
game.prestart();
|
|
// Start game on delay to allow time for clients to connect.
|
|
setTimeout(() => {
|
|
try {
|
|
game.start();
|
|
} catch (error) {
|
|
this.log.error(`error starting game ${id}: ${error}`);
|
|
}
|
|
}, 2000);
|
|
}
|
|
}
|
|
|
|
if (phase === GamePhase.Finished) {
|
|
try {
|
|
game.end();
|
|
} catch (error) {
|
|
this.log.error(`error ending game ${id}: ${error}`);
|
|
}
|
|
} else {
|
|
active.set(id, game);
|
|
}
|
|
}
|
|
this.games = active;
|
|
}
|
|
}
|