From 5c56208c8b9fb6db3ad9f307492e8d62cfeb8b93 Mon Sep 17 00:00:00 2001 From: Justin Bosker Date: Mon, 20 Jul 2026 19:10:39 +0200 Subject: [PATCH] Migrate manager and wrapper to shared message types --- wrapper/package.json | 1 + wrapper/src/index.ts | 15 ++++++++++++--- wrapper/src/processManager.ts | 2 +- wrapper/src/statusReporter.ts | 3 ++- 4 files changed, 16 insertions(+), 5 deletions(-) diff --git a/wrapper/package.json b/wrapper/package.json index 6aab8fe..963fcb3 100644 --- a/wrapper/package.json +++ b/wrapper/package.json @@ -11,6 +11,7 @@ "license": "ISC", "dependencies": { "amqplib": "^2.0.1", + "server-manager-shared": "file:../shared", "steam-server-query": "^1.1.3" }, "devDependencies": { diff --git a/wrapper/src/index.ts b/wrapper/src/index.ts index b84cdd7..623e490 100644 --- a/wrapper/src/index.ts +++ b/wrapper/src/index.ts @@ -4,6 +4,12 @@ import { loadConfig, saveConfig } from "./config"; import { ProcessManager } from "./processManager"; import { StatusReporter } from "./statusReporter"; import { QueryManager } from "./queryManager"; +import { + WrapperRegisterMessage, + WrapperHeartbeatMessage, + ServerStartCommand, + ServerStopCommand +} from "server-manager-shared"; class Wrapper { @@ -211,7 +217,7 @@ class Wrapper { - const message = { + const message: WrapperRegisterMessage = { @@ -298,7 +304,10 @@ class Wrapper { const command = JSON.parse( msg.content.toString() - ); + ) as ServerStartCommand | ServerStopCommand | { + type: string; + [key: string]: unknown; + }; @@ -392,7 +401,7 @@ class Wrapper { - const heartbeat = { + const heartbeat: WrapperHeartbeatMessage = { type: diff --git a/wrapper/src/processManager.ts b/wrapper/src/processManager.ts index d8e749c..b5fef8d 100644 --- a/wrapper/src/processManager.ts +++ b/wrapper/src/processManager.ts @@ -41,7 +41,7 @@ export class ProcessManager { - startServer(data:any){ + startServer(data: ServerStartCommand){ diff --git a/wrapper/src/statusReporter.ts b/wrapper/src/statusReporter.ts index ee4f352..ea41373 100644 --- a/wrapper/src/statusReporter.ts +++ b/wrapper/src/statusReporter.ts @@ -2,6 +2,7 @@ import * as amqp from "amqplib"; import { ProcessManager } from "./processManager"; import os from "os"; import { QueryManager } from "./queryManager"; +import { WrapperStatusMessage } from "server-manager-shared"; @@ -93,7 +94,7 @@ export class StatusReporter { - const status = { + const status: WrapperStatusMessage = { type: