fix config circular dependency (#296)

src/client/ClientGameRunner.ts

@@ -26,7 +26,8 @@ import {
 } from "../core/game/GameUpdates";
 import { WorkerClient } from "../core/worker/WorkerClient";
 import { consolex, initRemoteSender } from "../core/Consolex";
-import { getConfig, ServerConfig } from "../core/configuration/Config";
+import { ServerConfig } from "../core/configuration/Config";
+import { getConfig } from "../core/configuration/ConfigLoader";
 import { GameView, PlayerView } from "../core/game/GameView";
 import { GameUpdateViewData } from "../core/game/GameUpdates";
 import { UserSettings } from "../core/game/UserSettings";

src/client/HostLobbyModal.ts

@@ -8,10 +8,8 @@ import { DifficultyDescription } from "./components/Difficulties";
 import "./components/Maps";
 import randomMap from "../../resources/images/RandomMap.png";
 import { generateID } from "../core/Util";
-import {
-  getConfig,
-  getServerConfigFromClient,
-} from "../core/configuration/Config";
+import { getServerConfigFromClient } from "../core/configuration/ConfigLoader";
+import { getConfig } from "../core/configuration/ConfigLoader";
 import { JoinLobbyEvent } from "./Main";
 
 @customElement("host-lobby-modal")

src/client/JoinPrivateLobbyModal.ts

@@ -3,7 +3,7 @@ import { customElement, query, state } from "lit/decorators.js";
 import { consolex } from "../core/Consolex";
 import { GameMapType, GameType } from "../core/game/Game";
 import { GameInfo, GameRecord } from "../core/Schemas";
-import { getServerConfigFromClient } from "../core/configuration/Config";
+import { getServerConfigFromClient } from "../core/configuration/ConfigLoader";
 import { JoinLobbyEvent } from "./Main";
 
 @customElement("join-private-lobby-modal")

src/client/Main.ts

@@ -21,7 +21,7 @@ import { DarkModeButton } from "./DarkModeButton";
 import "./GoogleAdElement";
 import { HelpModal } from "./HelpModal";
 import { GameType } from "../core/game/Game";
-import { getServerConfigFromClient } from "../core/configuration/Config";
+import { getServerConfigFromClient } from "../core/configuration/ConfigLoader";
 import GoogleAdElement from "./GoogleAdElement";
 import { GameConfig, GameInfo, GameRecord } from "../core/Schemas";
 

src/core/GameRunner.ts

@@ -1,6 +1,6 @@
 import { utcDay } from "d3";
 import { placeName } from "../client/graphics/NameBoxCalculator";
-import { getConfig } from "./configuration/Config";
+import { getConfig } from "./configuration/ConfigLoader";
 import { EventBus } from "./EventBus";
 import { Executor } from "./execution/ExecutionManager";
 import { WinCheckExecution } from "./execution/WinCheckExecution";

src/core/configuration/Config.ts

@@ -12,81 +12,17 @@ import {
   UnitType,
 } from "../game/Game";
 import { Colord, colord } from "colord";
-import { preprodConfig } from "./PreprodConfig";
-import { prodConfig } from "./ProdConfig";
-import { consolex } from "../Consolex";
 import { GameConfig, GameID } from "../Schemas";
-import { DefaultConfig } from "./DefaultConfig";
-import { DevConfig, DevServerConfig } from "./DevConfig";
 import { GameMap, TileRef } from "../game/GameMap";
 import { PlayerView } from "../game/GameView";
 import { UserSettings } from "../game/UserSettings";
 
-let cachedSC: ServerConfig = null;
-
 export enum GameEnv {
   Dev,
   Preprod,
   Prod,
 }
 
-export async function getConfig(
-  gameConfig: GameConfig,
-  userSettings: UserSettings | null = null,
-): Promise<Config> {
-  const sc = await getServerConfigFromClient();
-  switch (sc.env()) {
-    case GameEnv.Dev:
-      return new DevConfig(sc, gameConfig, userSettings);
-    case GameEnv.Preprod:
-    case GameEnv.Prod:
-      consolex.log("using prod config");
-      return new DefaultConfig(sc, gameConfig, userSettings);
-    default:
-      throw Error(`unsupported server configuration: ${process.env.GAME_ENV}`);
-  }
-}
-
-export async function getServerConfigFromClient(): Promise<ServerConfig> {
-  if (cachedSC) {
-    return cachedSC;
-  }
-  const response = await fetch("/api/env");
-
-  if (!response.ok) {
-    throw new Error(
-      `Failed to fetch server config: ${response.status} ${response.statusText}`,
-    );
-  }
-  const config = await response.json();
-  // Log the retrieved configuration
-  console.log("Server config loaded:", config);
-
-  cachedSC = getServerConfig(config.game_env);
-  return cachedSC;
-}
-
-export function getServerConfigFromServer(): ServerConfig {
-  const gameEnv = process.env.GAME_ENV;
-  return getServerConfig(gameEnv);
-}
-
-function getServerConfig(gameEnv: string) {
-  switch (gameEnv) {
-    case "dev":
-      consolex.log("using dev server config");
-      return new DevServerConfig();
-    case "staging":
-      consolex.log("using preprod server config");
-      return preprodConfig;
-    case "prod":
-      consolex.log("using prod server config");
-      return prodConfig;
-    default:
-      throw Error(`unsupported server configuration: ${gameEnv}`);
-  }
-}
-
 export interface ServerConfig {
   turnIntervalMs(): number;
   gameCreationRate(): number;

src/core/configuration/ConfigLoader.ts

@@ -0,0 +1,64 @@
+import { consolex } from "../Consolex";
+import { UserSettings } from "../game/UserSettings";
+import { GameConfig } from "../Schemas";
+import { Config, GameEnv, ServerConfig } from "./Config";
+import { DefaultConfig } from "./DefaultConfig";
+import { DevConfig, DevServerConfig } from "./DevConfig";
+import { preprodConfig } from "./PreprodConfig";
+import { prodConfig } from "./ProdConfig";
+
+export let cachedSC: ServerConfig = null;
+
+export async function getConfig(
+  gameConfig: GameConfig,
+  userSettings: UserSettings | null = null,
+): Promise<Config> {
+  const sc = await getServerConfigFromClient();
+  switch (sc.env()) {
+    case GameEnv.Dev:
+      return new DevConfig(sc, gameConfig, userSettings);
+    case GameEnv.Preprod:
+    case GameEnv.Prod:
+      consolex.log("using prod config");
+      return new DefaultConfig(sc, gameConfig, userSettings);
+    default:
+      throw Error(`unsupported server configuration: ${process.env.GAME_ENV}`);
+  }
+}
+export async function getServerConfigFromClient(): Promise<ServerConfig> {
+  if (cachedSC) {
+    return cachedSC;
+  }
+  const response = await fetch("/api/env");
+
+  if (!response.ok) {
+    throw new Error(
+      `Failed to fetch server config: ${response.status} ${response.statusText}`,
+    );
+  }
+  const config = await response.json();
+  // Log the retrieved configuration
+  console.log("Server config loaded:", config);
+
+  cachedSC = getServerConfig(config.game_env);
+  return cachedSC;
+}
+export function getServerConfigFromServer(): ServerConfig {
+  const gameEnv = process.env.GAME_ENV;
+  return getServerConfig(gameEnv);
+}
+export function getServerConfig(gameEnv: string) {
+  switch (gameEnv) {
+    case "dev":
+      consolex.log("using dev server config");
+      return new DevServerConfig();
+    case "staging":
+      consolex.log("using preprod server config");
+      return preprodConfig;
+    case "prod":
+      consolex.log("using prod server config");
+      return prodConfig;
+    default:
+      throw Error(`unsupported server configuration: ${gameEnv}`);
+  }
+}

src/server/Archive.ts

@@ -1,9 +1,7 @@
 import { GameRecord, GameID, GameRecordSchema } from "../core/Schemas";
 import { S3 } from "@aws-sdk/client-s3";
-import {
-  GameEnv,
-  getServerConfigFromServer,
-} from "../core/configuration/Config";
+import { GameEnv } from "../core/configuration/Config";
+import { getServerConfigFromServer } from "../core/configuration/ConfigLoader";
 import { logger } from "./Logger";
 
 const config = getServerConfigFromServer();

src/server/Master.ts

@@ -4,7 +4,7 @@ import express from "express";
 import { GameMapType, GameType, Difficulty } from "../core/game/Game";
 import { generateID } from "../core/Util";
 import { PseudoRandom } from "../core/PseudoRandom";
-import { getServerConfigFromServer } from "../core/configuration/Config";
+import { getServerConfigFromServer } from "../core/configuration/ConfigLoader";
 import { GameConfig, GameInfo } from "../core/Schemas";
 import path from "path";
 import rateLimit from "express-rate-limit";

src/server/MasterMetrics.ts

@@ -1,7 +1,7 @@
 import express from "express";
 import http from "http";
 import promClient from "prom-client";
-import { getServerConfigFromServer } from "../core/configuration/Config";
+import { getServerConfigFromServer } from "../core/configuration/ConfigLoader";
 
 const config = getServerConfigFromServer();
 

src/server/Worker.ts

@@ -4,10 +4,8 @@ import { WebSocketServer } from "ws";
 import path from "path";
 import { fileURLToPath } from "url";
 import { GameManager } from "./GameManager";
-import {
-  GameEnv,
-  getServerConfigFromServer,
-} from "../core/configuration/Config";
+import { GameEnv } from "../core/configuration/Config";
+import { getServerConfigFromServer } from "../core/configuration/ConfigLoader";
 import { WebSocket } from "ws";
 import { Client } from "./Client";
 import rateLimit from "express-rate-limit";

src/server/WorkerMetrics.ts

@@ -1,6 +1,6 @@
 import promClient from "prom-client";
 import { GameManager } from "./GameManager";
-import { getServerConfigFromServer } from "../core/configuration/Config";
+import { getServerConfigFromServer } from "../core/configuration/ConfigLoader";
 
 const config = getServerConfigFromServer();
 const region = config.region();