From 4fef2d8143d6b911fc1381b77d9a5b8686a8f992 Mon Sep 17 00:00:00 2001
From: bbassie <badgamernl@gmail.com>
Date: Sun, 7 Nov 2021 21:35:48 +0100
Subject: [PATCH] Fix message null issues

---
 packages/lib/link/messages.js            | 1 +
 packages/master/src/ControlConnection.js | 2 +-
 packages/master/src/Master.js            | 2 +-
 packages/slave/slave.js                  | 5 +----
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/packages/lib/link/messages.js b/packages/lib/link/messages.js
index 5aa971e8..ea3d0aae 100644
--- a/packages/lib/link/messages.js
+++ b/packages/lib/link/messages.js
@@ -1147,6 +1147,7 @@ messages.instanceInitialized = new Event({
 messages.instanceStatusChanged = new Event({
 	type: "instance_status_changed",
 	links: ["instance-slave", "slave-master"],
+	eventRequired: ["instance_id", "status"],
 	eventProperties: {
 		"instance_id": { type: "integer" },
 		"status": { enum: [
diff --git a/packages/master/src/ControlConnection.js b/packages/master/src/ControlConnection.js
index 5ac4990f..7062ce7d 100644
--- a/packages/master/src/ControlConnection.js
+++ b/packages/master/src/ControlConnection.js
@@ -106,7 +106,7 @@ class ControlConnection extends BaseConnection {
 				version: slave.version,
 				id: slave.id,
 				name: slave.name,
-				public_address: slave.public_address,
+				public_address: slave.public_address || null,
 				connected: this._master.wsServer.slaveConnections.has(slave.id),
 			});
 		}
diff --git a/packages/master/src/Master.js b/packages/master/src/Master.js
index 72b525a7..5c7de4f0 100644
--- a/packages/master/src/Master.js
+++ b/packages/master/src/Master.js
@@ -368,7 +368,7 @@ class Master {
 			version: slave.version,
 			id: slave.id,
 			name: slave.name,
-			public_address: slave.public_address,
+			public_address: slave.public_address || null,
 			connected: this.wsServer.slaveConnections.has(slave.id),
 		};
 
diff --git a/packages/slave/slave.js b/packages/slave/slave.js
index b6f49f40..d1bd56e8 100755
--- a/packages/slave/slave.js
+++ b/packages/slave/slave.js
@@ -262,7 +262,7 @@ class Instance extends libLink.Link {
 		libLink.messages.instanceStatusChanged.send(this, {
 			instance_id: this.id,
 			status,
-			game_port: this.server ? this.server.gamePort : this.config.get("factorio.game_port") || null,
+			game_port: this.server?.gamePort || this.config.get("factorio.game_port") || null,
 		});
 	}
 
@@ -694,8 +694,6 @@ class Instance extends libLink.Link {
 	}
 
 	async masterConnectionEventEventHandler(message) {
-		this.notifyStatus(this._status);
-
 		await libPlugin.invokeHook(this.plugins, "onMasterConnectionEvent", message.data.event);
 	}
 
@@ -1301,7 +1299,6 @@ class Slave extends libLink.Link {
 		libLink.messages.instanceStatusChanged.send(this, {
 			instance_id,
 			status: instanceConnection ? instanceConnection.status : "stopped",
-			game_port: null,
 		});
 
 		// save a copy of the instance config