From d8301f3c6191634223e3d6b0a2ab19d9e3d1681d Mon Sep 17 00:00:00 2001 From: Hornwitser Date: Wed, 10 Jan 2024 23:49:00 +0100 Subject: [PATCH] Rename RawInstanceInfo to HostInstanceUpdate Due to configs needing a location to be deserialised it's not possible to cleanly replace RawInstanceInfo with the InstanceInfo class. Rename it to HostInstanceUpdate to better represent its purpose. --- packages/host/src/Host.ts | 2 +- packages/lib/src/data/messages_instance.ts | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/packages/host/src/Host.ts b/packages/host/src/Host.ts index eaaab7bc..436efe1b 100644 --- a/packages/host/src/Host.ts +++ b/packages/host/src/Host.ts @@ -920,7 +920,7 @@ export default class Host extends lib.Link { let list = []; for (let [instanceId, instanceInfo] of this.discoveredInstanceInfos) { let instanceConnection = this.instanceConnections.get(instanceId); - list.push(new lib.RawInstanceInfo( + list.push(new lib.HostInstanceUpdate( instanceInfo.config.toRemote("controller"), instanceConnection ? instanceConnection.instance.status : "stopped", instanceConnection ? instanceConnection.instance.server.gamePort : undefined, diff --git a/packages/lib/src/data/messages_instance.ts b/packages/lib/src/data/messages_instance.ts index 00af08e7..b943ea6c 100644 --- a/packages/lib/src/data/messages_instance.ts +++ b/packages/lib/src/data/messages_instance.ts @@ -712,8 +712,7 @@ export class InstanceSendRconRequest { static Response = JsonString; } -// TODO remove this after config refactor -export class RawInstanceInfo { +export class HostInstanceUpdate { constructor( public config: Static, public status: InstanceStatus, @@ -740,17 +739,17 @@ export class InstancesUpdateRequest { static dst = "controller" as const; constructor( - public instances: RawInstanceInfo[], + public instances: HostInstanceUpdate[], ) { } - static jsonSchema = Type.Array(RawInstanceInfo.jsonSchema); + static jsonSchema = Type.Array(HostInstanceUpdate.jsonSchema); toJSON() { return this.instances; } static fromJSON(json: Static) { - return new this(json.map(i => RawInstanceInfo.fromJSON(i))); + return new this(json.map(i => HostInstanceUpdate.fromJSON(i))); } }