mirror of
https://github.com/openfrontio/OpenFrontIO.git
synced 2026-06-21 06:10:42 +00:00
275fd0dccc
## Description: This is a refactor to simplify config handling. Replaces the per-environment DevConfig/PreprodConfig/ProdConfig class hierarchy with two static classes: ClientEnv (browser main thread, reads from window.BOOTSTRAP_CONFIG) and ServerEnv (Node server, reads from process.env). The four config classes are deleted, the abstract DefaultServerConfig is gone, and DefaultConfig is renamed to Config. The values that flow server → client (gameEnv, numWorkers, turnstileSiteKey, jwtAudience, instanceId) used to be baked into the hardcoded per-env classes. They're now real env vars on the server, embedded into a single window.BOOTSTRAP_CONFIG object in index.html at request time (alongside the existing gitCommit/assetManifest/cdnBase globals, which moved into the same object), and read back by ClientEnv on the client. The dev defaults previously hidden inside DevServerConfig are now explicit in start:server-dev (NUM_WORKERS=2, TURNSTILE_SITE_KEY=1x..., JWT_AUDIENCE=localhost, etc.) and in vite.config.ts's html plugin inject.data. Production deploys plumb NUM_WORKERS and TURNSTILE_SITE_KEY through deploy.yml (GitHub vars) into the remote env file; JWT_AUDIENCE is derived from DOMAIN in deploy.sh. The dynamic /api/instance endpoint is gone — INSTANCE_ID rides along in BOOTSTRAP_CONFIG now. ServerEnv is the only thing server code touches; ClientEnv is browser-only. The two classes have intentional overlap (env, numWorkers, jwtIssuer, gameCreationRate, workerIndex, etc.) since they derive identical logic from different sources — there's a TODO in each to consolidate via a shared helper later. The game-logic Config no longer stores a ServerConfig/ClientEnv reference and its serverConfig() getter is gone; the one caller (MultiTabModal) now reads ClientEnv.env() directly. Worker init no longer carries server-config values since nothing in the worker actually reads them. ## 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: evan
69 lines
1.9 KiB
TypeScript
69 lines
1.9 KiB
TypeScript
import * as logsAPI from "@opentelemetry/api-logs";
|
|
import { OTLPLogExporter } from "@opentelemetry/exporter-logs-otlp-http";
|
|
import {
|
|
LoggerProvider,
|
|
SimpleLogRecordProcessor,
|
|
} from "@opentelemetry/sdk-logs";
|
|
import { OpenTelemetryTransportV3 } from "@opentelemetry/winston-transport";
|
|
import * as dotenv from "dotenv";
|
|
import winston from "winston";
|
|
import { getOtelResource } from "./OtelResource";
|
|
import { ServerEnv } from "./ServerEnv";
|
|
dotenv.config();
|
|
|
|
const resource = getOtelResource();
|
|
|
|
if (ServerEnv.otelEnabled()) {
|
|
console.log("OTEL enabled");
|
|
// Configure OpenTelemetry endpoint with basic auth (if provided)
|
|
const headers: Record<string, string> = {};
|
|
headers["Authorization"] = "Basic " + ServerEnv.otelAuthHeader();
|
|
// Add OTLP exporter for logs
|
|
const logExporter = new OTLPLogExporter({
|
|
url: `${ServerEnv.otelEndpoint()}/v1/logs`,
|
|
headers,
|
|
});
|
|
|
|
// Initialize the OpenTelemetry Logger Provider
|
|
const loggerProvider = new LoggerProvider({
|
|
resource,
|
|
processors: [new SimpleLogRecordProcessor(logExporter)],
|
|
});
|
|
|
|
// Set as the global logger provider
|
|
logsAPI.logs.setGlobalLoggerProvider(loggerProvider);
|
|
} else {
|
|
console.log(
|
|
"No OTLP endpoint and credentials provided, remote logging disabled",
|
|
);
|
|
}
|
|
|
|
// Custom format to add severity tag based on log level
|
|
const addSeverityFormat = winston.format((info) => {
|
|
return {
|
|
...info,
|
|
severity: info.level,
|
|
};
|
|
});
|
|
|
|
// Define your base/parent logger
|
|
const logger = winston.createLogger({
|
|
level: "info",
|
|
format: winston.format.combine(
|
|
winston.format.timestamp(),
|
|
addSeverityFormat(),
|
|
winston.format.json(),
|
|
),
|
|
defaultMeta: {
|
|
service: "openfront",
|
|
environment: ServerEnv.gameEnvName(),
|
|
},
|
|
transports: [
|
|
new winston.transports.Console(),
|
|
new OpenTelemetryTransportV3(),
|
|
],
|
|
});
|
|
|
|
// Export both the main logger and the child logger factory
|
|
export { logger };
|