From edcfac2fe78dc3d167846a6eacde80a594717aac Mon Sep 17 00:00:00 2001
From: Evan <evanpelle@gmail.com>
Date: Thu, 6 Mar 2025 19:43:56 -0800
Subject: [PATCH] give public lobbies smoother countdown, use admin token in
 server.

---
 src/client/PublicLobby.ts | 16 +++++++++++++---
 src/server/Master.ts      |  7 +++++--
 src/server/Worker.ts      | 30 ++++--------------------------
 src/server/gatekeeper     |  2 +-
 4 files changed, 23 insertions(+), 32 deletions(-)

diff --git a/src/client/PublicLobby.ts b/src/client/PublicLobby.ts
index 0b4904990..1ba6be68b 100644
--- a/src/client/PublicLobby.ts
+++ b/src/client/PublicLobby.ts
@@ -7,6 +7,8 @@ import { GameInfo } from "../core/Schemas";
 
 @customElement("public-lobby")
 export class PublicLobby extends LitElement {
+  private lobbyOutOfDate = true;
+
   @state() private lobbies: GameInfo[] = [];
   @state() public isLobbyHighlighted: boolean = false;
   @state() private isButtonDebounced: boolean = false;
@@ -37,9 +39,17 @@ export class PublicLobby extends LitElement {
 
   private async fetchAndUpdateLobbies(): Promise<void> {
     try {
-      const lobbies = await this.fetchLobbies();
-      console.log(`got lobbies: ${JSON.stringify(lobbies)}`);
-      this.lobbies = lobbies;
+      // Due to cache we only update every 2s,
+      // but reduce time by 1s so countdown looks nice.
+      if (this.lobbyOutOfDate) {
+        this.lobbies = await this.fetchLobbies();
+      } else {
+        this.lobbies.forEach((l) => {
+          l.msUntilStart -= 1000;
+        });
+        this.requestUpdate();
+      }
+      this.lobbyOutOfDate = !this.lobbyOutOfDate;
     } catch (error) {
       consolex.error("Error fetching lobbies:", error);
     }
diff --git a/src/server/Master.ts b/src/server/Master.ts
index ae2092e13..e6ded5047 100644
--- a/src/server/Master.ts
+++ b/src/server/Master.ts
@@ -165,7 +165,9 @@ async function fetchLobbies(): Promise<void> {
 
   for (const gameID of publicLobbyIDs) {
     const port = config.workerPort(gameID);
-    const promise = fetch(`http://localhost:${port}/api/game/${gameID}`)
+    const promise = fetch(`http://localhost:${port}/api/game/${gameID}`, {
+      headers: { [config.adminHeader()]: config.adminToken() },
+    })
       .then((resp) => resp.json())
       .then((json) => {
         return json as GameInfo;
@@ -232,7 +234,8 @@ async function schedulePublicGame() {
         method: "POST",
         headers: {
           "Content-Type": "application/json",
-          "X-Internal-Request": "true", // Special header for internal requests
+          "X-Internal-Request": "true",
+          [config.adminHeader()]: config.adminToken(),
         },
         body: JSON.stringify({
           gameID: gameID,
diff --git a/src/server/Worker.ts b/src/server/Worker.ts
index e3c074057..74c16794d 100644
--- a/src/server/Worker.ts
+++ b/src/server/Worker.ts
@@ -79,7 +79,10 @@ export function startWorker() {
       // TODO: if game is public make sure request came from localhohst!!!
       const clientIP = req.ip || req.socket.remoteAddress || "unknown";
       const gc = req.body?.gameConfig as GameConfig;
-      if (gc?.gameType == GameType.Public && !isLocalhost(req)) {
+      if (
+        gc?.gameType == GameType.Public &&
+        req.headers[config.adminHeader()] != config.adminToken()
+      ) {
         console.warn(
           `cannot create public game ${id}, ip ${clientIP} not localhost`,
         );
@@ -319,28 +322,3 @@ export function startWorker() {
     });
   });
 }
-
-const isLocalhost = (req: Request): boolean => {
-  // Get client IP address from various possible sources
-  const clientIP =
-    req.ip ||
-    req.socket.remoteAddress ||
-    (req.headers["x-forwarded-for"] as string)?.split(",").shift() ||
-    "unknown";
-
-  // Check if the request is from a loopback address
-  const isLoopbackIP =
-    // IPv4 localhost
-    clientIP === "127.0.0.1" ||
-    // IPv6 localhost
-    clientIP === "::1" ||
-    // Full loopback range
-    clientIP.startsWith("127.");
-
-  // Check hostname
-  const isLocalHostname =
-    req.hostname === "localhost" || req.headers.host?.startsWith("localhost:");
-
-  // Consider request local if either IP is loopback or hostname is localhost
-  return isLoopbackIP || isLocalHostname;
-};
diff --git a/src/server/gatekeeper b/src/server/gatekeeper
index 647bc72f1..523c784e6 160000
--- a/src/server/gatekeeper
+++ b/src/server/gatekeeper
@@ -1 +1 @@
-Subproject commit 647bc72f1aa49a0453a109c3ba0132d3a127a0a6
+Subproject commit 523c784e625dc57ca81343010af158216163d96f