Refactor config to JSON data class pattern

Refactor the Config and ConfigGroup classes to match the JSON data class
pattern with toJSON, toRemote and fromJSON methods replacing the load,
init, and serialize methods.  Since fromJSON requires extra information
the messages structures passes around the plain JSON representation of
the configs instead of serialising instances of the config classes
automatically.

packages/controller/src/ControlConnection.ts

@@ -169,8 +169,8 @@ export default class ControlConnection extends BaseConnection {
 		throw new Error("Should be unreachable");
 	}
 
-	async handleControllerConfigGetRequest(): Promise<lib.RawConfig> {
-		return new lib.RawConfig(this._controller.config.serialize("control"));
+	async handleControllerConfigGetRequest() {
+		return this._controller.config.toRemote("control");
 	}
 
 	async handleControllerConfigSetFieldRequest(request: lib.ControllerConfigSetFieldRequest) {
@@ -211,8 +211,7 @@ export default class ControlConnection extends BaseConnection {
 	}
 
 	async handleHostConfigCreateRequest(request: lib.HostConfigCreateRequest) {
-		let hostConfig = new lib.HostConfig("control");
-		hostConfig.init();
+		const hostConfig = new lib.HostConfig("host");
 
 		hostConfig.set("host.controller_url", this._controller.getControllerUrl());
 		if (request.id !== undefined) {
@@ -225,7 +224,7 @@ export default class ControlConnection extends BaseConnection {
 			this.user.checkPermission("core.host.generate_token");
 			hostConfig.set("host.controller_token", this._controller.generateHostToken(hostConfig.get("host.id")));
 		}
-		return new lib.RawConfig(hostConfig.serialize());
+		return hostConfig.toJSON();
 	}
 
 	async handleInstanceDetailsGetRequest(request: lib.InstanceDetailsGetRequest) {
@@ -236,10 +235,9 @@ export default class ControlConnection extends BaseConnection {
 		return [...this._controller.instances.values()].map(instance => instance.toInstanceDetails());
 	}
 
-	// XXX should probably add a hook for host reuqests?
 	async handleInstanceCreateRequest(request: lib.InstanceCreateRequest) {
-		let instanceConfig = new lib.InstanceConfig("controller");
-		instanceConfig.load(request.config as lib.SerializedConfig);
+		const instanceConfig = new lib.InstanceConfig("controller");
+		instanceConfig.update(request.config, false, "control");
 		await this._controller.instanceCreate(instanceConfig);
 	}
 
@@ -249,7 +247,7 @@ export default class ControlConnection extends BaseConnection {
 
 	async handleInstanceConfigGetRequest(request: lib.InstanceConfigGetRequest) {
 		let instance = this._controller.getRequestInstance(request.instanceId);
-		return new lib.InstanceConfigGetRequest.Response(instance.config.serialize("control"));
+		return instance.config.toRemote("control");
 	}
 
 	async handleInstanceConfigSetFieldRequest(request: lib.InstanceConfigSetFieldRequest) {

packages/controller/src/Controller.ts

@@ -421,7 +421,7 @@ export default class Controller {
 	private async _saveDataInternal() {
 		if (this.config.dirty) {
 			this.config.dirty = false;
-			await lib.safeOutputFile(this.configPath, JSON.stringify(this.config.serialize(), null, "\t"));
+			await lib.safeOutputFile(this.configPath, JSON.stringify(this.config, null, "\t"));
 		}
 
 		let databaseDirectory = this.config.get("controller.database_directory");
@@ -495,11 +495,9 @@ export default class Controller {
 			) as Static<typeof InstanceInfo.jsonSchema>[];
 			for (let json of serialized) {
 				if (!json.config) { // migrate: from pre Alpha 14 format.
-					json = { config: json, status: "running" }; // Use running to force updatedAt
+					json = { config: json as any, status: "running" }; // Use running to force updatedAt
 				}
-				let instanceConfig = new lib.InstanceConfig("controller");
-				instanceConfig.load(json.config as lib.SerializedConfig);
-				let instance = InstanceInfo.fromJSON(json, instanceConfig);
+				const instance = InstanceInfo.fromJSON(json, "controller");
 				const status = instance.config.get("instance.assigned_host") === null ? "unassigned" : "unknown";
 				if (instance.status !== status) {
 					instance.status = status;
@@ -519,7 +517,7 @@ export default class Controller {
 	}
 
 	static async saveInstances(filePath: string, instances: Map<number, InstanceInfo>) {
-		let serialized = [...instances.values()].map(instance => instance.toJSON());
+		let serialized = [...instances.values()];
 		await lib.safeOutputFile(filePath, JSON.stringify(serialized, null, "\t"));
 	}
 
@@ -690,7 +688,6 @@ export default class Controller {
 	 *
 	 * @example
 	 * let instanceConfig = new lib.InstanceConfig("controller");
-	 * instanceConfig.init();
 	 * instanceConfig.set("instance.name", "My instance");
 	 * let instance = await controller.instanceAssign(instanceConfig);
 	 * await controller.instanceAssign(instance.id, hostId);
@@ -806,7 +803,7 @@ export default class Controller {
 		// "fieldChanged" event handler will set this.instancesDirty
 		if (hostId !== undefined && newHostConnection) {
 			await newHostConnection.send(
-				new lib.InstanceAssignInternalRequest(instanceId, instance.config.serialize("host"))
+				new lib.InstanceAssignInternalRequest(instanceId, instance.config.toRemote("host"))
 			);
 		} else {
 			instance.status = "unassigned";
@@ -855,7 +852,7 @@ export default class Controller {
 			let connection = this.wsServer.hostConnections.get(hostId);
 			if (connection) {
 				await connection.send(
-					new lib.InstanceAssignInternalRequest(instance.id, instance.config.serialize("host"))
+					new lib.InstanceAssignInternalRequest(instance.id, instance.config.toRemote("host"))
 				);
 			}
 		}

packages/controller/src/HostConnection.ts

@@ -189,7 +189,7 @@ export default class HostConnection extends BaseConnection {
 		for (let instance of this._controller.instances.values()) {
 			if (instance.config.get("instance.assigned_host") === this._id) {
 				await this.send(
-					new lib.InstanceAssignInternalRequest(instance.id, instance.config.serialize("host"))
+					new lib.InstanceAssignInternalRequest(instance.id, instance.config.toRemote("host"))
 				);
 			}
 		}
@@ -197,8 +197,8 @@ export default class HostConnection extends BaseConnection {
 		// Assign instances the host has but controller does not
 		const instanceUpdates: InstanceInfo[] = [];
 		for (let instanceData of request.instances) {
-			let instanceConfig = new lib.InstanceConfig("controller");
-			instanceConfig.load(instanceData.config as lib.SerializedConfig, "host");
+			const instanceConfig = new lib.InstanceConfig("controller");
+			instanceConfig.update(instanceData.config, false, "host");
 
 			let controllerInstance = this._controller.instances.get(instanceConfig.get("instance.id"));
 			if (controllerInstance) {
@@ -237,7 +237,7 @@ export default class HostConnection extends BaseConnection {
 			this._controller.addInstanceHooks(newInstance);
 			await this.send(
 				new lib.InstanceAssignInternalRequest(
-					instanceConfig.get("instance.id"), instanceConfig.serialize("host")
+					instanceConfig.get("instance.id"), instanceConfig.toRemote("host")
 				)
 			);
 			instanceUpdates.push(newInstance);

packages/controller/src/InstanceInfo.ts

@@ -18,30 +18,21 @@ export default class InstanceInfo {
 	}
 
 	static jsonSchema = Type.Object({
-		"config": Type.Object({}),
+		"config": lib.InstanceConfig.jsonSchema,
 		"status": lib.InstanceStatus,
 		"gamePort": Type.Optional(Type.Number()),
 		"updatedAt": Type.Optional(Type.Number()),
 	});
 
-	static fromJSON(json: Static<typeof this.jsonSchema>, config: lib.InstanceConfig) {
+	static fromJSON(json: Static<typeof this.jsonSchema>, location: lib.ConfigLocation) {
 		return new this(
-			config,
+			lib.InstanceConfig.fromJSON(json.config, location),
 			json.status,
 			json.gamePort,
 			json.updatedAt,
 		);
 	}
 
-	toJSON(): Static<typeof InstanceInfo.jsonSchema> {
-		return {
-			config: this.config.serialize(),
-			status: this.status,
-			gamePort: this.gamePort,
-			updatedAt: this.updatedAt,
-		};
-	}
-
 	toInstanceDetails() {
 		return new lib.InstanceDetails(
 			this.config.get("instance.name"),