Fix wrapper message handling in manager
This commit is contained in:
@@ -2,6 +2,18 @@ import { Rabbit } from "./rabbit";
|
||||
import { randomUUID } from "crypto";
|
||||
import { WrapperRegistry, WrapperInfo } from "./wrapperRegistry";
|
||||
import { ServerRegistry } from "./serverRegistry";
|
||||
import {
|
||||
WrapperRegisterMessage,
|
||||
WrapperHeartbeatMessage,
|
||||
WrapperStatusMessage,
|
||||
ServerStartCommand,
|
||||
ServerStopCommand
|
||||
} from "server-manager-shared";
|
||||
|
||||
type WrapperMessage =
|
||||
| WrapperRegisterMessage
|
||||
| WrapperHeartbeatMessage
|
||||
| WrapperStatusMessage;
|
||||
|
||||
|
||||
export class WrapperManager {
|
||||
@@ -52,7 +64,7 @@ export class WrapperManager {
|
||||
const data =
|
||||
JSON.parse(
|
||||
msg.content.toString()
|
||||
);
|
||||
) as WrapperMessage;
|
||||
|
||||
|
||||
|
||||
@@ -149,7 +161,7 @@ export class WrapperManager {
|
||||
|
||||
|
||||
|
||||
async register(data:any){
|
||||
async register(data: WrapperRegisterMessage){
|
||||
|
||||
|
||||
|
||||
@@ -225,12 +237,11 @@ export class WrapperManager {
|
||||
|
||||
|
||||
existing.ramFree =
|
||||
data.ramFree ?? data.ram;
|
||||
data.ram;
|
||||
|
||||
|
||||
|
||||
existing.servers =
|
||||
data.servers ?? existing.servers;
|
||||
// servers are updated via wrapper.status, not wrapper.register
|
||||
|
||||
|
||||
|
||||
@@ -391,7 +402,7 @@ export class WrapperManager {
|
||||
|
||||
|
||||
|
||||
heartbeat(data:any){
|
||||
heartbeat(data: WrapperHeartbeatMessage){
|
||||
|
||||
|
||||
|
||||
@@ -427,7 +438,7 @@ export class WrapperManager {
|
||||
|
||||
wrapperId:string,
|
||||
|
||||
command:any
|
||||
command: ServerStartCommand | ServerStopCommand
|
||||
|
||||
){
|
||||
|
||||
|
||||
Reference in New Issue
Block a user