fix config circular dependency (#296)

This commit is contained in:
evanpelle
2025-03-19 15:42:47 -07:00
committed by GitHub
parent 882a39ee70
commit 2c9fc7307e
13 changed files with 79 additions and 84 deletions
+2 -4
View File
@@ -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();
+1 -1
View File
@@ -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";
+1 -1
View File
@@ -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();
+2 -4
View File
@@ -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";
+1 -1
View File
@@ -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();