Revert "Allow NUM_WORKERS override (#2776)"

This reverts commit 3cd22745f7.

num_workers was not passed to the client

.github/workflows/deploy.yml

@@ -112,7 +112,6 @@ jobs:
           GHCR_USERNAME: ${{ vars.GHCR_USERNAME }}
           ENV: ${{ inputs.target_domain == 'openfront.io' && 'prod' || 'staging' }}
           HOST: ${{ github.event_name == 'workflow_dispatch' && inputs.target_host || 'staging' }}
-          NUM_WORKERS: ${{ vars.NUM_WORKERS }}
           OTEL_EXPORTER_OTLP_ENDPOINT: ${{ secrets.OTEL_EXPORTER_OTLP_ENDPOINT }}
           OTEL_AUTH_HEADER: ${{ secrets.OTEL_AUTH_HEADER }}
           TURNSTILE_SECRET_KEY: ${{ secrets.TURNSTILE_SECRET_KEY }}

.github/workflows/release.yml

@@ -70,7 +70,6 @@ jobs:
           GHCR_USERNAME: ${{ vars.GHCR_USERNAME }}
           DOMAIN: ${{ vars.DOMAIN }}
           IMAGE_ID: ${{ needs.build.outputs.IMAGE_ID }}
-          NUM_WORKERS: ${{ vars.NUM_WORKERS }}
           OTEL_EXPORTER_OTLP_ENDPOINT: ${{ secrets.OTEL_EXPORTER_OTLP_ENDPOINT }}
           OTEL_AUTH_HEADER: ${{ secrets.OTEL_AUTH_HEADER }}
           TURNSTILE_SECRET_KEY: ${{ secrets.TURNSTILE_SECRET_KEY }}
@@ -122,7 +121,6 @@ jobs:
           GHCR_USERNAME: ${{ vars.GHCR_USERNAME }}
           DOMAIN: ${{ vars.DOMAIN }}
           IMAGE_ID: ${{ needs.build.outputs.IMAGE_ID }}
-          NUM_WORKERS: ${{ vars.NUM_WORKERS }}
           OTEL_EXPORTER_OTLP_ENDPOINT: ${{ secrets.OTEL_EXPORTER_OTLP_ENDPOINT }}
           OTEL_AUTH_HEADER: ${{ secrets.OTEL_AUTH_HEADER }}
           TURNSTILE_SECRET_KEY: ${{ secrets.TURNSTILE_SECRET_KEY }}
@@ -174,7 +172,6 @@ jobs:
           GHCR_USERNAME: ${{ vars.GHCR_USERNAME }}
           DOMAIN: ${{ vars.DOMAIN }}
           IMAGE_ID: ${{ needs.build.outputs.IMAGE_ID }}
-          NUM_WORKERS: ${{ vars.NUM_WORKERS }}
           OTEL_EXPORTER_OTLP_ENDPOINT: ${{ secrets.OTEL_EXPORTER_OTLP_ENDPOINT }}
           OTEL_AUTH_HEADER: ${{ secrets.OTEL_AUTH_HEADER }}
           TURNSTILE_SECRET_KEY: ${{ secrets.TURNSTILE_SECRET_KEY }}
@@ -226,7 +223,6 @@ jobs:
           GHCR_USERNAME: ${{ vars.GHCR_USERNAME }}
           DOMAIN: ${{ vars.DOMAIN }}
           IMAGE_ID: ${{ needs.build.outputs.IMAGE_ID }}
-          NUM_WORKERS: ${{ vars.NUM_WORKERS }}
           OTEL_EXPORTER_OTLP_ENDPOINT: ${{ secrets.OTEL_EXPORTER_OTLP_ENDPOINT }}
           OTEL_AUTH_HEADER: ${{ secrets.OTEL_AUTH_HEADER }}
           TURNSTILE_SECRET_KEY: ${{ secrets.TURNSTILE_SECRET_KEY }}

deploy.sh

@@ -140,7 +140,6 @@ TURNSTILE_SECRET_KEY=$TURNSTILE_SECRET_KEY
 API_KEY=$API_KEY
 DOMAIN=$DOMAIN
 SUBDOMAIN=$SUBDOMAIN
-NUM_WORKERS=$NUM_WORKERS
 OTEL_EXPORTER_OTLP_ENDPOINT=$OTEL_EXPORTER_OTLP_ENDPOINT
 OTEL_AUTH_HEADER=$OTEL_AUTH_HEADER
 EOL

example.env

@@ -14,9 +14,6 @@ DOMAIN=your-domain.com
 # API Key
 API_KEY=your_api_key_here
 
-# Required for non-dev: server worker process count (defaults to 2 in dev)
-NUM_WORKERS=number_of_workers
-
 # Server Hosts
 SERVER_HOST_STAGING=123.456.78.90
 SERVER_HOST_FALK1=123.456.78.91

src/core/configuration/DefaultConfig.ts

@@ -164,17 +164,7 @@ export abstract class DefaultServerConfig implements ServerConfig {
     }
     return token;
   }
-  numWorkers(): number {
-    const raw = Env.NUM_WORKERS;
-    if (!raw) {
-      throw new Error("NUM_WORKERS not set");
-    }
-    const parsed = Number(raw);
-    if (!Number.isFinite(parsed) || parsed <= 0) {
-      throw new Error(`Invalid NUM_WORKERS value "${raw}"`);
-    }
-    return Math.floor(parsed);
-  }
+  abstract numWorkers(): number;
   abstract env(): GameEnv;
   turnIntervalMs(): number {
     return 100;

src/core/configuration/DevConfig.ts

@@ -27,6 +27,7 @@ export class DevServerConfig extends DefaultServerConfig {
   gameCreationRate(): number {
     return 5 * 1000;
   }
+
   numWorkers(): number {
     return 2;
   }

src/core/configuration/Env.ts

@@ -89,7 +89,4 @@ export const Env = {
   get ADMIN_TOKEN() {
     return getEnv("ADMIN_TOKEN");
   },
-  get NUM_WORKERS() {
-    return getEnv("NUM_WORKERS");
-  },
 };

src/core/configuration/PreprodConfig.ts

@@ -5,6 +5,9 @@ export const preprodConfig = new (class extends DefaultServerConfig {
   env(): GameEnv {
     return GameEnv.Preprod;
   }
+  numWorkers(): number {
+    return 2;
+  }
   turnstileSiteKey(): string {
     return "0x4AAAAAAB7QetxHwRCKw-aP";
   }

src/core/configuration/ProdConfig.ts

@@ -2,6 +2,9 @@ import { GameEnv } from "./Config";
 import { DefaultServerConfig } from "./DefaultConfig";
 
 export const prodConfig = new (class extends DefaultServerConfig {
+  numWorkers(): number {
+    return 20;
+  }
   env(): GameEnv {
     return GameEnv.Prod;
   }

startup.sh

@@ -8,12 +8,6 @@ if [ -z "$CF_API_TOKEN" ] || [ -z "$CF_ACCOUNT_ID" ] || [ -z "$SUBDOMAIN" ] || [
     exit 1
 fi
 
-# Require NUM_WORKERS for non-dev environments.
-if [ "${GAME_ENV:-dev}" != "dev" ] && [ -z "$NUM_WORKERS" ]; then
-    echo "Error: NUM_WORKERS must be set for non-dev environments"
-    exit 1
-fi
-
 # Generate a unique tunnel name using timestamp
 TIMESTAMP=$(date +%Y%m%d%H%M%S)
 TUNNEL_NAME="${SUBDOMAIN}-tunnel-${TIMESTAMP}"