config

Author: evanpelle

.vscode/launch.json

@@ -22,7 +22,7 @@
         "${workspaceFolder}/src/server/Server.ts"
       ],
       "env": {
-        "GAME_ENV": "dev"
+        "GAME_ENV": "Dev"
       },
       "console": "integratedTerminal",
       "internalConsoleOptions": "neverOpen",

.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+  "html.validate.scripts": false
+}

index.html

@@ -56,6 +56,11 @@
     />
     <meta property="og:type" content="game" />
 
+    <!-- Server Configuration -->
+    <script>
+      window.SERVER_CONFIG = <%- serverConfig %>;
+    </script>
+
     <!-- CrazyGames SDK -->
     <script
       src="https://sdk.crazygames.com/crazygames-sdk-v3.js"

nginx.conf

@@ -113,25 +113,6 @@ server {
         proxy_set_header X-Forwarded-Proto $scheme;
     }
 
-    # /api/env endpoint - Cache for 1 hour
-    location = /api/env {
-        proxy_pass http://127.0.0.1:3000;
-        proxy_http_version 1.1;
-        
-        # Cache configuration
-        proxy_cache API_CACHE;
-        proxy_cache_valid 200 1h;  # Cache successful responses for 1 hour
-        proxy_cache_use_stale error timeout http_500 http_502 http_503 http_504;
-        proxy_cache_lock on;
-        add_header X-Cache-Status $upstream_cache_status;
-        
-        # Standard proxy headers
-        proxy_set_header Host $host;
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header X-Forwarded-Proto $scheme;
-    }
-    
     # /commit.txt endpoint - Cache for 5 seconds
     location = /commit.txt {
         proxy_pass http://127.0.0.1:3000;

package.json

@@ -5,10 +5,10 @@
     "build-prod": "concurrently --kill-others-on-fail \"tsc --noEmit\" \"vite build\"",
     "start:client": "vite",
     "start:server": "tsx src/server/Server.ts",
-    "start:server-dev": "cross-env GAME_ENV=dev tsx src/server/Server.ts",
-    "dev": "cross-env GAME_ENV=dev concurrently \"npm run start:client\" \"npm run start:server-dev\"",
-    "dev:staging": "cross-env GAME_ENV=dev API_DOMAIN=api.openfront.dev concurrently \"npm run start:client\" \"npm run start:server-dev\"",
-    "dev:prod": "cross-env GAME_ENV=dev API_DOMAIN=api.openfront.io concurrently \"npm run start:client\" \"npm run start:server-dev\"",
+    "start:server-dev": "cross-env GAME_ENV=Dev tsx src/server/Server.ts",
+    "dev": "cross-env GAME_ENV=Dev concurrently \"npm run start:client\" \"npm run start:server-dev\"",
+    "dev:staging": "cross-env GAME_ENV=Dev API_DOMAIN=api.openfront.dev concurrently \"npm run start:client\" \"npm run start:server-dev\"",
+    "dev:prod": "cross-env GAME_ENV=Dev API_DOMAIN=api.openfront.io concurrently \"npm run start:client\" \"npm run start:server-dev\"",
     "docs:map-generator": "cd map-generator && go doc -cmd -u -all",
     "tunnel": "npm run build-prod && npm run start:server",
     "test": "vitest run",

src/client/ClientGameRunner.ts

@@ -1,3 +1,4 @@
+import { Env } from "src/core/configuration/Env";
 import { translateText } from "../client/Utils";
 import { EventBus } from "../core/EventBus";
 import {
@@ -182,8 +183,9 @@ async function createClientGame(
   if (lobbyConfig.gameStartInfo === undefined) {
     throw new Error("missing gameStartInfo");
   }
-  const config = await getConfig(
+  const config = getConfig(
     lobbyConfig.gameStartInfo.config,
+    Env.GAME_ENV,
     userSettings,
     lobbyConfig.gameRecord !== undefined,
   );
@@ -200,6 +202,7 @@ async function createClientGame(
   }
   const worker = new WorkerClient(
     lobbyConfig.gameStartInfo,
+    Env.GAME_ENV,
     lobbyConfig.clientID,
   );
   await worker.initialize();

src/client/HostLobbyModal.ts

@@ -1,7 +1,7 @@
 import { TemplateResult, html } from "lit";
 import { customElement, state } from "lit/decorators.js";
 import { copyToClipboard, translateText } from "../client/Utils";
-import { getServerConfigFromClient } from "../core/configuration/ConfigLoader";
+import { getServerConfig } from "../core/configuration/ConfigLoader";
 import {
   Difficulty,
   Duos,
@@ -1156,7 +1156,7 @@ export class HostLobbyModal extends BaseModal {
     console.log(
       `Starting private game with map: ${GameMapType[this.selectedMap as keyof typeof GameMapType]} ${this.useRandomMap ? " (Randomly selected)" : ""}`,
     );
-    const config = await getServerConfigFromClient();
+    const config = getServerConfig();
     const response = await fetch(
       `${window.location.origin}/${config.workerPath(this.lobbyId)}/api/start_game/${this.lobbyId}`,
       {
@@ -1178,7 +1178,7 @@ export class HostLobbyModal extends BaseModal {
   }
 
   private async pollPlayers() {
-    const config = await getServerConfigFromClient();
+    const config = getServerConfig();
     fetch(`/${config.workerPath(this.lobbyId)}/api/game/${this.lobbyId}`, {
       method: "GET",
       headers: {
@@ -1231,7 +1231,7 @@ export class HostLobbyModal extends BaseModal {
 }
 
 async function createLobby(creatorClientID: string): Promise<GameInfo> {
-  const config = await getServerConfigFromClient();
+  const config = getServerConfig();
   try {
     const id = generateID();
     const response = await fetch(

src/client/JoinPrivateLobbyModal.ts

@@ -1,5 +1,6 @@
 import { html, TemplateResult } from "lit";
 import { customElement, query, state } from "lit/decorators.js";
+import { Env } from "src/core/configuration/Env";
 import { copyToClipboard, translateText } from "../client/Utils";
 import {
   ClientInfo,
@@ -8,7 +9,7 @@ import {
   GameRecordSchema,
 } from "../core/Schemas";
 import { generateID } from "../core/Util";
-import { getServerConfigFromClient } from "../core/configuration/ConfigLoader";
+import { getServerConfig } from "../core/configuration/ConfigLoader";
 import { GameMode } from "../core/game/Game";
 import { UserSettings } from "../core/game/UserSettings";
 import { getApiBase } from "./Api";
@@ -511,7 +512,7 @@ export class JoinPrivateLobbyModal extends BaseModal {
   }
 
   private async checkActiveLobby(lobbyId: string): Promise<boolean> {
-    const config = await getServerConfigFromClient();
+    const config = getServerConfig();
     const url = `/${config.workerPath(lobbyId)}/api/game/${lobbyId}/exists`;
 
     const response = await fetch(url, {
@@ -548,22 +549,12 @@ export class JoinPrivateLobbyModal extends BaseModal {
   private async checkArchivedGame(
     lobbyId: string,
   ): Promise<"success" | "not_found" | "version_mismatch" | "error"> {
-    const archivePromise = fetch(`${getApiBase()}/game/${lobbyId}`, {
+    const archiveResponse = await fetch(`${getApiBase()}/game/${lobbyId}`, {
       method: "GET",
       headers: {
         "Content-Type": "application/json",
       },
     });
-    const gitCommitPromise = fetch(`/commit.txt`, {
-      method: "GET",
-      headers: { "Content-Type": "application/json" },
-      cache: "no-cache",
-    });
-
-    const [archiveResponse, gitCommitResponse] = await Promise.all([
-      archivePromise,
-      gitCommitPromise,
-    ]);
 
     if (archiveResponse.status === 404) {
       return "not_found";
@@ -578,16 +569,7 @@ export class JoinPrivateLobbyModal extends BaseModal {
       return "version_mismatch";
     }
 
-    let myGitCommit = "";
-    if (gitCommitResponse.status === 404) {
-      // commit.txt is not found when running locally
-      myGitCommit = "DEV";
-    } else if (gitCommitResponse.status === 200) {
-      myGitCommit = (await gitCommitResponse.text()).trim();
-    } else {
-      console.error("Error getting git commit:", gitCommitResponse.status);
-      return "error";
-    }
+    const myGitCommit = Env.GIT_COMMIT;
 
     // Allow DEV to join games created with a different version for debugging.
     if (myGitCommit !== "DEV" && parsed.data.gitCommit !== myGitCommit) {
@@ -616,7 +598,7 @@ export class JoinPrivateLobbyModal extends BaseModal {
   private async pollPlayers() {
     const lobbyId = this.currentLobbyId;
     if (!lobbyId) return;
-    const config = await getServerConfigFromClient();
+    const config = getServerConfig();
 
     fetch(`/${config.workerPath(lobbyId)}/api/game/${lobbyId}`, {
       method: "GET",

src/client/Main.ts

@@ -3,7 +3,7 @@ import { UserMeResponse } from "../core/ApiSchemas";
 import { EventBus } from "../core/EventBus";
 import { GameRecord, GameStartInfo, ID } from "../core/Schemas";
 import { GameEnv } from "../core/configuration/Config";
-import { getServerConfigFromClient } from "../core/configuration/ConfigLoader";
+import { getServerConfig } from "../core/configuration/ConfigLoader";
 import { GameType } from "../core/game/Game";
 import { UserSettings } from "../core/game/UserSettings";
 import "./AccountModal";
@@ -735,7 +735,7 @@ class Client {
       this.gameStop();
       document.body.classList.remove("in-game");
     }
-    const config = await getServerConfigFromClient();
+    const config = getServerConfig();
 
     const pattern = this.userSettings.getSelectedPatternName(
       await fetchCosmetics(),
@@ -895,7 +895,7 @@ class Client {
   private async getTurnstileToken(
     lobby: JoinLobbyEvent,
   ): Promise<string | null> {
-    const config = await getServerConfigFromClient();
+    const config = getServerConfig();
     if (
       config.env() === GameEnv.Dev ||
       lobby.gameStartInfo?.config.gameType === GameType.Singleplayer
@@ -955,7 +955,7 @@ async function getTurnstileToken(): Promise<{
     throw new Error("Failed to load Turnstile script");
   }
 
-  const config = await getServerConfigFromClient();
+  const config = getServerConfig();
   const widgetId = window.turnstile.render("#turnstile-container", {
     sitekey: config.turnstileSiteKey(),
     size: "normal",

src/client/Matchmaking.ts

@@ -1,7 +1,7 @@
 import { html, LitElement } from "lit";
 import { customElement, query, state } from "lit/decorators.js";
 import { UserMeResponse } from "../core/ApiSchemas";
-import { getServerConfigFromClient } from "../core/configuration/ConfigLoader";
+import { getServerConfig } from "../core/configuration/ConfigLoader";
 import { generateID } from "../core/Util";
 import { getUserMe } from "./Api";
 import { getPlayToken } from "./Auth";
@@ -143,7 +143,7 @@ export class MatchmakingModal extends BaseModal {
   }
 
   private async connect() {
-    const config = await getServerConfigFromClient();
+    const config = getServerConfig();
 
     this.socket = new WebSocket(`${config.jwtIssuer()}/matchmaking/join`);
     this.socket.onopen = async () => {
@@ -222,7 +222,7 @@ export class MatchmakingModal extends BaseModal {
     if (this.gameID === null) {
       return;
     }
-    const config = await getServerConfigFromClient();
+    const config = getServerConfig();
     const url = `/${config.workerPath(this.gameID)}/api/game/${this.gameID}/exists`;
 
     const response = await fetch(url, {