Allow NUM_WORKERS override (#2776)

Resolves #2610

## Description:

Add NUM_WORKERS env override for server worker count.

## 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:
aotumuri

---------

Co-authored-by: Evan <evanpelle@gmail.com>
This commit is contained in:
Aotumuri
2026-01-07 12:40:00 +09:00
committed by GitHub
parent ebcb654825
commit 3cd22745f7
10 changed files with 29 additions and 8 deletions
+1
View File
@@ -112,6 +112,7 @@ 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 }}
+4
View File
@@ -70,6 +70,7 @@ 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 }}
@@ -121,6 +122,7 @@ 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 }}
@@ -172,6 +174,7 @@ 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 }}
@@ -223,6 +226,7 @@ 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 }}
+1
View File
@@ -140,6 +140,7 @@ 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
+3
View File
@@ -14,6 +14,9 @@ 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
+11 -1
View File
@@ -164,7 +164,17 @@ export abstract class DefaultServerConfig implements ServerConfig {
}
return token;
}
abstract numWorkers(): number;
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 env(): GameEnv;
turnIntervalMs(): number {
return 100;
-1
View File
@@ -27,7 +27,6 @@ export class DevServerConfig extends DefaultServerConfig {
gameCreationRate(): number {
return 5 * 1000;
}
numWorkers(): number {
return 2;
}
+3
View File
@@ -89,4 +89,7 @@ export const Env = {
get ADMIN_TOKEN() {
return getEnv("ADMIN_TOKEN");
},
get NUM_WORKERS() {
return getEnv("NUM_WORKERS");
},
};
-3
View File
@@ -5,9 +5,6 @@ export const preprodConfig = new (class extends DefaultServerConfig {
env(): GameEnv {
return GameEnv.Preprod;
}
numWorkers(): number {
return 2;
}
turnstileSiteKey(): string {
return "0x4AAAAAAB7QetxHwRCKw-aP";
}
-3
View File
@@ -2,9 +2,6 @@ import { GameEnv } from "./Config";
import { DefaultServerConfig } from "./DefaultConfig";
export const prodConfig = new (class extends DefaultServerConfig {
numWorkers(): number {
return 20;
}
env(): GameEnv {
return GameEnv.Prod;
}
+6
View File
@@ -8,6 +8,12 @@ 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}"