refactor: add persistence groundwork and structured logging

manager/src/command.ts

@@ -1,5 +1,7 @@
 import * as amqp from "amqplib";
+import { getLogger } from "./logger";
 
+const logger = getLogger("CommandService");
 
 export class CommandService {
 
@@ -27,8 +29,8 @@ export class CommandService {
         );
 
 
-        console.log(
+        logger.debug(
-            "Command gesendet:",
+            "Command sent",
             command
         );
 

manager/src/config.ts

@@ -0,0 +1,13 @@
+export const RABBITMQ_URL = "amqp://manager:gigi1337@192.168.1.74";
+
+export const LIFECYCLE_CHECK_INTERVAL = 10000;
+export const LIFECYCLE_EMPTY_TIMEOUT = 300000;
+export const LIFECYCLE_STARTUP_GRACE_PERIOD = 60000;
+export const LIFECYCLE_MIN_UPTIME = 300000;
+export const LIFECYCLE_SCALE_DOWN_THRESHOLD = 0.30;
+export const LIFECYCLE_SCALE_COOLDOWN = 60000;
+export const LIFECYCLE_CRASH_TIMEOUT = 30000;
+export const DEFAULT_DESIRED_SERVERS = 1;
+
+export const GAME_PORT_START = 7777;
+export const QUERY_PORT_START = 27015;

manager/src/index.ts

@@ -1,4 +1,4 @@
-import { Rabbit } from "./rabbit";
+import { Rabbit } from "./rabbit";
 import { WrapperManager } from "./wrapperManager";
 import { WrapperRegistry } from "./wrapperRegistry";
 import { ServerRegistry } from "./serverRegistry";
@@ -6,6 +6,9 @@ import { ServerManager } from "./serverManager";
 import { PortManager } from "./portManager";
 import { ServerStatusManager } from "./serverStatusManager";
 import { ServerLifecycle } from "./serverLifecycle";
+import { getLogger } from "./logger";
+
+const logger = getLogger("Index");
 
 
 const wrapperRegistry =
@@ -34,8 +37,16 @@ async function main(){
 
 
     await rabbit.connect();
+    logger.info("RabbitMQ-Verbindung hergestellt");
 
+    await portManager.init();
+    logger.info("Persistenz initialisiert");
 
+    await wrapperRegistry.init();
+    logger.debug("WrapperRegistry initialisiert");
+
+    await serverRegistry.init();
+    logger.debug("ServerRegistry initialisiert");
 
     const wrapperManager =
         new WrapperManager(
@@ -51,6 +62,7 @@ async function main(){
 
 
     await wrapperManager.start();
+    logger.info("WrapperManager erfolgreich gestartet");
 
 
     const serverManager =
@@ -77,6 +89,7 @@ async function main(){
 
 
     lifecycle.start();
+    logger.debug("ServerLifecycle gestartet");
 
     const statusManager =
         new ServerStatusManager(
@@ -93,9 +106,7 @@ async function main(){
 
 
 
-    console.log(
+    logger.info("Manager gestartet");
-        "Manager gestartet"
-    );
 
 
 }

manager/src/logger.ts

@@ -0,0 +1,62 @@
+declare const process: {
+  env: Record<string, string | undefined>;
+};
+
+type LogLevel = "DEBUG" | "INFO" | "WARN" | "ERROR";
+
+const LEVELS: Record<LogLevel, number> = {
+  DEBUG: 0,
+  INFO: 1,
+  WARN: 2,
+  ERROR: 3,
+};
+
+const DEFAULT_LOG_LEVEL: LogLevel = "INFO";
+
+const configuredLevel =
+  (process.env.LOG_LEVEL ?? "").toUpperCase() as LogLevel;
+
+const currentLogLevel: LogLevel =
+  configuredLevel in LEVELS ? configuredLevel : DEFAULT_LOG_LEVEL;
+
+const currentLogLevelValue = LEVELS[currentLogLevel];
+
+function shouldLog(level: LogLevel): boolean {
+  return LEVELS[level] >= currentLogLevelValue;
+}
+
+function formatMessage(
+  level: LogLevel,
+  component: string,
+  message: unknown
+): string {
+  return `${new Date().toISOString()} ${level} [${component}] ${message}`;
+}
+
+class Logger {
+  constructor(private component: string) {}
+
+  debug(message: unknown, ...args: unknown[]): void {
+    if (!shouldLog("DEBUG")) return;
+    console.log(formatMessage("DEBUG", this.component, message), ...args);
+  }
+
+  info(message: unknown, ...args: unknown[]): void {
+    if (!shouldLog("INFO")) return;
+    console.log(formatMessage("INFO", this.component, message), ...args);
+  }
+
+  warn(message: unknown, ...args: unknown[]): void {
+    if (!shouldLog("WARN")) return;
+    console.warn(formatMessage("WARN", this.component, message), ...args);
+  }
+
+  error(message: unknown, ...args: unknown[]): void {
+    if (!shouldLog("ERROR")) return;
+    console.error(formatMessage("ERROR", this.component, message), ...args);
+  }
+}
+
+export function getLogger(component: string): Logger {
+  return new Logger(component);
+}

manager/src/persistence/jsonFileStore.ts

@@ -0,0 +1,42 @@
+import { promises as fs } from "fs";
+import { PersistenceStore } from "./persistenceStore";
+import { getLogger } from "../logger";
+
+const logger = getLogger("JsonFileStore");
+
+export class JsonFileStore<T> implements PersistenceStore<T> {
+    constructor(
+        private readonly filePath: string
+    ) {}
+
+    async load(): Promise<T | null> {
+        try {
+            const fileContents = await fs.readFile(this.filePath, "utf-8");
+            return JSON.parse(fileContents) as T;
+        }
+        catch (error) {
+            if ((error as NodeJS.ErrnoException).code === "ENOENT") {
+                return null;
+            }
+            logger.error(
+                `Fehler beim Laden der Persistenzdatei ${this.filePath}:`,
+                error
+            );
+            throw error;
+        }
+    }
+
+    async save(data: T): Promise<void> {
+        try {
+            const fileContents = JSON.stringify(data, null, 4);
+            await fs.writeFile(this.filePath, fileContents, "utf-8");
+        }
+        catch (error) {
+            logger.error(
+                `Fehler beim Speichern der Persistenzdatei ${this.filePath}:`,
+                error
+            );
+            throw error;
+        }
+    }
+}

manager/src/persistence/persistenceStore.ts

@@ -0,0 +1,4 @@
+export interface PersistenceStore<T> {
+    load(): Promise<T | null>;
+    save(data: T): Promise<void>;
+}

manager/src/portManager.ts

@@ -1,118 +1,124 @@
+import { GAME_PORT_START, QUERY_PORT_START } from "./config";
+import { JsonFileStore } from "./persistence/jsonFileStore";
+import { getLogger } from "./logger";
+
+const logger = getLogger("PortManager");
+
+interface PortManagerState {
+    usedPorts: number[];
+    usedQueryPorts: number[];
+}
+
 export class PortManager {
 
-
-
     private usedPorts =
         new Set<number>();
 
-
-
     private usedQueryPorts =
         new Set<number>();
 
-
-
-
-
     private gamePortStart =
-        7777;
+        GAME_PORT_START;
-
 
     private queryPortStart =
-        27015;
+        QUERY_PORT_START;
 
+    private readonly persistence =
+        new JsonFileStore<PortManagerState>(
+            "portManager-state.json"
+        );
 
+    async init(){
+        const state = await this.persistence.load();
 
+        if(!state)
+            return;
 
+        this.usedPorts =
+            new Set(state.usedPorts);
+
+        this.usedQueryPorts =
+            new Set(state.usedQueryPorts);
+    }
 
     allocate(){
 
-
-
         let port =
             this.gamePortStart;
 
-
-
         while(
             this.usedPorts.has(port)
         ){
-
             port++;
-
         }
 
-
-
-
         let queryPort =
             this.queryPortStart;
 
-
-
         while(
             this.usedQueryPorts.has(queryPort)
         ){
-
             queryPort++;
-
         }
 
-
-
-
-
         this.usedPorts.add(
             port
         );
 
-
         this.usedQueryPorts.add(
             queryPort
         );
 
+        logger.debug(`Port erfolgreich reserviert: ${port}`);
+        logger.debug(`Query-Port erfolgreich reserviert: ${queryPort}`);
 
-
+        this.saveState();
 
         return {
-
-
             port,
-
-
             queryPort
-
-
         };
-
-
     }
 
-
-
-
-
-
-
     release(
         port:number,
         queryPort:number
     ){
 
-
+        const removedPort = this.usedPorts.delete(
-        this.usedPorts.delete(
             port
         );
 
-
+        const removedQueryPort = this.usedQueryPorts.delete(
-        this.usedQueryPorts.delete(
             queryPort
         );
 
+        if (!removedPort || !removedQueryPort) {
+            logger.warn(
+                `Unerwarteter Port-Zustand während der Freigabe: port=${port}, queryPort=${queryPort}`
+            );
+        } else {
+            logger.debug(`Port wieder freigegeben: ${port}`);
+            logger.debug(`Query-Port wieder freigegeben: ${queryPort}`);
+        }
+
+        this.saveState();
 
     }
 
+    private saveState(){
+        const state: PortManagerState = {
+            usedPorts: Array.from(this.usedPorts),
+            usedQueryPorts: Array.from(this.usedQueryPorts)
+        };
 
-
+        this.persistence
-
+            .save(state)
+            .catch(error => {
+                logger.error(
+                    "Fehler beim Speichern des PortManager-Zustands:",
+                    error
+                );
+            });
+    }
 }

manager/src/rabbit.ts

@@ -1,5 +1,8 @@
 import * as amqp from "amqplib";
+import { RABBITMQ_URL } from "./config";
+import { getLogger } from "./logger";
 
+const logger = getLogger("Rabbit");
 
 export class Rabbit {
 
@@ -12,7 +15,7 @@ export class Rabbit {
 
         this.connection =
             await amqp.connect(
-                "amqp://manager:gigi1337@192.168.1.74"
+                RABBITMQ_URL
             );
 
 
@@ -20,8 +23,8 @@ export class Rabbit {
             await this.connection.createChannel();
 
 
-        console.log(
+        logger.info(
-            "RabbitMQ verbunden"
+            "Connected to RabbitMQ"
         );
     }
 

manager/src/serverLifecycle.ts

@@ -1,20 +1,33 @@
+import { getLogger } from "./logger";
 import { ServerRegistry } from "./serverRegistry";
 import { ServerManager } from "./serverManager";
+import {
+  LIFECYCLE_CHECK_INTERVAL,
+  LIFECYCLE_EMPTY_TIMEOUT,
+  LIFECYCLE_STARTUP_GRACE_PERIOD,
+  LIFECYCLE_MIN_UPTIME,
+  LIFECYCLE_SCALE_DOWN_THRESHOLD,
+  LIFECYCLE_SCALE_COOLDOWN,
+  LIFECYCLE_CRASH_TIMEOUT,
+  DEFAULT_DESIRED_SERVERS
+} from "./config";
 
 
+const logger = getLogger("ServerLifecycle");
+
 export class ServerLifecycle {
 
 
     private creatingServers = 0;
 
 
-    private emptyTimeout = 300000; // 5 Minuten
+    private emptyTimeout = LIFECYCLE_EMPTY_TIMEOUT;
 
 
     private lastScaleUp = 0;
 
 
-    private scaleCooldown = 60000; // 1 Minute
+    private scaleCooldown = LIFECYCLE_SCALE_COOLDOWN;
 
 
 
@@ -25,7 +38,7 @@ export class ServerLifecycle {
 
         private serverManager: ServerManager,
 
-        private desiredServers:number = 1
+        private desiredServers:number = DEFAULT_DESIRED_SERVERS
 
     ){}
 
@@ -36,7 +49,7 @@ export class ServerLifecycle {
     start(){
 
 
-        console.log(
+        logger.info(
             "Server Lifecycle gestartet"
         );
 
@@ -47,7 +60,7 @@ export class ServerLifecycle {
             this.checkServers();
 
 
-        },10000);
+        },LIFECYCLE_CHECK_INTERVAL);
 
 
     }
@@ -59,7 +72,7 @@ export class ServerLifecycle {
     setDesiredServers(count:number){
 
 
-        console.log(
+        logger.debug(
             "Neue Soll Server Anzahl:",
             count
         );
@@ -110,13 +123,19 @@ export class ServerLifecycle {
                         server.status =
                             "RUNNING";
 
+                        server.startedAt =
+                            Date.now();
+
+                        server.emptySince =
+                            undefined;
+
 
                         this.serverRegistry.update(
                             server
                         );
 
 
-                        console.log(
+                        logger.info(
                             "Server RUNNING:",
                             server.name,
                             "PID:",
@@ -147,7 +166,7 @@ export class ServerLifecycle {
                         Date.now() -
                         server.lastSeen
                         >
-                        30000
+                        LIFECYCLE_CRASH_TIMEOUT
                     ){
 
 
@@ -160,7 +179,7 @@ export class ServerLifecycle {
                         );
 
 
-                        console.log(
+                        logger.error(
                             "Server abgestürzt:",
                             server.name
                         );
@@ -186,17 +205,23 @@ export class ServerLifecycle {
 
                         if(!server.emptySince){
 
+                            if(
+                                server.startedAt &&
+                                Date.now() -
+                                server.startedAt <
+                                LIFECYCLE_STARTUP_GRACE_PERIOD
+                            ){
+                                break;
+                            }
 
                             server.emptySince =
                                 Date.now();
 
-
                             this.serverRegistry.update(
                                 server
                             );
 
-
+                            logger.debug(
-                            console.log(
                                 "Server leer:",
                                 server.name
                             );
@@ -213,7 +238,7 @@ export class ServerLifecycle {
                         if(server.emptySince){
 
 
-                            console.log(
+                            logger.debug(
                                 "Server wieder aktiv:",
                                 server.name
                             );
@@ -248,7 +273,7 @@ export class ServerLifecycle {
 
 
 
-                    console.log(
+                    logger.error(
                         "Server abgestürzt erkannt:",
                         server.name
                     );
@@ -359,7 +384,7 @@ export class ServerLifecycle {
 
 
 
-        console.log(
+        logger.debug(
 
             "Kapazität:",
 
@@ -452,7 +477,7 @@ export class ServerLifecycle {
 
 
 
-            console.log(
+            logger.info(
 
                 "Auslastung hoch - starte zusätzlichen Server"
 
@@ -501,11 +526,20 @@ export class ServerLifecycle {
 
                 server.emptySince &&
 
+                server.startedAt &&
+
+                Date.now() -
+                server.startedAt
+                >=
+                LIFECYCLE_MIN_UPTIME &&
 
                 Date.now() -
                 server.emptySince
                 >
-                this.emptyTimeout
+                this.emptyTimeout &&
+
+                usage <
+                LIFECYCLE_SCALE_DOWN_THRESHOLD
 
 
             )
@@ -559,18 +593,20 @@ export class ServerLifecycle {
 
 
 
-            console.log(
+            logger.info(
-
                 "Stoppe leeren Server:",
-
                 server.name
-
             );
 
 
 
 
 
+            logger.info(
+                "Stoppe leeren Server:",
+                server.name
+            );
+
             this.serverManager.stopServer(
 
                 server.id
@@ -597,7 +633,7 @@ export class ServerLifecycle {
 
 
 
-        console.log(
+        logger.info(
 
             "Starte Server:",
 
@@ -647,7 +683,7 @@ export class ServerLifecycle {
 
 
 
-                console.error(
+                logger.error(
 
                     "Server Erstellung fehlgeschlagen:",
 

manager/src/serverManager.ts

@@ -1,3 +1,4 @@
+import { getLogger } from "./logger";
 import { Rabbit } from "./rabbit";
 import { WrapperRegistry } from "./wrapperRegistry";
 import { ServerRegistry, ServerInfo } from "./serverRegistry";
@@ -6,6 +7,8 @@ import { generateServerName } from "./nameGenerator";
 import { PortManager } from "./portManager";
 import { ServerStartCommand, ServerStopCommand } from "server-manager-shared";
 
+const logger = getLogger("ServerManager");
+
 
 export class ServerManager {
 
@@ -39,7 +42,7 @@ export class ServerManager {
 
         if(!wrapper){
 
-            console.log(
+            logger.warn(
                 "Kein Wrapper verfügbar"
             );
 
@@ -208,11 +211,11 @@ export class ServerManager {
 
 
 
-        console.log(
+        logger.info(
 
-            "Server Start gesendet:",
+            "Starting server:",
 
-            server
+            server.id
 
         );
 
@@ -232,8 +235,8 @@ export class ServerManager {
 
         if(!server){
 
-            console.log(
+            logger.warn(
-                "Server nicht gefunden:",
+                "Server not found:",
                 serverId
             );
 
@@ -251,8 +254,8 @@ export class ServerManager {
 
         if(!wrapper){
 
-            console.log(
+            logger.warn(
-                "Wrapper nicht gefunden:",
+                "Wrapper not found:",
                 server.wrapperId
             );
 
@@ -298,9 +301,9 @@ export class ServerManager {
 
 
 
-        console.log(
+        logger.info(
-            "Server Stop gesendet:",
+            "Stopping server:",
-            server.name
+            serverId
         );
 
 

manager/src/serverRegistry.ts

@@ -1,4 +1,8 @@
+import { getLogger } from "./logger";
 import { WrapperStatusMessage } from "server-manager-shared";
+import { JsonFileStore } from "./persistence/jsonFileStore";
+
+const logger = getLogger("ServerRegistry");
 
 export interface ServerInfo {
 
@@ -33,9 +37,7 @@ export interface ServerInfo {
     
     emptySince?:number;
 
-
+    startedAt?:number;
-    created:number;
-
 
     lastSeen:number;
 
@@ -43,16 +45,84 @@ export interface ServerInfo {
 }
 
 
+interface ServerRegistryState {
+    servers: Array<{
+        id:string;
+        name:string;
+        wrapperId:string;
+        port:number;
+        queryPort:number;
+        created:number;
+    }>;
+}
+
+
 
 
 
 export class ServerRegistry {
 
 
-
     private servers =
         new Map<string, ServerInfo>();
 
+    private readonly persistence =
+        new JsonFileStore<ServerRegistryState>(
+            "serverRegistry-state.json"
+        );
+
+
+    async init(): Promise<void> {
+        const state = await this.persistence.load();
+
+        if (!state)
+            return;
+
+        for (const serverData of state.servers) {
+            this.servers.set(
+                serverData.id,
+                {
+                    id: serverData.id,
+                    name: serverData.name,
+                    wrapperId: serverData.wrapperId,
+                    port: serverData.port,
+                    queryPort: serverData.queryPort,
+                    created: serverData.created,
+                    status: "STARTING",
+                    players: 0,
+                    maxPlayers: 0,
+                    lastSeen: Date.now()
+                }
+            );
+        }
+    }
+
+    private toState(): ServerRegistryState {
+        return {
+            servers: Array.from(this.servers.values()).map(
+                server => ({
+                    id: server.id,
+                    name: server.name,
+                    wrapperId: server.wrapperId,
+                    port: server.port,
+                    queryPort: server.queryPort,
+                    created: server.created
+                })
+            )
+        };
+    }
+
+    private async saveState(): Promise<void> {
+        await this.persistence.save(
+            this.toState()
+        );
+    }
+
+
+    private persist(): void {
+        void this.saveState();
+    }
+
 
 
 
@@ -69,12 +139,13 @@ export class ServerRegistry {
         );
 
 
-        console.log(
+        logger.info(
-            "Server registriert:",
+            "Server added:",
-            server
+            server.id
         );
 
 
+        this.persist();
     }
 
 
@@ -128,6 +199,7 @@ export class ServerRegistry {
         );
 
 
+        this.persist();
     }
 
 
@@ -144,12 +216,13 @@ export class ServerRegistry {
         );
 
 
-        console.log(
+        logger.info(
-            "Server entfernt:",
+            "Server removed:",
             id
         );
 
 
+        this.persist();
     }
 
 
@@ -162,8 +235,8 @@ export class ServerRegistry {
     list(){
 
 
-        console.log(
+        logger.info(
-            "\n=== SERVER ÜBERSICHT ==="
+            "Server list output"
         );
 
 
@@ -177,7 +250,7 @@ export class ServerRegistry {
         if(servers.length === 0){
 
 
-            console.log(
+            logger.info(
                 "Keine Server vorhanden"
             );
 
@@ -192,7 +265,7 @@ export class ServerRegistry {
         for(const server of servers){
 
 
-            console.log({
+            logger.info({
 
 
                 id:
@@ -260,8 +333,8 @@ export class ServerRegistry {
             if(server.status === "STOPPING"){
 
 
-                console.log(
+                logger.debug(
-                    "Server sauber beendet:",
+                    "Server cleanly stopped:",
                     server.name
                 );
 
@@ -285,8 +358,8 @@ export class ServerRegistry {
                 );
 
 
-                console.log(
+                logger.warn(
-                    "Server abgestürzt:",
+                    "Server crashed:",
                     server.name
                 );
 
@@ -354,8 +427,8 @@ export class ServerRegistry {
 
         if(oldStatus !== server.status){
 
-            console.log(
+            logger.debug(
-                "Status Änderung:",
+                "Status change:",
                 server.name,
                 oldStatus,
                 "->",

manager/src/serverStatusManager.ts

@@ -1,7 +1,9 @@
+import { getLogger } from "./logger";
 import { Rabbit } from "./rabbit";
 import { ServerRegistry } from "./serverRegistry";
 import { ServerStartedEvent, ServerStoppedEvent } from "server-manager-shared";
 
+const logger = getLogger("ServerStatusManager");
 
 
 export class ServerStatusManager {
@@ -35,7 +37,7 @@ export class ServerStatusManager {
 
 
 
-        console.log(
+        logger.info(
             "Warte auf Server Status..."
         );
 
@@ -102,7 +104,7 @@ export class ServerStatusManager {
                     default:
 
 
-                        console.log(
+                        logger.warn(
                             "Unbekannter Server Status:",
                             data
                         );
@@ -168,11 +170,11 @@ export class ServerStatusManager {
 
 
 
-        console.log(
+        logger.info(
 
-            "Server läuft:",
+            "Server started:",
 
-            server.name
+            data.serverId
 
         );
 
@@ -221,11 +223,11 @@ export class ServerStatusManager {
 
 
 
-        console.log(
+        logger.info(
 
-            "Server crashed:",
+            "Server stopped:",
 
-            server.name
+            data.serverId
 
         );
 

manager/src/wrapperManager.ts

@@ -1,3 +1,4 @@
+import { getLogger } from "./logger";
 import { Rabbit } from "./rabbit";
 import { randomUUID } from "crypto";
 import { WrapperRegistry, WrapperInfo } from "./wrapperRegistry";
@@ -15,6 +16,8 @@ type WrapperMessage =
   | WrapperHeartbeatMessage
   | WrapperStatusMessage;
 
+const logger = getLogger("WrapperManager");
+
 
 export class WrapperManager {
 
@@ -43,7 +46,7 @@ export class WrapperManager {
 
 
 
-        console.log(
+        logger.info(
             "Warte auf Wrapper..."
         );
 
@@ -99,6 +102,11 @@ export class WrapperManager {
                     case "wrapper.status":
 
 
+                        logger.debug(
+                        "Status update received from wrapper-id",
+                        data.wrapperId
+                    );
+
                     this.registry.updateStatus(
                             data
                         );
@@ -115,7 +123,7 @@ export class WrapperManager {
                     default:
 
 
-                        console.log(
+logger.warn(
                             "Unbekannte Nachricht:",
                             data
                         );
@@ -185,7 +193,7 @@ export class WrapperManager {
 
 
 
-            console.log(
+            logger.debug(
                 "Neue Wrapper ID:",
                 id
             );
@@ -414,7 +422,7 @@ export class WrapperManager {
 
 
 
-        console.log(
+        logger.debug(
 
             "Heartbeat:",
 
@@ -523,23 +531,9 @@ export class WrapperManager {
 
 
 
-        console.log(
+        logger.info(
 
-            "\n======================"
+            "Wrapper Übersicht ausgegeben"
-
-        );
-
-
-        console.log(
-
-            " WRAPPER ÜBERSICHT "
-
-        );
-
-
-        console.log(
-
-            "======================\n"
 
         );
 
@@ -550,7 +544,7 @@ export class WrapperManager {
         if(wrappers.length===0){
 
 
-            console.log(
+            logger.info(
 
                 "Keine Wrapper registriert"
 
@@ -571,7 +565,7 @@ export class WrapperManager {
 
 
 
-            console.log(`
+            logger.info(`
 
 ID:
 ${wrapper.id}

manager/src/wrapperRegistry.ts

@@ -1,4 +1,8 @@
+import { getLogger } from "./logger";
 import { WrapperStatusMessage } from "server-manager-shared";
+import { JsonFileStore } from "./persistence/jsonFileStore";
+
+const logger = getLogger("WrapperRegistry");
 
 export interface WrapperInfo {
 
@@ -25,35 +29,91 @@ export interface WrapperInfo {
 
 }
 
+interface WrapperRegistryState {
+    wrappers: Array<{
+        id:string;
+        hostname:string;
+        commandQueue:string;
+        cpu:number;
+        ram:number;
+    }>;
+}
+
 
 
 
 
 export class WrapperRegistry {
 
-
     private wrappers =
         new Map<string, WrapperInfo>();
 
+    private readonly persistence =
+        new JsonFileStore<WrapperRegistryState>(
+            "wrapperRegistry-state.json"
+        );
 
 
 
 
+
+    async init(): Promise<void> {
+        const state = await this.persistence.load();
+
+        if (!state)
+            return;
+
+        for (const wrapperData of state.wrappers) {
+            this.wrappers.set(
+                wrapperData.id,
+                {
+                    id: wrapperData.id,
+                    hostname: wrapperData.hostname,
+                    commandQueue: wrapperData.commandQueue,
+                    cpu: wrapperData.cpu,
+                    ram: wrapperData.ram,
+                    ramFree: wrapperData.ram,
+                    online: false,
+                    lastHeartbeat: 0,
+                    servers: []
+                }
+            );
+        }
+    }
+
+    private toState(): WrapperRegistryState {
+        return {
+            wrappers: Array.from(this.wrappers.values()).map(
+                wrapper => ({
+                    id: wrapper.id,
+                    hostname: wrapper.hostname,
+                    commandQueue: wrapper.commandQueue,
+                    cpu: wrapper.cpu,
+                    ram: wrapper.ram
+                })
+            )
+        };
+    }
+
+    private async saveState(): Promise<void> {
+        await this.persistence.save(
+            this.toState()
+        );
+    }
+
     add(wrapper:WrapperInfo){
 
-
         this.wrappers.set(
             wrapper.id,
             wrapper
         );
 
-
+        logger.info(
-        console.log(
+            "Wrapper added:",
-            "Wrapper gespeichert:",
             wrapper.id
         );
 
-
+        void this.saveState();
     }
 
 
@@ -110,13 +170,12 @@ export class WrapperRegistry {
 
     update(wrapper:WrapperInfo){
 
-
         this.wrappers.set(
             wrapper.id,
             wrapper
         );
 
-
+        void this.saveState();
     }
 
 
@@ -140,7 +199,7 @@ export class WrapperRegistry {
                 wrapper.online = false;
 
 
-                console.log(
+                logger.warn(
                     "Wrapper offline:",
                     wrapper.id
                 );
@@ -156,7 +215,6 @@ export class WrapperRegistry {
 
     updateStatus(data: WrapperStatusMessage){
 
-
         const wrapper =
             this.wrappers.get(
                 data.wrapperId

wrapper/src/index.ts

@@ -10,6 +10,9 @@ import {
   ServerStartCommand,
   ServerStopCommand
 } from "server-manager-shared";
+import { getLogger } from "./logger";
+
+const logger = getLogger("Wrapper");
 
 
 class Wrapper {
@@ -36,6 +39,7 @@ class Wrapper {
         const config =
             loadConfig();
 
+        logger.info("Konfiguration geladen");
 
 
         if(config.wrapperId){
@@ -46,7 +50,7 @@ class Wrapper {
 
 
 
-            console.log(
+            logger.debug(
                 "Starte mit vorhandener ID:",
                 this.id
             );
@@ -55,7 +59,7 @@ class Wrapper {
         }else{
 
 
-            console.log(
+            logger.warn(
                 "Keine Wrapper ID vorhanden - neue Registrierung"
             );
 
@@ -77,8 +81,8 @@ class Wrapper {
 
 
 
-        console.log(
+        logger.info(
-            "RabbitMQ verbunden"
+            "RabbitMQ Verbindung hergestellt"
         );
 
 
@@ -136,9 +140,9 @@ class Wrapper {
 
 
 
-                console.log(
+                logger.debug(
                     "Antwort vom Manager:",
-                    data
+                    data.type
                 );
 
 
@@ -162,14 +166,17 @@ class Wrapper {
 
 
 
-                    console.log(
+                    logger.info(
+                        "Registrierung beim Manager erfolgreich"
+                    );
+                    logger.debug(
                         "Wrapper ID gespeichert:",
                         this.id
                     );
 
                     if(!this.id){
 
-                        console.error(
+                        logger.error(
                             "Keine Wrapper ID erhalten!"
                         );
 
@@ -272,7 +279,7 @@ class Wrapper {
 
 
 
-        console.log(
+        logger.debug(
             "Registrierung gesendet",
             this.id ?? "ohne ID"
         );
@@ -319,7 +326,7 @@ class Wrapper {
                             message?: unknown;
                         };
 
-                        console.log(
+                        logger.debug(
                             "TEST COMMAND:",
                             command.message
                         );
@@ -356,9 +363,9 @@ class Wrapper {
                     default:
 
 
-                        console.log(
+                        logger.warn(
                             "Unbekannter Command:",
-                            rawCommand
+                            commandType
                         );
 
 
@@ -376,7 +383,7 @@ class Wrapper {
 
 
 
-        console.log(
+        logger.debug(
             "Warte auf Commands:",
             queue
         );
@@ -392,7 +399,7 @@ class Wrapper {
 
     heartbeat(){
 
-        console.log("Heartbeat gestartet");
+        logger.debug("Heartbeat gestartet");
         setInterval(()=>{
 
 
@@ -438,7 +445,7 @@ class Wrapper {
 
 
 
-            console.log(
+            logger.debug(
                 "Heartbeat gesendet"
             );
 

wrapper/src/logger.ts

@@ -0,0 +1,62 @@
+declare const process: {
+  env: Record<string, string | undefined>;
+};
+
+type LogLevel = "DEBUG" | "INFO" | "WARN" | "ERROR";
+
+const LEVELS: Record<LogLevel, number> = {
+  DEBUG: 0,
+  INFO: 1,
+  WARN: 2,
+  ERROR: 3,
+};
+
+const DEFAULT_LOG_LEVEL: LogLevel = "INFO";
+
+const configuredLevel =
+  (process.env.LOG_LEVEL ?? "").toUpperCase() as LogLevel;
+
+const currentLogLevel: LogLevel =
+  configuredLevel in LEVELS ? configuredLevel : DEFAULT_LOG_LEVEL;
+
+const currentLogLevelValue = LEVELS[currentLogLevel];
+
+function shouldLog(level: LogLevel): boolean {
+  return LEVELS[level] >= currentLogLevelValue;
+}
+
+function formatMessage(
+  level: LogLevel,
+  component: string,
+  message: unknown
+): string {
+  return `${new Date().toISOString()} ${level} [${component}] ${message}`;
+}
+
+class Logger {
+  constructor(private component: string) {}
+
+  debug(message: unknown, ...args: unknown[]): void {
+    if (!shouldLog("DEBUG")) return;
+    console.log(formatMessage("DEBUG", this.component, message), ...args);
+  }
+
+  info(message: unknown, ...args: unknown[]): void {
+    if (!shouldLog("INFO")) return;
+    console.log(formatMessage("INFO", this.component, message), ...args);
+  }
+
+  warn(message: unknown, ...args: unknown[]): void {
+    if (!shouldLog("WARN")) return;
+    console.warn(formatMessage("WARN", this.component, message), ...args);
+  }
+
+  error(message: unknown, ...args: unknown[]): void {
+    if (!shouldLog("ERROR")) return;
+    console.error(formatMessage("ERROR", this.component, message), ...args);
+  }
+}
+
+export function getLogger(component: string): Logger {
+  return new Logger(component);
+}

wrapper/src/processManager.ts

@@ -1,6 +1,9 @@
 import { spawn, ChildProcess } from "child_process";
 import { ServerStartCommand } from "server-manager-shared";
 import { SERVER_SCRIPT_PATH, SERVER_WORKING_DIRECTORY } from "./config";
+import { getLogger } from "./logger";
+
+const logger = getLogger("ProcessManager");
 
 
 interface ServerProcess {
@@ -46,7 +49,7 @@ export class ProcessManager {
 
 
 
-        console.log(
+        logger.debug(
             "Starte Game Server:",
             data.name
         );
@@ -89,11 +92,9 @@ export class ProcessManager {
             data=>{
 
 
-                console.log(
+                logger.debug(
-
                     `[${data.name}]`,
                     data.toString()
-
                 );
 
 
@@ -112,7 +113,7 @@ export class ProcessManager {
             data=>{
 
 
-                console.error(
+                logger.error(
 
                     "SERVER ERROR:",
                     data.toString()
@@ -141,7 +142,7 @@ export class ProcessManager {
             if(server){
 
 
-                console.log(
+                logger.info(
                     "Server beendet:",
                     server.name,
                     code
@@ -199,18 +200,12 @@ export class ProcessManager {
 
 
 
-        console.log(
+        logger.info(
-
             "Server gestartet:",
-
             {
-
                 id:data.serverId,
-
                 pid:process.pid
-
             }
-
         );
 
 
@@ -238,7 +233,7 @@ export class ProcessManager {
         if(!server){
 
 
-            console.log(
+            logger.warn(
 
                 "Server nicht gefunden:",
 
@@ -256,12 +251,9 @@ export class ProcessManager {
 
 
 
-        console.log(
+        logger.debug(
-
             "Stoppe Server:",
-
             server.name
-
         );
 
 

wrapper/src/queryManager.ts

@@ -1,7 +1,9 @@
 import { queryGameServerInfo  } from "steam-server-query";
 import { ProcessManager } from "./processManager";
 import { WRAPPER_QUERY_INTERVAL } from "./config";
+import { getLogger } from "./logger";
 
+const logger = getLogger("QueryManager");
 
 export class QueryManager {
 
@@ -16,7 +18,7 @@ export class QueryManager {
     start(){
 
 
-        console.log(
+        logger.debug(
             "Query Manager gestartet"
         );
 
@@ -73,12 +75,10 @@ export class QueryManager {
 
 
 
-                console.log(
+                logger.debug(
-
+                    "Query erfolgreich:",
-                    "Query:",
                     server.name,
                     `${server.players}/${server.maxPlayers}`
-
                 );
 
 
@@ -86,11 +86,9 @@ export class QueryManager {
             catch(err){
 
 
-                console.log(
+                logger.warn(
-
                     "Query fehlgeschlagen:",
                     server.name
-
                 );
 
 

wrapper/src/statusReporter.ts

@@ -4,7 +4,9 @@ import os from "os";
 import { QueryManager } from "./queryManager";
 import { WrapperStatusMessage } from "server-manager-shared";
 import { WRAPPER_STATUS_INTERVAL } from "./config";
+import { getLogger } from "./logger";
 
+const logger = getLogger("StatusReporter");
 
 export class StatusReporter {
 
@@ -25,7 +27,7 @@ export class StatusReporter {
 
     start(){
 
-        console.log(
+        logger.debug(
             "Status Reporter gestartet"
         );
 
@@ -147,12 +149,9 @@ export class StatusReporter {
 
 
 
-        console.log(
+        logger.debug(
-
             "Status gesendet:",
-
             servers.length,
-
             "Server"
 
         );