diff --git a/packages/controller/src/ControlConnection.js b/packages/controller/src/ControlConnection.js index 29db241b..de792ba5 100644 --- a/packages/controller/src/ControlConnection.js +++ b/packages/controller/src/ControlConnection.js @@ -187,7 +187,7 @@ class ControlConnection extends BaseConnection { let list = []; for (let instance of this._controller.instances.values()) { list.push({ - id: instance.config.get("instance.id"), + id: instance.id, name: instance.config.get("instance.name"), assigned_host: instance.config.get("instance.assigned_host"), game_port: instance.game_port || null, @@ -204,10 +204,10 @@ class ControlConnection extends BaseConnection { instanceUpdated(instance) { if ( this.instanceSubscriptions.all - || this.instanceSubscriptions.instance_ids.includes(instance.config.get("instance.id")) + || this.instanceSubscriptions.instance_ids.includes(instance.id) ) { libLink.messages.instanceUpdate.send(this, { - id: instance.config.get("instance.id"), + id: instance.id, name: instance.config.get("instance.name"), assigned_host: instance.config.get("instance.assigned_host"), game_port: instance.game_port || null, diff --git a/packages/controller/src/Controller.js b/packages/controller/src/Controller.js index 556d0715..1da93e12 100644 --- a/packages/controller/src/Controller.js +++ b/packages/controller/src/Controller.js @@ -734,7 +734,7 @@ class Controller { let connection = this.wsServer.hostConnections.get(hostId); if (connection) { await libLink.messages.assignInstance.send(connection, { - instance_id: instance.config.get("instance.id"), + instance_id: instance.id, serialized_config: instance.config.serialize("host"), }); } diff --git a/packages/controller/src/HostConnection.js b/packages/controller/src/HostConnection.js index 7cccaee8..c37830a8 100644 --- a/packages/controller/src/HostConnection.js +++ b/packages/controller/src/HostConnection.js @@ -126,7 +126,7 @@ class HostConnection extends BaseConnection { for (let instance of this._controller.instances.values()) { if (instance.config.get("instance.assigned_host") === this._id) { await libLink.messages.assignInstance.send(this, { - instance_id: instance.config.get("instance.id"), + instance_id: instance.id, serialized_config: instance.config.serialize("host"), }); } @@ -142,7 +142,7 @@ class HostConnection extends BaseConnection { // Check if this instance is assigned somewhere else. if (controllerInstance.config.get("instance.assigned_host") !== this._id) { await libLink.messages.unassignInstance.send(this, { - instance_id: controllerInstance.config.get("instance.id"), + instance_id: controllerInstance.id, }); continue; } diff --git a/packages/controller/src/InstanceInfo.js b/packages/controller/src/InstanceInfo.js index da71ce2a..090f00e5 100644 --- a/packages/controller/src/InstanceInfo.js +++ b/packages/controller/src/InstanceInfo.js @@ -39,6 +39,11 @@ class InstanceInfo { status: this.status, }; } + + /** Shorthand for `instance.config.get("instance.id")` @type {number} */ + get id() { + return this.config.get("instance.id"); + } } module.exports = InstanceInfo; diff --git a/plugins/inventory_sync/controller.js b/plugins/inventory_sync/controller.js index 491d102f..ce4179a9 100644 --- a/plugins/inventory_sync/controller.js +++ b/plugins/inventory_sync/controller.js @@ -42,7 +42,7 @@ class ControllerPlugin extends libPlugin.BaseControllerPlugin { } async onInstanceStatusChanged(instance) { - let instanceId = instance.config.get("instance.id"); + let instanceId = instance.id; if (["unassigned", "deleted"].includes(instance.status)) { for (let [playerName, acquisitionRecord] of this.acquiredPlayers) { if (acquisitionRecord.instanceId === instanceId) {