Add "servermods" folder to ignored folders in backups

Caused by 72ddaf91.

.config/dotnet-tools.json

@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "dotnet-ef": {
-      "version": "7.0.0-rc.1.22426.7",
+      "version": "8.0.3",
       "commands": [
         "dotnet-ef"
       ]

.run/Agent 1.run.xml

@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Agent 1" type="DotNetProject" factoryName=".NET Project">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/Agent/Phantom.Agent/bin/Debug/net7.0/Phantom.Agent.exe" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/.artifacts/bin/Phantom.Agent/debug/Phantom.Agent.exe" />
     <option name="PROGRAM_PARAMETERS" value="" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.workdir/Agent1" />
     <option name="PASS_PARENT_ENVS" value="1" />
@@ -9,10 +9,10 @@
       <env name="AGENT_NAME" value="Agent 1" />
       <env name="ALLOWED_RCON_PORTS" value="25575,27000,27001" />
       <env name="ALLOWED_SERVER_PORTS" value="25565,26000,26001" />
+      <env name="CONTROLLER_HOST" value="localhost" />
       <env name="JAVA_SEARCH_PATH" value="~/.jdks" />
       <env name="MAX_INSTANCES" value="3" />
       <env name="MAX_MEMORY" value="12G" />
-      <env name="SERVER_HOST" value="localhost" />
     </envs>
     <option name="USE_EXTERNAL_CONSOLE" value="0" />
     <option name="USE_MONO" value="0" />
@@ -22,7 +22,7 @@
     <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
     <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="0" />
     <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value="net7.0" />
+    <option name="PROJECT_TFM" value="net8.0" />
     <method v="2">
       <option name="Build" />
     </method>

.run/Agent 2.run.xml

@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Agent 2" type="DotNetProject" factoryName=".NET Project">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/Agent/Phantom.Agent/bin/Debug/net7.0/Phantom.Agent.exe" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/.artifacts/bin/Phantom.Agent/debug/Phantom.Agent.exe" />
     <option name="PROGRAM_PARAMETERS" value="" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.workdir/Agent2" />
     <option name="PASS_PARENT_ENVS" value="1" />
@@ -9,10 +9,10 @@
       <env name="AGENT_NAME" value="Agent 2" />
       <env name="ALLOWED_RCON_PORTS" value="27002-27006" />
       <env name="ALLOWED_SERVER_PORTS" value="26002-26006" />
+      <env name="CONTROLLER_HOST" value="localhost" />
       <env name="JAVA_SEARCH_PATH" value="~/.jdks" />
       <env name="MAX_INSTANCES" value="5" />
       <env name="MAX_MEMORY" value="10G" />
-      <env name="SERVER_HOST" value="localhost" />
     </envs>
     <option name="USE_EXTERNAL_CONSOLE" value="0" />
     <option name="USE_MONO" value="0" />
@@ -22,7 +22,7 @@
     <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
     <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="0" />
     <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value="net7.0" />
+    <option name="PROJECT_TFM" value="net8.0" />
     <method v="2">
       <option name="Build" />
     </method>

.run/Agent 3.run.xml

@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Agent 3" type="DotNetProject" factoryName=".NET Project">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/Agent/Phantom.Agent/bin/Debug/net7.0/Phantom.Agent.exe" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/.artifacts/bin/Phantom.Agent/debug/Phantom.Agent.exe" />
     <option name="PROGRAM_PARAMETERS" value="" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.workdir/Agent3" />
     <option name="PASS_PARENT_ENVS" value="1" />
@@ -9,10 +9,10 @@
       <env name="AGENT_NAME" value="Agent 3" />
       <env name="ALLOWED_RCON_PORTS" value="27007" />
       <env name="ALLOWED_SERVER_PORTS" value="26007" />
+      <env name="CONTROLLER_HOST" value="localhost" />
       <env name="JAVA_SEARCH_PATH" value="~/.jdks" />
       <env name="MAX_INSTANCES" value="1" />
       <env name="MAX_MEMORY" value="2560M" />
-      <env name="SERVER_HOST" value="localhost" />
     </envs>
     <option name="USE_EXTERNAL_CONSOLE" value="0" />
     <option name="USE_MONO" value="0" />
@@ -22,7 +22,7 @@
     <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
     <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="0" />
     <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value="net7.0" />
+    <option name="PROJECT_TFM" value="net8.0" />
     <method v="2">
       <option name="Build" />
     </method>

.run/Compile Bootstrap.run.xml

@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Compile Bootstrap" type="js.build_tools.npm">
-    <package-json value="$PROJECT_DIR$/Server/Phantom.Server.Web.Bootstrap/package.json" />
+    <package-json value="$PROJECT_DIR$/Web/Phantom.Web.Bootstrap/package.json" />
     <command value="run" />
     <scripts>
       <script value="compile" />

.run/Controller + Web + Agent x3.run.xml

@@ -1,9 +1,10 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Server + Agent x3" type="CompoundRunConfigurationType">
+  <configuration default="false" name="Controller + Web + Agent x3" type="CompoundRunConfigurationType">
     <toRun name="Agent 1" type="DotNetProject" />
     <toRun name="Agent 2" type="DotNetProject" />
     <toRun name="Agent 3" type="DotNetProject" />
-    <toRun name="Server" type="DotNetProject" />
+    <toRun name="Controller" type="DotNetProject" />
+    <toRun name="Web" type="DotNetProject" />
     <method v="2" />
   </configuration>
 </component>

.run/Controller + Web + Agent.run.xml

@@ -0,0 +1,8 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Controller + Web + Agent" type="CompoundRunConfigurationType">
+    <toRun name="Agent 1" type="DotNetProject" />
+    <toRun name="Controller" type="DotNetProject" />
+    <toRun name="Web" type="DotNetProject" />
+    <method v="2" />
+  </configuration>
+</component>

.run/Controller.run.xml

@@ -1,28 +1,27 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Server" type="DotNetProject" factoryName=".NET Project">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/Server/Phantom.Server/bin/Debug/net7.0/Phantom.Server.exe" />
+  <configuration default="false" name="Controller" type="DotNetProject" factoryName=".NET Project">
+    <option name="EXE_PATH" value="$PROJECT_DIR$/.artifacts/bin/Phantom.Controller/debug/Phantom.Controller.exe" />
     <option name="PROGRAM_PARAMETERS" value="" />
-    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.workdir/Server" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.workdir/Controller" />
     <option name="PASS_PARENT_ENVS" value="1" />
     <envs>
-      <env name="ASPNETCORE_ENVIRONMENT" value="Development" />
+      <env name="AGENT_RPC_SERVER_HOST" value="localhost" />
       <env name="PG_DATABASE" value="postgres" />
       <env name="PG_HOST" value="localhost" />
       <env name="PG_PASS" value="development" />
-      <env name="PG_PORT" value="9402" />
+      <env name="PG_PORT" value="9403" />
       <env name="PG_USER" value="postgres" />
-      <env name="RPC_SERVER_HOST" value="localhost" />
-      <env name="WEB_SERVER_HOST" value="localhost" />
+      <env name="WEB_RPC_SERVER_HOST" value="localhost" />
     </envs>
     <option name="USE_EXTERNAL_CONSOLE" value="0" />
     <option name="USE_MONO" value="0" />
     <option name="RUNTIME_ARGUMENTS" value="" />
-    <option name="PROJECT_PATH" value="$PROJECT_DIR$/Server/Phantom.Server/Phantom.Server.csproj" />
+    <option name="PROJECT_PATH" value="$PROJECT_DIR$/Controller/Phantom.Controller/Phantom.Controller.csproj" />
     <option name="PROJECT_EXE_PATH_TRACKING" value="1" />
     <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
     <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="0" />
     <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value="net7.0" />
+    <option name="PROJECT_TFM" value="net8.0" />
     <method v="2">
       <option name="Build" />
     </method>

.run/Server + Agent.run.xml

@@ -1,7 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Server + Agent" type="CompoundRunConfigurationType">
-    <toRun name="Agent 1" type="DotNetProject" />
-    <toRun name="Server" type="DotNetProject" />
-    <method v="2" />
-  </configuration>
-</component>

.run/Web.run.xml

@@ -0,0 +1,26 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Web" type="DotNetProject" factoryName=".NET Project">
+    <option name="EXE_PATH" value="$PROJECT_DIR$/.artifacts/bin/Phantom.Web/debug/Phantom.Web.exe" />
+    <option name="PROGRAM_PARAMETERS" value="" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.workdir/Web" />
+    <option name="PASS_PARENT_ENVS" value="1" />
+    <envs>
+      <env name="ASPNETCORE_ENVIRONMENT" value="Development" />
+      <env name="CONTROLLER_HOST" value="localhost" />
+      <env name="WEB_KEY" value="BMNHM9RRPMCBBY29D9XHS6KBKZSRY7F5XFN27YZX96XXWJC2NM2D6YRHM9PZN9JGQGCSJ6FMB2GGZ" />
+      <env name="WEB_SERVER_HOST" value="localhost" />
+    </envs>
+    <option name="USE_EXTERNAL_CONSOLE" value="0" />
+    <option name="USE_MONO" value="0" />
+    <option name="RUNTIME_ARGUMENTS" value="" />
+    <option name="PROJECT_PATH" value="$PROJECT_DIR$/Web/Phantom.Web/Phantom.Web.csproj" />
+    <option name="PROJECT_EXE_PATH_TRACKING" value="1" />
+    <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
+    <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="0" />
+    <option name="PROJECT_KIND" value="DotNetCore" />
+    <option name="PROJECT_TFM" value="net8.0" />
+    <method v="2">
+      <option name="Build" />
+    </method>
+  </configuration>
+</component>

.workdir/Controller/.gitignore

@@ -0,0 +1 @@
+

.workdir/Controller/secrets/web.key

@@ -0,0 +1,2 @@
+<EFBFBD><EFBFBD>h?Ο<05>Bx
+<02>

.workdir/Controller/secrets/web.secret

@@ -0,0 +1 @@
+T<EFBFBD>./g<11><>N<EFBFBD><4E>t<EFBFBD>$<24>!<21>(<28><>#<23>~<7E><>}<14><:

AddMigration.bat

@@ -5,4 +5,4 @@ if [%1]==[] (
     exit
 )
 
-dotnet ef migrations add %~1 --project Server/Phantom.Server.Database.Postgres
+dotnet ef migrations add %~1 --project Controller/Phantom.Controller.Database.Postgres --msbuildprojectextensionspath .artifacts/obj/Phantom.Controller.Database.Postgres

AddMigration.sh

@@ -3,4 +3,4 @@ if [ -z "$1" ]; then
     exit 1
 fi
 
-dotnet ef migrations add "$1" --project Server/Phantom.Server.Database.Postgres
+dotnet ef migrations add "$1" --project Controller/Phantom.Controller.Database.Postgres --msbuildprojectextensionspath .artifacts/obj/Phantom.Controller.Database.Postgres

Agent/Phantom.Agent.Minecraft/Instance/InstanceProcess.cs

@@ -1,19 +1,20 @@
 using Phantom.Utils.Collections;
-using Phantom.Utils.Runtime;
+using Phantom.Utils.Processes;
+using Phantom.Utils.Tasks;
 
 namespace Phantom.Agent.Minecraft.Instance;
 
 public sealed class InstanceProcess : IDisposable {
 	public InstanceProperties InstanceProperties { get; }
-	public CancellableSemaphore BackupSemaphore { get; } = new (1, 1);
 	
-	private readonly RingBuffer<string> outputBuffer = new (10000);
+	private readonly RingBuffer<string> outputBuffer = new (100);
 	private event EventHandler<string>? OutputEvent;
 
 	public event EventHandler? Ended;
 	public bool HasEnded { get; private set; }
 
 	private readonly Process process;
+	private readonly TaskCompletionSource processExited = AsyncTasks.CreateCompletionSource();
 
 	internal InstanceProcess(InstanceProperties instanceProperties, Process process) {
 		this.InstanceProperties = instanceProperties;
@@ -47,21 +48,19 @@ public sealed class InstanceProcess : IDisposable {
 		OutputEvent = null;
 		HasEnded = true;
 		Ended?.Invoke(this, EventArgs.Empty);
+		processExited.SetResult();
 	}
 
 	public void Kill() {
 		process.Kill(true);
 	}
 
-	public async Task WaitForExit(CancellationToken cancellationToken) {
-		if (!HasEnded) {
-			await process.WaitForExitAsync(cancellationToken);
-		}
+	public async Task WaitForExit(TimeSpan timeout) {
+		await processExited.Task.WaitAsync(timeout);
 	}
 
 	public void Dispose() {
 		process.Dispose();
-		BackupSemaphore.Dispose();
 		OutputEvent = null;
 		Ended = null;
 	}

Agent/Phantom.Agent.Minecraft/Java/JavaPropertiesFileEditor.cs

@@ -0,0 +1,92 @@
+using System.Text;
+using Kajabity.Tools.Java;
+
+namespace Phantom.Agent.Minecraft.Java;
+
+sealed class JavaPropertiesFileEditor {
+	private static readonly Encoding Encoding = Encoding.GetEncoding("ISO-8859-1");
+
+	private readonly Dictionary<string, string> overriddenProperties = new ();
+
+	public void Set(string key, string value) {
+		overriddenProperties[key] = value;
+	}
+
+	public async Task EditOrCreate(string filePath) {
+		if (File.Exists(filePath)) {
+			string tmpFilePath = filePath + ".tmp";
+			File.Copy(filePath, tmpFilePath, overwrite: true);
+			await EditFromCopyOrCreate(filePath, tmpFilePath);
+			File.Move(tmpFilePath, filePath, overwrite: true);
+		}
+		else {
+			await EditFromCopyOrCreate(null, filePath);
+		}
+	}
+
+	private async Task EditFromCopyOrCreate(string? sourceFilePath, string targetFilePath) {
+		var properties = new JavaProperties();
+
+		if (sourceFilePath != null) {
+			// TODO replace with custom async parser
+			await using var sourceStream = new FileStream(sourceFilePath, FileMode.Open, FileAccess.Read, FileShare.Read);
+			properties.Load(sourceStream, Encoding);
+		}
+
+		foreach (var (key, value) in overriddenProperties) {
+			properties[key] = value;
+		}
+
+		await using var targetStream = new FileStream(targetFilePath, FileMode.Create, FileAccess.Write, FileShare.Read);
+		await using var targetWriter = new StreamWriter(targetStream, Encoding);
+
+		await targetWriter.WriteLineAsync("# Properties");
+
+		foreach (var (key, value) in properties) {
+			await WriteProperty(targetWriter, key, value);
+		}
+	}
+
+	private static async Task WriteProperty(StreamWriter writer, string key, string value) {
+		await WritePropertyComponent(writer, key, escapeSpaces: true);
+		await writer.WriteAsync('=');
+		await WritePropertyComponent(writer, value, escapeSpaces: false);
+		await writer.WriteLineAsync();
+	}
+
+	private static async Task WritePropertyComponent(TextWriter writer, string component, bool escapeSpaces) {
+		for (int index = 0; index < component.Length; index++) {
+			var c = component[index];
+			switch (c) {
+				case '\\':
+				case '#':
+				case '!':
+				case '=':
+				case ':':
+				case ' ' when escapeSpaces || index == 0:
+					await writer.WriteAsync('\\');
+					await writer.WriteAsync(c);
+					break;
+				case var _ when c > 31 && c < 127:
+					await writer.WriteAsync(c);
+					break;
+				case '\t':
+					await writer.WriteAsync("\\t");
+					break;
+				case '\n':
+					await writer.WriteAsync("\\n");
+					break;
+				case '\r':
+					await writer.WriteAsync("\\r");
+					break;
+				case '\f':
+					await writer.WriteAsync("\\f");
+					break;
+				default:
+					await writer.WriteAsync("\\u");
+					await writer.WriteAsync(((int) c).ToString("X4"));
+					break;
+			}
+		}
+	}
+}

Agent/Phantom.Agent.Minecraft/Java/JavaRuntimeDiscovery.cs

@@ -1,7 +1,7 @@
 using System.Diagnostics;
 using Phantom.Common.Data.Java;
-using Phantom.Common.Logging;
 using Phantom.Utils.IO;
+using Phantom.Utils.Logging;
 using Serilog;
 
 namespace Phantom.Agent.Minecraft.Java;
@@ -79,10 +79,9 @@ public sealed class JavaRuntimeDiscovery {
 			WorkingDirectory = Path.GetDirectoryName(javaExecutablePath),
 			Arguments = "-XshowSettings:properties -version",
 			RedirectStandardInput = false,
-			RedirectStandardOutput = true,
+			RedirectStandardOutput = false,
 			RedirectStandardError = true,
-			UseShellExecute = false,
-			CreateNoWindow = false
+			UseShellExecute = false
 		};
 
 		var process = new Process { StartInfo = startInfo };

Agent/Phantom.Agent.Minecraft/Java/JvmArgumentBuilder.cs

@@ -1,5 +1,4 @@
-using System.Collections.Immutable;
-using System.Collections.ObjectModel;
+using System.Collections.ObjectModel;
 
 namespace Phantom.Agent.Minecraft.Java;
 
@@ -7,12 +6,12 @@ sealed class JvmArgumentBuilder {
 	private readonly JvmProperties basicProperties;
 	private readonly List<string> customArguments = new ();
 
-	public JvmArgumentBuilder(JvmProperties basicProperties, ImmutableArray<string> customArguments) {
+	public JvmArgumentBuilder(JvmProperties basicProperties) {
 		this.basicProperties = basicProperties;
-
-		foreach (var jvmArgument in customArguments) {
-			this.customArguments.Add(jvmArgument);
 	}
+
+	public void Add(string argument) {
+		customArguments.Add(argument);
 	}
 
 	public void AddProperty(string key, string value) {
@@ -24,8 +23,8 @@ sealed class JvmArgumentBuilder {
 			target.Add(property);
 		}
 
+		// In case of duplicate JVM arguments, typically the last one wins.
 		target.Add("-Xms" + basicProperties.InitialHeapMegabytes + "M");
 		target.Add("-Xmx" + basicProperties.MaximumHeapMegabytes + "M");
-		target.Add("-Xrs");
 	}
 }

Agent/Phantom.Agent.Minecraft/Launcher/BaseLauncher.cs

@@ -1,10 +1,9 @@
-using System.Text;
-using Kajabity.Tools.Java;
+using System.Collections.ObjectModel;
+using System.Text;
 using Phantom.Agent.Minecraft.Instance;
 using Phantom.Agent.Minecraft.Java;
 using Phantom.Agent.Minecraft.Server;
-using Phantom.Common.Minecraft;
-using Phantom.Utils.Runtime;
+using Phantom.Utils.Processes;
 using Serilog;
 
 namespace Phantom.Agent.Minecraft.Launcher;
@@ -13,6 +12,7 @@ public abstract class BaseLauncher : IServerLauncher {
 	private readonly InstanceProperties instanceProperties;
 
 	protected string MinecraftVersion => instanceProperties.ServerVersion;
+	protected string InstanceFolder => instanceProperties.InstanceFolder;
 
 	private protected BaseLauncher(InstanceProperties instanceProperties) {
 		this.instanceProperties = instanceProperties;
@@ -23,10 +23,6 @@ public abstract class BaseLauncher : IServerLauncher {
 			return new LaunchResult.InvalidJavaRuntime();
 		}
 
-		if (JvmArgumentsHelper.Validate(instanceProperties.JvmArguments) != null) {
-			return new LaunchResult.InvalidJvmArguments();
-		}
-
 		var vanillaServerJarPath = await services.ServerExecutables.DownloadAndGetPath(instanceProperties.LaunchProperties.ServerDownloadInfo, MinecraftVersion, downloadProgressEventHandler, cancellationToken);
 		if (vanillaServerJarPath == null) {
 			return new LaunchResult.CouldNotDownloadMinecraftServer();
@@ -57,24 +53,14 @@ public abstract class BaseLauncher : IServerLauncher {
 		
 		var processConfigurator = new ProcessConfigurator {
 			FileName = javaRuntimeExecutable.ExecutablePath,
-			WorkingDirectory = instanceProperties.InstanceFolder,
+			WorkingDirectory = InstanceFolder,
 			RedirectInput = true,
 			UseShellExecute = false
 		};
 		
-		var jvmArguments = new JvmArgumentBuilder(instanceProperties.JvmProperties, instanceProperties.JvmArguments);
-		CustomizeJvmArguments(jvmArguments);
-
 		var processArguments = processConfigurator.ArgumentList;
-		jvmArguments.Build(processArguments);
-		
-		foreach (var extraArgument in serverJar.ExtraArgs) {
-			processArguments.Add(extraArgument);
-		}
-		
-		processArguments.Add("-jar");
-		processArguments.Add(serverJar.FilePath);
-		processArguments.Add("nogui");
+		PrepareJvmArguments(serverJar).Build(processArguments);
+		PrepareJavaProcessArguments(processArguments, serverJar.FilePath);
 
 		var process = processConfigurator.CreateProcess();
 		var instanceProcess = new InstanceProcess(instanceProperties, process);
@@ -96,8 +82,29 @@ public abstract class BaseLauncher : IServerLauncher {
 		return new LaunchResult.Success(instanceProcess);
 	}
 
+	private JvmArgumentBuilder PrepareJvmArguments(ServerJarInfo serverJar) {
+		var builder = new JvmArgumentBuilder(instanceProperties.JvmProperties);
+
+		foreach (string argument in instanceProperties.JvmArguments) {
+			builder.Add(argument);
+		}
+
+		foreach (var argument in serverJar.ExtraArgs) {
+			builder.Add(argument);
+		}
+
+		CustomizeJvmArguments(builder);
+		return builder;
+	}
+
 	private protected virtual void CustomizeJvmArguments(JvmArgumentBuilder arguments) {}
 
+	protected virtual void PrepareJavaProcessArguments(Collection<string> processArguments, string serverJarFilePath) {
+		processArguments.Add("-jar");
+		processArguments.Add(serverJarFilePath);
+		processArguments.Add("nogui");
+	}
+
 	private protected virtual Task<ServerJarInfo> PrepareServerJar(ILogger logger, string serverJarPath, CancellationToken cancellationToken) {
 		return Task.FromResult(new ServerJarInfo(serverJarPath));
 	}
@@ -108,21 +115,8 @@ public abstract class BaseLauncher : IServerLauncher {
 	}
 
 	private static async Task UpdateServerProperties(InstanceProperties instanceProperties) {
-		var serverPropertiesFilePath = Path.Combine(instanceProperties.InstanceFolder, "server.properties");
-		var serverPropertiesData = new JavaProperties();
-
-		await using var fileStream = new FileStream(serverPropertiesFilePath, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.None);
-		try {
-			serverPropertiesData.Load(fileStream);
-		} catch (ParseException e) {
-			throw new Exception("Could not parse server.properties file: " + serverPropertiesFilePath, e);
-		}
-		
-		instanceProperties.ServerProperties.SetTo(serverPropertiesData);
-
-		fileStream.Seek(0L, SeekOrigin.Begin);
-		fileStream.SetLength(0L);
-		
-		serverPropertiesData.Store(fileStream, true);
+		var serverPropertiesEditor = new JavaPropertiesFileEditor();
+		instanceProperties.ServerProperties.SetTo(serverPropertiesEditor);
+		await serverPropertiesEditor.EditOrCreate(Path.Combine(instanceProperties.InstanceFolder, "server.properties"));
 	}
 }

Agent/Phantom.Agent.Minecraft/Launcher/LaunchResult.cs

@@ -9,8 +9,6 @@ public abstract record LaunchResult {
 
 	public sealed record InvalidJavaRuntime : LaunchResult;
 
-	public sealed record InvalidJvmArguments : LaunchResult;
-
 	public sealed record CouldNotDownloadMinecraftServer : LaunchResult;
 	
 	public sealed record CouldNotPrepareMinecraftServerLauncher : LaunchResult;

Agent/Phantom.Agent.Minecraft/Launcher/Types/ForgeLauncher.cs

@@ -1,12 +1,29 @@
-using Phantom.Agent.Minecraft.Instance;
+using System.Collections.ObjectModel;
+using Phantom.Agent.Minecraft.Instance;
 using Phantom.Agent.Minecraft.Java;
+using Serilog;
 
 namespace Phantom.Agent.Minecraft.Launcher.Types; 
 
-public class ForgeLauncher : BaseLauncher {
+public sealed class ForgeLauncher : BaseLauncher {
 	public ForgeLauncher(InstanceProperties instanceProperties) : base(instanceProperties) {}
 	
 	private protected override void CustomizeJvmArguments(JvmArgumentBuilder arguments) {
 		arguments.AddProperty("terminal.ansi", "true"); // TODO
 	}
+
+	protected override void PrepareJavaProcessArguments(Collection<string> processArguments, string serverJarFilePath) {
+		if (OperatingSystem.IsWindows()) {
+			processArguments.Add("@libraries/net/minecraftforge/forge/1.20.1-47.2.0/win_args.txt");
+		}
+		else {
+			processArguments.Add("@libraries/net/minecraftforge/forge/1.20.1-47.2.0/unix_args.txt");
+		}
+		
+		processArguments.Add("nogui");
+	}
+
+	private protected override Task<ServerJarInfo> PrepareServerJar(ILogger logger, string serverJarPath, CancellationToken cancellationToken) {
+		return Task.FromResult(new ServerJarInfo(Path.Combine(InstanceFolder, "run.sh")));
+	}
 }

Agent/Phantom.Agent.Minecraft/Phantom.Agent.Minecraft.csproj

@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
@@ -12,12 +11,8 @@
   
   <ItemGroup>
     <ProjectReference Include="..\..\Common\Phantom.Common.Data\Phantom.Common.Data.csproj" />
-    <ProjectReference Include="..\..\Common\Phantom.Common.Logging\Phantom.Common.Logging.csproj" />
-    <ProjectReference Include="..\..\Common\Phantom.Common.Minecraft\Phantom.Common.Minecraft.csproj" />
-    <ProjectReference Include="..\..\Utils\Phantom.Utils.Collections\Phantom.Utils.Collections.csproj" />
-    <ProjectReference Include="..\..\Utils\Phantom.Utils.Cryptography\Phantom.Utils.Cryptography.csproj" />
-    <ProjectReference Include="..\..\Utils\Phantom.Utils.IO\Phantom.Utils.IO.csproj" />
-    <ProjectReference Include="..\..\Utils\Phantom.Utils.Runtime\Phantom.Utils.Runtime.csproj" />
+    <ProjectReference Include="..\..\Utils\Phantom.Utils\Phantom.Utils.csproj" />
+    <ProjectReference Include="..\..\Utils\Phantom.Utils.Logging\Phantom.Utils.Logging.csproj" />
   </ItemGroup>
 
 </Project>

Agent/Phantom.Agent.Minecraft/Properties/MinecraftServerProperties.cs

@@ -18,4 +18,5 @@ static class MinecraftServerProperties {
 	public static readonly MinecraftServerProperty<ushort> ServerPort = new UnsignedShort("server-port");
 	public static readonly MinecraftServerProperty<ushort> RconPort = new UnsignedShort("rcon.port");
 	public static readonly MinecraftServerProperty<bool> EnableRcon = new Boolean("enable-rcon");
+	public static readonly MinecraftServerProperty<bool> SyncChunkWrites = new Boolean("sync-chunk-writes");
 }

Agent/Phantom.Agent.Minecraft/Properties/MinecraftServerProperty.cs

@@ -1,4 +1,4 @@
-using Kajabity.Tools.Java;
+using Phantom.Agent.Minecraft.Java;
 
 namespace Phantom.Agent.Minecraft.Properties;
 
@@ -12,7 +12,7 @@ abstract class MinecraftServerProperty<T> {
 	protected abstract T Read(string value);
 	protected abstract string Write(T value);
 
-	public void Set(JavaProperties properties, T value) {
-		properties.SetProperty(key, Write(value));
+	public void Set(JavaPropertiesFileEditor properties, T value) {
+		properties.Set(key, Write(value));
 	}
 }

Agent/Phantom.Agent.Minecraft/Properties/ServerProperties.cs

@@ -1,15 +1,17 @@
-using Kajabity.Tools.Java;
+using Phantom.Agent.Minecraft.Java;
 
 namespace Phantom.Agent.Minecraft.Properties;
 
 public sealed record ServerProperties(
 	ushort ServerPort,
 	ushort RconPort,
-	bool EnableRcon = true
+	bool EnableRcon = true,
+	bool SyncChunkWrites = false
 ) {
-	internal void SetTo(JavaProperties properties) {
+	internal void SetTo(JavaPropertiesFileEditor properties) {
 		MinecraftServerProperties.ServerPort.Set(properties, ServerPort);
 		MinecraftServerProperties.RconPort.Set(properties, RconPort);
 		MinecraftServerProperties.EnableRcon.Set(properties, EnableRcon);
+		MinecraftServerProperties.SyncChunkWrites.Set(properties, SyncChunkWrites);
 	}
 }

Agent/Phantom.Agent.Minecraft/Server/MinecraftServerExecutableDownloader.cs

@@ -1,8 +1,8 @@
 using System.Security.Cryptography;
 using Phantom.Common.Data.Minecraft;
-using Phantom.Common.Logging;
 using Phantom.Utils.Cryptography;
 using Phantom.Utils.IO;
+using Phantom.Utils.Logging;
 using Phantom.Utils.Runtime;
 using Serilog;
 
@@ -16,32 +16,47 @@ sealed class MinecraftServerExecutableDownloader {
 	public event EventHandler? Completed;
 	
 	private readonly CancellationTokenSource cancellationTokenSource = new ();
-	private int listeners = 0;
+	
+	private readonly List<CancellationTokenRegistration> listenerCancellationRegistrations = new ();
+	private int listenerCount = 0;
 
 	public MinecraftServerExecutableDownloader(FileDownloadInfo fileDownloadInfo, string minecraftVersion, string filePath, MinecraftServerExecutableDownloadListener listener) {
 		Register(listener);
-		Task = DownloadAndGetPath(fileDownloadInfo, minecraftVersion, filePath);
+		Task = DownloadAndGetPath(fileDownloadInfo, minecraftVersion, filePath, new DownloadProgressCallback(this), cancellationTokenSource.Token);
 		Task.ContinueWith(OnCompleted, TaskScheduler.Default);
 	}
 
 	public void Register(MinecraftServerExecutableDownloadListener listener) {
-		++listeners;
-		Logger.Debug("Registered download listener, current listener count: {Listeners}", listeners);
+		int newListenerCount;
+		
+		lock (this) {
+			newListenerCount = ++listenerCount;
 			
 			DownloadProgress += listener.DownloadProgressEventHandler;
-		listener.CancellationToken.Register(Unregister, listener);
+			listenerCancellationRegistrations.Add(listener.CancellationToken.Register(Unregister, listener));
+		}
+		
+		Logger.Debug("Registered download listener, current listener count: {Listeners}", newListenerCount);
 	}
 
 	private void Unregister(object? listenerObject) {
+		int newListenerCount;
+		
+		lock (this) {
 			MinecraftServerExecutableDownloadListener listener = (MinecraftServerExecutableDownloadListener) listenerObject!;
 			DownloadProgress -= listener.DownloadProgressEventHandler;
 
-		if (--listeners <= 0) {
-			Logger.Debug("Unregistered last download listener, cancelling download.");
+			newListenerCount = --listenerCount;
+			if (newListenerCount <= 0) {
 				cancellationTokenSource.Cancel();
 			}
+		}
+		
+		if (newListenerCount <= 0) {
+			Logger.Debug("Unregistered last download listener, cancelling download.");
+		}
 		else {
-			Logger.Debug("Unregistered download listener, current listener count: {Listeners}", listeners);
+			Logger.Debug("Unregistered download listener, current listener count: {Listeners}", newListenerCount);
 		}
 	}
 
@@ -51,9 +66,19 @@ sealed class MinecraftServerExecutableDownloader {
 
 	private void OnCompleted(Task task) {
 		Logger.Debug("Download task completed.");
+
+		lock (this) {
 			Completed?.Invoke(this, EventArgs.Empty);
 			Completed = null;
 			DownloadProgress = null;
+
+			foreach (var registration in listenerCancellationRegistrations) {
+				registration.Dispose();
+			}
+			
+			listenerCancellationRegistrations.Clear();
+			cancellationTokenSource.Dispose();
+		}
 	}
 
 	private sealed class DownloadProgressCallback {
@@ -68,15 +93,14 @@ sealed class MinecraftServerExecutableDownloader {
 		}
 	}
 
-	private async Task<string?> DownloadAndGetPath(FileDownloadInfo fileDownloadInfo, string minecraftVersion, string filePath) {
+	private static async Task<string?> DownloadAndGetPath(FileDownloadInfo fileDownloadInfo, string minecraftVersion, string filePath, DownloadProgressCallback progressCallback, CancellationToken cancellationToken) {
 		string tmpFilePath = filePath + ".tmp";
 
-		var cancellationToken = cancellationTokenSource.Token;
 		try {
 			Logger.Information("Downloading server version {Version} from: {Url} ({Size})", minecraftVersion, fileDownloadInfo.DownloadUrl, fileDownloadInfo.Size.ToHumanReadable(decimalPlaces: 1));
 			try {
 				using var http = new HttpClient();
-				await FetchServerExecutableFile(http, new DownloadProgressCallback(this), fileDownloadInfo, tmpFilePath, cancellationToken);
+				await FetchServerExecutableFile(http, progressCallback, fileDownloadInfo, tmpFilePath, cancellationToken);
 			} catch (Exception) {
 				TryDeleteExecutableAfterFailure(tmpFilePath);
 				throw;
@@ -94,8 +118,6 @@ sealed class MinecraftServerExecutableDownloader {
 		} catch (Exception e) {
 			Logger.Error(e, "An unexpected error occurred.");
 			return null;
-		} finally {
-			cancellationTokenSource.Dispose();
 		}
 	}
 

Agent/Phantom.Agent.Minecraft/Server/MinecraftServerExecutables.cs

@@ -1,7 +1,7 @@
 using System.Text.RegularExpressions;
 using Phantom.Common.Data.Minecraft;
-using Phantom.Common.Logging;
 using Phantom.Utils.IO;
+using Phantom.Utils.Logging;
 using Serilog;
 
 namespace Phantom.Agent.Minecraft.Server;
@@ -10,7 +10,7 @@ public sealed partial class MinecraftServerExecutables {
 	private static readonly ILogger Logger = PhantomLogger.Create<MinecraftServerExecutables>();
 
 	[GeneratedRegex(@"[^a-zA-Z0-9_\-\.]", RegexOptions.Compiled)]
-	private static partial Regex VersionFolderSanitizeRegex();
+	private static partial Regex SanitizePathRegex();
 
 	private readonly string basePath;
 	private readonly Dictionary<string, MinecraftServerExecutableDownloader> runningDownloadersByVersion = new ();
@@ -20,7 +20,7 @@ public sealed partial class MinecraftServerExecutables {
 	}
 
 	internal async Task<string?> DownloadAndGetPath(FileDownloadInfo? fileDownloadInfo, string minecraftVersion, EventHandler<DownloadProgressEventArgs> progressEventHandler, CancellationToken cancellationToken) {
-		string serverExecutableFolderPath = Path.Combine(basePath, VersionFolderSanitizeRegex().Replace(minecraftVersion, "_"));
+		string serverExecutableFolderPath = Path.Combine(basePath, SanitizePathRegex().IsMatch(minecraftVersion) ? SanitizePathRegex().Replace(minecraftVersion, "_") : minecraftVersion);
 		string serverExecutableFilePath = Path.Combine(serverExecutableFolderPath, "server.jar");
 
 		if (File.Exists(serverExecutableFilePath)) {

Agent/Phantom.Agent.Minecraft/Server/ServerStatusProtocol.cs

@@ -3,28 +3,12 @@ using System.Buffers.Binary;
 using System.Net;
 using System.Net.Sockets;
 using System.Text;
-using Phantom.Common.Logging;
-using Serilog;
+using Phantom.Common.Data.Instance;
 
 namespace Phantom.Agent.Minecraft.Server;
 
-public sealed class ServerStatusProtocol {
-	private readonly ILogger logger;
-
-	public ServerStatusProtocol(string loggerName) {
-		this.logger = PhantomLogger.Create<ServerStatusProtocol>(loggerName);
-	}
-
-	public async Task<int?> GetOnlinePlayerCount(int serverPort, CancellationToken cancellationToken) {
-		try {
-			return await GetOnlinePlayerCountOrThrow(serverPort, cancellationToken);
-		} catch (Exception e) {
-			logger.Error(e, "Caught exception while checking if players are online.");
-			return null;
-		}
-	}
-
-	private async Task<int?> GetOnlinePlayerCountOrThrow(int serverPort, CancellationToken cancellationToken) {
+public static class ServerStatusProtocol {
+	public static async Task<InstancePlayerCounts> GetPlayerCounts(ushort serverPort, CancellationToken cancellationToken) {
 		using var tcpClient = new TcpClient();
 		await tcpClient.ConnectAsync(IPAddress.Loopback, serverPort, cancellationToken);
 		var tcpStream = tcpClient.GetStream();
@@ -33,24 +17,22 @@ public sealed class ServerStatusProtocol {
 		tcpStream.WriteByte(0xFE);
 		await tcpStream.FlushAsync(cancellationToken);
 
-		short? messageLength = await ReadStreamHeader(tcpStream, cancellationToken);
-		return messageLength == null ? null : await ReadOnlinePlayerCount(tcpStream, messageLength.Value * 2, cancellationToken);
+		short messageLength = await ReadStreamHeader(tcpStream, cancellationToken);
+		return await ReadPlayerCounts(tcpStream, messageLength * 2, cancellationToken);
 	}
 
-	private async Task<short?> ReadStreamHeader(NetworkStream tcpStream, CancellationToken cancellationToken) {
+	private static async Task<short> ReadStreamHeader(NetworkStream tcpStream, CancellationToken cancellationToken) {
 		var headerBuffer = ArrayPool<byte>.Shared.Rent(3);
 		try {
 			await tcpStream.ReadExactlyAsync(headerBuffer, 0, 3, cancellationToken);
 
 			if (headerBuffer[0] != 0xFF) {
-				logger.Error("Unexpected first byte in response from server: {FirstByte}.", headerBuffer[0]);
-				return null;
+				throw new ProtocolException("Unexpected first byte in response from server: " + headerBuffer[0]);
 			}
 
 			short messageLength = BinaryPrimitives.ReadInt16BigEndian(headerBuffer.AsSpan(1));
 			if (messageLength <= 0) {
-				logger.Error("Unexpected message length in response from server: {MessageLength}.", messageLength);
-				return null;
+				throw new ProtocolException("Unexpected message length in response from server: " + messageLength);
 			}
 			
 			return messageLength;
@@ -59,35 +41,54 @@ public sealed class ServerStatusProtocol {
 		}
 	}
 
-	private async Task<int?> ReadOnlinePlayerCount(NetworkStream tcpStream, int messageLength, CancellationToken cancellationToken) {
+	private static async Task<InstancePlayerCounts> ReadPlayerCounts(NetworkStream tcpStream, int messageLength, CancellationToken cancellationToken) {
 		var messageBuffer = ArrayPool<byte>.Shared.Rent(messageLength);
 		try {
 			await tcpStream.ReadExactlyAsync(messageBuffer, 0, messageLength, cancellationToken);
-
-			// Valid response separator encoded in UTF-16BE is 0x00 0xA7 (§).
-			const byte SeparatorSecondByte = 0xA7;
-			
-			static bool IsValidSeparator(ReadOnlySpan<byte> buffer, int index) {
-				return index > 0 && buffer[index - 1] == 0x00;
-			}
-			
-			int separator2 = Array.LastIndexOf(messageBuffer, SeparatorSecondByte);
-			int separator1 = separator2 == -1 ? -1 : Array.LastIndexOf(messageBuffer, SeparatorSecondByte, separator2 - 1);
-			if (!IsValidSeparator(messageBuffer, separator1) || !IsValidSeparator(messageBuffer, separator2)) {
-				logger.Error("Could not find message separators in response from server.");
-				return null;
-			}
-
-			string onlinePlayerCountStr = Encoding.BigEndianUnicode.GetString(messageBuffer[(separator1 + 1)..(separator2 - 1)]);
-			if (!int.TryParse(onlinePlayerCountStr, out int onlinePlayerCount)) {
-				logger.Error("Could not parse online player count in response from server: {OnlinePlayerCount}.", onlinePlayerCountStr);
-				return null;
-			}
-			
-			logger.Debug("Detected {OnlinePlayerCount} online player(s).", onlinePlayerCount);
-			return onlinePlayerCount;
+			return ReadPlayerCountsFromResponse(messageBuffer.AsSpan(0, messageLength));
 		} finally {
 			ArrayPool<byte>.Shared.Return(messageBuffer);
 		}
 	}
+	
+	/// <summary>
+	/// Legacy query protocol uses the paragraph symbol (§) as separator encoded in UTF-16BE.
+	/// </summary>
+	private static readonly byte[] Separator = { 0x00, 0xA7 };
+	
+	private static InstancePlayerCounts ReadPlayerCountsFromResponse(ReadOnlySpan<byte> messageBuffer) {
+		int lastSeparator = messageBuffer.LastIndexOf(Separator);
+		int middleSeparator = messageBuffer[..lastSeparator].LastIndexOf(Separator);
+		
+		if (lastSeparator == -1 || middleSeparator == -1) {
+			throw new ProtocolException("Could not find message separators in response from server.");
+		}
+
+		var onlinePlayerCountBuffer = messageBuffer[(middleSeparator + Separator.Length)..lastSeparator];
+		var maximumPlayerCountBuffer = messageBuffer[(lastSeparator + Separator.Length)..];
+		
+		// Player counts are integers, whose maximum string length is 10 characters.
+		Span<char> integerStringBuffer = stackalloc char[10];
+		
+		return new InstancePlayerCounts(
+			DecodeAndParsePlayerCount(onlinePlayerCountBuffer, integerStringBuffer, "online"),
+			DecodeAndParsePlayerCount(maximumPlayerCountBuffer, integerStringBuffer, "maximum")
+		);
+	}
+	
+	private static int DecodeAndParsePlayerCount(ReadOnlySpan<byte> inputBuffer, Span<char> tempCharBuffer, string countType) {
+		if (!Encoding.BigEndianUnicode.TryGetChars(inputBuffer, tempCharBuffer, out int charCount)) {
+			throw new ProtocolException("Could not decode " + countType + " player count in response from server.");
+		}
+		
+		if (!int.TryParse(tempCharBuffer, out int playerCount)) {
+			throw new ProtocolException("Could not parse " + countType + " player count in response from server: " + tempCharBuffer[..charCount].ToString());
+		}
+		
+		return playerCount;
+	}
+	
+	public sealed class ProtocolException : Exception {
+		internal ProtocolException(string message) : base(message) {}
+	}
 }

Agent/Phantom.Agent.Rpc/ControllerConnection.cs

@@ -0,0 +1,21 @@
+using Phantom.Common.Messages.Agent;
+using Phantom.Utils.Logging;
+using Phantom.Utils.Rpc.Runtime;
+using Serilog;
+
+namespace Phantom.Agent.Rpc;
+
+public sealed class ControllerConnection {
+	private static readonly ILogger Logger = PhantomLogger.Create(nameof(ControllerConnection));
+
+	private readonly RpcConnectionToServer<IMessageToController> connection;
+	
+	public ControllerConnection(RpcConnectionToServer<IMessageToController> connection) {
+		this.connection = connection;
+		Logger.Information("Connection ready.");
+	}
+
+	public Task Send<TMessage>(TMessage message) where TMessage : IMessageToController {
+		return connection.Send(message);
+	}
+}

Agent/Phantom.Agent.Rpc/KeepAliveLoop.cs

@@ -1,5 +1,7 @@
-using Phantom.Common.Logging;
-using Phantom.Common.Messages.ToServer;
+using Phantom.Common.Messages.Agent;
+using Phantom.Common.Messages.Agent.ToController;
+using Phantom.Utils.Logging;
+using Phantom.Utils.Rpc.Runtime;
 using Serilog;
 
 namespace Phantom.Agent.Rpc;
@@ -9,10 +11,10 @@ sealed class KeepAliveLoop {
 
 	private static readonly TimeSpan KeepAliveInterval = TimeSpan.FromSeconds(10);
 
-	private readonly RpcServerConnection connection;
+	private readonly RpcConnectionToServer<IMessageToController> connection;
 	private readonly CancellationTokenSource cancellationTokenSource = new ();
 
-	public KeepAliveLoop(RpcServerConnection connection) {
+	public KeepAliveLoop(RpcConnectionToServer<IMessageToController> connection) {
 		this.connection = connection;
 		Task.Run(Run);
 	}
@@ -20,11 +22,13 @@ sealed class KeepAliveLoop {
 	private async Task Run() {
 		var cancellationToken = cancellationTokenSource.Token;
 		
-		Logger.Information("Started keep-alive loop.");
 		try {
+			await connection.IsReady.WaitAsync(cancellationToken);
+			Logger.Information("Started keep-alive loop.");
+			
 			while (true) {
 				await Task.Delay(KeepAliveInterval, cancellationToken);
-				await connection.Send(new AgentIsAliveMessage());
+				await connection.Send(new AgentIsAliveMessage()).WaitAsync(cancellationToken);
 			}
 		} catch (OperationCanceledException) {
 			// Ignore.

Agent/Phantom.Agent.Rpc/Phantom.Agent.Rpc.csproj

@@ -1,13 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
   
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
   
   <ItemGroup>
-    <ProjectReference Include="..\..\Common\Phantom.Common.Messages\Phantom.Common.Messages.csproj" />
+    <ProjectReference Include="..\..\Common\Phantom.Common.Messages.Agent\Phantom.Common.Messages.Agent.csproj" />
   </ItemGroup>
 
 </Project>

Agent/Phantom.Agent.Rpc/RpcClientRuntime.cs

@@ -0,0 +1,37 @@
+using NetMQ;
+using NetMQ.Sockets;
+using Phantom.Common.Messages.Agent;
+using Phantom.Common.Messages.Agent.BiDirectional;
+using Phantom.Common.Messages.Agent.ToController;
+using Phantom.Utils.Actor;
+using Phantom.Utils.Rpc.Runtime;
+using Phantom.Utils.Rpc.Sockets;
+using Serilog;
+
+namespace Phantom.Agent.Rpc;
+
+public sealed class RpcClientRuntime : RpcClientRuntime<IMessageToAgent, IMessageToController, ReplyMessage> {
+	public static Task Launch(RpcClientSocket<IMessageToAgent, IMessageToController, ReplyMessage> socket, ActorRef<IMessageToAgent> handlerActorRef, SemaphoreSlim disconnectSemaphore, CancellationToken receiveCancellationToken) {
+		return new RpcClientRuntime(socket, handlerActorRef, disconnectSemaphore, receiveCancellationToken).Launch();
+	}
+
+	private RpcClientRuntime(RpcClientSocket<IMessageToAgent, IMessageToController, ReplyMessage> socket, ActorRef<IMessageToAgent> handlerActor, SemaphoreSlim disconnectSemaphore, CancellationToken receiveCancellationToken) : base(socket, handlerActor, disconnectSemaphore, receiveCancellationToken) {}
+
+	protected override async Task RunWithConnection(ClientSocket socket, RpcConnectionToServer<IMessageToController> connection) {
+		var keepAliveLoop = new KeepAliveLoop(connection);
+		try {
+			await base.RunWithConnection(socket, connection);
+		} finally {
+			keepAliveLoop.Cancel();
+		}
+	}
+
+	protected override async Task SendDisconnectMessage(ClientSocket socket, ILogger logger) {
+		var unregisterMessageBytes = AgentMessageRegistries.ToController.Write(new UnregisterAgentMessage()).ToArray();
+		try {
+			await socket.SendAsync(unregisterMessageBytes).AsTask().WaitAsync(TimeSpan.FromSeconds(5), CancellationToken.None);
+		} catch (TimeoutException) {
+			logger.Error("Timed out communicating agent shutdown with the controller.");
+		}
+	}
+}

Agent/Phantom.Agent.Rpc/RpcLauncher.cs

@@ -1,107 +0,0 @@
-using NetMQ;
-using NetMQ.Sockets;
-using Phantom.Common.Data.Agent;
-using Phantom.Common.Messages;
-using Phantom.Common.Messages.BiDirectional;
-using Phantom.Common.Messages.ToServer;
-using Phantom.Utils.Rpc;
-using Phantom.Utils.Rpc.Message;
-using Phantom.Utils.Runtime;
-using Serilog;
-using Serilog.Events;
-
-namespace Phantom.Agent.Rpc;
-
-public sealed class RpcLauncher : RpcRuntime<ClientSocket> {
-	public static async Task Launch(RpcConfiguration config, AgentAuthToken authToken, AgentInfo agentInfo, Func<RpcServerConnection, IMessageToAgentListener> listenerFactory, SemaphoreSlim disconnectSemaphore, CancellationToken receiveCancellationToken) {
-		var socket = new ClientSocket();
-		var options = socket.Options;
-
-		options.CurveServerCertificate = config.ServerCertificate;
-		options.CurveCertificate = new NetMQCertificate();
-		options.HelloMessage = MessageRegistries.ToServer.Write(new RegisterAgentMessage(authToken, agentInfo)).ToArray();
-
-		await new RpcLauncher(config, socket, agentInfo.Guid, listenerFactory, disconnectSemaphore, receiveCancellationToken).Launch();
-	}
-
-	private readonly RpcConfiguration config;
-	private readonly Guid agentGuid;
-	private readonly Func<RpcServerConnection, IMessageToAgentListener> messageListenerFactory;
-
-	private readonly SemaphoreSlim disconnectSemaphore;
-	private readonly CancellationToken receiveCancellationToken;
-
-	private RpcLauncher(RpcConfiguration config, ClientSocket socket, Guid agentGuid, Func<RpcServerConnection, IMessageToAgentListener> messageListenerFactory, SemaphoreSlim disconnectSemaphore, CancellationToken receiveCancellationToken) : base(config, socket) {
-		this.config = config;
-		this.agentGuid = agentGuid;
-		this.messageListenerFactory = messageListenerFactory;
-		this.disconnectSemaphore = disconnectSemaphore;
-		this.receiveCancellationToken = receiveCancellationToken;
-	}
-
-	protected override void Connect(ClientSocket socket) {
-		var logger = config.RuntimeLogger;
-		var url = config.TcpUrl;
-
-		logger.Information("Starting ZeroMQ client and connecting to {Url}...", url);
-		socket.Connect(url);
-		logger.Information("ZeroMQ client ready.");
-	}
-
-	protected override void Run(ClientSocket socket, MessageReplyTracker replyTracker, TaskManager taskManager) {
-		var connection = new RpcServerConnection(socket, replyTracker);
-		ServerMessaging.SetCurrentConnection(connection);
-		
-		var logger = config.RuntimeLogger;
-		var handler = new MessageToAgentHandler(messageListenerFactory(connection), logger, taskManager, receiveCancellationToken);
-		var keepAliveLoop = new KeepAliveLoop(connection);
-
-		try {
-			while (!receiveCancellationToken.IsCancellationRequested) {
-				var data = socket.Receive(receiveCancellationToken);
-				
-				LogMessageType(logger, data);
-				
-				if (data.Length > 0) {
-					MessageRegistries.ToAgent.Handle(data, handler);
-				}
-			}
-		} catch (OperationCanceledException) {
-			// Ignore.
-		} finally {
-			logger.Debug("ZeroMQ client stopped receiving messages.");
-
-			disconnectSemaphore.Wait(CancellationToken.None);
-			keepAliveLoop.Cancel();
-		}
-	}
-
-	private static void LogMessageType(ILogger logger, ReadOnlyMemory<byte> data) {
-		if (!logger.IsEnabled(LogEventLevel.Verbose)) {
-			return;
-		}
-
-		if (data.Length > 0 && MessageRegistries.ToAgent.TryGetType(data, out var type)) {
-			logger.Verbose("Received {MessageType} ({Bytes} B) from server.", type.Name, data.Length);
-		}
-		else {
-			logger.Verbose("Received {Bytes} B message from server.", data.Length);
-		}
-	}
-
-	protected override async Task Disconnect() {
-		var unregisterTimeoutTask = Task.Delay(TimeSpan.FromSeconds(5), CancellationToken.None);
-		var finishedTask = await Task.WhenAny(ServerMessaging.Send(new UnregisterAgentMessage(agentGuid)), unregisterTimeoutTask);
-		if (finishedTask == unregisterTimeoutTask) {
-			config.RuntimeLogger.Error("Timed out communicating agent shutdown with the server.");
-		}
-	}
-
-	private sealed class MessageToAgentHandler : MessageHandler<IMessageToAgentListener> {
-		public MessageToAgentHandler(IMessageToAgentListener listener, ILogger logger, TaskManager taskManager, CancellationToken cancellationToken) : base(listener, logger, taskManager, cancellationToken) {}
-		
-		protected override Task SendReply(uint sequenceId, byte[] serializedReply) {
-			return ServerMessaging.Send(new ReplyMessage(sequenceId, serializedReply));
-		}
-	}
-}

Agent/Phantom.Agent.Rpc/RpcServerConnection.cs

@@ -1,41 +0,0 @@
-using NetMQ;
-using NetMQ.Sockets;
-using Phantom.Common.Messages;
-using Phantom.Common.Messages.BiDirectional;
-using Phantom.Utils.Rpc.Message;
-
-namespace Phantom.Agent.Rpc; 
-
-public sealed class RpcServerConnection {
-	private readonly ClientSocket socket;
-	private readonly MessageReplyTracker replyTracker;
-
-	internal RpcServerConnection(ClientSocket socket, MessageReplyTracker replyTracker) {
-		this.socket = socket;
-		this.replyTracker = replyTracker;
-	}
-
-	internal async Task Send<TMessage>(TMessage message) where TMessage : IMessageToServer {
-		var bytes = MessageRegistries.ToServer.Write(message).ToArray();
-		if (bytes.Length > 0) {
-			await socket.SendAsync(bytes);
-		}
-	}
-
-	internal async Task<TReply?> Send<TMessage, TReply>(TMessage message, TimeSpan waitForReplyTime, CancellationToken waitForReplyCancellationToken) where TMessage : IMessageToServer<TReply> where TReply : class {
-		var sequenceId = replyTracker.RegisterReply();
-		
-		var bytes = MessageRegistries.ToServer.Write<TMessage, TReply>(sequenceId, message).ToArray();
-		if (bytes.Length == 0) {
-			replyTracker.ForgetReply(sequenceId);
-			return null;
-		}
-
-		await socket.SendAsync(bytes);
-		return await replyTracker.WaitForReply<TReply>(sequenceId, waitForReplyTime, waitForReplyCancellationToken);
-	}
-
-	public void Receive(ReplyMessage message) {
-		replyTracker.ReceiveReply(message.SequenceId, message.SerializedReply);
-	}
-}

Agent/Phantom.Agent.Rpc/ServerMessaging.cs

@@ -1,34 +0,0 @@
-using Phantom.Common.Logging;
-using Phantom.Common.Messages;
-using Serilog;
-
-namespace Phantom.Agent.Rpc;
-
-public static class ServerMessaging {
-	private static readonly ILogger Logger = PhantomLogger.Create(nameof(ServerMessaging));
-	
-	private static RpcServerConnection? CurrentConnection { get; set; }
-	private static RpcServerConnection CurrentConnectionOrThrow => CurrentConnection ?? throw new InvalidOperationException("Server connection not ready.");
-	
-	private static readonly object SetCurrentConnectionLock = new ();
-
-	internal static void SetCurrentConnection(RpcServerConnection connection) {
-		lock (SetCurrentConnectionLock) {
-			if (CurrentConnection != null) {
-				throw new InvalidOperationException("Server connection can only be set once.");
-			}
-			
-			CurrentConnection = connection;
-		}
-		
-		Logger.Information("Server connection ready.");
-	}
-
-	public static Task Send<TMessage>(TMessage message) where TMessage : IMessageToServer {
-		return CurrentConnectionOrThrow.Send(message);
-	}
-
-	public static Task<TReply?> Send<TMessage, TReply>(TMessage message, TimeSpan waitForReplyTime, CancellationToken waitForReplyCancellationToken) where TMessage : IMessageToServer<TReply> where TReply : class {
-		return CurrentConnectionOrThrow.Send<TMessage, TReply>(message, waitForReplyTime, waitForReplyCancellationToken);
-	}
-}

Agent/Phantom.Agent.Services/AgentFolders.cs

@@ -1,5 +1,5 @@
-using Phantom.Common.Logging;
-using Phantom.Utils.IO;
+using Phantom.Utils.IO;
+using Phantom.Utils.Logging;
 using Serilog;
 
 namespace Phantom.Agent.Services;

Agent/Phantom.Agent.Services/AgentServiceConfiguration.cs

@@ -0,0 +1,3 @@
+namespace Phantom.Agent.Services;
+
+public readonly record struct AgentServiceConfiguration(int MaxConcurrentCompressionTasks);

Agent/Phantom.Agent.Services/AgentServices.cs

@@ -1,9 +1,11 @@
-using Phantom.Agent.Minecraft.Java;
+using Akka.Actor;
+using Phantom.Agent.Minecraft.Java;
+using Phantom.Agent.Rpc;
 using Phantom.Agent.Services.Backups;
 using Phantom.Agent.Services.Instances;
 using Phantom.Common.Data.Agent;
-using Phantom.Common.Logging;
-using Phantom.Utils.Runtime;
+using Phantom.Utils.Actor;
+using Phantom.Utils.Logging;
 using Serilog;
 
 namespace Phantom.Agent.Services;
@@ -11,19 +13,28 @@ namespace Phantom.Agent.Services;
 public sealed class AgentServices {
 	private static readonly ILogger Logger = PhantomLogger.Create<AgentServices>();
 	
+	public ActorSystem ActorSystem { get; }
+
 	private AgentFolders AgentFolders { get; }
-	private TaskManager TaskManager { get; }
+	private AgentState AgentState { get; }
 	private BackupManager BackupManager { get; }
 
 	internal JavaRuntimeRepository JavaRuntimeRepository { get; }
-	internal InstanceSessionManager InstanceSessionManager { get; }
+	internal InstanceTicketManager InstanceTicketManager { get; }
+	internal ActorRef<InstanceManagerActor.ICommand> InstanceManager { get; }
+
+	public AgentServices(AgentInfo agentInfo, AgentFolders agentFolders, AgentServiceConfiguration serviceConfiguration, ControllerConnection controllerConnection) {
+		this.ActorSystem = ActorSystemFactory.Create("Agent");
 		
-	public AgentServices(AgentInfo agentInfo, AgentFolders agentFolders) {
 		this.AgentFolders = agentFolders;
-		this.TaskManager = new TaskManager(PhantomLogger.Create<TaskManager, AgentServices>());
-		this.BackupManager = new BackupManager(agentFolders);
+		this.AgentState = new AgentState();
+		this.BackupManager = new BackupManager(agentFolders, serviceConfiguration.MaxConcurrentCompressionTasks);
+		
 		this.JavaRuntimeRepository = new JavaRuntimeRepository();
-		this.InstanceSessionManager = new InstanceSessionManager(agentInfo, agentFolders, JavaRuntimeRepository, TaskManager, BackupManager);
+		this.InstanceTicketManager = new InstanceTicketManager(agentInfo, controllerConnection);
+		
+		var instanceManagerInit = new InstanceManagerActor.Init(controllerConnection, agentFolders, AgentState, JavaRuntimeRepository, InstanceTicketManager, BackupManager);
+		this.InstanceManager = ActorSystem.ActorOf(InstanceManagerActor.Factory(instanceManagerInit), "InstanceManager");
 	}
 
 	public async Task Initialize() {
@@ -35,10 +46,12 @@ public sealed class AgentServices {
 	public async Task Shutdown() {
 		Logger.Information("Stopping services...");
 		
-		await InstanceSessionManager.StopAll();
-		InstanceSessionManager.Dispose();
+		await InstanceManager.Stop(new InstanceManagerActor.ShutdownCommand());
 		
-		await TaskManager.Stop();
+		BackupManager.Dispose();
+		
+		await ActorSystem.Terminate();
+		ActorSystem.Dispose();
 		
 		Logger.Information("Services stopped.");
 	}

Agent/Phantom.Agent.Services/AgentState.cs

@@ -0,0 +1,15 @@
+using System.Collections.Immutable;
+using Phantom.Agent.Services.Instances;
+using Phantom.Utils.Actor.Event;
+
+namespace Phantom.Agent.Services;
+
+sealed class AgentState {
+	private readonly ObservableState<ImmutableDictionary<Guid, Instance>> instancesByGuid = new (ImmutableDictionary<Guid, Instance>.Empty);
+	
+	public ImmutableDictionary<Guid, Instance> InstancesByGuid => instancesByGuid.State;
+	
+	public void UpdateInstance(Instance instance) {
+		instancesByGuid.PublisherSide.Publish(static (instancesByGuid, instance) => instancesByGuid.SetItem(instance.InstanceGuid, instance), instance);
+	}
+}

Agent/Phantom.Agent.Services/Backups/BackupArchiver.cs

@@ -3,8 +3,8 @@ using System.Diagnostics.CodeAnalysis;
 using System.Formats.Tar;
 using Phantom.Agent.Minecraft.Instance;
 using Phantom.Common.Data.Backups;
-using Phantom.Common.Logging;
 using Phantom.Utils.IO;
+using Phantom.Utils.Logging;
 using Serilog;
 
 namespace Phantom.Agent.Services.Backups;
@@ -25,7 +25,7 @@ sealed class BackupArchiver {
 	}
 
 	private bool IsFolderSkipped(ImmutableList<string> relativePath) {
-		return relativePath is ["cache" or "crash-reports" or "debug" or "libraries" or "logs" or "mods" or "versions"];
+		return relativePath is ["cache" or "crash-reports" or "debug" or "libraries" or "logs" or "mods" or "servermods" or "versions"];
 	}
 	
 	[SuppressMessage("ReSharper", "ConvertIfStatementToReturnStatement")]

Agent/Phantom.Agent.Services/Backups/BackupCompressor.cs

@@ -1,5 +1,5 @@
-using Phantom.Common.Logging;
-using Phantom.Utils.Runtime;
+using Phantom.Utils.Logging;
+using Phantom.Utils.Processes;
 using Serilog;
 
 namespace Phantom.Agent.Services.Backups;
@@ -47,10 +47,8 @@ static class BackupCompressor {
 				Quality,
 				Memory,
 				Threads,
-				"-c",
 				"--rm",
 				"--no-progress",
-				"-c",
 				"-o", destinationFilePath,
 				"--", sourceFilePath
 			}

Agent/Phantom.Agent.Services/Backups/BackupManager.cs

@@ -1,48 +1,38 @@
 using Phantom.Agent.Minecraft.Instance;
 using Phantom.Common.Data.Backups;
-using Phantom.Common.Logging;
+using Phantom.Utils.Logging;
 using Serilog;
 
 namespace Phantom.Agent.Services.Backups;
 
-sealed class BackupManager {
+sealed class BackupManager : IDisposable {
 	private readonly string destinationBasePath;
 	private readonly string temporaryBasePath;
+	private readonly SemaphoreSlim compressionSemaphore;
 
-	public BackupManager(AgentFolders agentFolders) {
+	public BackupManager(AgentFolders agentFolders, int maxConcurrentCompressionTasks) {
 		this.destinationBasePath = agentFolders.BackupsFolderPath;
 		this.temporaryBasePath = Path.Combine(agentFolders.TemporaryFolderPath, "backups");
+		this.compressionSemaphore = new SemaphoreSlim(maxConcurrentCompressionTasks, maxConcurrentCompressionTasks);
 	}
 
-	public async Task<BackupCreationResult> CreateBackup(string loggerName, InstanceProcess process, CancellationToken cancellationToken) {
-		try {
-			if (!await process.BackupSemaphore.Wait(TimeSpan.FromSeconds(1), cancellationToken)) {
-				return new BackupCreationResult(BackupCreationResultKind.BackupAlreadyRunning);
-			}
-		} catch (ObjectDisposedException) {
-			return new BackupCreationResult(BackupCreationResultKind.InstanceNotRunning);
-		} catch (OperationCanceledException) {
-			return new BackupCreationResult(BackupCreationResultKind.InstanceNotRunning);
+	public Task<BackupCreationResult> CreateBackup(string loggerName, InstanceProcess process, CancellationToken cancellationToken) {
+		return new BackupCreator(this, loggerName, process, cancellationToken).CreateBackup();
 	}
 
-		try {
-			return await new BackupCreator(destinationBasePath, temporaryBasePath, loggerName, process, cancellationToken).CreateBackup();
-		} finally {
-			process.BackupSemaphore.Release();
-		}
+	public void Dispose() {
+		compressionSemaphore.Dispose();
 	}
 
 	private sealed class BackupCreator {
-		private readonly string destinationBasePath;
-		private readonly string temporaryBasePath;
+		private readonly BackupManager manager;
 		private readonly string loggerName;
 		private readonly ILogger logger;
 		private readonly InstanceProcess process;
 		private readonly CancellationToken cancellationToken;
 
-		public BackupCreator(string destinationBasePath, string temporaryBasePath, string loggerName, InstanceProcess process, CancellationToken cancellationToken) {
-			this.destinationBasePath = destinationBasePath;
-			this.temporaryBasePath = temporaryBasePath;
+		public BackupCreator(BackupManager manager, string loggerName, InstanceProcess process, CancellationToken cancellationToken) {
+			this.manager = manager;
 			this.loggerName = loggerName;
 			this.logger = PhantomLogger.Create<BackupManager>(loggerName);
 			this.process = process;
@@ -72,11 +62,15 @@ sealed class BackupManager {
 			try {
 				await dispatcher.DisableAutomaticSaving();
 				await dispatcher.SaveAllChunks();
-				return await new BackupArchiver(destinationBasePath, temporaryBasePath, loggerName, process.InstanceProperties, cancellationToken).ArchiveWorld(resultBuilder);
+				return await new BackupArchiver(manager.destinationBasePath, manager.temporaryBasePath, loggerName, process.InstanceProperties, cancellationToken).ArchiveWorld(resultBuilder);
 			} catch (OperationCanceledException) {
 				resultBuilder.Kind = BackupCreationResultKind.BackupCancelled;
 				logger.Warning("Backup creation was cancelled.");
 				return null;
+			} catch (TimeoutException) {
+				resultBuilder.Kind = BackupCreationResultKind.BackupTimedOut;
+				logger.Warning("Backup creation timed out.");
+				return null;
 			} catch (Exception e) {
 				resultBuilder.Kind = BackupCreationResultKind.UnknownError;
 				logger.Error(e, "Caught exception while creating an instance backup.");
@@ -85,7 +79,10 @@ sealed class BackupManager {
 				try {
 					await dispatcher.EnableAutomaticSaving();
 				} catch (OperationCanceledException) {
-					// ignore
+					// Ignore.
+				} catch (TimeoutException) {
+					resultBuilder.Warnings |= BackupCreationWarnings.CouldNotRestoreAutomaticSaving;
+					logger.Warning("Timed out waiting for automatic saving to be re-enabled.");
 				} catch (Exception e) {
 					resultBuilder.Warnings |= BackupCreationWarnings.CouldNotRestoreAutomaticSaving;
 					logger.Error(e, "Caught exception while enabling automatic saving after creating an instance backup.");
@@ -94,15 +91,25 @@ sealed class BackupManager {
 		}
 		
 		private async Task CompressWorldArchive(string filePath, BackupCreationResult.Builder resultBuilder) {
+			if (!await manager.compressionSemaphore.WaitAsync(TimeSpan.FromSeconds(1), cancellationToken)) {
+				logger.Information("Too many compression tasks running, waiting for one of them to complete...");
+				await manager.compressionSemaphore.WaitAsync(cancellationToken);
+			}
+
+			logger.Information("Compressing backup...");
+			try {
 				var compressedFilePath = await BackupCompressor.Compress(filePath, cancellationToken);
 				if (compressedFilePath == null) {
 					resultBuilder.Warnings |= BackupCreationWarnings.CouldNotCompressWorldArchive;
 				}
+			} finally {
+				manager.compressionSemaphore.Release();
+			}
 		}
 
 		private void LogBackupResult(BackupCreationResult result) {
 			if (result.Kind != BackupCreationResultKind.Success) {
-				logger.Warning("Backup failed: {Reason}", result.Kind.ToSentence());
+				logger.Warning("Backup failed: {Reason}", DescribeResult(result.Kind));
 				return;
 			}
 			
@@ -114,5 +121,20 @@ sealed class BackupManager {
 				logger.Information("Backup finished successfully.");
 			}
 		}
+
+		private static string DescribeResult(BackupCreationResultKind kind) {
+			return kind switch {
+				BackupCreationResultKind.Success                            => "Backup created successfully.",
+				BackupCreationResultKind.InstanceNotRunning                 => "Instance is not running.",
+				BackupCreationResultKind.BackupCancelled                    => "Backup cancelled.",
+				BackupCreationResultKind.BackupTimedOut                     => "Backup timed out.",
+				BackupCreationResultKind.BackupAlreadyRunning               => "A backup is already being created.",
+				BackupCreationResultKind.BackupFileAlreadyExists            => "Backup with the same name already exists.",
+				BackupCreationResultKind.CouldNotCreateBackupFolder         => "Could not create backup folder.",
+				BackupCreationResultKind.CouldNotCopyWorldToTemporaryFolder => "Could not copy world to temporary folder.",
+				BackupCreationResultKind.CouldNotCreateWorldArchive         => "Could not create world archive.",
+				_                                                           => "Unknown error."
+			};
+		}
 	}
 }

Agent/Phantom.Agent.Services/Backups/BackupScheduler.cs

@@ -1,8 +1,8 @@
-using Phantom.Agent.Minecraft.Instance;
-using Phantom.Agent.Minecraft.Server;
+using Phantom.Agent.Services.Instances;
+using Phantom.Agent.Services.Instances.State;
 using Phantom.Common.Data.Backups;
-using Phantom.Common.Logging;
-using Phantom.Utils.Runtime;
+using Phantom.Utils.Logging;
+using Phantom.Utils.Tasks;
 
 namespace Phantom.Agent.Services.Backups;
 
@@ -12,21 +12,19 @@ sealed class BackupScheduler : CancellableBackgroundTask {
 	private static readonly TimeSpan BackupInterval = TimeSpan.FromMinutes(30);
 	private static readonly TimeSpan BackupFailureRetryDelay = TimeSpan.FromMinutes(5);
 
-	private readonly string loggerName;
 	private readonly BackupManager backupManager;
-	private readonly InstanceProcess process;
-	private readonly int serverPort;
-	private readonly ServerStatusProtocol serverStatusProtocol;
+	private readonly InstanceContext context;
+	private readonly SemaphoreSlim backupSemaphore = new (1, 1);
 	private readonly ManualResetEventSlim serverOutputWhileWaitingForOnlinePlayers = new ();
+	private readonly InstancePlayerCountTracker playerCountTracker;
 	
 	public event EventHandler<BackupCreationResult>? BackupCompleted;
 
-	public BackupScheduler(TaskManager taskManager, BackupManager backupManager, InstanceProcess process, int serverPort, string loggerName) : base(PhantomLogger.Create<BackupScheduler>(loggerName), taskManager, "Backup scheduler for " + loggerName) {
-		this.loggerName = loggerName;
-		this.backupManager = backupManager;
-		this.process = process;
-		this.serverPort = serverPort;
-		this.serverStatusProtocol = new ServerStatusProtocol(loggerName);
+	public BackupScheduler(InstanceContext context, InstancePlayerCountTracker playerCountTracker) : base(PhantomLogger.Create<BackupScheduler>(context.ShortName)) {
+		this.backupManager = context.Services.BackupManager;
+		this.context = context;
+		this.playerCountTracker = playerCountTracker;
+		Start();
 	}
 
 	protected override async Task RunTask() {
@@ -50,47 +48,38 @@ sealed class BackupScheduler : CancellableBackgroundTask {
 	}
 
 	private async Task<BackupCreationResult> CreateBackup() {
-		return await backupManager.CreateBackup(loggerName, process, CancellationToken.None);
+		if (!await backupSemaphore.WaitAsync(TimeSpan.FromSeconds(1))) {
+			return new BackupCreationResult(BackupCreationResultKind.BackupAlreadyRunning);
+		}
+		
+		try {
+			context.ActorCancellationToken.ThrowIfCancellationRequested();
+			return await context.Actor.Request(new InstanceActor.BackupInstanceCommand(backupManager), context.ActorCancellationToken);
+		} catch (OperationCanceledException) {
+			return new BackupCreationResult(BackupCreationResultKind.InstanceNotRunning);
+		} finally {
+			backupSemaphore.Release();
+		}
 	}
 
 	private async Task WaitForOnlinePlayers() {
-		bool needsToLogOfflinePlayersMessage = true;
+		var task = playerCountTracker.WaitForOnlinePlayers(CancellationToken);
+		if (!task.IsCompleted) {
+			Logger.Information("Waiting for someone to join before starting a new backup.");
+		}
 		
-		process.AddOutputListener(ServerOutputListener, maxLinesToReadFromHistory: 0);
 		try {
-			while (!CancellationToken.IsCancellationRequested) {
-				serverOutputWhileWaitingForOnlinePlayers.Reset();
-				
-				var onlinePlayerCount = await serverStatusProtocol.GetOnlinePlayerCount(serverPort, CancellationToken);
-				if (onlinePlayerCount == null) {
-					Logger.Warning("Could not detect whether any players are online, starting a new backup.");
-					break;
-				}
-
-				if (onlinePlayerCount > 0) {
+			await task;
 			Logger.Information("Players are online, starting a new backup.");
-					break;
-				}
-
-				if (needsToLogOfflinePlayersMessage) {
-					needsToLogOfflinePlayersMessage = false;
-					Logger.Information("No players are online, waiting for someone to join before starting a new backup.");
-				}
-
-				await Task.Delay(TimeSpan.FromSeconds(10), CancellationToken);
-				
-				Logger.Debug("Waiting for server output before checking for online players again...");
-				await serverOutputWhileWaitingForOnlinePlayers.WaitHandle.WaitOneAsync(CancellationToken);
-			}
-		} finally {
-			process.RemoveOutputListener(ServerOutputListener);
+		} catch (OperationCanceledException) {
+			throw;
+		} catch (Exception) {
+			Logger.Warning("Could not detect whether any players are online, starting a new backup.");
 		}
 	}
 
-	private void ServerOutputListener(object? sender, string line) {
-		if (!serverOutputWhileWaitingForOnlinePlayers.IsSet) {
-			serverOutputWhileWaitingForOnlinePlayers.Set();
-			Logger.Debug("Detected server output, signalling to check for online players again.");
-		}
+	protected override void Dispose() {
+		backupSemaphore.Dispose();
+		serverOutputWhileWaitingForOnlinePlayers.Dispose();
 	}
 }

Agent/Phantom.Agent.Services/Backups/BackupServerCommandDispatcher.cs

@@ -1,22 +1,41 @@
-using System.Text.RegularExpressions;
+using System.Collections.Immutable;
+using System.Text.RegularExpressions;
 using Phantom.Agent.Minecraft.Command;
 using Phantom.Agent.Minecraft.Instance;
-using Phantom.Utils.Runtime;
+using Phantom.Utils.Tasks;
 using Serilog;
 
 namespace Phantom.Agent.Services.Backups;
 
 sealed partial class BackupServerCommandDispatcher : IDisposable {
-	[GeneratedRegex(@"^\[(?:.*?)\] \[Server thread/INFO\]: (.*?)$", RegexOptions.NonBacktracking)]
+	[GeneratedRegex(@"^(?:(?:\[.*?\] \[Server thread/INFO\].*?:)|(?:[\d-]+? [\d:]+? \[INFO\])) (.*?)$", RegexOptions.NonBacktracking)]
 	private static partial Regex ServerThreadInfoRegex();
 	
+	private static readonly ImmutableHashSet<string> AutomaticSavingDisabledMessages = ImmutableHashSet.Create(
+		"Automatic saving is now disabled",
+		"Turned off world auto-saving",
+		"CONSOLE: Disabling level saving.."
+	);
+	
+	private static readonly ImmutableHashSet<string> SavedTheGameMessages = ImmutableHashSet.Create(
+		"Saved the game",
+		"Saved the world",
+		"CONSOLE: Save complete."
+	);
+	
+	private static readonly ImmutableHashSet<string> AutomaticSavingEnabledMessages = ImmutableHashSet.Create(
+		"Automatic saving is now enabled",
+		"Turned on world auto-saving",
+		"CONSOLE: Enabling level saving.."
+	);
+
 	private readonly ILogger logger;
 	private readonly InstanceProcess process;
 	private readonly CancellationToken cancellationToken;
 
-	private readonly TaskCompletionSource automaticSavingDisabled = Tasks.CreateCompletionSource();
-	private readonly TaskCompletionSource savedTheGame = Tasks.CreateCompletionSource();
-	private readonly TaskCompletionSource automaticSavingEnabled = Tasks.CreateCompletionSource();
+	private readonly TaskCompletionSource automaticSavingDisabled = AsyncTasks.CreateCompletionSource();
+	private readonly TaskCompletionSource savedTheGame = AsyncTasks.CreateCompletionSource();
+	private readonly TaskCompletionSource automaticSavingEnabled = AsyncTasks.CreateCompletionSource();
 
 	public BackupServerCommandDispatcher(ILogger logger, InstanceProcess process, CancellationToken cancellationToken) {
 		this.logger = logger;
@@ -32,18 +51,17 @@ sealed partial class BackupServerCommandDispatcher : IDisposable {
 
 	public async Task DisableAutomaticSaving() {
 		await process.SendCommand(MinecraftCommand.SaveOff, cancellationToken);
-		await automaticSavingDisabled.Task.WaitAsync(cancellationToken);
+		await automaticSavingDisabled.Task.WaitAsync(TimeSpan.FromSeconds(30), cancellationToken);
 	}
 
 	public async Task SaveAllChunks() {
-		// TODO Try if not flushing and waiting a few seconds before flushing reduces lag.
 		await process.SendCommand(MinecraftCommand.SaveAll(flush: true), cancellationToken);
-		await savedTheGame.Task.WaitAsync(cancellationToken);
+		await savedTheGame.Task.WaitAsync(TimeSpan.FromMinutes(1), cancellationToken);
 	}
 
 	public async Task EnableAutomaticSaving() {
 		await process.SendCommand(MinecraftCommand.SaveOn, cancellationToken);
-		await automaticSavingEnabled.Task.WaitAsync(cancellationToken);
+		await automaticSavingEnabled.Task.WaitAsync(TimeSpan.FromMinutes(1), cancellationToken);
 	}
 
 	private void OnOutput(object? sender, string? line) {
@@ -59,19 +77,19 @@ sealed partial class BackupServerCommandDispatcher : IDisposable {
 		string info = match.Groups[1].Value;
 
 		if (!automaticSavingDisabled.Task.IsCompleted) {
-			if (info == "Automatic saving is now disabled") {
+			if (AutomaticSavingDisabledMessages.Contains(info)) {
 				logger.Debug("Detected that automatic saving is disabled.");
 				automaticSavingDisabled.SetResult();
 			}
 		}
 		else if (!savedTheGame.Task.IsCompleted) {
-			if (info == "Saved the game") {
+			if (SavedTheGameMessages.Contains(info)) {
 				logger.Debug("Detected that the game is saved.");
 				savedTheGame.SetResult();
 			}
 		}
 		else if (!automaticSavingEnabled.Task.IsCompleted) {
-			if (info == "Automatic saving is now enabled") {
+			if (AutomaticSavingEnabledMessages.Contains(info)) {
 				logger.Debug("Detected that automatic saving is enabled.");
 				automaticSavingEnabled.SetResult();
 			}

Agent/Phantom.Agent.Services/Instances/Instance.cs

@@ -1,209 +1,5 @@
-using Phantom.Agent.Minecraft.Launcher;
-using Phantom.Agent.Rpc;
-using Phantom.Agent.Services.Instances.States;
-using Phantom.Common.Data.Instance;
-using Phantom.Common.Data.Minecraft;
-using Phantom.Common.Data.Replies;
-using Phantom.Common.Logging;
-using Phantom.Common.Messages.ToServer;
-using Serilog;
+using Phantom.Common.Data.Instance;
 
 namespace Phantom.Agent.Services.Instances;
 
-sealed class Instance : IDisposable {
-	private static uint loggerSequenceId = 0;
-
-	private static string GetLoggerName(Guid guid) {
-		var prefix = guid.ToString();
-		return prefix[..prefix.IndexOf('-')] + "/" + Interlocked.Increment(ref loggerSequenceId);
-	}
-
-	private InstanceServices Services { get; }
-	
-	public InstanceConfiguration Configuration { get; private set; }
-	private IServerLauncher Launcher { get; set; }
-
-	private readonly string shortName;
-	private readonly ILogger logger;
-
-	private IInstanceStatus currentStatus;
-	private int statusUpdateCounter;
-	
-	private IInstanceState currentState;
-	private readonly SemaphoreSlim stateTransitioningActionSemaphore = new (1, 1);
-
-	public bool IsRunning => currentState is not InstanceNotRunningState;
-	
-	public event EventHandler? IsRunningChanged; 
-
-	public Instance(InstanceServices services, InstanceConfiguration configuration, IServerLauncher launcher) {
-		this.shortName = GetLoggerName(configuration.InstanceGuid);
-		this.logger = PhantomLogger.Create<Instance>(shortName);
-
-		this.Services = services;
-		this.Configuration = configuration;
-		this.Launcher = launcher;
-		
-		this.currentState = new InstanceNotRunningState();
-		this.currentStatus = InstanceStatus.NotRunning;
-	}
-
-	private void TryUpdateStatus(string taskName, Func<Task> getUpdateTask) {
-		int myStatusUpdateCounter = Interlocked.Increment(ref statusUpdateCounter);
-		
-		Services.TaskManager.Run(taskName, async () => {
-			if (myStatusUpdateCounter == statusUpdateCounter) {
-				await getUpdateTask();
-			}
-		});
-	}
-
-	public void ReportLastStatus() {
-		TryUpdateStatus("Report last status of instance " + shortName, async () => {
-			await ServerMessaging.Send(new ReportInstanceStatusMessage(Configuration.InstanceGuid, currentStatus));
-		});
-	}
-
-	private void ReportAndSetStatus(IInstanceStatus status) {
-		TryUpdateStatus("Report status of instance " + shortName + " as " + status.GetType().Name, async () => {
-			currentStatus = status;
-			await ServerMessaging.Send(new ReportInstanceStatusMessage(Configuration.InstanceGuid, status));
-		});
-	}
-
-	private void ReportEvent(IInstanceEvent instanceEvent) {
-		var message = new ReportInstanceEventMessage(Guid.NewGuid(), DateTime.UtcNow, Configuration.InstanceGuid, instanceEvent);
-		Services.TaskManager.Run("Report event for instance " + shortName, async () => await ServerMessaging.Send(message));
-	}
-	
-	private void TransitionState(IInstanceState newState) {
-		if (currentState == newState) {
-			return;
-		}
-
-		if (currentState is IDisposable disposable) {
-			disposable.Dispose();
-		}
-
-		logger.Debug("Transitioning instance state to: {NewState}", newState.GetType().Name);
-		
-		var wasRunning = IsRunning;
-		currentState = newState;
-		currentState.Initialize();
-
-		if (IsRunning != wasRunning) {
-			IsRunningChanged?.Invoke(this, EventArgs.Empty);
-		}
-	}
-
-	private T TransitionStateAndReturn<T>((IInstanceState State, T Result) newStateAndResult) {
-		TransitionState(newStateAndResult.State);
-		return newStateAndResult.Result;
-	}
-
-	public async Task Reconfigure(InstanceConfiguration configuration, IServerLauncher launcher, CancellationToken cancellationToken) {
-		await stateTransitioningActionSemaphore.WaitAsync(cancellationToken);
-		try {
-			Configuration = configuration;
-			Launcher = launcher;
-		} finally {
-			stateTransitioningActionSemaphore.Release();
-		}
-	}
-
-	public async Task<LaunchInstanceResult> Launch(CancellationToken shutdownCancellationToken) {
-		await stateTransitioningActionSemaphore.WaitAsync(shutdownCancellationToken);
-		try {
-			return TransitionStateAndReturn(currentState.Launch(new InstanceContextImpl(this, shutdownCancellationToken)));
-		} catch (Exception e) {
-			logger.Error(e, "Caught exception while launching instance.");
-			return LaunchInstanceResult.UnknownError;
-		} finally {
-			stateTransitioningActionSemaphore.Release();
-		}
-	}
-
-	public async Task<StopInstanceResult> Stop(MinecraftStopStrategy stopStrategy) {
-		await stateTransitioningActionSemaphore.WaitAsync();
-		try {
-			return TransitionStateAndReturn(currentState.Stop(stopStrategy));
-		} catch (Exception e) {
-			logger.Error(e, "Caught exception while stopping instance.");
-			return StopInstanceResult.UnknownError;
-		} finally {
-			stateTransitioningActionSemaphore.Release();
-		}
-	}
-
-	public async Task StopAndWait(TimeSpan waitTime) {
-		await Stop(MinecraftStopStrategy.Instant);
-
-		using var waitTokenSource = new CancellationTokenSource(waitTime);
-		var waitToken = waitTokenSource.Token;
-
-		while (currentState is not InstanceNotRunningState) {
-			await Task.Delay(TimeSpan.FromMilliseconds(250), waitToken);
-		}
-	}
-
-	public async Task<bool> SendCommand(string command, CancellationToken cancellationToken) {
-		return await currentState.SendCommand(command, cancellationToken);
-	}
-
-	private sealed class InstanceContextImpl : InstanceContext {
-		private readonly Instance instance;
-		private readonly CancellationToken shutdownCancellationToken;
-		
-		public InstanceContextImpl(Instance instance, CancellationToken shutdownCancellationToken) : base(instance.Services, instance.Configuration, instance.Launcher) {
-			this.instance = instance;
-			this.shutdownCancellationToken = shutdownCancellationToken;
-		}
-
-		public override ILogger Logger => instance.logger;
-		public override string ShortName => instance.shortName;
-
-		public override void SetStatus(IInstanceStatus newStatus) {
-			instance.ReportAndSetStatus(newStatus);
-		}
-
-		public override void ReportEvent(IInstanceEvent instanceEvent) {
-			instance.ReportEvent(instanceEvent);
-		}
-
-		public override void TransitionState(Func<(IInstanceState, IInstanceStatus?)> newStateAndStatus) {
-			instance.stateTransitioningActionSemaphore.Wait(CancellationToken.None);
-			try {
-				var (state, status) = newStateAndStatus();
-				
-				if (!instance.IsRunning) {
-					// Only InstanceSessionManager is allowed to transition an instance out of a non-running state.
-					instance.logger.Debug("Cancelled state transition to {State} because instance is not running.", state.GetType().Name);
-					return;
-				}
-				
-				if (state is not InstanceNotRunningState && shutdownCancellationToken.IsCancellationRequested) {
-					instance.logger.Debug("Cancelled state transition to {State} due to Agent shutdown.", state.GetType().Name);
-					return;
-				}
-
-				if (status != null) {
-					SetStatus(status);
-				}
-
-				instance.TransitionState(state);
-			} catch (Exception e) {
-				instance.logger.Error(e, "Caught exception during state transition.");
-			} finally {
-				instance.stateTransitioningActionSemaphore.Release();
-			}
-		}
-	}
-
-	public void Dispose() {
-		stateTransitioningActionSemaphore.Dispose();
-		
-		if (currentState is IDisposable disposable) {
-			disposable.Dispose();
-		}
-	}
-}
+sealed record Instance(Guid InstanceGuid, IInstanceStatus Status);

Agent/Phantom.Agent.Services/Instances/InstanceActor.cs

@@ -0,0 +1,161 @@
+using Phantom.Agent.Minecraft.Launcher;
+using Phantom.Agent.Services.Backups;
+using Phantom.Agent.Services.Instances.State;
+using Phantom.Common.Data.Backups;
+using Phantom.Common.Data.Instance;
+using Phantom.Common.Data.Minecraft;
+using Phantom.Common.Data.Replies;
+using Phantom.Common.Messages.Agent.ToController;
+using Phantom.Utils.Actor;
+using Phantom.Utils.Actor.Mailbox;
+using Phantom.Utils.Logging;
+
+namespace Phantom.Agent.Services.Instances;
+
+sealed class InstanceActor : ReceiveActor<InstanceActor.ICommand> {
+	public readonly record struct Init(AgentState AgentState, Guid InstanceGuid, string ShortName, InstanceServices InstanceServices, InstanceTicketManager InstanceTicketManager, CancellationToken ShutdownCancellationToken);
+
+	public static Props<ICommand> Factory(Init init) {
+		return Props<ICommand>.Create(() => new InstanceActor(init), new ActorConfiguration { SupervisorStrategy = SupervisorStrategies.Resume, MailboxType = UnboundedJumpAheadMailbox.Name });
+	}
+
+	private readonly AgentState agentState;
+	private readonly CancellationToken shutdownCancellationToken;
+	
+	private readonly Guid instanceGuid;
+	private readonly InstanceServices instanceServices;
+	private readonly InstanceTicketManager instanceTicketManager;
+	private readonly InstanceContext context;
+	
+	private readonly CancellationTokenSource actorCancellationTokenSource = new ();
+
+	private IInstanceStatus currentStatus = InstanceStatus.NotRunning;
+	private InstanceRunningState? runningState = null;
+
+	private InstanceActor(Init init) {
+		this.agentState = init.AgentState;
+		this.instanceGuid = init.InstanceGuid;
+		this.instanceServices = init.InstanceServices;
+		this.instanceTicketManager = init.InstanceTicketManager;
+		this.shutdownCancellationToken = init.ShutdownCancellationToken;
+		
+		var logger = PhantomLogger.Create<InstanceActor>(init.ShortName);
+		this.context = new InstanceContext(instanceGuid, init.ShortName, logger, instanceServices, SelfTyped, actorCancellationTokenSource.Token);
+
+		Receive<ReportInstanceStatusCommand>(ReportInstanceStatus);
+		ReceiveAsync<LaunchInstanceCommand>(LaunchInstance);
+		ReceiveAsync<StopInstanceCommand>(StopInstance);
+		ReceiveAsyncAndReply<SendCommandToInstanceCommand, SendCommandToInstanceResult>(SendCommandToInstance);
+		ReceiveAsyncAndReply<BackupInstanceCommand, BackupCreationResult>(BackupInstance);
+		Receive<HandleProcessEndedCommand>(HandleProcessEnded);
+		ReceiveAsync<ShutdownCommand>(Shutdown);
+	}
+
+	private void SetAndReportStatus(IInstanceStatus status) {
+		currentStatus = status;
+		ReportCurrentStatus();
+	}
+
+	private void ReportCurrentStatus() {
+		agentState.UpdateInstance(new Instance(instanceGuid, currentStatus));
+		instanceServices.ControllerConnection.Send(new ReportInstanceStatusMessage(instanceGuid, currentStatus));
+	}
+
+	private void TransitionState(InstanceRunningState? newState) {
+		if (runningState == newState) {
+			return;
+		}
+
+		runningState?.Dispose();
+		runningState = newState;
+		runningState?.Initialize();
+	}
+	
+	public interface ICommand {}
+
+	public sealed record ReportInstanceStatusCommand : ICommand;
+	
+	public sealed record LaunchInstanceCommand(InstanceConfiguration Configuration, IServerLauncher Launcher, InstanceTicketManager.Ticket Ticket, bool IsRestarting) : ICommand;
+	
+	public sealed record StopInstanceCommand(MinecraftStopStrategy StopStrategy) : ICommand;
+	
+	public sealed record SendCommandToInstanceCommand(string Command) : ICommand, ICanReply<SendCommandToInstanceResult>;
+	
+	public sealed record BackupInstanceCommand(BackupManager BackupManager) : ICommand, ICanReply<BackupCreationResult>;
+	
+	public sealed record HandleProcessEndedCommand(IInstanceStatus Status) : ICommand, IJumpAhead;
+	
+	public sealed record ShutdownCommand : ICommand;
+
+	private void ReportInstanceStatus(ReportInstanceStatusCommand command) {
+		ReportCurrentStatus();
+	}
+	
+	private async Task LaunchInstance(LaunchInstanceCommand command) {
+		if (command.IsRestarting || runningState is null) {
+			SetAndReportStatus(command.IsRestarting ? InstanceStatus.Restarting : InstanceStatus.Launching);
+			
+			var newState = await InstanceLaunchProcedure.Run(context, command.Configuration, command.Launcher, instanceTicketManager, command.Ticket, SetAndReportStatus, shutdownCancellationToken);
+			if (newState is null) {
+				instanceTicketManager.Release(command.Ticket);
+			}
+			
+			TransitionState(newState);
+		}
+	}
+
+	private async Task StopInstance(StopInstanceCommand command) {
+		if (runningState is null) {
+			return;
+		}
+
+		IInstanceStatus oldStatus = currentStatus;
+		SetAndReportStatus(InstanceStatus.Stopping);
+		
+		if (await InstanceStopProcedure.Run(context, command.StopStrategy, runningState, SetAndReportStatus, shutdownCancellationToken)) {
+			instanceTicketManager.Release(runningState.Ticket);
+			TransitionState(null);
+		}
+		else {
+			SetAndReportStatus(oldStatus);
+		}
+	}
+
+	private async Task<SendCommandToInstanceResult> SendCommandToInstance(SendCommandToInstanceCommand command) {
+		if (runningState is null) {
+			return SendCommandToInstanceResult.InstanceNotRunning;
+		}
+		else {
+			return await runningState.SendCommand(command.Command, shutdownCancellationToken);
+		}
+	}
+	
+	private async Task<BackupCreationResult> BackupInstance(BackupInstanceCommand command) {
+		if (runningState is null || runningState.Process.HasEnded) {
+			return new BackupCreationResult(BackupCreationResultKind.InstanceNotRunning);
+		}
+		else {
+			SetAndReportStatus(InstanceStatus.BackingUp);
+			try {
+				return await command.BackupManager.CreateBackup(context.ShortName, runningState.Process, shutdownCancellationToken);
+			} finally {
+				SetAndReportStatus(InstanceStatus.Running);
+			}
+		}
+	}
+
+	private void HandleProcessEnded(HandleProcessEndedCommand command) {
+		if (runningState is { Process.HasEnded: true }) {
+			SetAndReportStatus(command.Status);
+			context.ReportEvent(InstanceEvent.Stopped);
+			instanceTicketManager.Release(runningState.Ticket);
+			TransitionState(null);
+		}
+	}
+
+	private async Task Shutdown(ShutdownCommand command) {
+		await StopInstance(new StopInstanceCommand(MinecraftStopStrategy.Instant));
+		await actorCancellationTokenSource.CancelAsync();
+		Context.Stop(Self);
+	}
+}

Agent/Phantom.Agent.Services/Instances/InstanceContext.cs

@@ -1,35 +1,12 @@
-using Phantom.Agent.Minecraft.Launcher;
-using Phantom.Agent.Services.Instances.States;
-using Phantom.Common.Data.Instance;
+using Phantom.Common.Data.Instance;
+using Phantom.Common.Messages.Agent.ToController;
+using Phantom.Utils.Actor;
 using Serilog;
 
 namespace Phantom.Agent.Services.Instances;
 
-abstract class InstanceContext {
-	public InstanceServices Services { get; }
-	public InstanceConfiguration Configuration { get; }
-	public IServerLauncher Launcher { get; }
-	
-	public abstract ILogger Logger { get; }
-	public abstract string ShortName { get; }
-
-	protected InstanceContext(InstanceServices services, InstanceConfiguration configuration, IServerLauncher launcher) {
-		Services = services;
-		Configuration = configuration;
-		Launcher = launcher;
-	}
-
-	public abstract void SetStatus(IInstanceStatus newStatus);
-
-	public void SetLaunchFailedStatusAndReportEvent(InstanceLaunchFailReason reason) {
-		SetStatus(InstanceStatus.Failed(reason));
-		ReportEvent(new InstanceLaunchFailedEvent(reason));
-	}
-
-	public abstract void ReportEvent(IInstanceEvent instanceEvent);
-	public abstract void TransitionState(Func<(IInstanceState, IInstanceStatus?)> newStateAndStatus);
-
-	public void TransitionState(IInstanceState newState, IInstanceStatus? newStatus = null) {
-		TransitionState(() => (newState, newStatus));
+sealed record InstanceContext(Guid InstanceGuid, string ShortName, ILogger Logger, InstanceServices Services, ActorRef<InstanceActor.ICommand> Actor, CancellationToken ActorCancellationToken) {
+	public void ReportEvent(IInstanceEvent instanceEvent) {
+		Services.ControllerConnection.Send(new ReportInstanceEventMessage(Guid.NewGuid(), DateTime.UtcNow, InstanceGuid, instanceEvent));
 	}
 }

Agent/Phantom.Agent.Services/Instances/InstanceLogSender.cs

@@ -1,71 +0,0 @@
-using System.Collections.Immutable;
-using Phantom.Agent.Rpc;
-using Phantom.Common.Logging;
-using Phantom.Common.Messages.ToServer;
-using Phantom.Utils.Collections;
-using Phantom.Utils.Runtime;
-
-namespace Phantom.Agent.Services.Instances;
-
-sealed class InstanceLogSender : CancellableBackgroundTask {
-	private static readonly TimeSpan SendDelay = TimeSpan.FromMilliseconds(200);
-
-	private readonly Guid instanceGuid;
-
-	private readonly SemaphoreSlim semaphore = new (1, 1);
-	private readonly RingBuffer<string> buffer = new (1000);
-
-	public InstanceLogSender(TaskManager taskManager, Guid instanceGuid, string loggerName) : base(PhantomLogger.Create<InstanceLogSender>(loggerName), taskManager, "Instance log sender for " + loggerName) {
-		this.instanceGuid = instanceGuid;
-	}
-	
-	protected override async Task RunTask() {
-		try {
-			while (!CancellationToken.IsCancellationRequested) {
-				await SendOutputToServer(await DequeueOrThrow());
-				await Task.Delay(SendDelay, CancellationToken);
-			}
-		} catch (OperationCanceledException) {
-			// Ignore.
-		}
-
-		// Flush remaining lines.
-		await SendOutputToServer(DequeueWithoutSemaphore());
-	}
-
-	private async Task SendOutputToServer(ImmutableArray<string> lines) {
-		if (!lines.IsEmpty) {
-			await ServerMessaging.Send(new InstanceOutputMessage(instanceGuid, lines));
-		}
-	}
-
-	private ImmutableArray<string> DequeueWithoutSemaphore() {
-		ImmutableArray<string> lines = buffer.Count > 0 ? buffer.EnumerateLast(uint.MaxValue).ToImmutableArray() : ImmutableArray<string>.Empty;
-		buffer.Clear();
-		return lines;
-	}
-
-	private async Task<ImmutableArray<string>> DequeueOrThrow() {
-		await semaphore.WaitAsync(CancellationToken);
-
-		try {
-			return DequeueWithoutSemaphore();
-		} finally {
-			semaphore.Release();
-		}
-	}
-
-	public void Enqueue(string line) {
-		try {
-			semaphore.Wait(CancellationToken);
-		} catch (Exception) {
-			return;
-		}
-
-		try {
-			buffer.Add(line);
-		} finally {
-			semaphore.Release();
-		}
-	}
-}

Agent/Phantom.Agent.Services/Instances/InstanceManagerActor.cs

@@ -0,0 +1,209 @@
+using Phantom.Agent.Minecraft.Instance;
+using Phantom.Agent.Minecraft.Java;
+using Phantom.Agent.Minecraft.Launcher;
+using Phantom.Agent.Minecraft.Launcher.Types;
+using Phantom.Agent.Minecraft.Properties;
+using Phantom.Agent.Minecraft.Server;
+using Phantom.Agent.Rpc;
+using Phantom.Agent.Services.Backups;
+using Phantom.Common.Data;
+using Phantom.Common.Data.Instance;
+using Phantom.Common.Data.Minecraft;
+using Phantom.Common.Data.Replies;
+using Phantom.Utils.Actor;
+using Phantom.Utils.IO;
+using Phantom.Utils.Logging;
+using Serilog;
+
+namespace Phantom.Agent.Services.Instances;
+
+sealed class InstanceManagerActor : ReceiveActor<InstanceManagerActor.ICommand> {
+	private static readonly ILogger Logger = PhantomLogger.Create<InstanceManagerActor>();
+
+	public readonly record struct Init(ControllerConnection ControllerConnection, AgentFolders AgentFolders, AgentState AgentState, JavaRuntimeRepository JavaRuntimeRepository, InstanceTicketManager InstanceTicketManager, BackupManager BackupManager);
+
+	public static Props<ICommand> Factory(Init init) {
+		return Props<ICommand>.Create(() => new InstanceManagerActor(init), new ActorConfiguration { SupervisorStrategy = SupervisorStrategies.Resume });
+	}
+	
+	private readonly AgentState agentState;
+	private readonly string basePath;
+
+	private readonly InstanceServices instanceServices;
+	private readonly InstanceTicketManager instanceTicketManager;
+	private readonly Dictionary<Guid, InstanceInfo> instances = new ();
+
+	private readonly CancellationTokenSource shutdownCancellationTokenSource = new ();
+	private readonly CancellationToken shutdownCancellationToken;
+
+	private uint instanceLoggerSequenceId = 0;
+
+	private InstanceManagerActor(Init init) {
+		this.agentState = init.AgentState;
+		this.basePath = init.AgentFolders.InstancesFolderPath;
+		this.instanceTicketManager = init.InstanceTicketManager;
+		this.shutdownCancellationToken = shutdownCancellationTokenSource.Token;
+
+		var minecraftServerExecutables = new MinecraftServerExecutables(init.AgentFolders.ServerExecutableFolderPath);
+		var launchServices = new LaunchServices(minecraftServerExecutables, init.JavaRuntimeRepository);
+
+		this.instanceServices = new InstanceServices(init.ControllerConnection, init.BackupManager, launchServices);
+		
+		ReceiveAndReply<ConfigureInstanceCommand, Result<ConfigureInstanceResult, InstanceActionFailure>>(ConfigureInstance);
+		ReceiveAndReply<LaunchInstanceCommand, Result<LaunchInstanceResult, InstanceActionFailure>>(LaunchInstance);
+		ReceiveAndReply<StopInstanceCommand, Result<StopInstanceResult, InstanceActionFailure>>(StopInstance);
+		ReceiveAsyncAndReply<SendCommandToInstanceCommand, Result<SendCommandToInstanceResult, InstanceActionFailure>>(SendCommandToInstance);
+		ReceiveAsync<ShutdownCommand>(Shutdown);
+	}
+
+	private string GetInstanceLoggerName(Guid guid) {
+		var prefix = guid.ToString();
+		return prefix[..prefix.IndexOf('-')] + "/" + Interlocked.Increment(ref instanceLoggerSequenceId);
+	}
+
+	private sealed record InstanceInfo(ActorRef<InstanceActor.ICommand> Actor, InstanceConfiguration Configuration, IServerLauncher Launcher);
+	
+	public interface ICommand {}
+	
+	public sealed record ConfigureInstanceCommand(Guid InstanceGuid, InstanceConfiguration Configuration, InstanceLaunchProperties LaunchProperties, bool LaunchNow, bool AlwaysReportStatus) : ICommand, ICanReply<Result<ConfigureInstanceResult, InstanceActionFailure>>;
+	
+	public sealed record LaunchInstanceCommand(Guid InstanceGuid) : ICommand, ICanReply<Result<LaunchInstanceResult, InstanceActionFailure>>;
+	
+	public sealed record StopInstanceCommand(Guid InstanceGuid, MinecraftStopStrategy StopStrategy) : ICommand, ICanReply<Result<StopInstanceResult, InstanceActionFailure>>;
+	
+	public sealed record SendCommandToInstanceCommand(Guid InstanceGuid, string Command) : ICommand, ICanReply<Result<SendCommandToInstanceResult, InstanceActionFailure>>;
+	
+	public sealed record ShutdownCommand : ICommand;
+
+	private Result<ConfigureInstanceResult, InstanceActionFailure> ConfigureInstance(ConfigureInstanceCommand command) {
+		var instanceGuid = command.InstanceGuid;
+		var configuration = command.Configuration;
+
+		var instanceFolder = Path.Combine(basePath, instanceGuid.ToString());
+		Directories.Create(instanceFolder, Chmod.URWX_GRX);
+
+		var heapMegabytes = configuration.MemoryAllocation.InMegabytes;
+		var jvmProperties = new JvmProperties(
+			InitialHeapMegabytes: heapMegabytes / 2,
+			MaximumHeapMegabytes: heapMegabytes
+		);
+
+		var properties = new InstanceProperties(
+			instanceGuid,
+			configuration.JavaRuntimeGuid,
+			jvmProperties,
+			configuration.JvmArguments,
+			instanceFolder,
+			configuration.MinecraftVersion,
+			new ServerProperties(configuration.ServerPort, configuration.RconPort),
+			command.LaunchProperties
+		);
+
+		IServerLauncher launcher = configuration.MinecraftServerKind switch {
+			MinecraftServerKind.Vanilla => new VanillaLauncher(properties),
+			MinecraftServerKind.Fabric  => new FabricLauncher(properties),
+			MinecraftServerKind.Forge   => new ForgeLauncher(properties),
+			_                           => InvalidLauncher.Instance
+		};
+
+		if (instances.TryGetValue(instanceGuid, out var instance)) {
+			instances[instanceGuid] = instance with {
+				Configuration = configuration,
+				Launcher = launcher
+			};
+				
+			Logger.Information("Reconfigured instance \"{Name}\" (GUID {Guid}).", configuration.InstanceName, instanceGuid);
+
+			if (command.AlwaysReportStatus) {
+				instance.Actor.Tell(new InstanceActor.ReportInstanceStatusCommand());
+			}
+		}
+		else {
+			var instanceInit = new InstanceActor.Init(agentState, instanceGuid, GetInstanceLoggerName(instanceGuid), instanceServices, instanceTicketManager, shutdownCancellationToken);
+			instances[instanceGuid] = instance = new InstanceInfo(Context.ActorOf(InstanceActor.Factory(instanceInit), "Instance-" + instanceGuid), configuration, launcher);
+				
+			Logger.Information("Created instance \"{Name}\" (GUID {Guid}).", configuration.InstanceName, instanceGuid);
+
+			instance.Actor.Tell(new InstanceActor.ReportInstanceStatusCommand());
+		}
+
+		if (command.LaunchNow) {
+			LaunchInstance(new LaunchInstanceCommand(instanceGuid));
+		}
+
+		return ConfigureInstanceResult.Success;
+	}
+
+	private Result<LaunchInstanceResult, InstanceActionFailure> LaunchInstance(LaunchInstanceCommand command) {
+		var instanceGuid = command.InstanceGuid;
+		if (!instances.TryGetValue(instanceGuid, out var instanceInfo)) {
+			return InstanceActionFailure.InstanceDoesNotExist;
+		}
+		
+		var ticket = instanceTicketManager.Reserve(instanceInfo.Configuration);
+		if (!ticket) {
+			return ticket.Error;
+		}
+
+		if (agentState.InstancesByGuid.TryGetValue(instanceGuid, out var instance)) {
+			var status = instance.Status;
+			if (status.IsRunning()) {
+				return LaunchInstanceResult.InstanceAlreadyRunning;
+			}
+			else if (status.IsLaunching()) {
+				return LaunchInstanceResult.InstanceAlreadyLaunching;
+			}
+		}
+		
+		instanceInfo.Actor.Tell(new InstanceActor.LaunchInstanceCommand(instanceInfo.Configuration, instanceInfo.Launcher, ticket.Value, IsRestarting: false));
+		return LaunchInstanceResult.LaunchInitiated;
+	}
+
+	private Result<StopInstanceResult, InstanceActionFailure> StopInstance(StopInstanceCommand command) {
+		var instanceGuid = command.InstanceGuid;
+		if (!instances.TryGetValue(instanceGuid, out var instanceInfo)) {
+			return InstanceActionFailure.InstanceDoesNotExist;
+		}
+        
+		if (agentState.InstancesByGuid.TryGetValue(instanceGuid, out var instance)) {
+			var status = instance.Status;
+			if (status.IsStopping()) {
+				return StopInstanceResult.InstanceAlreadyStopping;
+			}
+			else if (!status.CanStop()) {
+				return StopInstanceResult.InstanceAlreadyStopped;
+			}
+		}
+			
+		instanceInfo.Actor.Tell(new InstanceActor.StopInstanceCommand(command.StopStrategy));
+		return StopInstanceResult.StopInitiated;
+	}
+
+	private async Task<Result<SendCommandToInstanceResult, InstanceActionFailure>> SendCommandToInstance(SendCommandToInstanceCommand command) {
+		var instanceGuid = command.InstanceGuid;
+		if (!instances.TryGetValue(instanceGuid, out var instanceInfo)) {
+			return InstanceActionFailure.InstanceDoesNotExist;
+		}
+
+		try {
+			return await instanceInfo.Actor.Request(new InstanceActor.SendCommandToInstanceCommand(command.Command), shutdownCancellationToken);
+		} catch (OperationCanceledException) {
+			return InstanceActionFailure.AgentShuttingDown;
+		}
+	}
+
+	private async Task Shutdown(ShutdownCommand command) {
+		Logger.Information("Stopping all instances...");
+		
+		await shutdownCancellationTokenSource.CancelAsync();
+		
+		await Task.WhenAll(instances.Values.Select(static instance => instance.Actor.Stop(new InstanceActor.ShutdownCommand())));
+		instances.Clear();
+		
+		shutdownCancellationTokenSource.Dispose();
+		
+		Logger.Information("All instances stopped.");
+		
+		Context.Stop(Self);
+	}
+}

Agent/Phantom.Agent.Services/Instances/InstanceServices.cs

@@ -1,7 +1,7 @@
 using Phantom.Agent.Minecraft.Launcher;
+using Phantom.Agent.Rpc;
 using Phantom.Agent.Services.Backups;
-using Phantom.Utils.Runtime;
 
 namespace Phantom.Agent.Services.Instances;
 
-sealed record InstanceServices(TaskManager TaskManager, PortManager PortManager, BackupManager BackupManager, LaunchServices LaunchServices);
+sealed record InstanceServices(ControllerConnection ControllerConnection, BackupManager BackupManager, LaunchServices LaunchServices);

Agent/Phantom.Agent.Services/Instances/InstanceSessionManager.cs

@@ -1,204 +0,0 @@
-using System.Collections.Immutable;
-using System.Diagnostics.CodeAnalysis;
-using Phantom.Agent.Minecraft.Instance;
-using Phantom.Agent.Minecraft.Java;
-using Phantom.Agent.Minecraft.Launcher;
-using Phantom.Agent.Minecraft.Launcher.Types;
-using Phantom.Agent.Minecraft.Properties;
-using Phantom.Agent.Minecraft.Server;
-using Phantom.Agent.Rpc;
-using Phantom.Agent.Services.Backups;
-using Phantom.Common.Data;
-using Phantom.Common.Data.Agent;
-using Phantom.Common.Data.Instance;
-using Phantom.Common.Data.Minecraft;
-using Phantom.Common.Data.Replies;
-using Phantom.Common.Logging;
-using Phantom.Common.Messages.ToServer;
-using Phantom.Utils.IO;
-using Phantom.Utils.Runtime;
-using Serilog;
-
-namespace Phantom.Agent.Services.Instances;
-
-sealed class InstanceSessionManager : IDisposable {
-	private static readonly ILogger Logger = PhantomLogger.Create<InstanceSessionManager>();
-	
-	private readonly AgentInfo agentInfo;
-	private readonly string basePath;
-
-	private readonly InstanceServices instanceServices;
-	private readonly Dictionary<Guid, Instance> instances = new ();
-
-	private readonly CancellationTokenSource shutdownCancellationTokenSource = new ();
-	private readonly CancellationToken shutdownCancellationToken;
-	private readonly SemaphoreSlim semaphore = new (1, 1);
-
-	public InstanceSessionManager(AgentInfo agentInfo, AgentFolders agentFolders, JavaRuntimeRepository javaRuntimeRepository, TaskManager taskManager, BackupManager backupManager) {
-		this.agentInfo = agentInfo;
-		this.basePath = agentFolders.InstancesFolderPath;
-		this.shutdownCancellationToken = shutdownCancellationTokenSource.Token;
-		
-		var minecraftServerExecutables = new MinecraftServerExecutables(agentFolders.ServerExecutableFolderPath);
-		var launchServices = new LaunchServices(minecraftServerExecutables, javaRuntimeRepository);
-		var portManager = new PortManager(agentInfo.AllowedServerPorts, agentInfo.AllowedRconPorts);
-		
-		this.instanceServices = new InstanceServices(taskManager, portManager, backupManager, launchServices);
-	}
-
-	private async Task<InstanceActionResult<T>> AcquireSemaphoreAndRun<T>(Func<Task<InstanceActionResult<T>>> func) {
-		try {
-			await semaphore.WaitAsync(shutdownCancellationToken);
-			try {
-				return await func();
-			} finally {
-				semaphore.Release();
-			}
-		} catch (OperationCanceledException) {
-			return InstanceActionResult.General<T>(InstanceActionGeneralResult.AgentShuttingDown);
-		}
-	}
-
-	[SuppressMessage("ReSharper", "ConvertIfStatementToReturnStatement")]
-	private Task<InstanceActionResult<T>> AcquireSemaphoreAndRunWithInstance<T>(Guid instanceGuid, Func<Instance, Task<T>> func) {
-		return AcquireSemaphoreAndRun(async () => {
-			if (instances.TryGetValue(instanceGuid, out var instance)) {
-				return InstanceActionResult.Concrete(await func(instance));
-			}
-			else {
-				return InstanceActionResult.General<T>(InstanceActionGeneralResult.InstanceDoesNotExist);
-			}
-		});
-	}
-
-	public async Task<InstanceActionResult<ConfigureInstanceResult>> Configure(InstanceConfiguration configuration, InstanceLaunchProperties launchProperties, bool launchNow, bool alwaysReportStatus) {
-		return await AcquireSemaphoreAndRun(async () => {
-			var instanceGuid = configuration.InstanceGuid;
-			var instanceFolder = Path.Combine(basePath, instanceGuid.ToString());
-			Directories.Create(instanceFolder, Chmod.URWX_GRX);
-			
-			var heapMegabytes = configuration.MemoryAllocation.InMegabytes;
-			var jvmProperties = new JvmProperties(
-				InitialHeapMegabytes: heapMegabytes / 2,
-				MaximumHeapMegabytes: heapMegabytes
-			);
-
-			var properties = new InstanceProperties(
-				instanceGuid,
-				configuration.JavaRuntimeGuid,
-				jvmProperties,
-				configuration.JvmArguments,
-				instanceFolder,
-				configuration.MinecraftVersion,
-				new ServerProperties(configuration.ServerPort, configuration.RconPort),
-				launchProperties
-			);
-
-			IServerLauncher launcher = configuration.MinecraftServerKind switch {
-				MinecraftServerKind.Vanilla => new VanillaLauncher(properties),
-				MinecraftServerKind.Fabric  => new FabricLauncher(properties),
-				_                           => InvalidLauncher.Instance
-			};
-
-			if (instances.TryGetValue(instanceGuid, out var instance)) {
-				await instance.Reconfigure(configuration, launcher, shutdownCancellationToken);
-				Logger.Information("Reconfigured instance \"{Name}\" (GUID {Guid}).", configuration.InstanceName, configuration.InstanceGuid);
-				
-				if (alwaysReportStatus) {
-					instance.ReportLastStatus();
-				}
-			}
-			else {
-				instances[instanceGuid] = instance = new Instance(instanceServices, configuration, launcher);
-				Logger.Information("Created instance \"{Name}\" (GUID {Guid}).", configuration.InstanceName, configuration.InstanceGuid);
-				
-				instance.ReportLastStatus();
-				instance.IsRunningChanged += OnInstanceIsRunningChanged;
-			}
-
-			if (launchNow) {
-				await LaunchInternal(instance);
-			}
-
-			return InstanceActionResult.Concrete(ConfigureInstanceResult.Success);
-		});
-	}
-
-	private ImmutableArray<Instance> GetRunningInstancesInternal() {
-		return instances.Values.Where(static instance => instance.IsRunning).ToImmutableArray();
-	}
-
-	private void OnInstanceIsRunningChanged(object? sender, EventArgs e) {
-		instanceServices.TaskManager.Run("Handle instance running state changed event", RefreshAgentStatus);
-	}
-
-	public async Task RefreshAgentStatus() {
-		try {
-			await semaphore.WaitAsync(shutdownCancellationToken);
-			try {
-				var runningInstances = GetRunningInstancesInternal();
-				var runningInstanceCount = runningInstances.Length;
-				var runningInstanceMemory = runningInstances.Aggregate(RamAllocationUnits.Zero, static (total, instance) => total + instance.Configuration.MemoryAllocation);
-				await ServerMessaging.Send(new ReportAgentStatusMessage(runningInstanceCount, runningInstanceMemory));
-			} finally {
-				semaphore.Release();
-			}
-		} catch (OperationCanceledException) {
-			// ignore
-		}
-	}
-
-	public Task<InstanceActionResult<LaunchInstanceResult>> Launch(Guid instanceGuid) {
-		return AcquireSemaphoreAndRunWithInstance(instanceGuid, LaunchInternal);
-	}
-
-	private async Task<LaunchInstanceResult> LaunchInternal(Instance instance) {
-		var runningInstances = GetRunningInstancesInternal();
-		if (runningInstances.Length + 1 > agentInfo.MaxInstances) {
-			return LaunchInstanceResult.InstanceLimitExceeded;
-		}
-
-		var availableMemory = agentInfo.MaxMemory - runningInstances.Aggregate(RamAllocationUnits.Zero, static (total, instance) => total + instance.Configuration.MemoryAllocation);
-		if (availableMemory < instance.Configuration.MemoryAllocation) {
-			return LaunchInstanceResult.MemoryLimitExceeded;
-		}
-
-		return await instance.Launch(shutdownCancellationToken);
-	}
-
-	public Task<InstanceActionResult<StopInstanceResult>> Stop(Guid instanceGuid, MinecraftStopStrategy stopStrategy) {
-		return AcquireSemaphoreAndRunWithInstance(instanceGuid, instance => instance.Stop(stopStrategy));
-	}
-
-	public Task<InstanceActionResult<SendCommandToInstanceResult>> SendCommand(Guid instanceGuid, string command) {
-		return AcquireSemaphoreAndRunWithInstance(instanceGuid, async instance => await instance.SendCommand(command, shutdownCancellationToken) ? SendCommandToInstanceResult.Success : SendCommandToInstanceResult.UnknownError);
-	}
-
-	public async Task StopAll() {
-		shutdownCancellationTokenSource.Cancel();
-		
-		Logger.Information("Stopping all instances...");
-
-		await semaphore.WaitAsync(CancellationToken.None);
-		try {
-			await Task.WhenAll(instances.Values.Select(static instance => instance.StopAndWait(TimeSpan.FromSeconds(30))));
-			DisposeAllInstances();
-		} finally {
-			semaphore.Release();
-		}
-	}
-
-	public void Dispose() {
-		DisposeAllInstances();
-		shutdownCancellationTokenSource.Dispose();
-		semaphore.Dispose();
-	}
-
-	private void DisposeAllInstances() {
-		foreach (var (_, instance) in instances) {
-			instance.Dispose();
-		}
-
-		instances.Clear();
-	}
-}

Agent/Phantom.Agent.Services/Instances/InstanceTicketManager.cs

@@ -0,0 +1,100 @@
+using Phantom.Agent.Rpc;
+using Phantom.Common.Data;
+using Phantom.Common.Data.Agent;
+using Phantom.Common.Data.Instance;
+using Phantom.Common.Data.Replies;
+using Phantom.Common.Messages.Agent.ToController;
+using Phantom.Utils.Logging;
+using Phantom.Utils.Tasks;
+using Serilog;
+
+namespace Phantom.Agent.Services.Instances;
+
+sealed class InstanceTicketManager {
+	private static readonly ILogger Logger = PhantomLogger.Create<InstanceTicketManager>();
+	
+	private readonly AgentInfo agentInfo;
+	private readonly ControllerConnection controllerConnection;
+	
+	private readonly HashSet<Guid> activeTicketGuids = new ();
+	private readonly HashSet<ushort> usedPorts = new ();
+	private RamAllocationUnits usedMemory = new ();
+
+	public InstanceTicketManager(AgentInfo agentInfo, ControllerConnection controllerConnection) {
+		this.agentInfo = agentInfo;
+		this.controllerConnection = controllerConnection;
+	}
+
+	public Result<Ticket, LaunchInstanceResult> Reserve(InstanceConfiguration configuration) {
+		var memoryAllocation = configuration.MemoryAllocation;
+		var serverPort = configuration.ServerPort;
+		var rconPort = configuration.RconPort;
+		
+		if (!agentInfo.AllowedServerPorts.Contains(serverPort)) {
+			return LaunchInstanceResult.ServerPortNotAllowed;
+		}
+
+		if (!agentInfo.AllowedRconPorts.Contains(rconPort)) {
+			return LaunchInstanceResult.RconPortNotAllowed;
+		}
+		
+		lock (this) {
+			if (activeTicketGuids.Count + 1 > agentInfo.MaxInstances) {
+				return LaunchInstanceResult.InstanceLimitExceeded;
+			}
+
+			if (usedMemory + memoryAllocation > agentInfo.MaxMemory) {
+				return LaunchInstanceResult.MemoryLimitExceeded;
+			}
+			
+			if (usedPorts.Contains(serverPort)) {
+				return LaunchInstanceResult.ServerPortAlreadyInUse;
+			}
+
+			if (usedPorts.Contains(rconPort)) {
+				return LaunchInstanceResult.RconPortAlreadyInUse;
+			}
+
+			var ticket = new Ticket(Guid.NewGuid(), memoryAllocation, serverPort, rconPort);
+			
+			activeTicketGuids.Add(ticket.TicketGuid);
+			usedMemory += memoryAllocation;
+			usedPorts.Add(serverPort);
+			usedPorts.Add(rconPort);
+			
+			RefreshAgentStatus();
+			Logger.Debug("Reserved ticket {TicketGuid} (server port {ServerPort}, rcon port {RconPort}, memory allocation {MemoryAllocation} MB).", ticket.TicketGuid, ticket.ServerPort, ticket.RconPort, ticket.MemoryAllocation.InMegabytes);
+
+			return ticket;
+		}
+	}
+
+	public bool IsValid(Ticket ticket) {
+		lock (this) {
+			return activeTicketGuids.Contains(ticket.TicketGuid);
+		}
+	}
+	
+	public void Release(Ticket ticket) {
+		lock (this) {
+			if (!activeTicketGuids.Remove(ticket.TicketGuid)) {
+				return;
+			}
+
+			usedMemory -= ticket.MemoryAllocation;
+			usedPorts.Remove(ticket.ServerPort);
+			usedPorts.Remove(ticket.RconPort);
+			
+			RefreshAgentStatus();
+			Logger.Debug("Released ticket {TicketGuid} (server port {ServerPort}, rcon port {RconPort}, memory allocation {MemoryAllocation} MB).", ticket.TicketGuid, ticket.ServerPort, ticket.RconPort, ticket.MemoryAllocation.InMegabytes);
+		}
+	}
+	
+	public void RefreshAgentStatus() {
+		lock (this) {
+			controllerConnection.Send(new ReportAgentStatusMessage(activeTicketGuids.Count, usedMemory));
+		}
+	}
+	
+	public sealed record Ticket(Guid TicketGuid, RamAllocationUnits MemoryAllocation, ushort ServerPort, ushort RconPort);
+}

Agent/Phantom.Agent.Services/Instances/PortManager.cs

@@ -1,58 +0,0 @@
-using Phantom.Common.Data;
-using Phantom.Common.Data.Instance;
-
-namespace Phantom.Agent.Services.Instances;
-
-sealed class PortManager {
-	private readonly AllowedPorts allowedServerPorts;
-	private readonly AllowedPorts allowedRconPorts;
-	private readonly HashSet<ushort> usedPorts = new ();
-
-	public PortManager(AllowedPorts allowedServerPorts, AllowedPorts allowedRconPorts) {
-		this.allowedServerPorts = allowedServerPorts;
-		this.allowedRconPorts = allowedRconPorts;
-	}
-
-	public Result Reserve(InstanceConfiguration configuration) {
-		var serverPort = configuration.ServerPort;
-		var rconPort = configuration.RconPort;
-		
-		if (!allowedServerPorts.Contains(serverPort)) {
-			return Result.ServerPortNotAllowed;
-		}
-
-		if (!allowedRconPorts.Contains(rconPort)) {
-			return Result.RconPortNotAllowed;
-		}
-		
-		lock (usedPorts) {
-			if (usedPorts.Contains(serverPort)) {
-				return Result.ServerPortAlreadyInUse;
-			}
-
-			if (usedPorts.Contains(rconPort)) {
-				return Result.RconPortAlreadyInUse;
-			}
-
-			usedPorts.Add(serverPort);
-			usedPorts.Add(rconPort);
-		}
-
-		return Result.Success;
-	}
-	
-	public void Release(InstanceConfiguration configuration) {
-		lock (usedPorts) {
-			usedPorts.Remove(configuration.ServerPort);
-			usedPorts.Remove(configuration.RconPort);
-		}
-	}
-
-	public enum Result {
-		Success,
-		ServerPortNotAllowed,
-		ServerPortAlreadyInUse,
-		RconPortNotAllowed,
-		RconPortAlreadyInUse
-	}
-}

Agent/Phantom.Agent.Services/Instances/Sessions/InstanceSession.cs

@@ -1,28 +0,0 @@
-using Phantom.Agent.Minecraft.Instance;
-
-namespace Phantom.Agent.Services.Instances.Sessions; 
-
-sealed class InstanceSession : IDisposable {
-	private readonly InstanceProcess process;
-	private readonly InstanceContext context;
-	private readonly InstanceLogSender logSender;
-
-	public InstanceSession(InstanceProcess process, InstanceContext context) {
-		this.process = process;
-		this.context = context;
-		this.logSender = new InstanceLogSender(context.Services.TaskManager, context.Configuration.InstanceGuid, context.ShortName);
-		
-		this.process.AddOutputListener(SessionOutput);
-	}
-	
-	private void SessionOutput(object? sender, string line) {
-		context.Logger.Debug("[Server] {Line}", line);
-		logSender.Enqueue(line);
-	}
-	
-	public void Dispose() {
-		logSender.Stop();
-		process.Dispose();
-		context.Services.PortManager.Release(context.Configuration);
-	}
-}

Agent/Phantom.Agent.Services/Instances/State/InstanceLaunchProcedure.cs

@@ -0,0 +1,86 @@
+using Phantom.Agent.Minecraft.Instance;
+using Phantom.Agent.Minecraft.Launcher;
+using Phantom.Agent.Minecraft.Server;
+using Phantom.Common.Data;
+using Phantom.Common.Data.Instance;
+
+namespace Phantom.Agent.Services.Instances.State;
+
+static class InstanceLaunchProcedure {
+	public static async Task<InstanceRunningState?> Run(InstanceContext context, InstanceConfiguration configuration, IServerLauncher launcher, InstanceTicketManager ticketManager, InstanceTicketManager.Ticket ticket, Action<IInstanceStatus> reportStatus, CancellationToken cancellationToken) {
+		context.Logger.Information("Session starting...");
+
+		Result<InstanceProcess, InstanceLaunchFailReason> result;
+
+		if (ticketManager.IsValid(ticket)) {
+			try {
+				result = await LaunchInstance(context, launcher, reportStatus, cancellationToken);
+			} catch (OperationCanceledException) {
+				reportStatus(InstanceStatus.NotRunning);
+				return null;
+			} catch (Exception e) {
+				context.Logger.Error(e, "Caught exception while launching instance.");
+				result = InstanceLaunchFailReason.UnknownError;
+			}
+		}
+		else {
+			context.Logger.Error("Attempted to launch instance with an invalid ticket!");
+			result = InstanceLaunchFailReason.UnknownError;
+		}
+
+		if (result) {
+			reportStatus(InstanceStatus.Running);
+			context.ReportEvent(InstanceEvent.LaunchSucceeded);
+			return new InstanceRunningState(context, configuration, launcher, ticket, result.Value, cancellationToken);
+		}
+		else {
+			reportStatus(InstanceStatus.Failed(result.Error));
+			context.ReportEvent(new InstanceLaunchFailedEvent(result.Error));
+			return null;
+		}
+	}
+
+	private static async Task<Result<InstanceProcess, InstanceLaunchFailReason>> LaunchInstance(InstanceContext context, IServerLauncher launcher, Action<IInstanceStatus> reportStatus, CancellationToken cancellationToken) {
+		cancellationToken.ThrowIfCancellationRequested();
+
+		byte lastDownloadProgress = byte.MaxValue;
+
+		void OnDownloadProgress(object? sender, DownloadProgressEventArgs args) {
+			byte progress = (byte) Math.Min(args.DownloadedBytes * 100 / args.TotalBytes, 100);
+
+			if (lastDownloadProgress != progress) {
+				lastDownloadProgress = progress;
+				reportStatus(InstanceStatus.Downloading(progress));
+			}
+		}
+
+		switch (await launcher.Launch(context.Logger, context.Services.LaunchServices, OnDownloadProgress, cancellationToken)) {
+			case LaunchResult.Success launchSuccess:
+				return launchSuccess.Process;
+
+			case LaunchResult.InvalidJavaRuntime:
+				context.Logger.Error("Session failed to launch, invalid Java runtime.");
+				return InstanceLaunchFailReason.JavaRuntimeNotFound;
+
+			case LaunchResult.CouldNotDownloadMinecraftServer:
+				context.Logger.Error("Session failed to launch, could not download Minecraft server.");
+				return InstanceLaunchFailReason.CouldNotDownloadMinecraftServer;
+
+			case LaunchResult.CouldNotPrepareMinecraftServerLauncher:
+				context.Logger.Error("Session failed to launch, could not prepare Minecraft server launcher.");
+				return InstanceLaunchFailReason.CouldNotPrepareMinecraftServerLauncher;
+
+			case LaunchResult.CouldNotConfigureMinecraftServer:
+				context.Logger.Error("Session failed to launch, could not configure Minecraft server.");
+				return InstanceLaunchFailReason.CouldNotConfigureMinecraftServer;
+
+			case LaunchResult.CouldNotStartMinecraftServer:
+				context.Logger.Error("Session failed to launch, could not start Minecraft server.");
+				return InstanceLaunchFailReason.CouldNotStartMinecraftServer;
+
+			default:
+				context.Logger.Error("Session failed to launch.");
+				return InstanceLaunchFailReason.UnknownError;
+		}
+	}
+}

Agent/Phantom.Agent.Services/Instances/State/InstanceLogSender.cs

@@ -0,0 +1,84 @@
+using System.Collections.Immutable;
+using System.Threading.Channels;
+using Phantom.Agent.Rpc;
+using Phantom.Common.Messages.Agent.ToController;
+using Phantom.Utils.Logging;
+using Phantom.Utils.Tasks;
+
+namespace Phantom.Agent.Services.Instances.State;
+
+sealed class InstanceLogSender : CancellableBackgroundTask {
+	private static readonly BoundedChannelOptions BufferOptions = new (capacity: 100) {
+		SingleReader = true,
+		SingleWriter = true,
+		FullMode = BoundedChannelFullMode.DropNewest
+	};
+	
+	private static readonly TimeSpan SendDelay = TimeSpan.FromMilliseconds(200);
+
+	private readonly ControllerConnection controllerConnection;
+	private readonly Guid instanceGuid;
+	private readonly Channel<string> outputChannel;
+	
+	private int droppedLinesSinceLastSend;
+
+	public InstanceLogSender(ControllerConnection controllerConnection, Guid instanceGuid, string loggerName) : base(PhantomLogger.Create<InstanceLogSender>(loggerName)) {
+		this.controllerConnection = controllerConnection;
+		this.instanceGuid = instanceGuid;
+		this.outputChannel = Channel.CreateBounded<string>(BufferOptions, OnLineDropped);
+		Start();
+	}
+	
+	protected override async Task RunTask() {
+		var lineReader = outputChannel.Reader;
+		var lineBuilder = ImmutableArray.CreateBuilder<string>();
+		
+		try {
+			while (await lineReader.WaitToReadAsync(CancellationToken)) {
+				await Task.Delay(SendDelay, CancellationToken);
+				SendOutputToServer(ReadLinesFromChannel(lineReader, lineBuilder));
+			}
+		} catch (OperationCanceledException) {
+			// Ignore.
+		}
+
+		// Flush remaining lines.
+		SendOutputToServer(ReadLinesFromChannel(lineReader, lineBuilder));
+	}
+
+	private ImmutableArray<string> ReadLinesFromChannel(ChannelReader<string> reader, ImmutableArray<string>.Builder builder) {
+		builder.Clear();
+		
+		while (reader.TryRead(out string? line)) {
+			builder.Add(line);
+		}
+		
+		int droppedLines = Interlocked.Exchange(ref droppedLinesSinceLastSend, 0);
+		if (droppedLines > 0) {
+			builder.Add($"Dropped {droppedLines} {(droppedLines == 1 ? "line" : "lines")} due to buffer overflow.");
+		}
+		
+		return builder.ToImmutable();
+	}
+
+	private void SendOutputToServer(ImmutableArray<string> lines) {
+		if (!lines.IsEmpty) {
+			controllerConnection.Send(new InstanceOutputMessage(instanceGuid, lines));
+		}
+	}
+
+	private void OnLineDropped(string line) {
+		Logger.Warning("Buffer is full, dropped line: {Line}", line);
+		Interlocked.Increment(ref droppedLinesSinceLastSend);
+	}
+
+	public void Enqueue(string line) {
+		outputChannel.Writer.TryWrite(line);
+	}
+
+	protected override void Dispose() {
+		if (!outputChannel.Writer.TryComplete()) {
+			Logger.Error("Could not mark channel as completed.");
+		}
+	}
+}

Agent/Phantom.Agent.Services/Instances/State/InstancePlayerCountTracker.cs

@@ -0,0 +1,140 @@
+using Phantom.Agent.Minecraft.Instance;
+using Phantom.Agent.Minecraft.Server;
+using Phantom.Agent.Rpc;
+using Phantom.Common.Data.Instance;
+using Phantom.Common.Messages.Agent.ToController;
+using Phantom.Utils.Logging;
+using Phantom.Utils.Tasks;
+using Phantom.Utils.Threading;
+
+namespace Phantom.Agent.Services.Instances.State;
+
+sealed class InstancePlayerCountTracker : CancellableBackgroundTask {
+	private readonly ControllerConnection controllerConnection;
+	private readonly Guid instanceGuid;
+	private readonly ushort serverPort;
+	private readonly InstanceProcess process;
+
+	private readonly TaskCompletionSource firstDetection = AsyncTasks.CreateCompletionSource();
+	private readonly ManualResetEventSlim serverOutputEvent = new ();
+
+	private InstancePlayerCounts? playerCounts;
+
+	public InstancePlayerCounts? PlayerCounts {
+		get {
+			lock (this) {
+				return playerCounts;
+			}
+		}
+		private set {
+			EventHandler<int?>? onlinePlayerCountChanged;
+			lock (this) {
+				if (playerCounts == value) {
+					return;
+				}
+				
+				playerCounts = value;
+				onlinePlayerCountChanged = OnlinePlayerCountChanged;
+			}
+
+			onlinePlayerCountChanged?.Invoke(this, value?.Online);
+			controllerConnection.Send(new ReportInstancePlayerCountsMessage(instanceGuid, value));
+		}
+	}
+
+	private event EventHandler<int?>? OnlinePlayerCountChanged;
+
+	private bool isDisposed = false;
+
+	public InstancePlayerCountTracker(InstanceContext context, InstanceProcess process, ushort serverPort) : base(PhantomLogger.Create<InstancePlayerCountTracker>(context.ShortName)) {
+		this.controllerConnection = context.Services.ControllerConnection;
+		this.instanceGuid = context.InstanceGuid;
+		this.process = process;
+		this.serverPort = serverPort;
+		Start();
+	}
+
+	protected override async Task RunTask() {
+		// Give the server time to start accepting connections.
+		await Task.Delay(TimeSpan.FromSeconds(10), CancellationToken);
+
+		serverOutputEvent.Set();
+		process.AddOutputListener(OnOutput, maxLinesToReadFromHistory: 0);
+		
+		while (!CancellationToken.IsCancellationRequested) {
+			serverOutputEvent.Reset();
+
+			PlayerCounts = await TryGetPlayerCounts();
+			
+			if (!firstDetection.Task.IsCompleted) {
+				firstDetection.SetResult();
+			}
+
+			await Task.Delay(TimeSpan.FromSeconds(10), CancellationToken);
+			await serverOutputEvent.WaitHandle.WaitOneAsync(CancellationToken);
+			await Task.Delay(TimeSpan.FromSeconds(1), CancellationToken);
+		}
+	}
+
+	private async Task<InstancePlayerCounts?> TryGetPlayerCounts() {
+		try {
+			var result = await ServerStatusProtocol.GetPlayerCounts(serverPort, CancellationToken);
+			Logger.Debug("Detected {OnlinePlayerCount} / {MaximumPlayerCount} online player(s).", result.Online, result.Maximum);
+			return result;
+		} catch (ServerStatusProtocol.ProtocolException e) {
+			Logger.Error(e.Message);
+			return null;
+		} catch (Exception e) {
+			Logger.Error(e, "Caught exception while checking online player count.");
+			return null;
+		}
+	}
+
+	public async Task WaitForOnlinePlayers(CancellationToken cancellationToken) {
+		await firstDetection.Task.WaitAsync(cancellationToken);
+
+		var onlinePlayersDetected = AsyncTasks.CreateCompletionSource();
+
+		lock (this) {
+			if (playerCounts is { Online: > 0 }) {
+				return;
+			}
+			else if (playerCounts == null) {
+				throw new InvalidOperationException();
+			}
+
+			OnlinePlayerCountChanged += OnOnlinePlayerCountChanged;
+
+			void OnOnlinePlayerCountChanged(object? sender, int? newPlayerCount) {
+				if (newPlayerCount == null) {
+					onlinePlayersDetected.TrySetException(new InvalidOperationException());
+					OnlinePlayerCountChanged -= OnOnlinePlayerCountChanged;
+				}
+				else if (newPlayerCount > 0) {
+					onlinePlayersDetected.TrySetResult();
+					OnlinePlayerCountChanged -= OnOnlinePlayerCountChanged;
+				}
+			}
+		}
+
+		await onlinePlayersDetected.Task;
+	}
+
+	private void OnOutput(object? sender, string? line) {
+		lock (this) {
+			if (!isDisposed) {
+				serverOutputEvent.Set();
+			}
+		}
+	}
+
+	protected override void Dispose() {
+		lock (this) {
+			isDisposed = true;
+			playerCounts = null;
+		}
+
+		process.RemoveOutputListener(OnOutput);
+		serverOutputEvent.Dispose();
+	}
+}

Agent/Phantom.Agent.Services/Instances/State/InstanceRunningState.cs

@@ -0,0 +1,123 @@
+using Phantom.Agent.Minecraft.Instance;
+using Phantom.Agent.Minecraft.Launcher;
+using Phantom.Agent.Services.Backups;
+using Phantom.Common.Data.Backups;
+using Phantom.Common.Data.Instance;
+using Phantom.Common.Data.Replies;
+
+namespace Phantom.Agent.Services.Instances.State;
+
+sealed class InstanceRunningState : IDisposable {
+	public InstanceTicketManager.Ticket Ticket { get; }
+	public InstanceProcess Process { get; }
+
+	internal bool IsStopping { get; set; }
+
+	private readonly InstanceContext context;
+	private readonly InstanceConfiguration configuration;
+	private readonly IServerLauncher launcher;
+	private readonly CancellationToken cancellationToken;
+
+	private readonly InstanceLogSender logSender;
+	private readonly InstancePlayerCountTracker playerCountTracker;
+	private readonly BackupScheduler backupScheduler;
+
+	private bool isDisposed;
+
+	public InstanceRunningState(InstanceContext context, InstanceConfiguration configuration, IServerLauncher launcher, InstanceTicketManager.Ticket ticket, InstanceProcess process, CancellationToken cancellationToken) {
+		this.context = context;
+		this.configuration = configuration;
+		this.launcher = launcher;
+		this.Ticket = ticket;
+		this.Process = process;
+		this.cancellationToken = cancellationToken;
+
+		this.logSender = new InstanceLogSender(context.Services.ControllerConnection, context.InstanceGuid, context.ShortName);
+		this.playerCountTracker = new InstancePlayerCountTracker(context, process, configuration.ServerPort);
+
+		this.backupScheduler = new BackupScheduler(context, playerCountTracker);
+		this.backupScheduler.BackupCompleted += OnScheduledBackupCompleted;
+	}
+
+	public void Initialize() {
+		Process.Ended += ProcessEnded;
+
+		if (Process.HasEnded) {
+			if (TryDispose()) {
+				context.Logger.Warning("Session ended immediately after it was started.");
+				context.Actor.Tell(new InstanceActor.HandleProcessEndedCommand(InstanceStatus.Failed(InstanceLaunchFailReason.UnknownError)));
+			}
+		}
+		else {
+			context.Logger.Information("Session started.");
+			Process.AddOutputListener(SessionOutput);
+		}
+	}
+
+	private void SessionOutput(object? sender, string line) {
+		context.Logger.Debug("[Server] {Line}", line);
+		logSender.Enqueue(line);
+	}
+
+	private void ProcessEnded(object? sender, EventArgs e) {
+		if (!TryDispose()) {
+			return;
+		}
+
+		if (cancellationToken.IsCancellationRequested) {
+			return;
+		}
+		
+		if (IsStopping) {
+			context.Actor.Tell(new InstanceActor.HandleProcessEndedCommand(InstanceStatus.NotRunning));
+		}
+		else {
+			context.Logger.Information("Session ended unexpectedly, restarting...");
+			context.ReportEvent(InstanceEvent.Crashed);
+			context.Actor.Tell(new InstanceActor.LaunchInstanceCommand(configuration, launcher, Ticket, IsRestarting: true));
+		}
+	}
+
+	private void OnScheduledBackupCompleted(object? sender, BackupCreationResult e) {
+		context.ReportEvent(new InstanceBackupCompletedEvent(e.Kind, e.Warnings));
+	}
+
+	public async Task<SendCommandToInstanceResult> SendCommand(string command, CancellationToken cancellationToken) {
+		try {
+			context.Logger.Information("Sending command: {Command}", command);
+			await Process.SendCommand(command, cancellationToken);
+			return SendCommandToInstanceResult.Success;
+		} catch (OperationCanceledException) {
+			return SendCommandToInstanceResult.UnknownError;
+		} catch (Exception e) {
+			context.Logger.Warning(e, "Caught exception while sending command.");
+			return SendCommandToInstanceResult.UnknownError;
+		}
+	}
+
+	public void OnStopInitiated() {
+		backupScheduler.Stop();
+		playerCountTracker.Stop();
+	}
+	
+	private bool TryDispose() {
+		lock (this) {
+			if (isDisposed) {
+				return false;
+			}
+
+			isDisposed = true;
+		}
+
+		OnStopInitiated();
+		logSender.Stop();
+		
+		Process.Dispose();
+		
+		return true;
+	}
+
+	public void Dispose() {
+		TryDispose();
+	}
+}

Agent/Phantom.Agent.Services/Instances/State/InstanceStopProcedure.cs

@@ -0,0 +1,99 @@
+using System.Diagnostics;
+using Phantom.Agent.Minecraft.Command;
+using Phantom.Agent.Minecraft.Instance;
+using Phantom.Common.Data.Instance;
+using Phantom.Common.Data.Minecraft;
+
+namespace Phantom.Agent.Services.Instances.State;
+
+static class InstanceStopProcedure {
+	private static readonly ushort[] Stops = { 60, 30, 10, 5, 4, 3, 2, 1, 0 };
+
+	public static async Task<bool> Run(InstanceContext context, MinecraftStopStrategy stopStrategy, InstanceRunningState runningState, Action<IInstanceStatus> reportStatus, CancellationToken cancellationToken) {
+		var process = runningState.Process;
+		runningState.IsStopping = true;
+
+		var seconds = stopStrategy.Seconds;
+		if (seconds > 0) {
+			try {
+				await CountDownWithAnnouncements(context, process, seconds, cancellationToken);
+			} catch (OperationCanceledException) {
+				runningState.IsStopping = false;
+				return false;
+			}
+		}
+
+		try {
+			// Too late to cancel the stop procedure now.
+			runningState.OnStopInitiated();
+			
+			if (!process.HasEnded) {
+				context.Logger.Information("Session stopping now.");
+				await DoStop(context, process);
+			}
+		} finally {
+			context.Logger.Information("Session stopped.");
+			reportStatus(InstanceStatus.NotRunning);
+			context.ReportEvent(InstanceEvent.Stopped);
+		}
+
+		return true;
+	}
+
+	private static async Task CountDownWithAnnouncements(InstanceContext context, InstanceProcess process, ushort seconds, CancellationToken cancellationToken) {
+		context.Logger.Information("Session stopping in {Seconds} seconds.", seconds);
+
+		foreach (var stop in Stops) {
+			// TODO change to event-based cancellation
+			if (process.HasEnded) {
+				return;
+			}
+
+			if (seconds > stop) {
+				await process.SendCommand(GetCountDownAnnouncementCommand(seconds), cancellationToken);
+				await Task.Delay(TimeSpan.FromSeconds(seconds - stop), cancellationToken);
+				seconds = stop;
+			}
+		}
+	}
+
+	private static string GetCountDownAnnouncementCommand(ushort seconds) {
+		return MinecraftCommand.Say("Server shutting down in " + seconds + (seconds == 1 ? " second." : " seconds."));
+	}
+
+	private static async Task DoStop(InstanceContext context, InstanceProcess process) {
+		context.Logger.Information("Sending stop command...");
+		await TrySendStopCommand(context, process);
+
+		context.Logger.Information("Waiting for session to end...");
+		await WaitForSessionToEnd(context, process);
+	}
+
+	private static async Task TrySendStopCommand(InstanceContext context, InstanceProcess process) {
+		using var timeout = new CancellationTokenSource(TimeSpan.FromSeconds(5));
+		try {
+			await process.SendCommand(MinecraftCommand.Stop, timeout.Token);
+		} catch (OperationCanceledException) {
+			// Ignore.
+		} catch (ObjectDisposedException e) when (e.ObjectName == typeof(Process).FullName && process.HasEnded) {
+			// Ignore.
+		} catch (IOException e) when (e.HResult == -2147024664 /* The pipe is being closed */) {
+			// Ignore.
+		} catch (Exception e) {
+			context.Logger.Warning(e, "Caught exception while sending stop command.");
+		}
+	}
+
+	private static async Task WaitForSessionToEnd(InstanceContext context, InstanceProcess process) {
+		try {
+			await process.WaitForExit(TimeSpan.FromSeconds(55));
+		} catch (TimeoutException) {
+			try {
+				context.Logger.Warning("Waiting timed out, killing session...");
+				process.Kill();
+			} catch (Exception e) {
+				context.Logger.Error(e, "Caught exception while killing session.");
+			}
+		}
+	}
+}

Agent/Phantom.Agent.Services/Instances/States/IInstanceState.cs

@@ -1,11 +0,0 @@
-using Phantom.Common.Data.Minecraft;
-using Phantom.Common.Data.Replies;
-
-namespace Phantom.Agent.Services.Instances.States; 
-
-interface IInstanceState {
-	void Initialize();
-	(IInstanceState, LaunchInstanceResult) Launch(InstanceContext context);
-	(IInstanceState, StopInstanceResult) Stop(MinecraftStopStrategy stopStrategy);
-	Task<bool> SendCommand(string command, CancellationToken cancellationToken);
-}

Agent/Phantom.Agent.Services/Instances/States/InstanceLaunchingState.cs

@@ -1,127 +0,0 @@
-using Phantom.Agent.Minecraft.Instance;
-using Phantom.Agent.Minecraft.Launcher;
-using Phantom.Agent.Minecraft.Server;
-using Phantom.Agent.Services.Instances.Sessions;
-using Phantom.Common.Data.Instance;
-using Phantom.Common.Data.Minecraft;
-using Phantom.Common.Data.Replies;
-
-namespace Phantom.Agent.Services.Instances.States;
-
-sealed class InstanceLaunchingState : IInstanceState, IDisposable {
-	private readonly InstanceContext context;
-	private readonly CancellationTokenSource cancellationTokenSource = new ();
-	private byte lastDownloadProgress = byte.MaxValue;
-
-	public InstanceLaunchingState(InstanceContext context) {
-		this.context = context;
-	}
-
-	public void Initialize() {
-		context.Logger.Information("Session starting...");
-
-		var launchTask = context.Services.TaskManager.Run("Launch procedure for instance " + context.ShortName, DoLaunch);
-		launchTask.ContinueWith(OnLaunchSuccess, CancellationToken.None, TaskContinuationOptions.OnlyOnRanToCompletion, TaskScheduler.Default);
-		launchTask.ContinueWith(OnLaunchFailure, CancellationToken.None, TaskContinuationOptions.NotOnRanToCompletion, TaskScheduler.Default);
-	}
-
-	private async Task<InstanceProcess> DoLaunch() {
-		var cancellationToken = cancellationTokenSource.Token;
-		cancellationToken.ThrowIfCancellationRequested();
-
-		void OnDownloadProgress(object? sender, DownloadProgressEventArgs args) {
-			byte progress = (byte) Math.Min(args.DownloadedBytes * 100 / args.TotalBytes, 100);
-
-			if (lastDownloadProgress != progress) {
-				lastDownloadProgress = progress;
-				context.SetStatus(InstanceStatus.Downloading(progress));
-			}
-		}
-
-		var launchResult = await context.Launcher.Launch(context.Logger, context.Services.LaunchServices, OnDownloadProgress, cancellationToken);
-		if (launchResult is LaunchResult.InvalidJavaRuntime) {
-			throw new LaunchFailureException(InstanceLaunchFailReason.JavaRuntimeNotFound, "Session failed to launch, invalid Java runtime.");
-		}
-		else if (launchResult is LaunchResult.InvalidJvmArguments) {
-			throw new LaunchFailureException(InstanceLaunchFailReason.InvalidJvmArguments, "Session failed to launch, invalid JVM arguments.");
-		}
-		else if (launchResult is LaunchResult.CouldNotDownloadMinecraftServer) {
-			throw new LaunchFailureException(InstanceLaunchFailReason.CouldNotDownloadMinecraftServer, "Session failed to launch, could not download Minecraft server.");
-		}
-		else if (launchResult is LaunchResult.CouldNotPrepareMinecraftServerLauncher) {
-			throw new LaunchFailureException(InstanceLaunchFailReason.CouldNotPrepareMinecraftServerLauncher, "Session failed to launch, could not prepare Minecraft server launcher.");
-		}
-		else if (launchResult is LaunchResult.CouldNotConfigureMinecraftServer) {
-			throw new LaunchFailureException(InstanceLaunchFailReason.CouldNotConfigureMinecraftServer, "Session failed to launch, could not configure Minecraft server.");
-		}
-		else if (launchResult is LaunchResult.CouldNotStartMinecraftServer) {
-			throw new LaunchFailureException(InstanceLaunchFailReason.CouldNotStartMinecraftServer, "Session failed to launch, could not start Minecraft server.");
-		}
-
-		if (launchResult is not LaunchResult.Success launchSuccess) {
-			throw new LaunchFailureException(InstanceLaunchFailReason.UnknownError, "Session failed to launch.");
-		}
-
-		context.SetStatus(InstanceStatus.Launching);
-		return launchSuccess.Process;
-	}
-
-	private void OnLaunchSuccess(Task<InstanceProcess> task) {
-		context.TransitionState(() => {
-			context.ReportEvent(InstanceEvent.LaunchSucceded);
-			
-			var process = task.Result;
-			var session = new InstanceSession(process, context);
-			
-			if (cancellationTokenSource.IsCancellationRequested) {
-				return (new InstanceStoppingState(context, process, session), InstanceStatus.Stopping);
-			}
-			else {
-				return (new InstanceRunningState(context, process, session), null);
-			}
-		});
-	}
-
-	private void OnLaunchFailure(Task task) {
-		if (task.IsFaulted) {
-			if (task.Exception is { InnerException: LaunchFailureException e }) {
-				context.Logger.Error(e.LogMessage);
-				context.SetLaunchFailedStatusAndReportEvent(e.Reason);
-			}
-			else {
-				context.Logger.Error(task.Exception, "Caught exception while launching instance.");
-				context.SetLaunchFailedStatusAndReportEvent(InstanceLaunchFailReason.UnknownError);
-			}
-		}
-
-		context.Services.PortManager.Release(context.Configuration);
-		context.TransitionState(new InstanceNotRunningState());
-	}
-
-	private sealed class LaunchFailureException : Exception {
-		public InstanceLaunchFailReason Reason { get; }
-		public string LogMessage { get; }
-
-		public LaunchFailureException(InstanceLaunchFailReason reason, string logMessage) {
-			this.Reason = reason;
-			this.LogMessage = logMessage;
-		}
-	}
-
-	public (IInstanceState, LaunchInstanceResult) Launch(InstanceContext context) {
-		return (this, LaunchInstanceResult.InstanceAlreadyLaunching);
-	}
-
-	public (IInstanceState, StopInstanceResult) Stop(MinecraftStopStrategy stopStrategy) {
-		cancellationTokenSource.Cancel();
-		return (this, StopInstanceResult.StopInitiated);
-	}
-
-	public Task<bool> SendCommand(string command, CancellationToken cancellationToken) {
-		return Task.FromResult(false);
-	}
-
-	public void Dispose() {
-		cancellationTokenSource.Dispose();
-	}
-}

Agent/Phantom.Agent.Services/Instances/States/InstanceNotRunningState.cs

@@ -1,35 +0,0 @@
-using Phantom.Common.Data.Instance;
-using Phantom.Common.Data.Minecraft;
-using Phantom.Common.Data.Replies;
-
-namespace Phantom.Agent.Services.Instances.States; 
-
-sealed class InstanceNotRunningState : IInstanceState {
-	public void Initialize() {}
-
-	public (IInstanceState, LaunchInstanceResult) Launch(InstanceContext context) {
-		InstanceLaunchFailReason? failReason = context.Services.PortManager.Reserve(context.Configuration) switch {
-			PortManager.Result.ServerPortNotAllowed   => InstanceLaunchFailReason.ServerPortNotAllowed,
-			PortManager.Result.ServerPortAlreadyInUse => InstanceLaunchFailReason.ServerPortAlreadyInUse,
-			PortManager.Result.RconPortNotAllowed     => InstanceLaunchFailReason.RconPortNotAllowed,
-			PortManager.Result.RconPortAlreadyInUse   => InstanceLaunchFailReason.RconPortAlreadyInUse,
-			_                                         => null
-		};
-
-		if (failReason is {} reason) {
-			context.SetLaunchFailedStatusAndReportEvent(reason);
-			return (this, LaunchInstanceResult.LaunchInitiated);
-		}
-		
-		context.SetStatus(InstanceStatus.Launching);
-		return (new InstanceLaunchingState(context), LaunchInstanceResult.LaunchInitiated);
-	}
-
-	public (IInstanceState, StopInstanceResult) Stop(MinecraftStopStrategy stopStrategy) {
-		return (this, StopInstanceResult.InstanceAlreadyStopped);
-	}
-
-	public Task<bool> SendCommand(string command, CancellationToken cancellationToken) {
-		return Task.FromResult(false);
-	}
-}

Agent/Phantom.Agent.Services/Instances/States/InstanceRunningState.cs

@@ -1,178 +0,0 @@
-using Phantom.Agent.Minecraft.Command;
-using Phantom.Agent.Minecraft.Instance;
-using Phantom.Agent.Services.Backups;
-using Phantom.Agent.Services.Instances.Sessions;
-using Phantom.Common.Data.Backups;
-using Phantom.Common.Data.Instance;
-using Phantom.Common.Data.Minecraft;
-using Phantom.Common.Data.Replies;
-
-namespace Phantom.Agent.Services.Instances.States;
-
-sealed class InstanceRunningState : IInstanceState {
-	private readonly InstanceContext context;
-	private readonly InstanceProcess process;
-	private readonly BackupScheduler backupScheduler;
-	private readonly RunningSessionDisposer runningSessionDisposer;
-	
-	private readonly CancellationTokenSource delayedStopCancellationTokenSource = new ();
-	private bool stateOwnsDelayedStopCancellationTokenSource = true;
-	private bool isStopping;
-
-	public InstanceRunningState(InstanceContext context, InstanceProcess process, InstanceSession session) {
-		this.context = context;
-		this.process = process;
-		this.backupScheduler = new BackupScheduler(context.Services.TaskManager, context.Services.BackupManager, process, context.Configuration.ServerPort, context.ShortName);
-		this.backupScheduler.BackupCompleted += OnScheduledBackupCompleted;
-		this.runningSessionDisposer = new RunningSessionDisposer(this, session);
-	}
-
-	public void Initialize() {
-		process.Ended += ProcessEnded;
-		
-		if (process.HasEnded) {
-			if (runningSessionDisposer.Dispose()) {
-				context.Logger.Warning("Session ended immediately after it was started.");
-				context.ReportEvent(InstanceEvent.Stopped);
-				context.Services.TaskManager.Run("Transition state of instance " + context.ShortName + " to not running", () => context.TransitionState(new InstanceNotRunningState(), InstanceStatus.Failed(InstanceLaunchFailReason.UnknownError)));
-			}
-		}
-		else {
-			context.SetStatus(InstanceStatus.Running);
-			context.Logger.Information("Session started.");
-		}
-	}
-
-	private void ProcessEnded(object? sender, EventArgs e) {
-		if (!runningSessionDisposer.Dispose()) {
-			return;
-		}
-
-		if (isStopping) {
-			context.Logger.Information("Session ended.");
-			context.ReportEvent(InstanceEvent.Stopped);
-			context.TransitionState(new InstanceNotRunningState(), InstanceStatus.NotRunning);
-		}
-		else {
-			context.Logger.Information("Session ended unexpectedly, restarting...");
-			context.ReportEvent(InstanceEvent.Crashed);
-			context.TransitionState(new InstanceLaunchingState(context), InstanceStatus.Restarting);
-		}
-	}
-
-	public (IInstanceState, LaunchInstanceResult) Launch(InstanceContext context) {
-		return (this, LaunchInstanceResult.InstanceAlreadyRunning);
-	}
-
-	public (IInstanceState, StopInstanceResult) Stop(MinecraftStopStrategy stopStrategy) {
-		if (stopStrategy == MinecraftStopStrategy.Instant) {
-			CancelDelayedStop();
-			return (PrepareStoppedState(), StopInstanceResult.StopInitiated);
-		}
-
-		if (isStopping) {
-			// TODO change delay or something
-			return (this, StopInstanceResult.InstanceAlreadyStopping);
-		}
-		
-		isStopping = true;
-		context.Services.TaskManager.Run("Delayed stop timer for instance " + context.ShortName, () => StopLater(stopStrategy.Seconds));
-		return (this, StopInstanceResult.StopInitiated);
-	}
-
-	private IInstanceState PrepareStoppedState() {
-		process.Ended -= ProcessEnded;
-		backupScheduler.Stop();
-		return new InstanceStoppingState(context, process, runningSessionDisposer);
-	}
-
-	private void CancelDelayedStop() {
-		try {
-			delayedStopCancellationTokenSource.Cancel();
-		} catch (ObjectDisposedException) {
-			// ignore
-		}
-	}
-
-	private async Task StopLater(int seconds) {
-		var cancellationToken = delayedStopCancellationTokenSource.Token;
-
-		try {
-			stateOwnsDelayedStopCancellationTokenSource = false;
-
-			int[] stops = { 60, 30, 10, 5, 4, 3, 2, 1, 0 };
-			
-			foreach (var stop in stops) {
-				if (seconds > stop) {
-					await SendCommand(MinecraftCommand.Say("Server shutting down in " + seconds + (seconds == 1 ? " second." : " seconds.")), cancellationToken);
-					await Task.Delay(TimeSpan.FromSeconds(seconds - stop), cancellationToken);
-					seconds = stop;
-				}
-			}
-		} catch (OperationCanceledException) {
-			context.Logger.Debug("Cancelled delayed stop.");
-			return;
-		} catch (ObjectDisposedException) {
-			return;
-		} catch (Exception e) {
-			context.Logger.Warning(e, "Caught exception during delayed stop.");
-			return;
-		} finally {
-			delayedStopCancellationTokenSource.Dispose();
-		}
-
-		context.TransitionState(PrepareStoppedState());
-	}
-
-	public async Task<bool> SendCommand(string command, CancellationToken cancellationToken) {
-		try {
-			context.Logger.Information("Sending command: {Command}", command);
-			await process.SendCommand(command, cancellationToken);
-			return true;
-		} catch (OperationCanceledException) {
-			return false;
-		} catch (Exception e) {
-			context.Logger.Warning(e, "Caught exception while sending command.");
-			return false;
-		}
-	}
-
-	private void OnScheduledBackupCompleted(object? sender, BackupCreationResult e) {
-		context.ReportEvent(new InstanceBackupCompletedEvent(e.Kind, e.Warnings));
-	}
-
-	private sealed class RunningSessionDisposer : IDisposable {
-		private readonly InstanceRunningState state;
-		private readonly InstanceSession session;
-		private bool isDisposed;
-
-		public RunningSessionDisposer(InstanceRunningState state, InstanceSession session) {
-			this.state = state;
-			this.session = session;
-		}
-
-		public bool Dispose() {
-			lock (this) {
-				if (isDisposed) {
-					return false;
-				}
-
-				isDisposed = true;
-			}
-
-			if (state.stateOwnsDelayedStopCancellationTokenSource) {
-				state.delayedStopCancellationTokenSource.Dispose();
-			}
-			else {
-				state.CancelDelayedStop();
-			}
-			
-			session.Dispose();
-			return true;
-		}
-
-		void IDisposable.Dispose() {
-			Dispose();
-		}
-	}
-}

Agent/Phantom.Agent.Services/Instances/States/InstanceStoppingState.cs

@@ -1,89 +0,0 @@
-using System.Diagnostics;
-using Phantom.Agent.Minecraft.Command;
-using Phantom.Agent.Minecraft.Instance;
-using Phantom.Common.Data.Instance;
-using Phantom.Common.Data.Minecraft;
-using Phantom.Common.Data.Replies;
-
-namespace Phantom.Agent.Services.Instances.States; 
-
-sealed class InstanceStoppingState : IInstanceState, IDisposable {
-	private readonly InstanceContext context;
-	private readonly InstanceProcess process;
-	private readonly IDisposable sessionDisposer;
-
-	public InstanceStoppingState(InstanceContext context, InstanceProcess process, IDisposable sessionDisposer) {
-		this.context = context;
-		this.process = process;
-		this.sessionDisposer = sessionDisposer;
-	}
-
-	public void Initialize() {
-		context.Logger.Information("Session stopping.");
-		context.SetStatus(InstanceStatus.Stopping);
-		context.Services.TaskManager.Run("Stop procedure for instance " + context.ShortName, DoStop);
-	}
-
-	private async Task DoStop() {
-		try {
-			// Do not release the semaphore after this point.
-			if (!await process.BackupSemaphore.CancelAndWait(TimeSpan.FromSeconds(1))) {
-				context.Logger.Information("Waiting for backup to finish...");
-				await process.BackupSemaphore.CancelAndWait(Timeout.InfiniteTimeSpan);
-			}
-			
-			context.Logger.Information("Sending stop command...");
-			await DoSendStopCommand();
-
-			context.Logger.Information("Waiting for session to end...");
-			await DoWaitForSessionToEnd();
-		} finally {
-			context.Logger.Information("Session stopped.");
-			context.ReportEvent(InstanceEvent.Stopped);
-			context.TransitionState(new InstanceNotRunningState(), InstanceStatus.NotRunning);
-		}
-	}
-
-	private async Task DoSendStopCommand() {
-		using var timeout = new CancellationTokenSource(TimeSpan.FromSeconds(5));
-		try {
-			await process.SendCommand(MinecraftCommand.Stop, timeout.Token);
-		} catch (OperationCanceledException) {
-			// ignore
-		} catch (ObjectDisposedException e) when (e.ObjectName == typeof(Process).FullName && process.HasEnded) {
-			// ignore
-		} catch (Exception e) {
-			context.Logger.Warning(e, "Caught exception while sending stop command.");
-		}
-	}
-
-	private async Task DoWaitForSessionToEnd() {
-		using var timeout = new CancellationTokenSource(TimeSpan.FromSeconds(55));
-		try {
-			await process.WaitForExit(timeout.Token);
-		} catch (OperationCanceledException) {
-			try {
-				context.Logger.Warning("Waiting timed out, killing session...");
-				process.Kill();
-			} catch (Exception e) {
-				context.Logger.Error(e, "Caught exception while killing session.");
-			}
-		}
-	}
-
-	public (IInstanceState, LaunchInstanceResult) Launch(InstanceContext context) {
-		return (this, LaunchInstanceResult.InstanceIsStopping);
-	}
-
-	public (IInstanceState, StopInstanceResult) Stop(MinecraftStopStrategy stopStrategy) {
-		return (this, StopInstanceResult.InstanceAlreadyStopping); // TODO maybe provide a way to kill?
-	}
-
-	public Task<bool> SendCommand(string command, CancellationToken cancellationToken) {
-		return Task.FromResult(false);
-	}
-
-	public void Dispose() {
-		sessionDisposer.Dispose();
-	}
-}

Agent/Phantom.Agent.Services/Phantom.Agent.Services.csproj

@@ -1,13 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
   
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
   
   <ItemGroup>
-    <ProjectReference Include="..\..\Common\Phantom.Common.Messages\Phantom.Common.Messages.csproj" />
+    <ProjectReference Include="..\..\Common\Phantom.Common.Messages.Agent\Phantom.Common.Messages.Agent.csproj" />
     <ProjectReference Include="..\Phantom.Agent.Minecraft\Phantom.Agent.Minecraft.csproj" />
     <ProjectReference Include="..\Phantom.Agent.Rpc\Phantom.Agent.Rpc.csproj" />
   </ItemGroup>

Agent/Phantom.Agent.Services/Rpc/ControllerMessageHandlerActor.cs

@@ -0,0 +1,101 @@
+using Phantom.Agent.Services.Instances;
+using Phantom.Common.Data;
+using Phantom.Common.Data.Instance;
+using Phantom.Common.Data.Replies;
+using Phantom.Common.Messages.Agent;
+using Phantom.Common.Messages.Agent.BiDirectional;
+using Phantom.Common.Messages.Agent.ToAgent;
+using Phantom.Common.Messages.Agent.ToController;
+using Phantom.Utils.Actor;
+using Phantom.Utils.Logging;
+using Phantom.Utils.Rpc.Runtime;
+using Serilog;
+
+namespace Phantom.Agent.Services.Rpc;
+
+public sealed class ControllerMessageHandlerActor : ReceiveActor<IMessageToAgent> {
+	private static ILogger Logger { get; } = PhantomLogger.Create<ControllerMessageHandlerActor>();
+
+	public readonly record struct Init(RpcConnectionToServer<IMessageToController> Connection, AgentServices Agent, CancellationTokenSource ShutdownTokenSource);
+	
+	public static Props<IMessageToAgent> Factory(Init init) {
+		return Props<IMessageToAgent>.Create(() => new ControllerMessageHandlerActor(init), new ActorConfiguration { SupervisorStrategy = SupervisorStrategies.Resume });
+	}
+	
+	private readonly RpcConnectionToServer<IMessageToController> connection;
+	private readonly AgentServices agent;
+	private readonly CancellationTokenSource shutdownTokenSource;
+
+	private ControllerMessageHandlerActor(Init init) {
+		this.connection = init.Connection;
+		this.agent = init.Agent;
+		this.shutdownTokenSource = init.ShutdownTokenSource;
+		
+		ReceiveAsync<RegisterAgentSuccessMessage>(HandleRegisterAgentSuccess);
+		Receive<RegisterAgentFailureMessage>(HandleRegisterAgentFailure);
+		ReceiveAndReplyLater<ConfigureInstanceMessage, Result<ConfigureInstanceResult, InstanceActionFailure>>(HandleConfigureInstance);
+		ReceiveAndReplyLater<LaunchInstanceMessage, Result<LaunchInstanceResult, InstanceActionFailure>>(HandleLaunchInstance);
+		ReceiveAndReplyLater<StopInstanceMessage, Result<StopInstanceResult, InstanceActionFailure>>(HandleStopInstance);
+		ReceiveAndReplyLater<SendCommandToInstanceMessage, Result<SendCommandToInstanceResult, InstanceActionFailure>>(HandleSendCommandToInstance);
+		Receive<ReplyMessage>(HandleReply);
+	}
+
+	private async Task HandleRegisterAgentSuccess(RegisterAgentSuccessMessage message) {
+		Logger.Information("Agent authentication successful.");
+
+		void ShutdownAfterConfigurationFailed(Guid instanceGuid, InstanceConfiguration configuration) {
+			Logger.Fatal("Unable to configure instance \"{Name}\" (GUID {Guid}), shutting down.", configuration.InstanceName, instanceGuid);
+			shutdownTokenSource.Cancel();
+		}
+		
+		foreach (var configureInstanceMessage in message.InitialInstanceConfigurations) {
+			var result = await HandleConfigureInstance(configureInstanceMessage, alwaysReportStatus: true);
+			if (!result.Is(ConfigureInstanceResult.Success)) {
+				ShutdownAfterConfigurationFailed(configureInstanceMessage.InstanceGuid, configureInstanceMessage.Configuration);
+				return;
+			}
+		}
+
+		connection.SetIsReady();
+		
+		await connection.Send(new AdvertiseJavaRuntimesMessage(agent.JavaRuntimeRepository.All));
+		agent.InstanceTicketManager.RefreshAgentStatus();
+	}
+
+	private void HandleRegisterAgentFailure(RegisterAgentFailureMessage message) {
+		string errorMessage = message.FailureKind switch {
+			RegisterAgentFailure.ConnectionAlreadyHasAnAgent => "This connection already has an associated agent.",
+			RegisterAgentFailure.InvalidToken                => "Invalid token.",
+			_                                                => "Unknown error " + (byte) message.FailureKind + "."
+		};
+
+		Logger.Fatal("Agent authentication failed: {Error}", errorMessage);
+		
+		PhantomLogger.Dispose();
+		Environment.Exit(1);
+	}
+	
+	private Task<Result<ConfigureInstanceResult, InstanceActionFailure>> HandleConfigureInstance(ConfigureInstanceMessage message, bool alwaysReportStatus) {
+		return agent.InstanceManager.Request(new InstanceManagerActor.ConfigureInstanceCommand(message.InstanceGuid, message.Configuration, message.LaunchProperties, message.LaunchNow, alwaysReportStatus));
+	}
+	
+	private async Task<Result<ConfigureInstanceResult, InstanceActionFailure>> HandleConfigureInstance(ConfigureInstanceMessage message) {
+		return await HandleConfigureInstance(message, alwaysReportStatus: false);
+	}
+
+	private async Task<Result<LaunchInstanceResult, InstanceActionFailure>> HandleLaunchInstance(LaunchInstanceMessage message) {
+		return await agent.InstanceManager.Request(new InstanceManagerActor.LaunchInstanceCommand(message.InstanceGuid));
+	}
+
+	private async Task<Result<StopInstanceResult, InstanceActionFailure>> HandleStopInstance(StopInstanceMessage message) {
+		return await agent.InstanceManager.Request(new InstanceManagerActor.StopInstanceCommand(message.InstanceGuid, message.StopStrategy));
+	}
+
+	private async Task<Result<SendCommandToInstanceResult, InstanceActionFailure>> HandleSendCommandToInstance(SendCommandToInstanceMessage message) {
+		return await agent.InstanceManager.Request(new InstanceManagerActor.SendCommandToInstanceCommand(message.InstanceGuid, message.Command));
+	}
+
+	private void HandleReply(ReplyMessage message) {
+		connection.Receive(message);
+	}
+}

Agent/Phantom.Agent.Services/Rpc/MessageListener.cs

@@ -1,86 +0,0 @@
-using Phantom.Agent.Rpc;
-using Phantom.Common.Data.Instance;
-using Phantom.Common.Data.Replies;
-using Phantom.Common.Logging;
-using Phantom.Common.Messages;
-using Phantom.Common.Messages.BiDirectional;
-using Phantom.Common.Messages.ToAgent;
-using Phantom.Common.Messages.ToServer;
-using Phantom.Utils.Rpc.Message;
-using Serilog;
-
-namespace Phantom.Agent.Services.Rpc;
-
-public sealed class MessageListener : IMessageToAgentListener {
-	private static ILogger Logger { get; } = PhantomLogger.Create<MessageListener>();
-
-	private readonly RpcServerConnection connection;
-	private readonly AgentServices agent;
-	private readonly CancellationTokenSource shutdownTokenSource;
-
-	public MessageListener(RpcServerConnection connection, AgentServices agent, CancellationTokenSource shutdownTokenSource) {
-		this.connection = connection;
-		this.agent = agent;
-		this.shutdownTokenSource = shutdownTokenSource;
-	}
-
-	public async Task<NoReply> HandleRegisterAgentSuccess(RegisterAgentSuccessMessage message) {
-		Logger.Information("Agent authentication successful.");
-
-		void ShutdownAfterConfigurationFailed(InstanceConfiguration configuration) {
-			Logger.Fatal("Unable to configure instance \"{Name}\" (GUID {Guid}), shutting down.", configuration.InstanceName, configuration.InstanceGuid);
-			shutdownTokenSource.Cancel();
-		}
-		
-		foreach (var configureInstanceMessage in message.InitialInstanceConfigurations) {
-			var result = await HandleConfigureInstance(configureInstanceMessage, alwaysReportStatus: true);
-			if (!result.Is(ConfigureInstanceResult.Success)) {
-				ShutdownAfterConfigurationFailed(configureInstanceMessage.Configuration);
-				return NoReply.Instance;
-			}
-		}
-
-		await ServerMessaging.Send(new AdvertiseJavaRuntimesMessage(agent.JavaRuntimeRepository.All));
-		await agent.InstanceSessionManager.RefreshAgentStatus();
-		
-		return NoReply.Instance;
-	}
-
-	public Task<NoReply> HandleRegisterAgentFailure(RegisterAgentFailureMessage message) {
-		string errorMessage = message.FailureKind switch {
-			RegisterAgentFailure.ConnectionAlreadyHasAnAgent => "This connection already has an associated agent.",
-			RegisterAgentFailure.InvalidToken                => "Invalid token.",
-			_                                                => "Unknown error " + (byte) message.FailureKind + "."
-		};
-
-		Logger.Fatal("Agent authentication failed: {Error}", errorMessage);
-		Environment.Exit(1);
-
-		return Task.FromResult(NoReply.Instance);
-	}
-	
-	private Task<InstanceActionResult<ConfigureInstanceResult>> HandleConfigureInstance(ConfigureInstanceMessage message, bool alwaysReportStatus) {
-		return agent.InstanceSessionManager.Configure(message.Configuration, message.LaunchProperties, message.LaunchNow, alwaysReportStatus);
-	}
-	
-	public async Task<InstanceActionResult<ConfigureInstanceResult>> HandleConfigureInstance(ConfigureInstanceMessage message) {
-		return await HandleConfigureInstance(message, alwaysReportStatus: false);
-	}
-
-	public async Task<InstanceActionResult<LaunchInstanceResult>> HandleLaunchInstance(LaunchInstanceMessage message) {
-		return await agent.InstanceSessionManager.Launch(message.InstanceGuid);
-	}
-
-	public async Task<InstanceActionResult<StopInstanceResult>> HandleStopInstance(StopInstanceMessage message) {
-		return await agent.InstanceSessionManager.Stop(message.InstanceGuid, message.StopStrategy);
-	}
-
-	public async Task<InstanceActionResult<SendCommandToInstanceResult>> HandleSendCommandToInstance(SendCommandToInstanceMessage message) {
-		return await agent.InstanceSessionManager.SendCommand(message.InstanceGuid, message.Command);
-	}
-
-	public Task<NoReply> HandleReply(ReplyMessage message) {
-		connection.Receive(message);
-		return Task.FromResult(NoReply.Instance);
-	}
-}

Agent/Phantom.Agent/AgentKey.cs

@@ -1,8 +1,8 @@
 using NetMQ;
-using Phantom.Common.Data.Agent;
-using Phantom.Common.Logging;
+using Phantom.Common.Data;
 using Phantom.Utils.Cryptography;
 using Phantom.Utils.IO;
+using Phantom.Utils.Logging;
 using Serilog;
 
 namespace Phantom.Agent;
@@ -10,7 +10,7 @@ namespace Phantom.Agent;
 static class AgentKey {
 	private static ILogger Logger { get; } = PhantomLogger.Create(nameof(AgentKey));
 
-	public static Task<(NetMQCertificate, AgentAuthToken)?> Load(string? agentKeyToken, string? agentKeyFilePath) {
+	public static Task<(NetMQCertificate, AuthToken)?> Load(string? agentKeyToken, string? agentKeyFilePath) {
 		if (agentKeyFilePath != null) {
 			return LoadFromFile(agentKeyFilePath);
 		}
@@ -22,7 +22,7 @@ static class AgentKey {
 		}
 	}
 
-	private static async Task<(NetMQCertificate, AgentAuthToken)?> LoadFromFile(string agentKeyFilePath) {
+	private static async Task<(NetMQCertificate, AuthToken)?> LoadFromFile(string agentKeyFilePath) {
 		if (!File.Exists(agentKeyFilePath)) {
 			Logger.Fatal("Missing agent key file: {AgentKeyFilePath}", agentKeyFilePath);
 			return null;
@@ -41,7 +41,7 @@ static class AgentKey {
 		}
 	}
 
-	private static (NetMQCertificate, AgentAuthToken)? LoadFromToken(string agentKey) {
+	private static (NetMQCertificate, AuthToken)? LoadFromToken(string agentKey) {
 		try {
 			return LoadFromBytes(TokenGenerator.DecodeBytes(agentKey));
 		} catch (Exception) {
@@ -50,11 +50,11 @@ static class AgentKey {
 		}
 	}
 
-	private static (NetMQCertificate, AgentAuthToken)? LoadFromBytes(byte[] agentKey) {
-		var (publicKey, agentToken) = AgentKeyData.FromBytes(agentKey);
-		var serverCertificate = NetMQCertificate.FromPublicKey(publicKey);
+	private static (NetMQCertificate, AuthToken)? LoadFromBytes(byte[] agentKey) {
+		var (publicKey, agentToken) = ConnectionCommonKey.FromBytes(agentKey);
+		var controllerCertificate = NetMQCertificate.FromPublicKey(publicKey);
 		
 		Logger.Information("Loaded agent key.");
-		return (serverCertificate, agentToken);
+		return (controllerCertificate, agentToken);
 	}
 }

Agent/Phantom.Agent/GuidFile.cs

@@ -1,6 +1,6 @@
 using System.Text;
-using Phantom.Common.Logging;
 using Phantom.Utils.IO;
+using Phantom.Utils.Logging;
 using Serilog;
 
 namespace Phantom.Agent;

Agent/Phantom.Agent/Phantom.Agent.csproj

@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
@@ -12,8 +11,7 @@
   </PropertyGroup>
   
   <ItemGroup>
-    <ProjectReference Include="..\..\Utils\Phantom.Utils.IO\Phantom.Utils.IO.csproj" />
-    <ProjectReference Include="..\..\Utils\Phantom.Utils.Runtime\Phantom.Utils.Runtime.csproj" />
+    <ProjectReference Include="..\..\Utils\Phantom.Utils\Phantom.Utils.csproj" />
     <ProjectReference Include="..\Phantom.Agent.Minecraft\Phantom.Agent.Minecraft.csproj" />
     <ProjectReference Include="..\Phantom.Agent.Services\Phantom.Agent.Services.csproj" />
   </ItemGroup>

Agent/Phantom.Agent/Program.cs

@@ -1,11 +1,16 @@
 using System.Reflection;
+using NetMQ;
 using Phantom.Agent;
 using Phantom.Agent.Rpc;
 using Phantom.Agent.Services;
 using Phantom.Agent.Services.Rpc;
 using Phantom.Common.Data.Agent;
-using Phantom.Common.Logging;
+using Phantom.Common.Messages.Agent;
+using Phantom.Common.Messages.Agent.ToController;
+using Phantom.Utils.Actor;
+using Phantom.Utils.Logging;
 using Phantom.Utils.Rpc;
+using Phantom.Utils.Rpc.Sockets;
 using Phantom.Utils.Runtime;
 
 const int ProtocolVersion = 1;
@@ -13,6 +18,9 @@ const int ProtocolVersion = 1;
 var shutdownCancellationTokenSource = new CancellationTokenSource();
 var shutdownCancellationToken = shutdownCancellationTokenSource.Token;
 
+ProgramCulture.UseInvariantCulture();
+ThreadPool.SetMinThreads(workerThreads: 2, completionPortThreads: 1);
+
 PosixSignals.RegisterCancellation(shutdownCancellationTokenSource, static () => {
 	PhantomLogger.Root.InformationHeading("Stopping Phantom Panel agent...");
 });
@@ -23,38 +31,39 @@ try {
 	PhantomLogger.Root.InformationHeading("Initializing Phantom Panel agent...");
 	PhantomLogger.Root.Information("Agent version: {Version}", fullVersion);
 
-	var (serverHost, serverPort, javaSearchPath, agentKeyToken, agentKeyFilePath, agentName, maxInstances, maxMemory, allowedServerPorts, allowedRconPorts) = Variables.LoadOrExit();
+	var (controllerHost, controllerPort, javaSearchPath, agentKeyToken, agentKeyFilePath, agentName, maxInstances, maxMemory, allowedServerPorts, allowedRconPorts, maxConcurrentBackupCompressionTasks) = Variables.LoadOrStop();
 
 	var agentKey = await AgentKey.Load(agentKeyToken, agentKeyFilePath);
 	if (agentKey == null) {
-		Environment.Exit(1);
+		return 1;
 	}
 
 	var folders = new AgentFolders("./data", "./temp", javaSearchPath);
 	if (!folders.TryCreate()) {
-		Environment.Exit(1);
+		return 1;
 	}
 
 	var agentGuid = await GuidFile.CreateOrLoad(folders.DataFolderPath);
 	if (agentGuid == null) {
-		Environment.Exit(1);
+		return 1;
 	}
 
-	var (serverCertificate, agentToken) = agentKey.Value;
+	var (controllerCertificate, agentToken) = agentKey.Value;
 	var agentInfo = new AgentInfo(agentGuid.Value, agentName, ProtocolVersion, fullVersion, maxInstances, maxMemory, allowedServerPorts, allowedRconPorts);
-	var agentServices = new AgentServices(agentInfo, folders);
-
-	MessageListener MessageListenerFactory(RpcServerConnection connection) {
-		return new MessageListener(connection, agentServices, shutdownCancellationTokenSource);
-	}
 	
 	PhantomLogger.Root.InformationHeading("Launching Phantom Panel agent...");
 	
+	var rpcConfiguration = new RpcConfiguration("Agent", controllerHost, controllerPort, controllerCertificate);
+	var rpcSocket = RpcClientSocket.Connect(rpcConfiguration, AgentMessageRegistries.Definitions, new RegisterAgentMessage(agentToken, agentInfo));
+
+	var agentServices = new AgentServices(agentInfo, folders, new AgentServiceConfiguration(maxConcurrentBackupCompressionTasks), new ControllerConnection(rpcSocket.Connection));
 	await agentServices.Initialize();
 
+	var rpcMessageHandlerInit = new ControllerMessageHandlerActor.Init(rpcSocket.Connection, agentServices, shutdownCancellationTokenSource);
+	var rpcMessageHandlerActor = agentServices.ActorSystem.ActorOf(ControllerMessageHandlerActor.Factory(rpcMessageHandlerInit), "ControllerMessageHandler");
+	
 	var rpcDisconnectSemaphore = new SemaphoreSlim(0, 1);
-	var rpcConfiguration = new RpcConfiguration(PhantomLogger.Create("Rpc"), PhantomLogger.Create<TaskManager>("Rpc"), serverHost, serverPort, serverCertificate);
-	var rpcTask = RpcLauncher.Launch(rpcConfiguration, agentToken, agentInfo, MessageListenerFactory, rpcDisconnectSemaphore, shutdownCancellationToken);
+	var rpcTask = RpcClientRuntime.Launch(rpcSocket, rpcMessageHandlerActor, rpcDisconnectSemaphore, shutdownCancellationToken);
 	try {
 		await rpcTask.WaitAsync(shutdownCancellationToken);
 	} finally {
@@ -64,11 +73,18 @@ try {
 		rpcDisconnectSemaphore.Release();
 		await rpcTask;
 		rpcDisconnectSemaphore.Dispose();
+		
+		NetMQConfig.Cleanup();
 	}
+
+	return 0;
 } catch (OperationCanceledException) {
-	// Ignore.
+	return 0;
+} catch (StopProcedureException) {
+	return 1;
 } catch (Exception e) {
 	PhantomLogger.Root.Fatal(e, "Caught exception in entry point.");
+	return 1;
 } finally {
 	shutdownCancellationTokenSource.Dispose();
 

Agent/Phantom.Agent/Variables.cs

@@ -1,13 +1,13 @@
 using Phantom.Agent.Minecraft.Java;
 using Phantom.Common.Data;
-using Phantom.Common.Logging;
+using Phantom.Utils.Logging;
 using Phantom.Utils.Runtime;
 
 namespace Phantom.Agent;
 
 sealed record Variables(
-	string ServerHost,
-	ushort ServerPort,
+	string ControllerHost,
+	ushort ControllerPort,
 	string JavaSearchPath,
 	string? AgentKeyToken,
 	string? AgentKeyFilePath,
@@ -15,15 +15,16 @@ sealed record Variables(
 	ushort MaxInstances,
 	RamAllocationUnits MaxMemory,
 	AllowedPorts AllowedServerPorts,
-	AllowedPorts AllowedRconPorts
+	AllowedPorts AllowedRconPorts,
+	ushort MaxConcurrentBackupCompressionTasks
 ) {
 	private static Variables LoadOrThrow() {
 		var (agentKeyToken, agentKeyFilePath) = EnvironmentVariables.GetEitherString("AGENT_KEY", "AGENT_KEY_FILE").Require;
 		var javaSearchPath = EnvironmentVariables.GetString("JAVA_SEARCH_PATH").WithDefaultGetter(GetDefaultJavaSearchPath);
 
 		return new Variables(
-			EnvironmentVariables.GetString("SERVER_HOST").Require,
-			EnvironmentVariables.GetPortNumber("SERVER_PORT").WithDefault(9401),
+			EnvironmentVariables.GetString("CONTROLLER_HOST").Require,
+			EnvironmentVariables.GetPortNumber("CONTROLLER_PORT").WithDefault(9401),
 			javaSearchPath,
 			agentKeyToken,
 			agentKeyFilePath,
@@ -31,7 +32,8 @@ sealed record Variables(
 			(ushort) EnvironmentVariables.GetInteger("MAX_INSTANCES", min: 1, max: 10000).Require,
 			EnvironmentVariables.GetString("MAX_MEMORY").MapParse(RamAllocationUnits.FromString).Require,
 			EnvironmentVariables.GetString("ALLOWED_SERVER_PORTS").MapParse(AllowedPorts.FromString).Require,
-			EnvironmentVariables.GetString("ALLOWED_RCON_PORTS").MapParse(AllowedPorts.FromString).Require
+			EnvironmentVariables.GetString("ALLOWED_RCON_PORTS").MapParse(AllowedPorts.FromString).Require,
+			(ushort) EnvironmentVariables.GetInteger("MAX_CONCURRENT_BACKUP_COMPRESSION_TASKS", min: 1, max: 10000).WithDefault(1)
 		);
 	}
 
@@ -39,13 +41,12 @@ sealed record Variables(
 		return JavaRuntimeDiscovery.GetSystemSearchPath() ?? throw new Exception("Could not automatically determine the path to Java installations on this system. Please set the JAVA_SEARCH_PATH environment variable to the folder containing Java installations.");
 	}
 
-	public static Variables LoadOrExit() {
+	public static Variables LoadOrStop() {
 		try {
 			return LoadOrThrow();
 		} catch (Exception e) {
 			PhantomLogger.Root.Fatal(e.Message);
-			Environment.Exit(1);
-			throw;
+			throw StopProcedureException.Instance;
 		}
 	}
 }

Common/Phantom.Common.Data.Tests/Phantom.Common.Data.Tests.csproj

@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
@@ -15,7 +14,6 @@
     <PackageReference Include="NUnit" />
     <PackageReference Include="NUnit3TestAdapter" />
     <PackageReference Include="NUnit.Analyzers" />
-    <PackageReference Include="coverlet.collector" />
   </ItemGroup>
   
   <ItemGroup>

Common/Phantom.Common.Data.Web/Agent/Agent.cs

@@ -0,0 +1,15 @@
+using MemoryPack;
+using Phantom.Common.Data.Agent;
+
+namespace Phantom.Common.Data.Web.Agent;
+
+[MemoryPackable(GenerateType.VersionTolerant)]
+public sealed partial record Agent(
+	[property: MemoryPackOrder(0)] Guid AgentGuid,
+	[property: MemoryPackOrder(1)] AgentConfiguration Configuration,
+	[property: MemoryPackOrder(2)] AgentStats? Stats,
+	[property: MemoryPackOrder(3)] IAgentConnectionStatus ConnectionStatus
+) {
+	[MemoryPackIgnore]
+	public RamAllocationUnits? AvailableMemory => Configuration.MaxMemory - Stats?.RunningInstanceMemory;
+}

Common/Phantom.Common.Data.Web/Agent/AgentConfiguration.cs

@@ -0,0 +1,19 @@
+using MemoryPack;
+using Phantom.Common.Data.Agent;
+
+namespace Phantom.Common.Data.Web.Agent;
+
+[MemoryPackable(GenerateType.VersionTolerant)]
+public sealed partial record AgentConfiguration(
+	[property: MemoryPackOrder(0)] string AgentName,
+	[property: MemoryPackOrder(1)] ushort ProtocolVersion,
+	[property: MemoryPackOrder(2)] string BuildVersion,
+	[property: MemoryPackOrder(3)] ushort MaxInstances,
+	[property: MemoryPackOrder(4)] RamAllocationUnits MaxMemory,
+	[property: MemoryPackOrder(5)] AllowedPorts? AllowedServerPorts = null,
+	[property: MemoryPackOrder(6)] AllowedPorts? AllowedRconPorts = null
+) {
+	public static AgentConfiguration From(AgentInfo agentInfo) {
+		return new AgentConfiguration(agentInfo.AgentName, agentInfo.ProtocolVersion, agentInfo.BuildVersion, agentInfo.MaxInstances, agentInfo.MaxMemory, agentInfo.AllowedServerPorts, agentInfo.AllowedRconPorts);
+	}
+}

Common/Phantom.Common.Data.Web/Agent/IAgentConnectionStatus.cs

@@ -0,0 +1,27 @@
+using MemoryPack;
+
+namespace Phantom.Common.Data.Web.Agent;
+
+[MemoryPackable]
+[MemoryPackUnion(0, typeof(AgentIsOffline))]
+[MemoryPackUnion(1, typeof(AgentIsDisconnected))]
+[MemoryPackUnion(2, typeof(AgentIsOnline))]
+public partial interface IAgentConnectionStatus {}
+
+[MemoryPackable(GenerateType.VersionTolerant)]
+public sealed partial record AgentIsOffline : IAgentConnectionStatus;
+
+[MemoryPackable(GenerateType.VersionTolerant)]
+public sealed partial record AgentIsDisconnected([property: MemoryPackOrder(0)] DateTimeOffset LastPingTime) : IAgentConnectionStatus;
+
+[MemoryPackable(GenerateType.VersionTolerant)]
+public sealed partial record AgentIsOnline : IAgentConnectionStatus;
+
+public static class AgentConnectionStatus {
+	public static readonly IAgentConnectionStatus Offline = new AgentIsOffline();
+	public static readonly IAgentConnectionStatus Online = new AgentIsOnline();
+
+	public static IAgentConnectionStatus Disconnected(DateTimeOffset lastPingTime) {
+		return new AgentIsDisconnected(lastPingTime);
+	}
+}

Common/Phantom.Common.Data.Web/AuditLog/AuditLogEventType.cs

@@ -1,4 +1,4 @@
-namespace Phantom.Server.Database.Enums;
+namespace Phantom.Common.Data.Web.AuditLog;
 
 public enum AuditLogEventType {
 	AdministratorUserCreated,
@@ -6,6 +6,7 @@ public enum AuditLogEventType {
 	UserLoggedIn,
 	UserLoggedOut,
 	UserCreated,
+	UserPasswordChanged,
 	UserRolesChanged,
 	UserDeleted,
 	InstanceCreated,
@@ -22,6 +23,7 @@ public static class AuditLogEventTypeExtensions {
 		{ AuditLogEventType.UserLoggedIn,              AuditLogSubjectType.User },
 		{ AuditLogEventType.UserLoggedOut,             AuditLogSubjectType.User },
 		{ AuditLogEventType.UserCreated,               AuditLogSubjectType.User },
+		{ AuditLogEventType.UserPasswordChanged,       AuditLogSubjectType.User },
 		{ AuditLogEventType.UserRolesChanged,          AuditLogSubjectType.User },
 		{ AuditLogEventType.UserDeleted,               AuditLogSubjectType.User },
 		{ AuditLogEventType.InstanceCreated,           AuditLogSubjectType.Instance },
@@ -39,7 +41,7 @@ public static class AuditLogEventTypeExtensions {
 		}
 	}
 
-	internal static AuditLogSubjectType GetSubjectType(this AuditLogEventType type) {
+	public static AuditLogSubjectType GetSubjectType(this AuditLogEventType type) {
 		return SubjectTypes[type];
 	}
 }

Common/Phantom.Common.Data.Web/AuditLog/AuditLogItem.cs

@@ -0,0 +1,14 @@
+using MemoryPack;
+
+namespace Phantom.Common.Data.Web.AuditLog;
+
+[MemoryPackable(GenerateType.VersionTolerant)]
+public sealed partial record AuditLogItem(
+	[property: MemoryPackOrder(0)] DateTime UtcTime,
+	[property: MemoryPackOrder(1)] Guid? UserGuid,
+	[property: MemoryPackOrder(2)] string? UserName,
+	[property: MemoryPackOrder(3)] AuditLogEventType EventType,
+	[property: MemoryPackOrder(4)] AuditLogSubjectType SubjectType,
+	[property: MemoryPackOrder(5)] string? SubjectId,
+	[property: MemoryPackOrder(6)] string? JsonData
+);

Common/Phantom.Common.Data.Web/AuditLog/AuditLogSubjectType.cs

@@ -1,4 +1,4 @@
-namespace Phantom.Server.Database.Enums; 
+namespace Phantom.Common.Data.Web.AuditLog;
 
 public enum AuditLogSubjectType {
 	User,

Common/Phantom.Common.Data.Web/EventLog/EventLogEventType.cs

@@ -1,24 +1,24 @@
-namespace Phantom.Server.Database.Enums;
+namespace Phantom.Common.Data.Web.EventLog;
 
 public enum EventLogEventType {
-	InstanceLaunchSucceded,
+	InstanceLaunchSucceeded,
 	InstanceLaunchFailed,
 	InstanceCrashed,
 	InstanceStopped,
 	InstanceBackupSucceeded,
 	InstanceBackupSucceededWithWarnings,
-	InstanceBackupFailed,
+	InstanceBackupFailed
 }
 
-internal static class EventLogEventTypeExtensions {
+public static class EventLogEventTypeExtensions {
 	private static readonly Dictionary<EventLogEventType, EventLogSubjectType> SubjectTypes = new () {
-		{ EventLogEventType.InstanceLaunchSucceded, EventLogSubjectType.Instance },
+		{ EventLogEventType.InstanceLaunchSucceeded, EventLogSubjectType.Instance },
 		{ EventLogEventType.InstanceLaunchFailed, EventLogSubjectType.Instance },
 		{ EventLogEventType.InstanceCrashed, EventLogSubjectType.Instance },
 		{ EventLogEventType.InstanceStopped, EventLogSubjectType.Instance },
 		{ EventLogEventType.InstanceBackupSucceeded, EventLogSubjectType.Instance },
 		{ EventLogEventType.InstanceBackupSucceededWithWarnings, EventLogSubjectType.Instance },
-		{ EventLogEventType.InstanceBackupFailed, EventLogSubjectType.Instance },
+		{ EventLogEventType.InstanceBackupFailed, EventLogSubjectType.Instance }
 	};
 
 	static EventLogEventTypeExtensions() {

Common/Phantom.Common.Data.Web/EventLog/EventLogItem.cs

@@ -0,0 +1,13 @@
+using MemoryPack;
+
+namespace Phantom.Common.Data.Web.EventLog;
+
+[MemoryPackable(GenerateType.VersionTolerant)]
+public sealed partial record EventLogItem(
+	[property: MemoryPackOrder(0)] DateTime UtcTime,
+	[property: MemoryPackOrder(1)] Guid? AgentGuid,
+	[property: MemoryPackOrder(2)] EventLogEventType EventType,
+	[property: MemoryPackOrder(3)] EventLogSubjectType SubjectType,
+	[property: MemoryPackOrder(4)] string SubjectId,
+	[property: MemoryPackOrder(5)] string? JsonData
+);

Common/Phantom.Common.Data.Web/EventLog/EventLogSubjectType.cs

@@ -1,4 +1,4 @@
-namespace Phantom.Server.Database.Enums; 
+namespace Phantom.Common.Data.Web.EventLog;
 
 public enum EventLogSubjectType {
 	Instance

Common/Phantom.Common.Data.Web/Instance/CreateOrUpdateInstanceResult.cs

@@ -0,0 +1,23 @@
+namespace Phantom.Common.Data.Web.Instance;
+
+public enum CreateOrUpdateInstanceResult : byte {
+	UnknownError,
+	Success,
+	InstanceNameMustNotBeEmpty,
+	InstanceMemoryMustNotBeZero,
+	MinecraftVersionDownloadInfoNotFound,
+	AgentNotFound
+}
+
+public static class CreateOrUpdateInstanceResultExtensions {
+	public static string ToSentence(this CreateOrUpdateInstanceResult reason) {
+		return reason switch {
+			CreateOrUpdateInstanceResult.Success                              => "Success.",
+			CreateOrUpdateInstanceResult.InstanceNameMustNotBeEmpty           => "Instance name must not be empty.",
+			CreateOrUpdateInstanceResult.InstanceMemoryMustNotBeZero          => "Memory must not be 0 MB.",
+			CreateOrUpdateInstanceResult.MinecraftVersionDownloadInfoNotFound => "Could not find download information for the selected Minecraft version.",
+			CreateOrUpdateInstanceResult.AgentNotFound                        => "Agent not found.",
+			_                                                                 => "Unknown error."
+		};
+	}
+}

Common/Phantom.Common.Data.Web/Instance/Instance.cs

@@ -0,0 +1,17 @@
+using MemoryPack;
+using Phantom.Common.Data.Instance;
+
+namespace Phantom.Common.Data.Web.Instance;
+
+[MemoryPackable(GenerateType.VersionTolerant)]
+public sealed partial record Instance(
+	[property: MemoryPackOrder(0)] Guid InstanceGuid,
+	[property: MemoryPackOrder(1)] InstanceConfiguration Configuration,
+	[property: MemoryPackOrder(2)] IInstanceStatus Status,
+	[property: MemoryPackOrder(3)] InstancePlayerCounts? PlayerCounts,
+	[property: MemoryPackOrder(4)] bool LaunchAutomatically
+) {
+	public static Instance Offline(Guid instanceGuid, InstanceConfiguration configuration, bool launchAutomatically = false) {
+		return new Instance(instanceGuid, configuration, InstanceStatus.Offline, PlayerCounts: null, launchAutomatically);
+	}
+}

Common/Phantom.Common.Data.Web/Minecraft/JvmArgumentsHelper.cs

@@ -1,17 +1,21 @@
 using System.Collections.Immutable;
 
-namespace Phantom.Common.Minecraft;
+namespace Phantom.Common.Data.Web.Minecraft;
 
 public static class JvmArgumentsHelper {
 	public static ImmutableArray<string> Split(string arguments) {
 		return arguments.Split('\n', StringSplitOptions.TrimEntries | StringSplitOptions.RemoveEmptyEntries).ToImmutableArray();
 	}
 
+	public static string Join(ImmutableArray<string> arguments) {
+		return string.Join('\n', arguments);
+	}
+
 	public static ValidationError? Validate(string arguments) {
 		return Validate(Split(arguments));
 	}
 
-	public static ValidationError? Validate(ImmutableArray<string> arguments) {
+	private static ValidationError? Validate(ImmutableArray<string> arguments) {
 		if (!arguments.All(static argument => argument.StartsWith('-'))) {
 			return ValidationError.InvalidFormat;
 		}
@@ -28,22 +32,9 @@ public static class JvmArgumentsHelper {
 		return null;
 	}
 
-	public static string Join(ImmutableArray<string> arguments) {
-		return string.Join('\n', arguments);
-	}
-
 	public enum ValidationError {
 		InvalidFormat,
 		XmxNotAllowed,
 		XmsNotAllowed
 	}
-
-	public static string ToSentence(this ValidationError? result) {
-		return result switch {
-			ValidationError.InvalidFormat => "Invalid format.",
-			ValidationError.XmxNotAllowed => "The -Xmx argument must not be specified manually.",
-			ValidationError.XmsNotAllowed => "The -Xms argument must not be specified manually.",
-			_                             => throw new ArgumentOutOfRangeException(nameof(result), result, null)
-		};
-	}
 }

Common/Phantom.Common.Data.Web/Phantom.Common.Data.Web.csproj

@@ -1,17 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk">
   
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
   
   <ItemGroup>
-    <PackageReference Include="Serilog" />
+    <PackageReference Include="BCrypt.Net-Next.StrongName" />
+    <PackageReference Include="MemoryPack" />
   </ItemGroup>
   
   <ItemGroup>
-    <ProjectReference Include="..\Phantom.Utils.Collections\Phantom.Utils.Collections.csproj" />
+    <ProjectReference Include="..\Phantom.Common.Data\Phantom.Common.Data.csproj" />
   </ItemGroup>
   
 </Project>

Common/Phantom.Common.Data.Web/Users/AddRoleError.cs

@@ -0,0 +1,8 @@
+namespace Phantom.Common.Data.Web.Users;
+
+public enum AddRoleError : byte {
+	NameIsEmpty,
+	NameIsTooLong,
+	NameAlreadyExists,
+	UnknownError
+}

Common/Phantom.Common.Data.Web/Users/AddUserError.cs

@@ -0,0 +1,28 @@
+using System.Collections.Immutable;
+using MemoryPack;
+using Phantom.Common.Data.Web.Users.AddUserErrors;
+
+namespace Phantom.Common.Data.Web.Users {
+	[MemoryPackable]
+	[MemoryPackUnion(0, typeof(NameIsInvalid))]
+	[MemoryPackUnion(1, typeof(PasswordIsInvalid))]
+	[MemoryPackUnion(2, typeof(NameAlreadyExists))]
+	[MemoryPackUnion(3, typeof(UnknownError))]
+	public abstract partial record AddUserError {
+		internal AddUserError() {}
+	}
+}
+
+namespace Phantom.Common.Data.Web.Users.AddUserErrors {
+	[MemoryPackable(GenerateType.VersionTolerant)]
+	public sealed partial record NameIsInvalid([property: MemoryPackOrder(0)] UsernameRequirementViolation Violation) : AddUserError;
+
+	[MemoryPackable(GenerateType.VersionTolerant)]
+	public sealed partial record PasswordIsInvalid([property: MemoryPackOrder(0)] ImmutableArray<PasswordRequirementViolation> Violations) : AddUserError;
+
+	[MemoryPackable(GenerateType.VersionTolerant)]
+	public sealed partial record NameAlreadyExists : AddUserError;
+
+	[MemoryPackable(GenerateType.VersionTolerant)]
+	public sealed partial record UnknownError : AddUserError;
+}

Common/Phantom.Common.Data.Web/Users/AuthenticatedUserInfo.cs

@@ -0,0 +1,24 @@
+using System.Collections.Immutable;
+using MemoryPack;
+
+namespace Phantom.Common.Data.Web.Users;
+
+[MemoryPackable(GenerateType.VersionTolerant)]
+public sealed partial record AuthenticatedUserInfo(
+	[property: MemoryPackOrder(0)] Guid Guid,
+	[property: MemoryPackOrder(1)] string Name,
+	[property: MemoryPackOrder(2)] PermissionSet Permissions,
+	[property: MemoryPackOrder(3)] ImmutableHashSet<Guid> ManagedAgentGuids
+) {
+	public bool CheckPermission(Permission permission) {
+		return Permissions.Check(permission);
+	}
+
+	public bool HasAccessToAgent(Guid agentGuid) {
+		return ManagedAgentGuids.Contains(agentGuid) || Permissions.Check(Permission.ManageAllAgents);
+	}
+
+	public ImmutableHashSet<Guid> FilterAccessibleAgentGuids(ImmutableHashSet<Guid> agentGuids) {
+		return Permissions.Check(Permission.ManageAllAgents) ? agentGuids : agentGuids.Intersect(ManagedAgentGuids);
+	}
+}

Common/Phantom.Common.Data.Web/Users/ChangeUserRolesResult.cs

@@ -0,0 +1,10 @@
+using System.Collections.Immutable;
+using MemoryPack;
+
+namespace Phantom.Common.Data.Web.Users; 
+
+[MemoryPackable(GenerateType.VersionTolerant)]
+public sealed partial record ChangeUserRolesResult(
+	[property: MemoryPackOrder(0)] ImmutableHashSet<Guid> AddedToRoleGuids,
+	[property: MemoryPackOrder(1)] ImmutableHashSet<Guid> RemovedFromRoleGuids
+);

Common/Phantom.Common.Data.Web/Users/CreateOrUpdateAdministratorUserResult.cs

@@ -0,0 +1,31 @@
+using MemoryPack;
+using Phantom.Common.Data.Web.Users.CreateOrUpdateAdministratorUserResults;
+
+namespace Phantom.Common.Data.Web.Users {
+	[MemoryPackable]
+	[MemoryPackUnion(0, typeof(Success))]
+	[MemoryPackUnion(1, typeof(CreationFailed))]
+	[MemoryPackUnion(2, typeof(UpdatingFailed))]
+	[MemoryPackUnion(3, typeof(AddingToRoleFailed))]
+	[MemoryPackUnion(4, typeof(UnknownError))]
+	public abstract partial record CreateOrUpdateAdministratorUserResult {
+		internal CreateOrUpdateAdministratorUserResult() {}
+	}
+}
+
+namespace Phantom.Common.Data.Web.Users.CreateOrUpdateAdministratorUserResults {
+	[MemoryPackable(GenerateType.VersionTolerant)]
+	public sealed partial record Success([property: MemoryPackOrder(0)] UserInfo User) : CreateOrUpdateAdministratorUserResult;
+
+	[MemoryPackable(GenerateType.VersionTolerant)]
+	public sealed partial record CreationFailed([property: MemoryPackOrder(0)] AddUserError Error) : CreateOrUpdateAdministratorUserResult;
+
+	[MemoryPackable(GenerateType.VersionTolerant)]
+	public sealed partial record UpdatingFailed([property: MemoryPackOrder(0)] SetUserPasswordError Error) : CreateOrUpdateAdministratorUserResult;
+
+	[MemoryPackable(GenerateType.VersionTolerant)]
+	public sealed partial record AddingToRoleFailed : CreateOrUpdateAdministratorUserResult;
+
+	[MemoryPackable(GenerateType.VersionTolerant)]
+	public sealed partial record UnknownError : CreateOrUpdateAdministratorUserResult;
+}

Common/Phantom.Common.Data.Web/Users/CreateUserResult.cs

@@ -0,0 +1,23 @@
+using MemoryPack;
+using Phantom.Common.Data.Web.Users.CreateUserResults;
+
+namespace Phantom.Common.Data.Web.Users {
+	[MemoryPackable]
+	[MemoryPackUnion(0, typeof(Success))]
+	[MemoryPackUnion(1, typeof(CreationFailed))]
+	[MemoryPackUnion(2, typeof(UnknownError))]
+	public abstract partial record CreateUserResult {
+		internal CreateUserResult() {}
+	}
+}
+
+namespace Phantom.Common.Data.Web.Users.CreateUserResults {
+	[MemoryPackable(GenerateType.VersionTolerant)]
+	public sealed partial record Success([property: MemoryPackOrder(0)] UserInfo User) : CreateUserResult;
+
+	[MemoryPackable(GenerateType.VersionTolerant)]
+	public sealed partial record CreationFailed([property: MemoryPackOrder(0)] AddUserError Error) : CreateUserResult;
+
+	[MemoryPackable(GenerateType.VersionTolerant)]
+	public sealed partial record UnknownError : CreateUserResult;
+}

Common/Phantom.Common.Data.Web/Users/DeleteUserResult.cs

@@ -0,0 +1,7 @@
+namespace Phantom.Common.Data.Web.Users;
+
+public enum DeleteUserResult : byte {
+	Deleted,
+	NotFound,
+	Failed
+}

Common/Phantom.Common.Data.Web/Users/LogInSuccess.cs

@@ -0,0 +1,10 @@
+using System.Collections.Immutable;
+using MemoryPack;
+
+namespace Phantom.Common.Data.Web.Users;
+
+[MemoryPackable(GenerateType.VersionTolerant)]
+public sealed partial record LogInSuccess(
+	[property: MemoryPackOrder(0)] AuthenticatedUserInfo UserInfo,
+	[property: MemoryPackOrder(1)] ImmutableArray<byte> AuthToken
+);

Common/Phantom.Common.Data.Web/Users/PasswordRequirementViolation.cs

@@ -0,0 +1,27 @@
+using MemoryPack;
+using Phantom.Common.Data.Web.Users.PasswordRequirementViolations;
+
+namespace Phantom.Common.Data.Web.Users {
+	[MemoryPackable]
+	[MemoryPackUnion(0, typeof(TooShort))]
+	[MemoryPackUnion(1, typeof(MustContainLowercaseLetter))]
+	[MemoryPackUnion(2, typeof(MustContainUppercaseLetter))]
+	[MemoryPackUnion(3, typeof(MustContainDigit))]
+	public abstract partial record PasswordRequirementViolation {
+		internal PasswordRequirementViolation() {}
+	}
+}
+
+namespace Phantom.Common.Data.Web.Users.PasswordRequirementViolations {
+	[MemoryPackable(GenerateType.VersionTolerant)]
+	public sealed partial record TooShort([property: MemoryPackOrder(0)] int MinimumLength) : PasswordRequirementViolation;
+
+	[MemoryPackable(GenerateType.VersionTolerant)]
+	public sealed partial record MustContainLowercaseLetter : PasswordRequirementViolation;
+
+	[MemoryPackable(GenerateType.VersionTolerant)]
+	public sealed partial record MustContainUppercaseLetter : PasswordRequirementViolation;
+
+	[MemoryPackable(GenerateType.VersionTolerant)]
+	public sealed partial record MustContainDigit : PasswordRequirementViolation;
+}

Common/Phantom.Common.Data.Web/Users/Permission.cs

@@ -1,4 +1,4 @@
-namespace Phantom.Server.Web.Identity.Data;
+namespace Phantom.Common.Data.Web.Users;
 
 public sealed record Permission(string Id, Permission? Parent) {
 	private static readonly List<Permission> AllPermissions = new ();
@@ -14,6 +14,9 @@ public sealed record Permission(string Id, Permission? Parent) {
 		return Register(id, this);
 	}
 
+	public const string ManageAllAgentsPolicy = "Agents.ManageAll";
+	public static readonly Permission ManageAllAgents = Register(ManageAllAgentsPolicy);
+	
 	public const string ViewInstancesPolicy = "Instances.View";
 	public static readonly Permission ViewInstances = Register(ViewInstancesPolicy);