Replace NetMQ with custom TCP logic

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"
       ]

.gitignore

@@ -192,7 +192,6 @@ ClientBin/
 *.dbmdl
 *.dbproj.schemaview
 *.jfm
-*.pfx
 *.publishsettings
 orleans.codegen.cs
 

.run/Agent 1.run.xml

@@ -5,7 +5,7 @@
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.workdir/Agent1" />
     <option name="PASS_PARENT_ENVS" value="1" />
     <envs>
-      <env name="AGENT_KEY" value="JXBQQYG5T267RQS75MXWBTCJZY5CKTCCGQY22MCZPHSQQSJYCHH2NG2TCNXQY6TBSXM9NQDRS2CMX" />
+      <env name="AGENT_KEY" value="K5ZRZYYJ9GWM2FS6XH5N5QQ7WZRPNDGHYMN5QP7RP6PPY27KRPMSYGCN" />
       <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" />
@@ -15,14 +15,19 @@
       <env name="MAX_MEMORY" value="12G" />
     </envs>
     <option name="USE_EXTERNAL_CONSOLE" value="0" />
+    <option name="ENV_FILE_PATHS" value="" />
+    <option name="REDIRECT_INPUT_PATH" value="" />
+    <option name="PTY_MODE" value="Auto" />
     <option name="USE_MONO" value="0" />
     <option name="RUNTIME_ARGUMENTS" value="" />
+    <option name="AUTO_ATTACH_CHILDREN" value="0" />
+    <option name="MIXED_MODE_DEBUG" value="0" />
     <option name="PROJECT_PATH" value="$PROJECT_DIR$/Agent/Phantom.Agent/Phantom.Agent.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" />
+    <option name="PROJECT_TFM" value="net9.0" />
     <method v="2">
       <option name="Build" />
     </method>

.run/Agent 2.run.xml

@@ -5,7 +5,7 @@
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.workdir/Agent2" />
     <option name="PASS_PARENT_ENVS" value="1" />
     <envs>
-      <env name="AGENT_KEY" value="JXBQQYG5T267RQS75MXWBTCJZY5CKTCCGQY22MCZPHSQQSJYCHH2NG2TCNXQY6TBSXM9NQDRS2CMX" />
+      <env name="AGENT_KEY" value="K5ZRZYYJ9GWM2FS6XH5N5QQ7WZRPNDGHYMN5QP7RP6PPY27KRPMSYGCN" />
       <env name="AGENT_NAME" value="Agent 2" />
       <env name="ALLOWED_RCON_PORTS" value="27002-27006" />
       <env name="ALLOWED_SERVER_PORTS" value="26002-26006" />
@@ -15,14 +15,19 @@
       <env name="MAX_MEMORY" value="10G" />
     </envs>
     <option name="USE_EXTERNAL_CONSOLE" value="0" />
+    <option name="ENV_FILE_PATHS" value="" />
+    <option name="REDIRECT_INPUT_PATH" value="" />
+    <option name="PTY_MODE" value="Auto" />
     <option name="USE_MONO" value="0" />
     <option name="RUNTIME_ARGUMENTS" value="" />
+    <option name="AUTO_ATTACH_CHILDREN" value="0" />
+    <option name="MIXED_MODE_DEBUG" value="0" />
     <option name="PROJECT_PATH" value="$PROJECT_DIR$/Agent/Phantom.Agent/Phantom.Agent.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" />
+    <option name="PROJECT_TFM" value="net9.0" />
     <method v="2">
       <option name="Build" />
     </method>

.run/Agent 3.run.xml

@@ -5,7 +5,7 @@
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.workdir/Agent3" />
     <option name="PASS_PARENT_ENVS" value="1" />
     <envs>
-      <env name="AGENT_KEY" value="JXBQQYG5T267RQS75MXWBTCJZY5CKTCCGQY22MCZPHSQQSJYCHH2NG2TCNXQY6TBSXM9NQDRS2CMX" />
+      <env name="AGENT_KEY" value="K5ZRZYYJ9GWM2FS6XH5N5QQ7WZRPNDGHYMN5QP7RP6PPY27KRPMSYGCN" />
       <env name="AGENT_NAME" value="Agent 3" />
       <env name="ALLOWED_RCON_PORTS" value="27007" />
       <env name="ALLOWED_SERVER_PORTS" value="26007" />
@@ -15,14 +15,19 @@
       <env name="MAX_MEMORY" value="2560M" />
     </envs>
     <option name="USE_EXTERNAL_CONSOLE" value="0" />
+    <option name="ENV_FILE_PATHS" value="" />
+    <option name="REDIRECT_INPUT_PATH" value="" />
+    <option name="PTY_MODE" value="Auto" />
     <option name="USE_MONO" value="0" />
     <option name="RUNTIME_ARGUMENTS" value="" />
+    <option name="AUTO_ATTACH_CHILDREN" value="0" />
+    <option name="MIXED_MODE_DEBUG" value="0" />
     <option name="PROJECT_PATH" value="$PROJECT_DIR$/Agent/Phantom.Agent/Phantom.Agent.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" />
+    <option name="PROJECT_TFM" value="net9.0" />
     <method v="2">
       <option name="Build" />
     </method>

.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>
+</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

@@ -14,14 +14,19 @@
       <env name="WEB_RPC_SERVER_HOST" value="localhost" />
     </envs>
     <option name="USE_EXTERNAL_CONSOLE" value="0" />
+    <option name="ENV_FILE_PATHS" value="" />
+    <option name="REDIRECT_INPUT_PATH" value="" />
+    <option name="PTY_MODE" value="Auto" />
     <option name="USE_MONO" value="0" />
     <option name="RUNTIME_ARGUMENTS" value="" />
+    <option name="AUTO_ATTACH_CHILDREN" value="0" />
+    <option name="MIXED_MODE_DEBUG" value="0" />
     <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="net8.0" />
+    <option name="PROJECT_TFM" value="net9.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

@@ -6,17 +6,24 @@
     <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="T5Y722D2GZBXT2H27QS95P2YQRFB2GCTKHSWT5CZFDTFKW52TCM9GDRW" />
       <env name="WEB_SERVER_HOST" value="localhost" />
     </envs>
     <option name="USE_EXTERNAL_CONSOLE" value="0" />
+    <option name="ENV_FILE_PATHS" value="" />
+    <option name="REDIRECT_INPUT_PATH" value="" />
+    <option name="PTY_MODE" value="Auto" />
     <option name="USE_MONO" value="0" />
     <option name="RUNTIME_ARGUMENTS" value="" />
+    <option name="AUTO_ATTACH_CHILDREN" value="0" />
+    <option name="MIXED_MODE_DEBUG" value="0" />
     <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" />
+    <option name="PROJECT_TFM" value="net9.0" />
     <method v="2">
       <option name="Build" />
     </method>

.workdir/Controller/secrets/agent.auth

@@ -0,0 +1 @@
+满<EFBFBD>H<EFBFBD>c<EFBFBD>og<EFBFBD>

.workdir/Controller/secrets/agent.secret

@@ -1 +0,0 @@
-<EFBFBD>Z<EFBFBD>t<>MPI<49>GMZ<4D><5A><EFBFBD><EFBFBD>kN<6B>VF1X<><58>p

.workdir/Controller/secrets/web.auth

@@ -0,0 +1 @@
+<07>U<EFBFBD>/<2F><04><><EFBFBD>q

.workdir/Controller/secrets/web.key

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

.workdir/Controller/secrets/web.secret

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

Agent/Phantom.Agent.Minecraft/Command/MinecraftCommand.cs

@@ -1,4 +1,4 @@
-namespace Phantom.Agent.Minecraft.Command; 
+namespace Phantom.Agent.Minecraft.Command;
 
 public static class MinecraftCommand {
 	public const string SaveOn = "save-on";
@@ -8,7 +8,7 @@ public static class MinecraftCommand {
 	public static string Say(string message) {
 		return "say " + message;
 	}
-
+	
 	public static string SaveAll(bool flush) {
 		return flush ? "save-all flush" : "save-all";
 	}

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

@@ -1,30 +1,32 @@
 using Phantom.Utils.Collections;
 using Phantom.Utils.Processes;
+using Phantom.Utils.Tasks;
 
-namespace Phantom.Agent.Minecraft.Instance; 
+namespace Phantom.Agent.Minecraft.Instance;
 
 public sealed class InstanceProcess : IDisposable {
 	public InstanceProperties InstanceProperties { get; }
 	
 	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;
 		this.process = process;
 		this.process.Exited += ProcessOnExited;
 		this.process.OutputReceived += ProcessOutputReceived;
 	}
-
+	
 	public async Task SendCommand(string command, CancellationToken cancellationToken) {
 		await process.StandardInput.WriteLineAsync(command.AsMemory(), cancellationToken);
 	}
-
+	
 	public void AddOutputListener(EventHandler<string> listener, uint maxLinesToReadFromHistory = uint.MaxValue) {
 		OutputEvent += listener;
 		
@@ -32,32 +34,31 @@ public sealed class InstanceProcess : IDisposable {
 			listener(this, line);
 		}
 	}
-
+	
 	public void RemoveOutputListener(EventHandler<string> listener) {
 		OutputEvent -= listener;
 	}
-
+	
 	private void ProcessOutputReceived(object? sender, Process.Output output) {
 		outputBuffer.Add(output.Line);
 		OutputEvent?.Invoke(this, output.Line);
 	}
-
+	
 	private void ProcessOnExited(object? sender, EventArgs e) {
 		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();
 		OutputEvent = null;

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

@@ -5,13 +5,13 @@ 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";
@@ -23,37 +23,37 @@ sealed class JavaPropertiesFileEditor {
 			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];

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

@@ -1,24 +1,24 @@
 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;
 
 public sealed class JavaRuntimeDiscovery {
 	private static readonly ILogger Logger = PhantomLogger.Create(nameof(JavaRuntimeDiscovery));
-
+	
 	public static string? GetSystemSearchPath() {
 		const string LinuxJavaPath = "/usr/lib/jvm";
-
+		
 		if (OperatingSystem.IsLinux() && Directory.Exists(LinuxJavaPath)) {
 			return LinuxJavaPath;
 		}
-
+		
 		return null;
 	}
-
+	
 	public static IAsyncEnumerable<JavaRuntimeExecutable> Scan(string folderPath) {
 		return new JavaRuntimeDiscovery().ScanInternal(folderPath);
 	}
@@ -27,9 +27,9 @@ public sealed class JavaRuntimeDiscovery {
 	
 	private async IAsyncEnumerable<JavaRuntimeExecutable> ScanInternal(string folderPath) {
 		Logger.Information("Starting Java runtime scan in: {FolderPath}", folderPath);
-
+		
 		string javaExecutableName = OperatingSystem.IsWindows() ? "java.exe" : "java";
-
+		
 		foreach (var binFolderPath in Directory.EnumerateDirectories(Paths.ExpandTilde(folderPath), "bin", new EnumerationOptions {
 			MatchType = MatchType.Simple,
 			RecurseSubdirectories = true,
@@ -45,13 +45,13 @@ public sealed class JavaRuntimeDiscovery {
 			} catch (Exception) {
 				continue;
 			}
-
+			
 			if (javaExecutableAttributes.HasFlag(FileAttributes.ReparsePoint)) {
 				continue;
 			}
-
+			
 			Logger.Information("Found candidate Java executable: {JavaExecutablePath}", javaExecutablePath);
-
+			
 			JavaRuntime? foundRuntime;
 			try {
 				foundRuntime = await TryReadJavaRuntimeInformationFromProcess(javaExecutablePath);
@@ -62,17 +62,17 @@ public sealed class JavaRuntimeDiscovery {
 				Logger.Error(e, "Caught exception while reading Java version information.");
 				continue;
 			}
-
+			
 			if (foundRuntime == null) {
 				Logger.Error("Java executable did not output version information.");
 				continue;
 			}
-
+			
 			Logger.Information("Found Java {DisplayName} at: {Path}", foundRuntime.DisplayName, javaExecutablePath);
 			yield return new JavaRuntimeExecutable(javaExecutablePath, foundRuntime);
 		}
 	}
-
+	
 	private async Task<JavaRuntime?> TryReadJavaRuntimeInformationFromProcess(string javaExecutablePath) {
 		var startInfo = new ProcessStartInfo {
 			FileName = javaExecutablePath,
@@ -83,15 +83,15 @@ public sealed class JavaRuntimeDiscovery {
 			RedirectStandardError = true,
 			UseShellExecute = false
 		};
-
+		
 		var process = new Process { StartInfo = startInfo };
 		var cancellationTokenSource = new CancellationTokenSource(TimeSpan.FromSeconds(5));
-
+		
 		try {
 			process.Start();
-
+			
 			JavaRuntimeBuilder runtimeBuilder = new ();
-
+			
 			while (await process.StandardError.ReadLineAsync(cancellationTokenSource.Token) is {} line) {
 				ExtractJavaVersionPropertiesFromLine(line, runtimeBuilder);
 				
@@ -100,7 +100,7 @@ public sealed class JavaRuntimeDiscovery {
 					return runtime;
 				}
 			}
-
+			
 			await process.WaitForExitAsync(cancellationTokenSource.Token);
 			return null;
 		} finally {
@@ -108,15 +108,15 @@ public sealed class JavaRuntimeDiscovery {
 			cancellationTokenSource.Dispose();
 		}
 	}
-
+	
 	private static void ExtractJavaVersionPropertiesFromLine(ReadOnlySpan<char> line, JavaRuntimeBuilder runtimeBuilder) {
 		line = line.TrimStart();
-
+		
 		int separatorIndex = line.IndexOf('=');
 		if (separatorIndex == -1) {
 			return;
 		}
-
+		
 		var propertyName = line[..separatorIndex].TrimEnd();
 		if (propertyName.Equals("java.specification.version", StringComparison.Ordinal)) {
 			runtimeBuilder.MainVersion = ExtractValue(line, separatorIndex);
@@ -128,16 +128,16 @@ public sealed class JavaRuntimeDiscovery {
 			runtimeBuilder.Vendor = ExtractValue(line, separatorIndex);
 		}
 	}
-
+	
 	private static string ExtractValue(ReadOnlySpan<char> line, int separatorIndex) {
 		return line[(separatorIndex + 1)..].Trim().ToString();
 	}
-
+	
 	private sealed class JavaRuntimeBuilder {
 		public string? MainVersion { get; set; } = null;
 		public string? FullVersion { get; set; } = null;
 		public string? Vendor { get; set; } = null;
-
+		
 		public JavaRuntime? TryBuild(Dictionary<string, int> duplicateDisplayNames) {
 			if (MainVersion == null || FullVersion == null || Vendor == null) {
 				return null;

Agent/Phantom.Agent.Minecraft/Java/JavaRuntimeExecutable.cs

@@ -1,11 +1,11 @@
 using Phantom.Common.Data.Java;
 
-namespace Phantom.Agent.Minecraft.Java; 
+namespace Phantom.Agent.Minecraft.Java;
 
 public sealed class JavaRuntimeExecutable {
 	internal string ExecutablePath { get; }
 	internal JavaRuntime Runtime { get; }
-
+	
 	internal JavaRuntimeExecutable(string executablePath, JavaRuntime runtime) {
 		this.ExecutablePath = executablePath;
 		this.Runtime = runtime;

Agent/Phantom.Agent.Minecraft/Java/JavaRuntimeRepository.cs

@@ -9,7 +9,7 @@ public sealed class JavaRuntimeRepository {
 	private readonly Dictionary<string, Guid> guidsByPath = new ();
 	private readonly Dictionary<Guid, JavaRuntimeExecutable> runtimesByGuid = new ();
 	private readonly ReaderWriterLockSlim rwLock = new (LockRecursionPolicy.NoRecursion);
-
+	
 	public ImmutableArray<TaggedJavaRuntime> All {
 		get {
 			rwLock.EnterReadLock();
@@ -20,20 +20,20 @@ public sealed class JavaRuntimeRepository {
 			}
 		}
 	}
-
+	
 	public void Include(JavaRuntimeExecutable runtime) {
 		rwLock.EnterWriteLock();
 		try {
 			if (!guidsByPath.TryGetValue(runtime.ExecutablePath, out var guid)) {
 				guidsByPath[runtime.ExecutablePath] = guid = GenerateStableGuid(runtime.ExecutablePath);
 			}
-
+			
 			runtimesByGuid[guid] = runtime;
 		} finally {
 			rwLock.ExitWriteLock();
 		}
 	}
-
+	
 	public bool TryGetByGuid(Guid guid, [MaybeNullWhen(false)] out JavaRuntimeExecutable runtime) {
 		rwLock.EnterReadLock();
 		try {
@@ -42,7 +42,7 @@ public sealed class JavaRuntimeRepository {
 			rwLock.ExitReadLock();
 		}
 	}
-
+	
 	private static Guid GenerateStableGuid(string executablePath) {
 		Random rand = new Random(StableHashCode.ForString(executablePath));
 		Span<byte> bytes = stackalloc byte[16];

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

@@ -5,24 +5,24 @@ namespace Phantom.Agent.Minecraft.Java;
 sealed class JvmArgumentBuilder {
 	private readonly JvmProperties basicProperties;
 	private readonly List<string> customArguments = new ();
-
+	
 	public JvmArgumentBuilder(JvmProperties basicProperties) {
 		this.basicProperties = basicProperties;
 	}
-
+	
 	public void Add(string argument) {
 		customArguments.Add(argument);
 	}
-
+	
 	public void AddProperty(string key, string value) {
 		customArguments.Add("-D" + key + "=\"" + value + "\""); // TODO test quoting?
 	}
-
+	
 	public void Build(Collection<string> target) {
 		foreach (var property in customArguments) {
 			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");

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

@@ -9,23 +9,23 @@ namespace Phantom.Agent.Minecraft.Launcher;
 
 public abstract class BaseLauncher : IServerLauncher {
 	private readonly InstanceProperties instanceProperties;
-
+	
 	protected string MinecraftVersion => instanceProperties.ServerVersion;
-
+	
 	private protected BaseLauncher(InstanceProperties instanceProperties) {
 		this.instanceProperties = instanceProperties;
 	}
-
+	
 	public async Task<LaunchResult> Launch(ILogger logger, LaunchServices services, EventHandler<DownloadProgressEventArgs> downloadProgressEventHandler, CancellationToken cancellationToken) {
 		if (!services.JavaRuntimeRepository.TryGetByGuid(instanceProperties.JavaRuntimeGuid, out var javaRuntimeExecutable)) {
 			return new LaunchResult.InvalidJavaRuntime();
 		}
-
+		
 		var vanillaServerJarPath = await services.ServerExecutables.DownloadAndGetPath(instanceProperties.LaunchProperties.ServerDownloadInfo, MinecraftVersion, downloadProgressEventHandler, cancellationToken);
 		if (vanillaServerJarPath == null) {
 			return new LaunchResult.CouldNotDownloadMinecraftServer();
 		}
-
+		
 		ServerJarInfo? serverJar;
 		try {
 			serverJar = await PrepareServerJar(logger, vanillaServerJarPath, cancellationToken);
@@ -35,12 +35,12 @@ public abstract class BaseLauncher : IServerLauncher {
 			logger.Error(e, "Caught exception while preparing the server jar.");
 			return new LaunchResult.CouldNotPrepareMinecraftServerLauncher();
 		}
-
+		
 		if (!File.Exists(serverJar.FilePath)) {
 			logger.Error("Missing prepared server or launcher jar: {FilePath}", serverJar.FilePath);
 			return new LaunchResult.CouldNotPrepareMinecraftServerLauncher();
 		}
-
+		
 		try {
 			await AcceptEula(instanceProperties);
 			await UpdateServerProperties(instanceProperties);
@@ -61,10 +61,10 @@ public abstract class BaseLauncher : IServerLauncher {
 		processArguments.Add("-jar");
 		processArguments.Add(serverJar.FilePath);
 		processArguments.Add("nogui");
-
+		
 		var process = processConfigurator.CreateProcess();
 		var instanceProcess = new InstanceProcess(instanceProperties, process);
-
+		
 		try {
 			process.Start();
 		} catch (Exception launchException) {
@@ -75,39 +75,39 @@ public abstract class BaseLauncher : IServerLauncher {
 			} catch (Exception killException) {
 				logger.Error(killException, "Caught exception trying to kill the server process after a failed launch.");
 			}
-
+			
 			return new LaunchResult.CouldNotStartMinecraftServer();
 		}
-
+		
 		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) {}
-
+	
 	private protected virtual Task<ServerJarInfo> PrepareServerJar(ILogger logger, string serverJarPath, CancellationToken cancellationToken) {
 		return Task.FromResult(new ServerJarInfo(serverJarPath));
 	}
-
+	
 	private static async Task AcceptEula(InstanceProperties instanceProperties) {
 		var eulaFilePath = Path.Combine(instanceProperties.InstanceFolder, "eula.txt");
-		await File.WriteAllLinesAsync(eulaFilePath, new [] { "# EULA", "eula=true" }, Encoding.UTF8);
+		await File.WriteAllLinesAsync(eulaFilePath, new[] { "# EULA", "eula=true" }, Encoding.UTF8);
 	}
-
+	
 	private static async Task UpdateServerProperties(InstanceProperties instanceProperties) {
 		var serverPropertiesEditor = new JavaPropertiesFileEditor();
 		instanceProperties.ServerProperties.SetTo(serverPropertiesEditor);

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

@@ -4,11 +4,11 @@ namespace Phantom.Agent.Minecraft.Launcher;
 
 public abstract record LaunchResult {
 	private LaunchResult() {}
-
+	
 	public sealed record Success(InstanceProcess Process) : LaunchResult;
-
+	
 	public sealed record InvalidJavaRuntime : LaunchResult;
-
+	
 	public sealed record CouldNotDownloadMinecraftServer : LaunchResult;
 	
 	public sealed record CouldNotPrepareMinecraftServerLauncher : LaunchResult;

Agent/Phantom.Agent.Minecraft/Launcher/LaunchServices.cs

@@ -1,6 +1,6 @@
 using Phantom.Agent.Minecraft.Java;
 using Phantom.Agent.Minecraft.Server;
 
-namespace Phantom.Agent.Minecraft.Launcher; 
+namespace Phantom.Agent.Minecraft.Launcher;
 
 public sealed record LaunchServices(MinecraftServerExecutables ServerExecutables, JavaRuntimeRepository JavaRuntimeRepository);

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

@@ -3,7 +3,7 @@ using Phantom.Agent.Minecraft.Instance;
 using Phantom.Utils.IO;
 using Serilog;
 
-namespace Phantom.Agent.Minecraft.Launcher.Types; 
+namespace Phantom.Agent.Minecraft.Launcher.Types;
 
 public sealed class FabricLauncher : BaseLauncher {
 	public FabricLauncher(InstanceProperties instanceProperties) : base(instanceProperties) {}
@@ -19,10 +19,10 @@ public sealed class FabricLauncher : BaseLauncher {
 		if (!File.Exists(launcherJarPath)) {
 			await DownloadLauncher(logger, launcherJarPath, cancellationToken);
 		}
-
+		
 		return new ServerJarInfo(launcherJarPath, ImmutableArray.Create("-Dfabric.installer.server.gameJar=" + Paths.NormalizeSlashes(serverJarPath)));
 	}
-
+	
 	private async Task DownloadLauncher(ILogger logger, string targetFilePath, CancellationToken cancellationToken) {
 		// TODO customizable loader version, probably with a dedicated temporary folder
 		string installerUrl = $"https://meta.fabricmc.net/v2/versions/loader/{MinecraftVersion}/stable/stable/server/jar";
@@ -42,7 +42,7 @@ public sealed class FabricLauncher : BaseLauncher {
 			throw;
 		}
 	}
-
+	
 	private static void TryDeleteLauncherAfterFailure(ILogger logger, string filePath) {
 		if (File.Exists(filePath)) {
 			try {

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

@@ -1,7 +1,7 @@
 using Phantom.Agent.Minecraft.Server;
 using Serilog;
 
-namespace Phantom.Agent.Minecraft.Launcher.Types; 
+namespace Phantom.Agent.Minecraft.Launcher.Types;
 
 public sealed class InvalidLauncher : IServerLauncher {
 	public static InvalidLauncher Instance { get; } = new ();

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

@@ -1,6 +1,6 @@
 using Phantom.Agent.Minecraft.Instance;
 
-namespace Phantom.Agent.Minecraft.Launcher.Types; 
+namespace Phantom.Agent.Minecraft.Launcher.Types;
 
 public sealed class VanillaLauncher : BaseLauncher {
 	public VanillaLauncher(InstanceProperties instanceProperties) : base(instanceProperties) {}

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

@@ -11,8 +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="..\..\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

@@ -14,8 +14,9 @@ static class MinecraftServerProperties {
 		protected override ushort Read(string value) => ushort.Parse(value);
 		protected override string Write(ushort value) => value.ToString();
 	}
-
+	
 	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,17 +1,17 @@
 using Phantom.Agent.Minecraft.Java;
 
-namespace Phantom.Agent.Minecraft.Properties; 
+namespace Phantom.Agent.Minecraft.Properties;
 
 abstract class MinecraftServerProperty<T> {
 	private readonly string key;
-
+	
 	protected MinecraftServerProperty(string key) {
 		this.key = key;
 	}
 	
 	protected abstract T Read(string value);
 	protected abstract string Write(T value);
-
+	
 	public void Set(JavaPropertiesFileEditor properties, T value) {
 		properties.Set(key, Write(value));
 	}

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

@@ -5,11 +5,13 @@ 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(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/DownloadProgressEventArgs.cs

@@ -1,4 +1,4 @@
-namespace Phantom.Agent.Minecraft.Server; 
+namespace Phantom.Agent.Minecraft.Server;
 
 public sealed class DownloadProgressEventArgs : EventArgs {
 	public ulong DownloadedBytes { get; }

Agent/Phantom.Agent.Minecraft/Server/MinecraftServerExecutableDownloadListener.cs

@@ -1,3 +1,3 @@
-namespace Phantom.Agent.Minecraft.Server; 
+namespace Phantom.Agent.Minecraft.Server;
 
 sealed record MinecraftServerExecutableDownloadListener(EventHandler<DownloadProgressEventArgs> DownloadProgressEventHandler, CancellationToken CancellationToken);

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;
 
@@ -10,81 +10,105 @@ namespace Phantom.Agent.Minecraft.Server;
 
 sealed class MinecraftServerExecutableDownloader {
 	private static readonly ILogger Logger = PhantomLogger.Create<MinecraftServerExecutableDownloader>();
-
+	
 	public Task<string?> Task { get; }
 	public event EventHandler<DownloadProgressEventArgs>? DownloadProgress;
 	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;
 		
-		DownloadProgress += listener.DownloadProgressEventHandler;
-		listener.CancellationToken.Register(Unregister, listener);
+		lock (this) {
+			newListenerCount = ++listenerCount;
+			
+			DownloadProgress += listener.DownloadProgressEventHandler;
+			listenerCancellationRegistrations.Add(listener.CancellationToken.Register(Unregister, listener));
+		}
+		
+		Logger.Debug("Registered download listener, current listener count: {Listeners}", newListenerCount);
 	}
-
+	
 	private void Unregister(object? listenerObject) {
-		MinecraftServerExecutableDownloadListener listener = (MinecraftServerExecutableDownloadListener) listenerObject!;
-		DownloadProgress -= listener.DownloadProgressEventHandler;
-
-		if (--listeners <= 0) {
+		int newListenerCount;
+		
+		lock (this) {
+			MinecraftServerExecutableDownloadListener listener = (MinecraftServerExecutableDownloadListener) listenerObject!;
+			DownloadProgress -= listener.DownloadProgressEventHandler;
+			
+			newListenerCount = --listenerCount;
+			if (newListenerCount <= 0) {
+				cancellationTokenSource.Cancel();
+			}
+		}
+		
+		if (newListenerCount <= 0) {
 			Logger.Debug("Unregistered last download listener, cancelling download.");
-			cancellationTokenSource.Cancel();
 		}
 		else {
-			Logger.Debug("Unregistered download listener, current listener count: {Listeners}", listeners);
+			Logger.Debug("Unregistered download listener, current listener count: {Listeners}", newListenerCount);
 		}
 	}
-
+	
 	private void ReportDownloadProgress(DownloadProgressEventArgs args) {
 		DownloadProgress?.Invoke(this, args);
 	}
-
+	
 	private void OnCompleted(Task task) {
 		Logger.Debug("Download task completed.");
-		Completed?.Invoke(this, EventArgs.Empty);
-		Completed = null;
-		DownloadProgress = null;
+		
+		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 {
 		private readonly MinecraftServerExecutableDownloader downloader;
-
+		
 		public DownloadProgressCallback(MinecraftServerExecutableDownloader downloader) {
 			this.downloader = downloader;
 		}
-
+		
 		public void ReportProgress(ulong downloadedBytes, ulong totalBytes) {
 			downloader.ReportDownloadProgress(new DownloadProgressEventArgs(downloadedBytes, totalBytes));
 		}
 	}
-
-	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;
 			}
-
+			
 			File.Move(tmpFilePath, filePath, true);
 			Logger.Information("Server version {Version} downloaded.", minecraftVersion);
-
+			
 			return filePath;
 		} catch (OperationCanceledException) {
 			Logger.Information("Download for server version {Version} was cancelled.", minecraftVersion);
@@ -94,21 +118,19 @@ sealed class MinecraftServerExecutableDownloader {
 		} catch (Exception e) {
 			Logger.Error(e, "An unexpected error occurred.");
 			return null;
-		} finally {
-			cancellationTokenSource.Dispose();
 		}
 	}
-
+	
 	private static async Task FetchServerExecutableFile(HttpClient http, DownloadProgressCallback progressCallback, FileDownloadInfo fileDownloadInfo, string filePath, CancellationToken cancellationToken) {
 		Sha1String downloadedFileHash;
-
+		
 		try {
 			var response = await http.GetAsync(fileDownloadInfo.DownloadUrl, HttpCompletionOption.ResponseHeadersRead, cancellationToken);
 			response.EnsureSuccessStatusCode();
-
+			
 			await using var fileStream = new FileStream(filePath, FileMode.CreateNew, FileAccess.Write, FileShare.Read);
 			await using var responseStream = await response.Content.ReadAsStreamAsync(cancellationToken);
-
+			
 			using var streamCopier = new MinecraftServerDownloadStreamCopier(progressCallback, fileDownloadInfo.Size.Bytes);
 			downloadedFileHash = await streamCopier.Copy(responseStream, fileStream, cancellationToken);
 		} catch (OperationCanceledException) {
@@ -117,13 +139,13 @@ sealed class MinecraftServerExecutableDownloader {
 			Logger.Error(e, "Unable to download server executable.");
 			throw StopProcedureException.Instance;
 		}
-
+		
 		if (!downloadedFileHash.Equals(fileDownloadInfo.Hash)) {
 			Logger.Error("Downloaded server executable has mismatched SHA1 hash. Expected {Expected}, got {Actual}.", fileDownloadInfo.Hash, downloadedFileHash);
 			throw StopProcedureException.Instance;
 		}
 	}
-
+	
 	private static void TryDeleteExecutableAfterFailure(string filePath) {
 		if (File.Exists(filePath)) {
 			try {
@@ -133,33 +155,33 @@ sealed class MinecraftServerExecutableDownloader {
 			}
 		}
 	}
-
+	
 	private sealed class MinecraftServerDownloadStreamCopier : IDisposable {
 		private readonly StreamCopier streamCopier = new ();
 		private readonly IncrementalHash sha1 = IncrementalHash.CreateHash(HashAlgorithmName.SHA1);
-
+		
 		private readonly DownloadProgressCallback progressCallback;
 		private readonly ulong totalBytes;
 		private ulong readBytes;
-
+		
 		public MinecraftServerDownloadStreamCopier(DownloadProgressCallback progressCallback, ulong totalBytes) {
 			this.progressCallback = progressCallback;
 			this.totalBytes = totalBytes;
 			this.streamCopier.BufferReady += OnBufferReady;
 		}
-
+		
 		private void OnBufferReady(object? sender, StreamCopier.BufferEventArgs args) {
 			sha1.AppendData(args.Buffer.Span);
-
+			
 			readBytes += (uint) args.Buffer.Length;
 			progressCallback.ReportProgress(readBytes, totalBytes);
 		}
-
+		
 		public async Task<Sha1String> Copy(Stream source, Stream destination, CancellationToken cancellationToken) {
 			await streamCopier.Copy(source, destination, cancellationToken);
 			return Sha1String.FromBytes(sha1.GetHashAndReset());
 		}
-
+		
 		public void Dispose() {
 			sha1.Dispose();
 			streamCopier.Dispose();

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

@@ -1,47 +1,47 @@
 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;
 
 public sealed partial class MinecraftServerExecutables {
 	private static readonly ILogger Logger = PhantomLogger.Create<MinecraftServerExecutables>();
-
+	
 	[GeneratedRegex(@"[^a-zA-Z0-9_\-\.]", RegexOptions.Compiled)]
 	private static partial Regex SanitizePathRegex();
-
+	
 	private readonly string basePath;
 	private readonly Dictionary<string, MinecraftServerExecutableDownloader> runningDownloadersByVersion = new ();
-
+	
 	public MinecraftServerExecutables(string basePath) {
 		this.basePath = basePath;
 	}
-
+	
 	internal async Task<string?> DownloadAndGetPath(FileDownloadInfo? fileDownloadInfo, string minecraftVersion, EventHandler<DownloadProgressEventArgs> progressEventHandler, CancellationToken cancellationToken) {
 		string serverExecutableFolderPath = Path.Combine(basePath, SanitizePathRegex().IsMatch(minecraftVersion) ? SanitizePathRegex().Replace(minecraftVersion, "_") : minecraftVersion);
 		string serverExecutableFilePath = Path.Combine(serverExecutableFolderPath, "server.jar");
-
+		
 		if (File.Exists(serverExecutableFilePath)) {
 			return serverExecutableFilePath;
 		}
-
+		
 		if (fileDownloadInfo == null) {
 			Logger.Error("Unable to download server executable for version {Version} because no download info was provided.", minecraftVersion);
 			return null;
 		}
-
+		
 		try {
 			Directories.Create(serverExecutableFolderPath, Chmod.URWX_GRX);
 		} catch (Exception e) {
 			Logger.Error(e, "Unable to create folder for server executable: {ServerExecutableFolderPath}", serverExecutableFolderPath);
 			return null;
 		}
-
+		
 		MinecraftServerExecutableDownloader? downloader;
 		MinecraftServerExecutableDownloadListener listener = new (progressEventHandler, cancellationToken);
-
+		
 		lock (this) {
 			if (runningDownloadersByVersion.TryGetValue(minecraftVersion, out downloader)) {
 				Logger.Information("A download for server version {Version} is already running, waiting for it to finish...", minecraftVersion);
@@ -54,11 +54,11 @@ public sealed partial class MinecraftServerExecutables {
 						runningDownloadersByVersion.Remove(minecraftVersion);
 					}
 				};
-
+				
 				runningDownloadersByVersion[minecraftVersion] = downloader;
 			}
 		}
-
+		
 		return await downloader.Task.WaitAsync(cancellationToken);
 	}
 }

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; 
+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();
@@ -32,25 +16,23 @@ public sealed class ServerStatusProtocol {
 		// https://wiki.vg/Server_List_Ping
 		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;
@@ -58,36 +40,55 @@ public sealed class ServerStatusProtocol {
 			ArrayPool<byte>.Shared.Return(headerBuffer);
 		}
 	}
-
-	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.AsSpan((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/KeepAliveLoop.cs

@@ -1,40 +0,0 @@
-using Phantom.Common.Logging;
-using Phantom.Common.Messages.Agent.ToController;
-using Serilog;
-
-namespace Phantom.Agent.Rpc;
-
-sealed class KeepAliveLoop {
-	private static readonly ILogger Logger = PhantomLogger.Create<KeepAliveLoop>();
-
-	private static readonly TimeSpan KeepAliveInterval = TimeSpan.FromSeconds(10);
-
-	private readonly RpcServerConnection connection;
-	private readonly CancellationTokenSource cancellationTokenSource = new ();
-
-	public KeepAliveLoop(RpcServerConnection connection) {
-		this.connection = connection;
-		Task.Run(Run);
-	}
-
-	private async Task Run() {
-		var cancellationToken = cancellationTokenSource.Token;
-
-		Logger.Information("Started keep-alive loop.");
-		try {
-			while (true) {
-				await Task.Delay(KeepAliveInterval, cancellationToken);
-				await connection.Send(new AgentIsAliveMessage());
-			}
-		} catch (OperationCanceledException) {
-			// Ignore.
-		} finally {
-			cancellationTokenSource.Dispose();
-			Logger.Information("Stopped keep-alive loop.");
-		}
-	}
-
-	public void Cancel() {
-		cancellationTokenSource.Cancel();
-	}
-}

Agent/Phantom.Agent.Rpc/RpcLauncher.cs

@@ -1,107 +0,0 @@
-using NetMQ;
-using NetMQ.Sockets;
-using Phantom.Common.Data.Agent;
-using Phantom.Common.Messages.Agent;
-using Phantom.Common.Messages.Agent.BiDirectional;
-using Phantom.Common.Messages.Agent.ToController;
-using Phantom.Utils.Rpc;
-using Phantom.Utils.Rpc.Message;
-using Phantom.Utils.Tasks;
-using Serilog;
-using Serilog.Events;
-
-namespace Phantom.Agent.Rpc;
-
-public sealed class RpcLauncher : RpcRuntime<ClientSocket> {
-	public static Task Launch(RpcConfiguration config, AuthToken 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 = AgentMessageRegistries.ToController.Write(new RegisterAgentMessage(authToken, agentInfo)).ToArray();
-
-		return 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) {
-					AgentMessageRegistries.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 && AgentMessageRegistries.ToAgent.TryGetType(data, out var type)) {
-			logger.Verbose("Received {MessageType} ({Bytes} B) from controller.", type.Name, data.Length);
-		}
-		else {
-			logger.Verbose("Received {Bytes} B message from controller.", 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 controller.");
-		}
-	}
-
-	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.Agent;
-using Phantom.Common.Messages.Agent.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 : IMessageToController {
-		var bytes = AgentMessageRegistries.ToController.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 : IMessageToController<TReply> where TReply : class {
-		var sequenceId = replyTracker.RegisterReply();
-		
-		var bytes = AgentMessageRegistries.ToController.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.Agent;
-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 : IMessageToController {
-		return CurrentConnectionOrThrow.Send(message);
-	}
-
-	public static Task<TReply?> Send<TMessage, TReply>(TMessage message, TimeSpan waitForReplyTime, CancellationToken waitForReplyCancellationToken) where TMessage : IMessageToController<TReply> where TReply : class {
-		return CurrentConnectionOrThrow.Send<TMessage, TReply>(message, waitForReplyTime, waitForReplyCancellationToken);
-	}
-}

Agent/Phantom.Agent.Services/AgentFolders.cs

@@ -1,21 +1,21 @@
-using Phantom.Common.Logging;
-using Phantom.Utils.IO;
+using Phantom.Utils.IO;
+using Phantom.Utils.Logging;
 using Serilog;
 
 namespace Phantom.Agent.Services;
 
 public sealed class AgentFolders {
 	private static readonly ILogger Logger = PhantomLogger.Create<AgentFolders>();
-
+	
 	public string DataFolderPath { get; }
 	public string InstancesFolderPath { get; }
 	public string BackupsFolderPath { get; }
-
+	
 	public string TemporaryFolderPath { get; }
 	public string ServerExecutableFolderPath { get; }
-
+	
 	public string JavaSearchFolderPath { get; }
-
+	
 	public AgentFolders(string dataFolderPath, string temporaryFolderPath, string javaSearchFolderPath) {
 		this.DataFolderPath = Path.GetFullPath(dataFolderPath);
 		this.InstancesFolderPath = Path.Combine(DataFolderPath, "instances");
@@ -26,7 +26,7 @@ public sealed class AgentFolders {
 		
 		this.JavaSearchFolderPath = javaSearchFolderPath;
 	}
-
+	
 	public bool TryCreate() {
 		return TryCreateFolder(DataFolderPath) &&
 		       TryCreateFolder(InstancesFolderPath) &&
@@ -34,12 +34,12 @@ public sealed class AgentFolders {
 		       TryCreateFolder(TemporaryFolderPath) &&
 		       TryCreateFolder(ServerExecutableFolderPath);
 	}
-
+	
 	private static bool TryCreateFolder(string folderPath) {
 		if (Directory.Exists(folderPath)) {
 			return true;
 		}
-
+		
 		try {
 			Directories.Create(folderPath, Chmod.URWX_GRX);
 			return true;

Agent/Phantom.Agent.Services/AgentServiceConfiguration.cs

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

Agent/Phantom.Agent.Services/AgentServices.cs

@@ -1,9 +1,15 @@
-using Phantom.Agent.Minecraft.Java;
+using System.Collections.Immutable;
+using Akka.Actor;
+using Phantom.Agent.Minecraft.Java;
 using Phantom.Agent.Services.Backups;
 using Phantom.Agent.Services.Instances;
+using Phantom.Agent.Services.Rpc;
 using Phantom.Common.Data.Agent;
-using Phantom.Common.Logging;
-using Phantom.Utils.Tasks;
+using Phantom.Common.Data.Replies;
+using Phantom.Common.Messages.Agent.ToAgent;
+using Phantom.Common.Messages.Agent.ToController;
+using Phantom.Utils.Actor;
+using Phantom.Utils.Logging;
 using Serilog;
 
 namespace Phantom.Agent.Services;
@@ -11,35 +17,81 @@ namespace Phantom.Agent.Services;
 public sealed class AgentServices {
 	private static readonly ILogger Logger = PhantomLogger.Create<AgentServices>();
 	
+	public ActorSystem ActorSystem { get; }
+	
+	private AgentInfo AgentInfo { 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; }
-
-	public AgentServices(AgentInfo agentInfo, AgentFolders agentFolders, AgentServiceConfiguration serviceConfiguration) {
+	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");
+		
+		this.AgentInfo = agentInfo;
 		this.AgentFolders = agentFolders;
-		this.TaskManager = new TaskManager(PhantomLogger.Create<TaskManager, AgentServices>());
+		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() {
 		await foreach (var runtime in JavaRuntimeDiscovery.Scan(AgentFolders.JavaSearchFolderPath)) {
 			JavaRuntimeRepository.Include(runtime);
 		}
 	}
-
+	
+	public  async Task<bool> Register(ControllerConnection connection, CancellationToken cancellationToken) {
+		Logger.Information("Registering with the controller...");
+		
+		ImmutableArray<ConfigureInstanceMessage> configureInstanceMessages;
+		try {
+			configureInstanceMessages = await connection.Send<RegisterAgentMessage, ImmutableArray<ConfigureInstanceMessage>>(new RegisterAgentMessage(AgentInfo), TimeSpan.FromMinutes(1), cancellationToken);
+		} catch (Exception e) {
+			Logger.Fatal(e, "Registration failed.");
+			return false;
+		}
+		
+		foreach (var configureInstanceMessage in configureInstanceMessages) {
+			var configureInstanceCommand = new InstanceManagerActor.ConfigureInstanceCommand(
+				configureInstanceMessage.InstanceGuid,
+				configureInstanceMessage.Configuration,
+				configureInstanceMessage.LaunchProperties,
+				configureInstanceMessage.LaunchNow,
+				AlwaysReportStatus: true
+			);
+			
+			var configureInstanceResult = await InstanceManager.Request(configureInstanceCommand, cancellationToken);
+			if (!configureInstanceResult.Is(ConfigureInstanceResult.Success)) {
+				Logger.Fatal("Unable to configure instance \"{Name}\" (GUID {Guid}), shutting down.", configureInstanceMessage.Configuration.InstanceName, configureInstanceMessage.InstanceGuid);
+				return false;
+			}
+		}
+		
+		await connection.Send(new AdvertiseJavaRuntimesMessage(JavaRuntimeRepository.All), cancellationToken);
+		InstanceTicketManager.RefreshAgentStatus();
+		
+		return true;
+	}
+	
 	public async Task Shutdown() {
 		Logger.Information("Stopping services...");
 		
-		await InstanceSessionManager.DisposeAsync();
-		await TaskManager.Stop();
+		await InstanceManager.Stop(new InstanceManagerActor.ShutdownCommand());
 		
 		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,11 +3,11 @@ 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; 
+namespace Phantom.Agent.Services.Backups;
 
 sealed class BackupArchiver {
 	private readonly string destinationBasePath;
@@ -23,7 +23,7 @@ sealed class BackupArchiver {
 		this.instanceProperties = instanceProperties;
 		this.cancellationToken = cancellationToken;
 	}
-
+	
 	private bool IsFolderSkipped(ImmutableList<string> relativePath) {
 		return relativePath is ["cache" or "crash-reports" or "debug" or "libraries" or "logs" or "mods" or "versions"];
 	}
@@ -35,7 +35,7 @@ sealed class BackupArchiver {
 		if (relativePath.Count == 2 && name == "session.lock") {
 			return true;
 		}
-
+		
 		var extension = Path.GetExtension(name);
 		if (extension is ".jar" or ".zip") {
 			return true;
@@ -43,7 +43,7 @@ sealed class BackupArchiver {
 		
 		return false;
 	}
-
+	
 	public async Task<string?> ArchiveWorld(BackupCreationResult.Builder resultBuilder) {
 		string guid = instanceProperties.InstanceGuid.ToString();
 		string currentDateTime = DateTime.Now.ToString("yyyyMMdd-HHmmss");
@@ -63,7 +63,7 @@ sealed class BackupArchiver {
 			logger.Error(e, "Could not create backup folder: {Folder}", backupFolderPath);
 			return null;
 		}
-
+		
 		string temporaryFolderPath = Path.Combine(temporaryBasePath, guid + "_" + currentDateTime);
 		if (!await CopyWorldAndCreateTarArchive(temporaryFolderPath, backupFilePath, resultBuilder)) {
 			return null;
@@ -72,19 +72,19 @@ sealed class BackupArchiver {
 		logger.Debug("Created world backup: {FilePath}", backupFilePath);
 		return backupFilePath;
 	}
-
+	
 	private async Task<bool> CopyWorldAndCreateTarArchive(string temporaryFolderPath, string backupFilePath, BackupCreationResult.Builder resultBuilder) {
 		try {
 			if (!await CopyWorldToTemporaryFolder(temporaryFolderPath)) {
 				resultBuilder.Kind = BackupCreationResultKind.CouldNotCopyWorldToTemporaryFolder;
 				return false;
 			}
-
+			
 			if (!await CreateTarArchive(temporaryFolderPath, backupFilePath)) {
 				resultBuilder.Kind = BackupCreationResultKind.CouldNotCreateWorldArchive;
 				return false;
 			}
-
+			
 			return true;
 		} finally {
 			try {
@@ -95,7 +95,7 @@ sealed class BackupArchiver {
 			}
 		}
 	}
-
+	
 	private async Task<bool> CopyWorldToTemporaryFolder(string temporaryFolderPath) {
 		try {
 			await CopyDirectory(new DirectoryInfo(instanceProperties.InstanceFolder), temporaryFolderPath, ImmutableList<string>.Empty);
@@ -105,7 +105,7 @@ sealed class BackupArchiver {
 			return false;
 		}
 	}
-
+	
 	private async Task<bool> CreateTarArchive(string sourceFolderPath, string backupFilePath) {
 		try {
 			await TarFile.CreateFromDirectoryAsync(sourceFolderPath, backupFilePath, false, cancellationToken);
@@ -116,7 +116,7 @@ sealed class BackupArchiver {
 			return false;
 		}
 	}
-
+	
 	private void DeleteBrokenArchiveFile(string filePath) {
 		if (File.Exists(filePath)) {
 			try {
@@ -126,10 +126,10 @@ sealed class BackupArchiver {
 			}
 		}
 	}
-
+	
 	private async Task CopyDirectory(DirectoryInfo sourceFolder, string destinationFolderPath, ImmutableList<string> relativePath) {
 		cancellationToken.ThrowIfCancellationRequested();
-
+		
 		bool needsToCreateFolder = true;
 		
 		foreach (FileInfo file in sourceFolder.EnumerateFiles()) {
@@ -138,15 +138,15 @@ sealed class BackupArchiver {
 				logger.Debug("Skipping file: {File}", string.Join('/', filePath));
 				continue;
 			}
-
+			
 			if (needsToCreateFolder) {
 				needsToCreateFolder = false;
 				Directories.Create(destinationFolderPath, Chmod.URWX);
 			}
-
+			
 			await CopyFileWithRetries(file, destinationFolderPath);
 		}
-
+		
 		foreach (DirectoryInfo directory in sourceFolder.EnumerateDirectories()) {
 			var folderPath = relativePath.Add(directory.Name);
 			if (IsFolderSkipped(folderPath)) {
@@ -157,7 +157,7 @@ sealed class BackupArchiver {
 			await CopyDirectory(directory, Path.Join(destinationFolderPath, directory.Name), folderPath);
 		}
 	}
-
+	
 	private async Task CopyFileWithRetries(FileInfo sourceFile, string destinationFolderPath) {
 		var destinationFilePath = Path.Combine(destinationFolderPath, sourceFile.Name);
 		

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

@@ -1,8 +1,8 @@
-using Phantom.Common.Logging;
+using Phantom.Utils.Logging;
 using Phantom.Utils.Processes;
 using Serilog;
 
-namespace Phantom.Agent.Services.Backups; 
+namespace Phantom.Agent.Services.Backups;
 
 static class BackupCompressor {
 	private static ILogger Logger { get; } = PhantomLogger.Create(nameof(BackupCompressor));
@@ -19,27 +19,27 @@ static class BackupCompressor {
 		}
 		
 		var destinationFilePath = sourceFilePath + ".zst";
-
+		
 		if (!await TryCompressFile(sourceFilePath, destinationFilePath, cancellationToken)) {
 			try {
 				File.Delete(destinationFilePath);
 			} catch (Exception e) {
 				Logger.Error(e, "Could not delete compresed archive after unsuccessful compression: {Path}", destinationFilePath);
 			}
-
+			
 			return null;
 		}
-
+		
 		return destinationFilePath;
 	}
-
+	
 	private static async Task<bool> TryCompressFile(string sourceFilePath, string destinationFilePath, CancellationToken cancellationToken) {
 		var workingDirectory = Path.GetDirectoryName(sourceFilePath);
 		if (string.IsNullOrEmpty(workingDirectory)) {
 			Logger.Error("Invalid destination path: {Path}", destinationFilePath);
 			return false;
 		}
-
+		
 		var launcher = new ProcessConfigurator {
 			FileName = "zstd",
 			WorkingDirectory = workingDirectory,
@@ -53,13 +53,13 @@ static class BackupCompressor {
 				"--", sourceFilePath
 			}
 		};
-
+		
 		static void OnZstdOutput(object? sender, Process.Output output) {
 			if (!string.IsNullOrWhiteSpace(output.Line)) {
 				ZstdLogger.Debug("[Output] {Line}", output.Line);
 			}
 		}
-
+		
 		var process = new OneShotProcess(ZstdLogger, launcher);
 		process.OutputReceived += OnZstdOutput;
 		return await process.Run(cancellationToken);

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

@@ -1,6 +1,6 @@
 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;
@@ -9,28 +9,28 @@ sealed class BackupManager : IDisposable {
 	private readonly string destinationBasePath;
 	private readonly string temporaryBasePath;
 	private readonly SemaphoreSlim compressionSemaphore;
-
+	
 	public BackupManager(AgentFolders agentFolders, int maxConcurrentCompressionTasks) {
 		this.destinationBasePath = agentFolders.BackupsFolderPath;
 		this.temporaryBasePath = Path.Combine(agentFolders.TemporaryFolderPath, "backups");
 		this.compressionSemaphore = new SemaphoreSlim(maxConcurrentCompressionTasks, maxConcurrentCompressionTasks);
 	}
-
+	
 	public Task<BackupCreationResult> CreateBackup(string loggerName, InstanceProcess process, CancellationToken cancellationToken) {
 		return new BackupCreator(this, loggerName, process, cancellationToken).CreateBackup();
 	}
-
+	
 	public void Dispose() {
 		compressionSemaphore.Dispose();
 	}
-
+	
 	private sealed class BackupCreator {
 		private readonly BackupManager manager;
 		private readonly string loggerName;
 		private readonly ILogger logger;
 		private readonly InstanceProcess process;
 		private readonly CancellationToken cancellationToken;
-
+		
 		public BackupCreator(BackupManager manager, string loggerName, InstanceProcess process, CancellationToken cancellationToken) {
 			this.manager = manager;
 			this.loggerName = loggerName;
@@ -38,7 +38,7 @@ sealed class BackupManager : IDisposable {
 			this.process = process;
 			this.cancellationToken = cancellationToken;
 		}
-
+		
 		public async Task<BackupCreationResult> CreateBackup() {
 			logger.Information("Backup started.");
 			
@@ -57,7 +57,7 @@ sealed class BackupManager : IDisposable {
 			LogBackupResult(result);
 			return result;
 		}
-
+		
 		private async Task<string?> CreateWorldArchive(BackupServerCommandDispatcher dispatcher, BackupCreationResult.Builder resultBuilder) {
 			try {
 				await dispatcher.DisableAutomaticSaving();
@@ -67,6 +67,10 @@ sealed class BackupManager : IDisposable {
 				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.");
@@ -76,6 +80,9 @@ sealed class BackupManager : IDisposable {
 					await dispatcher.EnableAutomaticSaving();
 				} catch (OperationCanceledException) {
 					// 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.");
@@ -88,7 +95,7 @@ sealed class BackupManager : IDisposable {
 				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);
@@ -99,10 +106,10 @@ sealed class BackupManager : IDisposable {
 				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 : IDisposable {
 				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,11 +1,8 @@
-using Phantom.Agent.Minecraft.Instance;
-using Phantom.Agent.Minecraft.Server;
-using Phantom.Agent.Services.Instances;
-using Phantom.Agent.Services.Instances.Procedures;
+using Phantom.Agent.Services.Instances;
+using Phantom.Agent.Services.Instances.State;
 using Phantom.Common.Data.Backups;
-using Phantom.Common.Logging;
+using Phantom.Utils.Logging;
 using Phantom.Utils.Tasks;
-using Phantom.Utils.Threading;
 
 namespace Phantom.Agent.Services.Backups;
 
@@ -14,30 +11,26 @@ sealed class BackupScheduler : CancellableBackgroundTask {
 	private static readonly TimeSpan InitialDelay = TimeSpan.FromMinutes(2);
 	private static readonly TimeSpan BackupInterval = TimeSpan.FromMinutes(30);
 	private static readonly TimeSpan BackupFailureRetryDelay = TimeSpan.FromMinutes(5);
-
-	private readonly BackupManager backupManager;
-	private readonly InstanceProcess process;
-	private readonly IInstanceContext context;
-	private readonly SemaphoreSlim backupSemaphore = new (1, 1);
-	private readonly int serverPort;
-	private readonly ServerStatusProtocol serverStatusProtocol;
-	private readonly ManualResetEventSlim serverOutputWhileWaitingForOnlinePlayers = new ();
 	
-	public event EventHandler<BackupCreationResult>? BackupCompleted; 
-
-	public BackupScheduler(TaskManager taskManager, BackupManager backupManager, InstanceProcess process, IInstanceContext context, int serverPort) : base(PhantomLogger.Create<BackupScheduler>(context.ShortName), taskManager, "Backup scheduler for " + context.ShortName) {
-		this.backupManager = backupManager;
-		this.process = process;
+	private readonly BackupManager backupManager;
+	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(InstanceContext context, InstancePlayerCountTracker playerCountTracker) : base(PhantomLogger.Create<BackupScheduler>(context.ShortName)) {
+		this.backupManager = context.Services.BackupManager;
 		this.context = context;
-		this.serverPort = serverPort;
-		this.serverStatusProtocol = new ServerStatusProtocol(context.ShortName);
+		this.playerCountTracker = playerCountTracker;
 		Start();
 	}
-
+	
 	protected override async Task RunTask() {
 		await Task.Delay(InitialDelay, CancellationToken);
 		Logger.Information("Starting a new backup after server launched.");
-			
+		
 		while (!CancellationToken.IsCancellationRequested) {
 			var result = await CreateBackup();
 			BackupCompleted?.Invoke(this, result);
@@ -53,62 +46,38 @@ sealed class BackupScheduler : CancellableBackgroundTask {
 			}
 		}
 	}
-
+	
 	private async Task<BackupCreationResult> CreateBackup() {
 		if (!await backupSemaphore.WaitAsync(TimeSpan.FromSeconds(1))) {
 			return new BackupCreationResult(BackupCreationResultKind.BackupAlreadyRunning);
 		}
 		
 		try {
-			var procedure = new BackupInstanceProcedure(backupManager);
-			context.EnqueueProcedure(procedure);
-			return await procedure.Result;
+			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) {
-					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);
+			await task;
+			Logger.Information("Players are online, starting a new backup.");
+		} 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,4 +1,5 @@
-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.Tasks;
@@ -7,71 +8,88 @@ 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 = 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;
 		this.process = process;
 		this.cancellationToken = cancellationToken;
-
+		
 		this.process.AddOutputListener(OnOutput, maxLinesToReadFromHistory: 0);
 	}
-
+	
 	void IDisposable.Dispose() {
 		process.RemoveOutputListener(OnOutput);
 	}
-
+	
 	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) {
 		if (line == null) {
 			return;
 		}
-
+		
 		var match = ServerThreadInfoRegex().Match(line);
 		if (!match.Success) {
 			return;
 		}
-
+		
 		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/IInstanceContext.cs

@@ -1,25 +0,0 @@
-using Phantom.Agent.Services.Instances.Procedures;
-using Phantom.Agent.Services.Instances.States;
-using Phantom.Common.Data.Instance;
-using Serilog;
-
-namespace Phantom.Agent.Services.Instances; 
-
-interface IInstanceContext {
-	string ShortName { get; }
-	ILogger Logger { get; }
-	
-	InstanceServices Services { get; }
-	IInstanceState CurrentState { get; }
-
-	void SetStatus(IInstanceStatus newStatus);
-	void ReportEvent(IInstanceEvent instanceEvent);
-	void EnqueueProcedure(IInstanceProcedure procedure, bool immediate = false);
-}
-
-static class InstanceContextExtensions {
-	public static void SetLaunchFailedStatusAndReportEvent(this IInstanceContext context, InstanceLaunchFailReason reason) {
-		context.SetStatus(InstanceStatus.Failed(reason));
-		context.ReportEvent(new InstanceLaunchFailedEvent(reason));
-	}
-}

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

@@ -1,188 +1,5 @@
-using Phantom.Agent.Minecraft.Launcher;
-using Phantom.Agent.Rpc;
-using Phantom.Agent.Services.Instances.Procedures;
-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.Agent.ToController;
-using Serilog;
+using Phantom.Common.Data.Instance;
 
 namespace Phantom.Agent.Services.Instances;
 
-sealed class Instance : IAsyncDisposable {
-	private InstanceServices Services { get; }
-	
-	public InstanceConfiguration Configuration { get; private set; }
-	private IServerLauncher Launcher { get; set; }
-	private readonly SemaphoreSlim configurationSemaphore = new (1, 1);
-
-	private readonly string shortName;
-	private readonly ILogger logger;
-
-	private IInstanceStatus currentStatus;
-	private int statusUpdateCounter;
-	
-	private IInstanceState currentState;
-	public bool IsRunning => currentState is not InstanceNotRunningState;
-	
-	public event EventHandler? IsRunningChanged; 
-	
-	private readonly InstanceProcedureManager procedureManager;
-
-	public Instance(string shortName, InstanceServices services, InstanceConfiguration configuration, IServerLauncher launcher) {
-		this.shortName = shortName;
-		this.logger = PhantomLogger.Create<Instance>(shortName);
-
-		this.Services = services;
-		this.Configuration = configuration;
-		this.Launcher = launcher;
-		
-		this.currentState = new InstanceNotRunningState();
-		this.currentStatus = InstanceStatus.NotRunning;
-		
-		this.procedureManager = new InstanceProcedureManager(this, new Context(this), services.TaskManager);
-	}
-
-	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 () => {
-			if (status != currentStatus) {
-				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));
-	}
-	
-	internal 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);
-		}
-	}
-
-	public async Task Reconfigure(InstanceConfiguration configuration, IServerLauncher launcher, CancellationToken cancellationToken) {
-		await configurationSemaphore.WaitAsync(cancellationToken);
-		try {
-			Configuration = configuration;
-			Launcher = launcher;
-		} finally {
-			configurationSemaphore.Release();
-		}
-	}
-
-	public async Task<LaunchInstanceResult> Launch(CancellationToken cancellationToken) {
-		if (IsRunning) {
-			return LaunchInstanceResult.InstanceAlreadyRunning;
-		}
-
-		if (await procedureManager.GetCurrentProcedure(cancellationToken) is LaunchInstanceProcedure) {
-			return LaunchInstanceResult.InstanceAlreadyLaunching;
-		}
-		
-		LaunchInstanceProcedure procedure;
-		
-		await configurationSemaphore.WaitAsync(cancellationToken);
-		try {
-			procedure = new LaunchInstanceProcedure(Configuration, Launcher);
-		} finally {
-			configurationSemaphore.Release();
-		}
-		
-		ReportAndSetStatus(InstanceStatus.Launching);
-		await procedureManager.Enqueue(procedure);
-		return LaunchInstanceResult.LaunchInitiated;
-	}
-
-	public async Task<StopInstanceResult> Stop(MinecraftStopStrategy stopStrategy, CancellationToken cancellationToken) {
-		if (!IsRunning) {
-			return StopInstanceResult.InstanceAlreadyStopped;
-		}
-		
-		if (await procedureManager.GetCurrentProcedure(cancellationToken) is StopInstanceProcedure) {
-			return StopInstanceResult.InstanceAlreadyStopping;
-		}
-		
-		ReportAndSetStatus(InstanceStatus.Stopping);
-		await procedureManager.Enqueue(new StopInstanceProcedure(stopStrategy));
-		return StopInstanceResult.StopInitiated;
-	}
-
-	public async Task<bool> SendCommand(string command, CancellationToken cancellationToken) {
-		return await currentState.SendCommand(command, cancellationToken);
-	}
-
-	public async ValueTask DisposeAsync() {
-		await procedureManager.DisposeAsync();
-
-		while (currentState is not InstanceNotRunningState) {
-			await Task.Delay(TimeSpan.FromMilliseconds(250), CancellationToken.None);
-		}
-
-		if (currentState is IDisposable disposable) {
-			disposable.Dispose();
-		}
-		
-		configurationSemaphore.Dispose();
-	}
-
-	private sealed class Context : IInstanceContext {
-		public string ShortName => instance.shortName;
-		public ILogger Logger => instance.logger;
-		
-		public InstanceServices Services => instance.Services;
-		public IInstanceState CurrentState => instance.currentState;
-
-		private readonly Instance instance;
-		
-		public Context(Instance instance) {
-			this.instance = instance;
-		}
-
-		public void SetStatus(IInstanceStatus newStatus) {
-			instance.ReportAndSetStatus(newStatus);
-		}
-
-		public void ReportEvent(IInstanceEvent instanceEvent) {
-			instance.ReportEvent(instanceEvent);
-		}
-
-		public void EnqueueProcedure(IInstanceProcedure procedure, bool immediate) {
-			Services.TaskManager.Run("Enqueue procedure for instance " + instance.shortName, () => instance.procedureManager.Enqueue(procedure, immediate));
-		}
-	}
-}
+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.TrySend(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

@@ -0,0 +1,12 @@
+using Phantom.Common.Data.Instance;
+using Phantom.Common.Messages.Agent.ToController;
+using Phantom.Utils.Actor;
+using Serilog;
+
+namespace Phantom.Agent.Services.Instances;
+
+sealed record InstanceContext(Guid InstanceGuid, string ShortName, ILogger Logger, InstanceServices Services, ActorRef<InstanceActor.ICommand> Actor, CancellationToken ActorCancellationToken) {
+	public void ReportEvent(IInstanceEvent instanceEvent) {
+		Services.ControllerConnection.TrySend(new ReportInstanceEventMessage(Guid.NewGuid(), DateTime.UtcNow, InstanceGuid, instanceEvent));
+	}
+}

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

@@ -0,0 +1,208 @@
+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.Services.Backups;
+using Phantom.Agent.Services.Rpc;
+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),
+			_                           => 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/InstanceProcedureManager.cs

@@ -1,85 +0,0 @@
-using Phantom.Agent.Services.Instances.Procedures;
-using Phantom.Common.Data.Minecraft;
-using Phantom.Utils.Tasks;
-using Phantom.Utils.Threading;
-
-namespace Phantom.Agent.Services.Instances;
-
-sealed class InstanceProcedureManager : IAsyncDisposable {
-	private readonly record struct CurrentProcedure(IInstanceProcedure Procedure, CancellationTokenSource CancellationTokenSource);
-
-	private readonly ThreadSafeStructRef<CurrentProcedure> currentProcedure = new ();
-	private readonly ThreadSafeLinkedList<IInstanceProcedure> procedureQueue = new ();
-	private readonly AutoResetEvent procedureQueueReady = new (false);
-	private readonly ManualResetEventSlim procedureQueueFinished = new (false);
-
-	private readonly Instance instance;
-	private readonly IInstanceContext context;
-	private readonly CancellationTokenSource shutdownCancellationTokenSource = new ();
-
-	public InstanceProcedureManager(Instance instance, IInstanceContext context, TaskManager taskManager) {
-		this.instance = instance;
-		this.context = context;
-		taskManager.Run("Procedure manager for instance " + context.ShortName, Run);
-	}
-
-	public async Task Enqueue(IInstanceProcedure procedure, bool immediate = false) {
-		await procedureQueue.Add(procedure, toFront: immediate, shutdownCancellationTokenSource.Token);
-		procedureQueueReady.Set();
-	}
-
-	public async Task<IInstanceProcedure?> GetCurrentProcedure(CancellationToken cancellationToken) {
-		return (await currentProcedure.Get(cancellationToken))?.Procedure;
-	}
-
-	private async Task Run() {
-		try {
-			var shutdownCancellationToken = shutdownCancellationTokenSource.Token;
-			while (true) {
-				await procedureQueueReady.WaitOneAsync(shutdownCancellationToken);
-				while (await procedureQueue.TryTakeFromFront(shutdownCancellationToken) is {} nextProcedure) {
-					using var procedureCancellationTokenSource = new CancellationTokenSource();
-					await currentProcedure.Set(new CurrentProcedure(nextProcedure, procedureCancellationTokenSource), shutdownCancellationToken);
-					await RunProcedure(nextProcedure, procedureCancellationTokenSource.Token);
-					await currentProcedure.Set(null, shutdownCancellationToken);
-				}
-			}
-		} catch (OperationCanceledException) {
-			// Ignore.
-		}
-
-		await RunProcedure(new StopInstanceProcedure(MinecraftStopStrategy.Instant), CancellationToken.None);
-		procedureQueueFinished.Set();
-	}
-
-	private async Task RunProcedure(IInstanceProcedure procedure, CancellationToken cancellationToken) {
-		var procedureName = procedure.GetType().Name;
-
-		context.Logger.Debug("Started procedure: {Procedure}", procedureName);
-		try {
-			var newState = await procedure.Run(context, cancellationToken);
-			context.Logger.Debug("Finished procedure: {Procedure}", procedureName);
-
-			if (newState != null) {
-				instance.TransitionState(newState);
-			}
-		} catch (OperationCanceledException) {
-			context.Logger.Debug("Cancelled procedure: {Procedure}", procedureName);
-		} catch (Exception e) {
-			context.Logger.Error(e, "Caught exception while running procedure: {Procedure}", procedureName);
-		}
-	}
-
-	public async ValueTask DisposeAsync() {
-		shutdownCancellationTokenSource.Cancel();
-
-		(await currentProcedure.Get(CancellationToken.None))?.CancellationTokenSource.Cancel();
-		await procedureQueueFinished.WaitHandle.WaitOneAsync();
-
-		currentProcedure.Dispose();
-		procedureQueue.Dispose();
-		procedureQueueReady.Dispose();
-		procedureQueueFinished.Dispose();
-		shutdownCancellationTokenSource.Dispose();
-	}
-}

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

@@ -1,7 +1,7 @@
 using Phantom.Agent.Minecraft.Launcher;
 using Phantom.Agent.Services.Backups;
-using Phantom.Utils.Tasks;
+using Phantom.Agent.Services.Rpc;
 
-namespace Phantom.Agent.Services.Instances; 
+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,196 +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.Agent.ToController;
-using Phantom.Utils.IO;
-using Phantom.Utils.Tasks;
-using Serilog;
-
-namespace Phantom.Agent.Services.Instances;
-
-sealed class InstanceSessionManager : IAsyncDisposable {
-	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);
-
-	private uint instanceLoggerSequenceId = 0;
-
-	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(GetInstanceLoggerName(instanceGuid), 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 string GetInstanceLoggerName(Guid guid) {
-		var prefix = guid.ToString();
-		return prefix[..prefix.IndexOf('-')] + "/" + Interlocked.Increment(ref instanceLoggerSequenceId);
-	}
-
-	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, shutdownCancellationToken));
-	}
-
-	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 ValueTask DisposeAsync() {
-		Logger.Information("Stopping all instances...");
-		
-		shutdownCancellationTokenSource.Cancel();
-
-		await semaphore.WaitAsync(CancellationToken.None);
-		await Task.WhenAll(instances.Values.Select(static instance => instance.DisposeAsync().AsTask()));
-		instances.Clear();
-		
-		shutdownCancellationTokenSource.Dispose();
-		semaphore.Dispose();
-	}
-}

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

@@ -0,0 +1,99 @@
+using Phantom.Agent.Services.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 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.TrySend(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/Procedures/BackupInstanceProcedure.cs

@@ -1,29 +0,0 @@
-using Phantom.Agent.Services.Backups;
-using Phantom.Agent.Services.Instances.States;
-using Phantom.Common.Data.Backups;
-
-namespace Phantom.Agent.Services.Instances.Procedures;
-
-sealed record BackupInstanceProcedure(BackupManager BackupManager) : IInstanceProcedure {
-	private readonly TaskCompletionSource<BackupCreationResult> resultCompletionSource = new ();
-
-	public Task<BackupCreationResult> Result => resultCompletionSource.Task;
-
-	public async Task<IInstanceState?> Run(IInstanceContext context, CancellationToken cancellationToken) {
-		if (context.CurrentState is not InstanceRunningState runningState || runningState.Process.HasEnded) {
-			resultCompletionSource.SetResult(new BackupCreationResult(BackupCreationResultKind.InstanceNotRunning));
-			return null;
-		}
-
-		try {
-			var result = await BackupManager.CreateBackup(context.ShortName, runningState.Process, cancellationToken);
-			resultCompletionSource.SetResult(result);
-		} catch (OperationCanceledException) {
-			resultCompletionSource.SetCanceled(cancellationToken);
-		} catch (Exception e) {
-			resultCompletionSource.SetException(e);
-		}
-
-		return null;
-	}
-}

Agent/Phantom.Agent.Services/Instances/Procedures/IInstanceProcedure.cs

@@ -1,7 +0,0 @@
-using Phantom.Agent.Services.Instances.States;
-
-namespace Phantom.Agent.Services.Instances.Procedures; 
-
-interface IInstanceProcedure {
-	Task<IInstanceState?> Run(IInstanceContext context, CancellationToken cancellationToken);
-}

Agent/Phantom.Agent.Services/Instances/Procedures/LaunchInstanceProcedure.cs

@@ -1,97 +0,0 @@
-using Phantom.Agent.Minecraft.Instance;
-using Phantom.Agent.Minecraft.Launcher;
-using Phantom.Agent.Minecraft.Server;
-using Phantom.Agent.Services.Instances.States;
-using Phantom.Common.Data.Instance;
-
-namespace Phantom.Agent.Services.Instances.Procedures;
-
-sealed record LaunchInstanceProcedure(InstanceConfiguration Configuration, IServerLauncher Launcher, bool IsRestarting = false) : IInstanceProcedure {
-	public async Task<IInstanceState?> Run(IInstanceContext context, CancellationToken cancellationToken) {
-		if (!IsRestarting && context.CurrentState is InstanceRunningState) {
-			return null;
-		}
-		
-		context.SetStatus(IsRestarting ? InstanceStatus.Restarting : InstanceStatus.Launching);
-
-		InstanceLaunchFailReason? failReason = context.Services.PortManager.Reserve(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 new InstanceNotRunningState();
-		}
-		
-		context.Logger.Information("Session starting...");
-		try {
-			InstanceProcess process = await DoLaunch(context, cancellationToken);
-			return new InstanceRunningState(Configuration, Launcher, process, context);
-		} catch (OperationCanceledException) {
-			context.SetStatus(InstanceStatus.NotRunning);
-		} catch (LaunchFailureException e) {
-			context.Logger.Error(e.LogMessage);
-			context.SetLaunchFailedStatusAndReportEvent(e.Reason);
-		} catch (Exception e) {
-			context.Logger.Error(e, "Caught exception while launching instance.");
-			context.SetLaunchFailedStatusAndReportEvent(InstanceLaunchFailReason.UnknownError);
-		}
-		
-		context.Services.PortManager.Release(Configuration);
-		return new InstanceNotRunningState();
-	}
-
-	private async Task<InstanceProcess> DoLaunch(IInstanceContext context, 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;
-				context.SetStatus(InstanceStatus.Downloading(progress));
-			}
-		}
-
-		var launchResult = await 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.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.Running);
-		context.ReportEvent(InstanceEvent.LaunchSucceded);
-		return launchSuccess.Process;
-	}
-
-	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;
-		}
-	}
-}

Agent/Phantom.Agent.Services/Instances/Procedures/SetInstanceToNotRunningStateProcedure.cs

@@ -1,17 +0,0 @@
-using Phantom.Agent.Services.Instances.States;
-using Phantom.Common.Data.Instance;
-
-namespace Phantom.Agent.Services.Instances.Procedures;
-
-sealed record SetInstanceToNotRunningStateProcedure(IInstanceStatus Status) : IInstanceProcedure {
-	public Task<IInstanceState?> Run(IInstanceContext context, CancellationToken cancellationToken) {
-		if (context.CurrentState is InstanceRunningState { Process.HasEnded: true }) {
-			context.SetStatus(Status);
-			context.ReportEvent(InstanceEvent.Stopped);
-			return Task.FromResult<IInstanceState?>(new InstanceNotRunningState());
-		}
-		else {
-			return Task.FromResult<IInstanceState?>(null);
-		}
-	}
-}

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

@@ -1,27 +1,29 @@
 using System.Collections.Immutable;
 using System.Threading.Channels;
-using Phantom.Agent.Rpc;
-using Phantom.Common.Logging;
+using Phantom.Agent.Services.Rpc;
 using Phantom.Common.Messages.Agent.ToController;
+using Phantom.Utils.Logging;
 using Phantom.Utils.Tasks;
 
-namespace Phantom.Agent.Services.Instances;
+namespace Phantom.Agent.Services.Instances.State;
 
 sealed class InstanceLogSender : CancellableBackgroundTask {
-	private static readonly BoundedChannelOptions BufferOptions = new (capacity: 64) {
+	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(TaskManager taskManager, Guid instanceGuid, string loggerName) : base(PhantomLogger.Create<InstanceLogSender>(loggerName), taskManager, "Instance log sender for " + loggerName) {
+	
+	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();
@@ -34,16 +36,16 @@ sealed class InstanceLogSender : CancellableBackgroundTask {
 		try {
 			while (await lineReader.WaitToReadAsync(CancellationToken)) {
 				await Task.Delay(SendDelay, CancellationToken);
-				await SendOutputToServer(ReadLinesFromChannel(lineReader, lineBuilder));
+				SendOutputToServer(ReadLinesFromChannel(lineReader, lineBuilder));
 			}
 		} catch (OperationCanceledException) {
 			// Ignore.
 		}
-
+		
 		// Flush remaining lines.
-		await SendOutputToServer(ReadLinesFromChannel(lineReader, lineBuilder));
+		SendOutputToServer(ReadLinesFromChannel(lineReader, lineBuilder));
 	}
-
+	
 	private ImmutableArray<string> ReadLinesFromChannel(ChannelReader<string> reader, ImmutableArray<string>.Builder builder) {
 		builder.Clear();
 		
@@ -58,22 +60,22 @@ sealed class InstanceLogSender : CancellableBackgroundTask {
 		
 		return builder.ToImmutable();
 	}
-
-	private async Task SendOutputToServer(ImmutableArray<string> lines) {
+	
+	private void SendOutputToServer(ImmutableArray<string> lines) {
 		if (!lines.IsEmpty) {
-			await ServerMessaging.Send(new InstanceOutputMessage(instanceGuid, lines));
+			controllerConnection.TrySend(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.Services.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.TrySend(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

@@ -1,45 +1,51 @@
 using Phantom.Agent.Minecraft.Instance;
 using Phantom.Agent.Minecraft.Launcher;
 using Phantom.Agent.Services.Backups;
-using Phantom.Agent.Services.Instances.Procedures;
 using Phantom.Common.Data.Backups;
 using Phantom.Common.Data.Instance;
+using Phantom.Common.Data.Replies;
 
-namespace Phantom.Agent.Services.Instances.States;
+namespace Phantom.Agent.Services.Instances.State;
 
-sealed class InstanceRunningState : IInstanceState, IDisposable {
+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 IInstanceContext context;
-
+	private readonly CancellationToken cancellationToken;
+	
 	private readonly InstanceLogSender logSender;
+	private readonly InstancePlayerCountTracker playerCountTracker;
 	private readonly BackupScheduler backupScheduler;
-
+	
 	private bool isDisposed;
-
-	public InstanceRunningState(InstanceConfiguration configuration, IServerLauncher launcher, InstanceProcess process, IInstanceContext context) {
+	
+	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.context = context;
+		this.Ticket = ticket;
 		this.Process = process;
-
-		this.logSender = new InstanceLogSender(context.Services.TaskManager, configuration.InstanceGuid, context.ShortName);
-
-		this.backupScheduler = new BackupScheduler(context.Services.TaskManager, context.Services.BackupManager, process, context, configuration.ServerPort);
+		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.EnqueueProcedure(new SetInstanceToNotRunningStateProcedure(InstanceStatus.Failed(InstanceLaunchFailReason.UnknownError)), immediate: true);
+				context.Actor.Tell(new InstanceActor.HandleProcessEndedCommand(InstanceStatus.Failed(InstanceLaunchFailReason.UnknownError)));
 			}
 		}
 		else {
@@ -47,62 +53,70 @@ sealed class InstanceRunningState : IInstanceState, IDisposable {
 			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.EnqueueProcedure(new SetInstanceToNotRunningStateProcedure(InstanceStatus.NotRunning), immediate: true);
+			context.Actor.Tell(new InstanceActor.HandleProcessEndedCommand(InstanceStatus.NotRunning));
 		}
 		else {
 			context.Logger.Information("Session ended unexpectedly, restarting...");
 			context.ReportEvent(InstanceEvent.Crashed);
-			context.EnqueueProcedure(new LaunchInstanceProcedure(configuration, launcher, IsRestarting: true));
+			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<bool> SendCommand(string command, CancellationToken cancellationToken) {
+	
+	public async Task<SendCommandToInstanceResult> SendCommand(string command, CancellationToken cancellationToken) {
 		try {
 			context.Logger.Information("Sending command: {Command}", command);
 			await Process.SendCommand(command, cancellationToken);
-			return true;
+			return SendCommandToInstanceResult.Success;
 		} catch (OperationCanceledException) {
-			return false;
+			return SendCommandToInstanceResult.UnknownError;
 		} catch (Exception e) {
 			context.Logger.Warning(e, "Caught exception while sending command.");
-			return false;
+			return SendCommandToInstanceResult.UnknownError;
 		}
 	}
-
+	
+	public void OnStopInitiated() {
+		backupScheduler.Stop();
+		playerCountTracker.Stop();
+	}
+	
 	private bool TryDispose() {
 		lock (this) {
 			if (isDisposed) {
 				return false;
 			}
-
+			
 			isDisposed = true;
 		}
-
+		
+		OnStopInitiated();
 		logSender.Stop();
-		backupScheduler.Stop();
 		
 		Process.Dispose();
-		context.Services.PortManager.Release(configuration);
 		
 		return true;
 	}
-
+	
 	public void Dispose() {
 		TryDispose();
 	}

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

@@ -1,59 +1,54 @@
 using System.Diagnostics;
 using Phantom.Agent.Minecraft.Command;
 using Phantom.Agent.Minecraft.Instance;
-using Phantom.Agent.Services.Instances.States;
 using Phantom.Common.Data.Instance;
 using Phantom.Common.Data.Minecraft;
 
-namespace Phantom.Agent.Services.Instances.Procedures;
+namespace Phantom.Agent.Services.Instances.State;
 
-sealed record StopInstanceProcedure(MinecraftStopStrategy StopStrategy) : IInstanceProcedure {
+static class InstanceStopProcedure {
 	private static readonly ushort[] Stops = { 60, 30, 10, 5, 4, 3, 2, 1, 0 };
-
-	public async Task<IInstanceState?> Run(IInstanceContext context, CancellationToken cancellationToken) {
-		if (context.CurrentState is not InstanceRunningState runningState) {
-			return null;
-		}
-
+	
+	public static async Task<bool> Run(InstanceContext context, MinecraftStopStrategy stopStrategy, InstanceRunningState runningState, Action<IInstanceStatus> reportStatus, CancellationToken cancellationToken) {
 		var process = runningState.Process;
-
 		runningState.IsStopping = true;
-		context.SetStatus(InstanceStatus.Stopping);
-
-		var seconds = StopStrategy.Seconds;
+		
+		var seconds = stopStrategy.Seconds;
 		if (seconds > 0) {
 			try {
 				await CountDownWithAnnouncements(context, process, seconds, cancellationToken);
 			} catch (OperationCanceledException) {
 				runningState.IsStopping = false;
-				return null;
+				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.");
-			context.SetStatus(InstanceStatus.NotRunning);
+			reportStatus(InstanceStatus.NotRunning);
 			context.ReportEvent(InstanceEvent.Stopped);
 		}
-
-		return new InstanceNotRunningState();
+		
+		return true;
 	}
-
-	private async Task CountDownWithAnnouncements(IInstanceContext context, InstanceProcess process, ushort seconds, CancellationToken cancellationToken) {
+	
+	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);
@@ -61,20 +56,20 @@ sealed record StopInstanceProcedure(MinecraftStopStrategy StopStrategy) : IInsta
 			}
 		}
 	}
-
+	
 	private static string GetCountDownAnnouncementCommand(ushort seconds) {
 		return MinecraftCommand.Say("Server shutting down in " + seconds + (seconds == 1 ? " second." : " seconds."));
 	}
-
-	private async Task DoStop(IInstanceContext context, InstanceProcess process) {
+	
+	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 async Task TrySendStopCommand(IInstanceContext context, InstanceProcess 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);
@@ -82,16 +77,17 @@ sealed record StopInstanceProcedure(MinecraftStopStrategy StopStrategy) : IInsta
 			// 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 async Task WaitForSessionToEnd(IInstanceContext context, InstanceProcess process) {
-		using var timeout = new CancellationTokenSource(TimeSpan.FromSeconds(55));
+	
+	private static async Task WaitForSessionToEnd(InstanceContext context, InstanceProcess process) {
 		try {
-			await process.WaitForExit(timeout.Token);
-		} catch (OperationCanceledException) {
+			await process.WaitForExit(TimeSpan.FromSeconds(55));
+		} catch (TimeoutException) {
 			try {
 				context.Logger.Warning("Waiting timed out, killing session...");
 				process.Kill();

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

@@ -1,6 +0,0 @@
-namespace Phantom.Agent.Services.Instances.States; 
-
-interface IInstanceState {
-	void Initialize();
-	Task<bool> SendCommand(string command, CancellationToken cancellationToken);
-}

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

@@ -1,9 +0,0 @@
-namespace Phantom.Agent.Services.Instances.States; 
-
-sealed class InstanceNotRunningState : IInstanceState {
-	public void Initialize() {}
-
-	public Task<bool> SendCommand(string command, CancellationToken cancellationToken) {
-		return Task.FromResult(false);
-	}
-}

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

@@ -8,7 +8,6 @@
   <ItemGroup>
     <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>
 
 </Project>

Agent/Phantom.Agent.Services/Rpc/ControllerConnection.cs

@@ -0,0 +1,20 @@
+using Phantom.Common.Messages.Agent;
+using Phantom.Utils.Actor;
+using Phantom.Utils.Rpc.Runtime;
+
+namespace Phantom.Agent.Services.Rpc;
+
+public sealed class ControllerConnection(RpcSendChannel<IMessageToController> sendChannel) {
+	public ValueTask Send<TMessage>(TMessage message, CancellationToken cancellationToken) where TMessage : IMessageToController {
+		return sendChannel.SendMessage(message, cancellationToken);
+	}
+	
+	// TODO handle properly
+	public bool TrySend<TMessage>(TMessage message) where TMessage : IMessageToController {
+		return sendChannel.TrySendMessage(message);
+	}
+	
+	public Task<TReply> Send<TMessage, TReply>(TMessage message, TimeSpan waitForReplyTime, CancellationToken cancellationToken) where TMessage : IMessageToController, ICanReply<TReply> {
+		return sendChannel.SendMessage<TMessage, TReply>(message, waitForReplyTime, cancellationToken);
+	}
+}

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

@@ -0,0 +1,43 @@
+using Phantom.Agent.Services.Instances;
+using Phantom.Common.Data;
+using Phantom.Common.Data.Replies;
+using Phantom.Common.Messages.Agent;
+using Phantom.Common.Messages.Agent.ToAgent;
+using Phantom.Utils.Actor;
+
+namespace Phantom.Agent.Services.Rpc;
+
+public sealed class ControllerMessageHandlerActor : ReceiveActor<IMessageToAgent> {
+	public readonly record struct Init(AgentServices Agent);
+	
+	public static Props<IMessageToAgent> Factory(Init init) {
+		return Props<IMessageToAgent>.Create(() => new ControllerMessageHandlerActor(init), new ActorConfiguration { SupervisorStrategy = SupervisorStrategies.Resume });
+	}
+	
+	private readonly AgentServices agent;
+	
+	private ControllerMessageHandlerActor(Init init) {
+		this.agent = init.Agent;
+		
+		ReceiveAndReplyLater<ConfigureInstanceMessage, Result<ConfigureInstanceResult, InstanceActionFailure>>(HandleConfigureInstance);
+		ReceiveAndReplyLater<LaunchInstanceMessage, Result<LaunchInstanceResult, InstanceActionFailure>>(HandleLaunchInstance);
+		ReceiveAndReplyLater<StopInstanceMessage, Result<StopInstanceResult, InstanceActionFailure>>(HandleStopInstance);
+		ReceiveAndReplyLater<SendCommandToInstanceMessage, Result<SendCommandToInstanceResult, InstanceActionFailure>>(HandleSendCommandToInstance);
+	}
+	
+	private async Task<Result<ConfigureInstanceResult, InstanceActionFailure>> HandleConfigureInstance(ConfigureInstanceMessage message) {
+		return await agent.InstanceManager.Request(new InstanceManagerActor.ConfigureInstanceCommand(message.InstanceGuid, message.Configuration, message.LaunchProperties, message.LaunchNow, 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));
+	}
+}

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

@@ -1,88 +0,0 @@
-using Phantom.Agent.Rpc;
-using Phantom.Common.Data.Instance;
-using Phantom.Common.Data.Replies;
-using Phantom.Common.Logging;
-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.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);
-		
-		PhantomLogger.Dispose();
-		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,16 +1,16 @@
-using NetMQ;
-using Phantom.Common.Data.Agent;
-using Phantom.Common.Logging;
+using System.Text;
+using Phantom.Common.Data;
 using Phantom.Utils.Cryptography;
 using Phantom.Utils.IO;
+using Phantom.Utils.Logging;
 using Serilog;
 
 namespace Phantom.Agent;
 
 static class AgentKey {
 	private static ILogger Logger { get; } = PhantomLogger.Create(nameof(AgentKey));
-
-	public static Task<(NetMQCertificate, AuthToken)?> Load(string? agentKeyToken, string? agentKeyFilePath) {
+	
+	public static Task<ConnectionKey?> Load(string? agentKeyToken, string? agentKeyFilePath) {
 		if (agentKeyFilePath != null) {
 			return LoadFromFile(agentKeyFilePath);
 		}
@@ -21,27 +21,28 @@ static class AgentKey {
 			throw new InvalidOperationException();
 		}
 	}
-
-	private static async Task<(NetMQCertificate, AuthToken)?> LoadFromFile(string agentKeyFilePath) {
+	
+	private static async Task<ConnectionKey?> LoadFromFile(string agentKeyFilePath) {
 		if (!File.Exists(agentKeyFilePath)) {
 			Logger.Fatal("Missing agent key file: {AgentKeyFilePath}", agentKeyFilePath);
 			return null;
 		}
-
+		
 		try {
-			Files.RequireMaximumFileSize(agentKeyFilePath, 64);
-			return LoadFromBytes(await File.ReadAllBytesAsync(agentKeyFilePath));
+			Files.RequireMaximumFileSize(agentKeyFilePath, maximumBytes: 64);
+			string[] lines = await File.ReadAllLinesAsync(agentKeyFilePath, Encoding.UTF8);
+			return LoadFromToken(lines[0]);
 		} catch (IOException e) {
 			Logger.Fatal("Error loading agent key from file: {AgentKeyFilePath}", agentKeyFilePath);
-			Logger.Fatal(e.Message);
+			Logger.Fatal("{}", e.Message);
 			return null;
 		} catch (Exception) {
 			Logger.Fatal("File does not contain a valid agent key: {AgentKeyFilePath}", agentKeyFilePath);
 			return null;
 		}
 	}
-
-	private static (NetMQCertificate, AuthToken)? LoadFromToken(string agentKey) {
+	
+	private static ConnectionKey? LoadFromToken(string agentKey) {
 		try {
 			return LoadFromBytes(TokenGenerator.DecodeBytes(agentKey));
 		} catch (Exception) {
@@ -49,12 +50,10 @@ static class AgentKey {
 			return null;
 		}
 	}
-
-	private static (NetMQCertificate, AuthToken)? LoadFromBytes(byte[] agentKey) {
-		var (publicKey, agentToken) = ConnectionCommonKey.FromBytes(agentKey);
-		var controllerCertificate = NetMQCertificate.FromPublicKey(publicKey);
-		
+	
+	private static ConnectionKey? LoadFromBytes(byte[] agentKey) {
+		var connectionKey = ConnectionKey.FromBytes(agentKey);
 		Logger.Information("Loaded agent key.");
-		return (controllerCertificate, agentToken);
+		return connectionKey;
 	}
 }

Agent/Phantom.Agent/GuidFile.cs

@@ -1,18 +1,18 @@
 using System.Text;
-using Phantom.Common.Logging;
 using Phantom.Utils.IO;
+using Phantom.Utils.Logging;
 using Serilog;
 
-namespace Phantom.Agent; 
+namespace Phantom.Agent;
 
 static class GuidFile {
 	private static ILogger Logger { get; } = PhantomLogger.Create(nameof(GuidFile));
-
+	
 	private const string GuidFileName = "agent.guid";
 	
 	public static async Task<Guid?> CreateOrLoad(string folderPath) {
 		string filePath = Path.Combine(folderPath, GuidFileName);
-
+		
 		if (File.Exists(filePath)) {
 			try {
 				var guid = await LoadGuidFromFile(filePath);
@@ -25,7 +25,7 @@ static class GuidFile {
 		}
 		
 		Logger.Information("Creating agent GUID file: {FilePath}", filePath);
-
+		
 		try {
 			var guid = Guid.NewGuid();
 			await File.WriteAllTextAsync(filePath, guid.ToString(), Encoding.ASCII);

Agent/Phantom.Agent/Program.cs

@@ -1,74 +1,102 @@
 using System.Reflection;
 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.Utils.Rpc;
+using Phantom.Common.Messages.Agent;
+using Phantom.Common.Messages.Agent.ToController;
+using Phantom.Utils.Actor;
+using Phantom.Utils.Logging;
+using Phantom.Utils.Rpc.Runtime.Client;
 using Phantom.Utils.Runtime;
-using Phantom.Utils.Tasks;
+using Phantom.Utils.Threading;
 
 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...");
 });
 
-ThreadPool.SetMinThreads(workerThreads: 2, completionPortThreads: 1);
-
 try {
 	var fullVersion = AssemblyAttributes.GetFullVersion(Assembly.GetExecutingAssembly());
-
+	
 	PhantomLogger.Root.InformationHeading("Initializing Phantom Panel agent...");
 	PhantomLogger.Root.Information("Agent version: {Version}", fullVersion);
-
+	
 	var (controllerHost, controllerPort, javaSearchPath, agentKeyToken, agentKeyFilePath, agentName, maxInstances, maxMemory, allowedServerPorts, allowedRconPorts, maxConcurrentBackupCompressionTasks) = Variables.LoadOrStop();
-
+	
 	var agentKey = await AgentKey.Load(agentKeyToken, agentKeyFilePath);
 	if (agentKey == null) {
 		return 1;
 	}
-
+	
 	var folders = new AgentFolders("./data", "./temp", javaSearchPath);
 	if (!folders.TryCreate()) {
 		return 1;
 	}
-
+	
 	var agentGuid = await GuidFile.CreateOrLoad(folders.DataFolderPath);
 	if (agentGuid == null) {
 		return 1;
 	}
-
-	var (controllerCertificate, agentToken) = agentKey.Value;
-	var agentInfo = new AgentInfo(agentGuid.Value, agentName, ProtocolVersion, fullVersion, maxInstances, maxMemory, allowedServerPorts, allowedRconPorts);
-	var agentServices = new AgentServices(agentInfo, folders, new AgentServiceConfiguration(maxConcurrentBackupCompressionTasks));
-
-	MessageListener MessageListenerFactory(RpcServerConnection connection) {
-		return new MessageListener(connection, agentServices, shutdownCancellationTokenSource);
+	
+	var rpcClientConnectionParameters = new RpcClientConnectionParameters(
+		Host: controllerHost,
+		Port: controllerPort,
+		DistinguishedName: "phantom-controller",
+		CertificateThumbprint: agentKey.Value.CertificateThumbprint,
+		AuthToken: agentKey.Value.AuthToken,
+		SendQueueCapacity: 500,
+		PingInterval: TimeSpan.FromSeconds(10)
+	);
+	
+	using var rpcClient = await RpcClient<IMessageToController, IMessageToAgent>.Connect("Controller", rpcClientConnectionParameters, AgentMessageRegistries.Definitions, shutdownCancellationToken);
+	if (rpcClient == null) {
+		return 1;
 	}
-
-	PhantomLogger.Root.InformationHeading("Launching Phantom Panel agent...");
-
-	await agentServices.Initialize();
-
-	var rpcDisconnectSemaphore = new SemaphoreSlim(0, 1);
-	var rpcConfiguration = new RpcConfiguration(PhantomLogger.Create("Rpc"), PhantomLogger.Create<TaskManager>("Rpc"), controllerHost, controllerPort, controllerCertificate);
-	var rpcTask = RpcLauncher.Launch(rpcConfiguration, agentToken, agentInfo, MessageListenerFactory, rpcDisconnectSemaphore, shutdownCancellationToken);
+	
+	var controllerConnection = new ControllerConnection(rpcClient.SendChannel);
+	
+	Task? rpcClientListener = null;
 	try {
-		await rpcTask.WaitAsync(shutdownCancellationToken);
-	} finally {
-		shutdownCancellationTokenSource.Cancel();
+		PhantomLogger.Root.InformationHeading("Launching Phantom Panel agent...");
+		
+		var agentInfo = new AgentInfo(agentGuid.Value, agentName, ProtocolVersion, fullVersion, maxInstances, maxMemory, allowedServerPorts, allowedRconPorts);
+		var agentServices = new AgentServices(agentInfo, folders, new AgentServiceConfiguration(maxConcurrentBackupCompressionTasks), controllerConnection);
+		await agentServices.Initialize();
+		
+		var rpcMessageHandlerInit = new ControllerMessageHandlerActor.Init(agentServices);
+		var rpcMessageHandlerActor = agentServices.ActorSystem.ActorOf(ControllerMessageHandlerActor.Factory(rpcMessageHandlerInit), "ControllerMessageHandler");
+		
+		rpcClientListener = rpcClient.Listen(rpcMessageHandlerActor);
+		
+		if (await agentServices.Register(controllerConnection, shutdownCancellationToken)) {
+			PhantomLogger.Root.Information("Phantom Panel agent is ready.");
+			await shutdownCancellationToken.WaitHandle.WaitOneAsync();
+		}
+		
 		await agentServices.Shutdown();
-
-		rpcDisconnectSemaphore.Release();
-		await rpcTask;
-		rpcDisconnectSemaphore.Dispose();
+	} finally {
+		try {
+			await controllerConnection.Send(new UnregisterAgentMessage(), CancellationToken.None);
+			// TODO wait for acknowledgment
+		} catch (Exception e) {
+			PhantomLogger.Root.Warning(e, "Could not unregister agent after shutdown.");
+		} finally {
+			await rpcClient.Shutdown();
+			
+			if (rpcClientListener != null) {
+				await rpcClientListener;
+			}
+		}
 	}
-
+	
 	return 0;
 } catch (OperationCanceledException) {
 	return 0;
@@ -79,7 +107,7 @@ try {
 	return 1;
 } finally {
 	shutdownCancellationTokenSource.Dispose();
-
+	
 	PhantomLogger.Root.Information("Bye!");
 	PhantomLogger.Dispose();
 }

Agent/Phantom.Agent/Variables.cs

@@ -1,6 +1,6 @@
 using Phantom.Agent.Minecraft.Java;
 using Phantom.Common.Data;
-using Phantom.Common.Logging;
+using Phantom.Utils.Logging;
 using Phantom.Utils.Runtime;
 
 namespace Phantom.Agent;
@@ -21,7 +21,7 @@ sealed record Variables(
 	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("CONTROLLER_HOST").Require,
 			EnvironmentVariables.GetPortNumber("CONTROLLER_PORT").WithDefault(9401),
@@ -36,11 +36,11 @@ sealed record Variables(
 			(ushort) EnvironmentVariables.GetInteger("MAX_CONCURRENT_BACKUP_COMPRESSION_TASKS", min: 1, max: 10000).WithDefault(1)
 		);
 	}
-
+	
 	private static string GetDefaultJavaSearchPath() {
 		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 LoadOrStop() {
 		try {
 			return LoadOrThrow();

Common/Phantom.Common.Data.Tests/AllowedPortsTests.cs

@@ -1,6 +1,6 @@
 using NUnit.Framework;
 
-namespace Phantom.Common.Data.Tests; 
+namespace Phantom.Common.Data.Tests;
 
 [TestFixture]
 public sealed class AllowedPortsTests {

Common/Phantom.Common.Data.Tests/RamAllocationUnitsTests.cs

@@ -8,7 +8,7 @@ public sealed class RamAllocationUnitsTests {
 		private Action CallFromMegabytes(int value) {
 			return () => RamAllocationUnits.FromMegabytes(value);
 		}
-
+		
 		[TestCase(1)]
 		[TestCase(-1)]
 		[TestCase(255)]
@@ -24,13 +24,13 @@ public sealed class RamAllocationUnitsTests {
 		public void LessThan256MegabytesThrows(int value) {
 			Assert.That(CallFromMegabytes(value), Throws.Exception.TypeOf<ArgumentOutOfRangeException>().With.Message.StartsWith("Must be at least 0 MB."));
 		}
-
+		
 		[TestCase(16777216)]
 		[TestCase(int.MaxValue - 255)]
 		public void MoreThan16TerabytesThrows(int value) {
 			Assert.That(CallFromMegabytes(value), Throws.Exception.TypeOf<ArgumentOutOfRangeException>().With.Message.StartsWith("Must be at most " + (256 * 65535) + " MB."));
 		}
-
+		
 		[TestCase(0)]
 		[TestCase(256)]
 		[TestCase(512)]
@@ -41,17 +41,17 @@ public sealed class RamAllocationUnitsTests {
 			Assert.That(RamAllocationUnits.FromMegabytes(value).InMegabytes, Is.EqualTo(value));
 		}
 	}
-
+	
 	public sealed class FromString {
 		private Action CallFromString(string definition) {
 			return () => RamAllocationUnits.FromString(definition);
 		}
-
+		
 		[Test]
 		public void EmptyThrows() {
 			Assert.That(CallFromString(""), Throws.Exception.TypeOf<ArgumentOutOfRangeException>().With.Message.StartsWith("Must not be empty."));
 		}
-
+		
 		[Test]
 		public void MissingUnitThrows() {
 			Assert.That(CallFromString("256"), Throws.Exception.TypeOf<ArgumentOutOfRangeException>().With.Message.StartsWith("Must end with "));
@@ -66,7 +66,7 @@ public sealed class RamAllocationUnitsTests {
 		public void UnparseableValueThrows() {
 			Assert.That(CallFromString("123A5M"), Throws.Exception.TypeOf<ArgumentOutOfRangeException>().With.Message.StartsWith("Must begin with a number."));
 		}
-
+		
 		[TestCase("0m", 0)]
 		[TestCase("256m", 256)]
 		[TestCase("256M", 256)]
@@ -76,7 +76,7 @@ public sealed class RamAllocationUnitsTests {
 		public void ValidDefinitionInMegabytesIsParsedCorrectly(string definition, int megabytes) {
 			Assert.That(RamAllocationUnits.FromString(definition).InMegabytes, Is.EqualTo(megabytes));
 		}
-
+		
 		[TestCase("0g", 0)]
 		[TestCase("1g", 1024)]
 		[TestCase("1G", 1024)]

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.Controller.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,
@@ -15,13 +16,14 @@ public enum AuditLogEventType {
 	InstanceCommandExecuted
 }
 
-static class AuditLogEventTypeExtensions {
+public static class AuditLogEventTypeExtensions {
 	private static readonly Dictionary<AuditLogEventType, AuditLogSubjectType> SubjectTypes = new () {
 		{ AuditLogEventType.AdministratorUserCreated,  AuditLogSubjectType.User },
 		{ AuditLogEventType.AdministratorUserModified, AuditLogSubjectType.User },
 		{ 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 },
@@ -30,7 +32,7 @@ static class AuditLogEventTypeExtensions {
 		{ AuditLogEventType.InstanceStopped,           AuditLogSubjectType.Instance },
 		{ AuditLogEventType.InstanceCommandExecuted,   AuditLogSubjectType.Instance }
 	};
-
+	
 	static AuditLogEventTypeExtensions() {
 		foreach (var eventType in Enum.GetValues<AuditLogEventType>()) {
 			if (!SubjectTypes.ContainsKey(eventType)) {
@@ -38,8 +40,8 @@ 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.Controller.Database.Enums; 
+namespace Phantom.Common.Data.Web.AuditLog;
 
 public enum AuditLogSubjectType {
 	User,

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

@@ -1,26 +1,26 @@
-namespace Phantom.Controller.Database.Enums;
+namespace Phantom.Common.Data.Web.EventLog;
 
 public enum EventLogEventType {
-	InstanceLaunchSucceded,
+	InstanceLaunchSucceeded,
 	InstanceLaunchFailed,
 	InstanceCrashed,
 	InstanceStopped,
 	InstanceBackupSucceeded,
 	InstanceBackupSucceededWithWarnings,
-	InstanceBackupFailed,
+	InstanceBackupFailed
 }
 
-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() {
 		foreach (var eventType in Enum.GetValues<EventLogEventType>()) {
 			if (!SubjectTypes.ContainsKey(eventType)) {
@@ -28,7 +28,7 @@ static class EventLogEventTypeExtensions {
 			}
 		}
 	}
-
+	
 	public static EventLogSubjectType GetSubjectType(this EventLogEventType type) {
 		return SubjectTypes[type];
 	}

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

@@ -0,0 +1,5 @@
+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,25 +1,25 @@
 using System.Collections.Immutable;
 
-namespace Phantom.Controller.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));
 	}
-
+	
 	private static ValidationError? Validate(ImmutableArray<string> arguments) {
 		if (!arguments.All(static argument => argument.StartsWith('-'))) {
 			return ValidationError.InvalidFormat;
 		}
-
+		
 		// TODO not perfect, but good enough
 		if (arguments.Any(static argument => argument.Contains("-Xmx"))) {
 			return ValidationError.XmxNotAllowed;
@@ -31,19 +31,10 @@ public static class JvmArgumentsHelper {
 		
 		return null;
 	}
-
+	
 	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

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

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

@@ -1,4 +1,4 @@
-namespace Phantom.Controller.Services.Users.Roles; 
+namespace Phantom.Common.Data.Web.Users;
 
 public enum AddRoleError : byte {
 	NameIsEmpty,

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);
+	}
+}